Attachment 238171 Details for Bug 423614 – The same patch used for Luna

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] The same patch used for Luna

bug400489.patch (text/plain), 20.74 KB, created by Carl Anderson

on 2013-12-09 12:11:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2013-12-09 12:11:31 EST

Size: 20.74 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.xml b/plugins/org.eclipse.jst.jee.ui/plugin.xml
>index 97dc206..b35ab11 100644
>--- a/plugins/org.eclipse.jst.jee.ui/plugin.xml
>+++ b/plugins/org.eclipse.jst.jee.ui/plugin.xml
>@@ -570,6 +570,11 @@
>                        property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                        value="jst.ejb:3.1">
>                  </test>
>+                 <test
>+                       forcePluginActivation="true"
>+                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
>+                       value="jst.ejb:3.2">
>+                 </test>
>               </or>
>            </adapt>
> 			<instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
>@@ -802,6 +807,11 @@
>                        property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                        value="jst.web:3.0">
>                  </test>
>+                 <test
>+                       forcePluginActivation="true"
>+                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
>+                       value="jst.web:3.1">
>+                 </test>
>               </or>
>            </adapt>
>    <instanceof
>@@ -987,12 +997,17 @@
>                     forcePluginActivation="true"
>                     property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                     value="jst.ear:5.0">
>-              </test>
>+                </test>
>                 <test
>                     forcePluginActivation="true"
>                     property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                     value="jst.ear:6.0">
>-              </test>
>+                </test>
>+                <test
>+                    forcePluginActivation="true"
>+                    property="org.eclipse.wst.common.project.facet.core.projectFacet"
>+                    value="jst.ear:7.0">
>+                </test>
>               </or>
>            </adapt>
>            <instanceof
>@@ -1263,6 +1278,11 @@
>                     property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                     value="jst.appclient:6.0">
>               </test>
>+              <test
>+                    forcePluginActivation="true"
>+                    property="org.eclipse.wst.common.project.facet.core.projectFacet"
>+                    value="jst.appclient:7.0">
>+              </test>
>               </or>
>            </adapt>
>            <instanceof
>@@ -1322,6 +1342,11 @@
>                        property="org.eclipse.wst.common.project.facet.core.projectFacet"
>                        value="jst.connector:1.6">
>                  </test>
>+                 <test
>+                       forcePluginActivation="true"
>+                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
>+                       value="jst.connector:1.7">
>+                 </test>
>               </or>
>            </adapt>
>            <instanceof
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
>index 776f26f..16f6ca6 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator;
> 
>@@ -38,6 +39,7 @@
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
> import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
> import org.eclipse.wst.common.project.facet.core.IFacetedProject;
>+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
> import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> 
> /**
>@@ -107,12 +109,11 @@
> 				IFacetedProject facetedProject;
> 				try {
> 					facetedProject = ProjectFacetsManager.create(project);
>+					IProjectFacet earFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
> 					if (facetedProject != null && 
>-							(facetedProject.hasProjectFacet(
>-									ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
>-											J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
>-													ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
>-															J2EEVersionConstants.VERSION_6_0_TEXT)))) {
>+							(facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_5_0_TEXT)) 
>+							|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_6_0_TEXT))
>+							|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_7_0_TEXT)))) {
> 						AbstractGroupProvider element = getCachedContentProvider(project);
> 						if (element != null){
> 							children.add(element);	
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
>index a5a5d5e..3963ae4 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008, 2010 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator;
> 
>@@ -48,6 +49,7 @@
> 	
> 	private Image ejb30Image;
> 	private Image ejb31Image;
>+	private Image ejb32Image;
> 	private Image sessionBeanImage;
> 	private Image mdbImage;
> 	private Image cmpImage;
>@@ -72,6 +74,8 @@
> 				return getEjb30Image();
> 			} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
> 				return getEjb31Image();
>+			} else if (J2EEVersionConstants.VERSION_3_2_TEXT.equals(version)) {
>+				return getEjb32Image();
> 			}
> 			return getEjb30Image();
> 		} else if(element instanceof AbstractDDNode) {
>@@ -154,6 +158,13 @@
> 		}
> 		return ejb31Image;
> 	}
>+
>+	private Image getEjb32Image() {
>+		if (ejb32Image == null) {
>+			ejb32Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEE7MODEL).createImage();
>+		}
>+		return ejb32Image;
>+	}
> 	
> 	private Image getSessionBeanImage() {
> 		if (sessionBeanImage == null) {
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
>index abe0183..47a21b8 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008, 2010 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator.appclient;
> 
>@@ -47,6 +48,7 @@
> 	
> 	private Image appClient50Image;
> 	private Image appClient60Image;
>+	private Image appClient70Image;
> 
> 	private IFile ddFile;
> 
>@@ -85,6 +87,8 @@
> 			return getAppClient50Image();
> 		} else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
> 			return getAppClient60Image();
>+		} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
>+			return getAppClient70Image();
> 		}
> 		return getAppClient50Image();
> 	}
>@@ -122,5 +126,11 @@
> 		}
> 		return appClient60Image;
> 	}
>-	
>+
>+	private Image getAppClient70Image() {
>+		if (appClient70Image == null) {
>+			appClient70Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT70).createImage();
>+		}
>+		return appClient70Image;
>+	}
> }
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
>index 95d0cba..5788f29 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008, 2010 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator.ear;
> 
>@@ -30,6 +31,7 @@
> import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
> import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
> import org.eclipse.wst.common.project.facet.core.IFacetedProject;
>+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
> import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> 
> /**
>@@ -44,6 +46,7 @@
> 	public final static String EAR_DEFAULT_LIB = "lib"; //$NON-NLS-1$
> 	private static Image ear50Image;
> 	private static Image ear60Image;
>+	private static Image ear70Image;
> 	private EARVirtualComponent earComponent;
> 	private IFile ddFile;
> 	
>@@ -75,13 +78,12 @@
> 
> 		try {
> 			IFacetedProject facetedProject = ProjectFacetsManager.create(project);
>+			IProjectFacet earFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
> 			//EE6TODO
> 			if (facetedProject != null && 
>-					(facetedProject.hasProjectFacet(
>-							ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
>-									J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
>-											ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
>-													J2EEVersionConstants.VERSION_6_0_TEXT)))) {
>+					(facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_5_0_TEXT)) 
>+					|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_6_0_TEXT))
>+					|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_7_0_TEXT)))) {
> 
> 				if (bundledLibsNode == null) {
> 					BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent), null);//$NON-NLS-1$
>@@ -112,6 +114,8 @@
> 			return getEar50Image();
> 		} else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
> 			return getEar60Image();
>+		} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
>+			return getEar70Image();
> 		}
> 		return getEar50Image();
> 	}
>@@ -146,4 +150,10 @@
> 		return ear60Image;
> 	}
> 
>+	private Image getEar70Image() {
>+		if (ear70Image == null) {
>+			ear70Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR7_IMAGE).createImage();
>+		}
>+		return ear70Image;
>+	}
> }
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
>index b5ee3aa..c7a4838 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
>@@ -1,3 +1,14 @@
>+/***********************************************************************
>+ * Copyright (c) 2010, 2013 by SAP AG, Walldorf. 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>+ ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator.ra;
> 
> import java.util.ArrayList;
>@@ -62,5 +73,9 @@
> 	public String getText() {
> 		return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;
> 	}
>-	
>-}
>+
>+	public Connector getConnector()
>+	{
>+		return (Connector) javaee;
>+	}
>+}
>\ No newline at end of file
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
>index 56172ad..f17aa6f 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
>@@ -1,9 +1,21 @@
>+/***********************************************************************
>+ * Copyright (c) 2010, 2013 by SAP AG, Walldorf. 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>+ ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator.ra;
> 
> import java.util.ArrayList;
> import java.util.List;
> 
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> import org.eclipse.jst.javaee.jca.Connector;
> import org.eclipse.jst.jee.ui.internal.Messages;
>@@ -16,6 +28,7 @@
> 
> 	private IProject project;
> 	private Image CONNECTOR_IMAGE;
>+	private Image CONNECTOR_17_IMAGE;
> 
> 	public RaGroupContentProvider(JavaEEObject javaee, IProject project) {
> 		super(javaee);
>@@ -34,10 +47,15 @@
> 
> 	@Override
> 	public Image getImage() {
>-		if (CONNECTOR_IMAGE == null) {
>-			CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
>-		}
>-		return CONNECTOR_IMAGE;
>+		// default to 1.7
>+		Image retVal = getConnector17Image();
>+		String version = ((Connector)javaee).getVersion();
>+		if (J2EEVersionConstants.VERSION_1_6_TEXT.equals(version)) {
>+			retVal = getConnector16Image();
>+		} else if (J2EEVersionConstants.VERSION_1_7_TEXT.equals(version)) {
>+			retVal = getConnector17Image();
>+		} 
>+		return retVal;
> 	}
> 	
> 	
>@@ -46,4 +64,17 @@
> 		return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
> 	}
> 
>-}
>+	private Image getConnector16Image() {
>+		if (CONNECTOR_IMAGE == null) {
>+			CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
>+		}
>+		return CONNECTOR_IMAGE;
>+	}
>+
>+	private Image getConnector17Image() {
>+		if (CONNECTOR_17_IMAGE == null) {
>+			CONNECTOR_17_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_EE7CONNECTOR);
>+		}
>+		return CONNECTOR_17_IMAGE;
>+	}
>+}
>\ No newline at end of file
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
>index b84bf6d..8a0faa5 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008, 2010 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.internal.navigator.web;
> 
>@@ -54,6 +55,7 @@
> 	
> 	private Image web25Image;
> 	private Image web30Image;
>+	private Image web31Image;
> 	
> 	private IProject prjct = null;
> 	private IFile ddFile = null;
>@@ -99,6 +101,8 @@
> 			return getWeb25Image();
> 		} else if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
> 			return getWeb30Image();
>+		} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
>+			return getWeb31Image();
> 		}
> 		return getWeb25Image();
> 	}
>@@ -144,4 +148,11 @@
> 		}
> 		return web30Image;
> 	}
>+
>+	private Image getWeb31Image() {
>+		if (web31Image == null) {
>+			web31Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE7MODEL).createImage();
>+		}
>+		return web31Image;
>+	}
> }
>diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
>index 40cbac1..d4d23a1 100644
>--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
>+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
>@@ -1,5 +1,5 @@
> /***********************************************************************
>- * Copyright (c) 2008, 2010 by SAP AG, Walldorf. 
>+ * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     SAP AG - initial API and implementation
>+ *     IBM - Java EE 7 support
>  ***********************************************************************/
> package org.eclipse.jst.jee.ui.plugin;
> 
>@@ -14,9 +15,12 @@
> 
> 	public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$
> 	public static String IMG_EJBEE6MODEL = "31_ejbjar_obj"; //$NON-NLS-1$
>+	public static String IMG_EJBEE7MODEL = "32_ejbjar_obj"; //$NON-NLS-1$
> 	public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
> 	public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$
>+	public static String IMG_WEBEE7MODEL = "webapp_31"; //$NON-NLS-1$
> 	public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
>+	public static String IMG_EE7CONNECTOR = "connector_17"; //$NON-NLS-1$
> 	public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
> 	public static String IMG_LICENSE = "license_obj"; //$NON-NLS-1$
> 	public static String IMG_RESOURCE_ADAPTER = "resource_adapter_obj"; //$NON-NLS-1$
>@@ -40,7 +44,9 @@
> 	public static String LOCAL_HOME = "ovr/local_home_ovr"; //$NON-NLS-1$
> 	public static String EAR_IMAGE = "ear_50"; //$NON-NLS-1$
> 	public static String EAR6_IMAGE = "ear_60"; //$NON-NLS-1$
>+	public static String EAR7_IMAGE = "ear_70"; //$NON-NLS-1$
> 	public static String APP_CLIENT50 = "appclient_50"; //$NON-NLS-1$
> 	public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$
>+	public static String APP_CLIENT70 = "appclient_70"; //$NON-NLS-1$
> 
>-}
>+}
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 423614: 238171