[93218] removed com.ibm.wtp.server from id's: committed for JL

11 files changed, 16 insertions, 16 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/deployables/Connector1_3DeployableFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/deployables/Connector1_3DeployableFactory.java
index af23c0e95..fd1593627 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/deployables/Connector1_3DeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/deployables/Connector1_3DeployableFactory.java
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.server.core.IModule;
 
 public class Connector1_3DeployableFactory extends J2EEDeployableFactory {
-	private static final String ID = "com.ibm.wtp.server.j2ee.connector13"; //$NON-NLS-1$
+	private static final String ID = "org.eclipse.jst.j2ee.server.connector13"; //$NON-NLS-1$
 
 	/**
 	 * Constructor for Connector1_3DeployableFactory
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
index 8ab55e02d..bda543bbe 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
@@ -73,7 +73,7 @@
       <moduleFactory
             projects="true"
             class="org.eclipse.jst.j2ee.jca.internal.deployables.Connector1_3DeployableFactory"
-            id="com.ibm.wtp.server.j2ee.connector13">
+            id="org.eclipse.jst.j2ee.server.connector13">
          <moduleType
                versions="1.2, 1.3, 1.4"
                types="j2ee.connector">
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
index 5dbdeda33..f29579da0 100644
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
@@ -230,7 +230,7 @@
       <moduleFactory
             projects="true"
             class="org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableFactory"
-            id="com.ibm.wtp.web.server">
+            id="org.eclipse.jst.j2ee.server.web">
          <moduleType
                versions="1.2, 1.3, 1.4"
                types="j2ee.web">
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/J2EEFlexProjWebDeployable.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/J2EEFlexProjWebDeployable.java
index f11ac8dae..294686e6a 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/J2EEFlexProjWebDeployable.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/J2EEFlexProjWebDeployable.java
@@ -329,7 +329,7 @@ public class J2EEFlexProjWebDeployable extends J2EEFlexProjDeployable implements
     /**
      * Returns the child modules of this module.
      * 
-     * @return com.ibm.wtp.server.core.model.IModule[]
+     * @return org.eclipse.wst.server.core.model.IModule[]
      */
     public IModule[] getChildModules() {
         List list = new ArrayList();
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployable.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployable.java
index 23f4c257e..c675f3393 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployable.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployable.java
@@ -26,7 +26,7 @@ public abstract class WebDeployable extends ProjectModule implements IModule, IW
 //	}
 
 	public String getFactoryId() {
-		return "com.ibm.wtp.web.server"; //$NON-NLS-1$
+		return WebDeployableFactory.ID; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
index 4311182f3..c242a99ac 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.server.core.IModule;
 
 public class WebDeployableFactory extends J2EEDeployableFactory {
-	private static final String ID = "com.ibm.wtp.web.server"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.jst.j2ee.server.web"; //$NON-NLS-1$
 
 	protected static final IPath[] PATHS = new IPath[]{new Path(".j2ee") //$NON-NLS-1$
 	};
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java
index 153211cbd..828e4be86 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java
@@ -29,7 +29,7 @@ import org.eclipse.wst.server.core.IModule;
  * @author
  */
 public class ApplicationClientDeployableFactory extends J2EEDeployableFactory {
-	private static final String ID = "com.ibm.wtp.server.j2ee.appclient"; //$NON-NLS-1$
+	private static final String ID = "org.eclipse.jst.j2ee.server.appclient"; //$NON-NLS-1$
 
 	/**
 	 * Constructor for ApplicationClientDeployableFactory.
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java
index f948372bd..4015292e7 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java
@@ -31,7 +31,7 @@ import org.eclipse.wst.server.core.IModule;
  */
 public class EnterpriseApplicationDeployableFactory extends J2EEDeployableFactory {
 
-	protected static final String ID = "com.ibm.wtp.server.j2ee.application"; //$NON-NLS-1$
+	protected static final String ID = "org.eclipse.jst.j2ee.server.application"; //$NON-NLS-1$
 
 	protected static final IPath[] PATHS = new IPath[]{new Path("META-INF/application.xml"), //$NON-NLS-1$
 				new Path("META-INF/.modulemaps") //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java
index e71e08c12..f06944369 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.wst.server.core.model.ModuleDelegate;
 import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
 
 public class LooseArchiveDeployableFactory extends ProjectModuleFactoryDelegate {
-	private static final String ID = "com.ibm.wtp.server.looseArchive"; //$NON-NLS-1$
+	private static final String ID = "org.eclipse.jst.j2ee.server.looseArchive"; //$NON-NLS-1$
 
 	/*
 	 * @see DeployableProjectFactoryDelegate#getFactoryID()
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 60b2fed88..f07843e86 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -556,7 +556,7 @@
    <extension
          point="org.eclipse.wst.server.core.moduleArtifactAdapters">
     <moduleArtifactAdapter
-           id="com.ibm.wtp.server.j2ee.ear1"
+           id="org.eclipse.jst.j2ee.server.ear1"
            class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
          <enablement>
            <with variable="selection">
@@ -566,7 +566,7 @@
       </moduleArtifactAdapter>
    
      <moduleArtifactAdapter
-            id="com.ibm.wtp.server.j2ee.ear2"
+            id="org.eclipse.jst.j2ee.server.ear2"
             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
          <enablement>
            <with variable="selection">
@@ -576,7 +576,7 @@
       </moduleArtifactAdapter>
       
       <moduleArtifactAdapter
-            id="com.ibm.wtp.server.j2ee.ear3"
+            id="org.eclipse.jst.j2ee.server.ear3"
             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
          <enablement>
            <with variable="selection">
@@ -617,7 +617,7 @@
             projects="true"
             
             class="org.eclipse.jst.j2ee.internal.deployables.ApplicationClientDeployableFactory"
-            id="com.ibm.wtp.server.j2ee.appclient">
+            id="org.eclipse.jst.j2ee.server.appclient">
          <moduleType
                versions="*"
                types="j2ee.appClient">
@@ -628,7 +628,7 @@
             projects="true"
            
             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseApplicationDeployableFactory"
-            id="com.ibm.wtp.server.j2ee.application">
+            id="org.eclipse.jst.j2ee.server.application">
          <moduleType
                versions="*"
                types="j2ee.ear">
@@ -638,7 +638,7 @@
             projects="true"
           
             class="org.eclipse.jst.j2ee.internal.deployables.LooseArchiveDeployableFactory"
-            id="com.ibm.wtp.server.looseArchive">
+            id="org.eclipse.jst.j2ee.server.looseArchive">
          <moduleType
                versions="*"
                types="j2ee.loosearchive">
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
index d319eb5c2..7e12d04ca 100644
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
@@ -70,7 +70,7 @@ public class StaticWebDeployable extends ProjectModule implements IStaticWeb {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.ibm.wtp.server.core.util.ProjectModule#getRootFolder()
+	 * @see org.eclipse.wst.server.core.util.ProjectModule#getRootFolder()
 	 */
 	public IPath getRootFolder() {
 		// TODO Auto-generated method stub