This commit was manufactured by cvs2svn to create tag 'v20041014'.
diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
index ca0c03d..b1d0cfc 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.core/plugin.xml
@@ -8,19 +8,18 @@
class="org.eclipse.jst.server.internal.core.JavaServerPlugin">
<requires>
- <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.launching" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.resources" />
+ <import plugin="org.eclipse.debug.core" />
+ <import plugin="org.eclipse.wst.server.core" />
+ <import plugin="org.eclipse.jdt.core" />
+ <import plugin="org.eclipse.jdt.launching" />
+ <import plugin="org.eclipse.core.runtime"/>
</requires>
<runtime>
<library name="sjavacore.jar">
<export name="*"/>
- <packages prefixes="org.eclipse.jst.server.j2ee,org.eclipse.jst.server.core"/>
- </library>
+ </library>
</runtime>
<extension point="org.eclipse.jdt.core.classpathContainerInitializer">
diff --git a/plugins/org.eclipse.jst.server.generic.core/build.properties b/plugins/org.eclipse.jst.server.generic.core/build.properties
index 3a9558d..84146a6 100644
--- a/plugins/org.eclipse.jst.server.generic.core/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.core/build.properties
@@ -1,4 +1,10 @@
source.genericserver.jar = src/
output.genericserver.jar = bin/
bin.includes = plugin.xml,\
- genericserver.jar
+ genericserver.jar,\
+ servers/,\
+ plugin.properties
+src.includes = servers/,\
+ src/,\
+ plugin.xml,\
+ plugin.properties
diff --git a/plugins/org.eclipse.jst.server.generic.core/plugin.xml b/plugins/org.eclipse.jst.server.generic.core/plugin.xml
index bc6bbb4..4323f76 100644
--- a/plugins/org.eclipse.jst.server.generic.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.core/plugin.xml
@@ -16,15 +16,16 @@
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.launching" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.core" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.resources" />
+ <import plugin="org.eclipse.debug.core" />
+ <import plugin="org.eclipse.jdt.core" />
+ <import plugin="org.eclipse.jdt.launching" />
+ <import plugin="org.eclipse.wst.server.core" />
+ <import plugin="org.eclipse.jst.server.core" />
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.ant.core"/>
<import plugin="org.eclipse.ant.ui"/>
+ <import plugin="org.eclipse.jst.server.generic.modules"/>
</requires>
<extension point="org.eclipse.wst.server.core.runtimeTargetHandlers">
@@ -107,7 +108,13 @@
id="org.eclipse.jst.server.generic.core.sourcePathComputer"
class="org.eclipse.jst.server.generic.internal.core.GenericServerSourcePathComputerDelegate"/>
</extension>
-
+
+ <extension point="org.eclipse.wst.server.core.launchableAdapters">
+ <launchableAdapter
+ class="org.eclipse.jst.server.generic.internal.core.GenericServerLaunchableAdapterDelegate"
+ id="org.eclipse.jst.server.generic.web"/>
+ </extension>
+
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/jboss32x.server b/plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server
similarity index 89%
rename from plugins/org.eclipse.jst.server.generic.core/servers/jboss32x.server
rename to plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server
index 4d9f55b..be6ffb7 100644
--- a/plugins/org.eclipse.jst.server.generic.core/servers/jboss32x.server
+++ b/plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server
@@ -1,6 +1,6 @@
<serverDefinition
- name="JBOSS 3.2.x"
+ name="JBOSS 3.2.3"
ejbModules="true"
webModules="true"
earModules="true">
@@ -89,16 +89,28 @@
<jar type="variable">${classPath}/server/${serverConfig}/lib/bcel.jar</jar>
</projectClassPath>
<adminTool>
- <web><deploy /><undeploy />
+ <web>
+ <deploy>
+ <![CDATA[
+
+ <project name="deployextension" default="deploy" basedir=".">
+ <target name="deploy">
+ <jar destfile="${deploymentUnitName}.war">
+ <zipfileset dir="${moduleDir}">
+ <include name="**/*.*"/>
+ <exclude name="**/*.war"/>
+ </zipfileset>
+ </jar>
+ <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
+ </target>
+ </project>
+
+ ]]>
+
+ </deploy>
+ <undeploy>
+ </undeploy>
</web>
- <ejb><deploy /><undeploy />
- </ejb>
- <ear><deploy /><undeploy />
- <webModule><deploy /><undeploy />
- </webModule>
- <ejbModule><deploy /><undeploy />
- </ejbModule>
- </ear>
</adminTool>
<adminToolPath>
</adminToolPath>
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server b/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server
index 398eb6f..7fed5f8 100644
--- a/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server
+++ b/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server
@@ -1,25 +1,25 @@
<serverDefinition
- name="JonAS"
+ name="JonAS 4.1.4"
ejbModules="true"
webModules="true"
earModules="true">
<property id="jonasRoot"
label="JonAS Installation Directory:"
type="directory"
- default="/your_server_root/appservers/JOnAS-3.3.5" />
+ default="/your_server_root/JOnAS-4.1.4" />
<property id="jonasBase"
- label="JonAS Configaration Directory:"
+ label="JonAS Configuration Directory:"
type="directory"
- default="/your_server_root/appservers/JOnAS-3.3.5" />
+ default="/your_server_root/JOnAS-4.1.4" />
<property id="serverAddress"
label="Address:"
type="string"
default="127.0.0.1" />
-<property id="serverPort"
+<property id="port"
label="Port:"
type="string"
- default="8080" />
+ default="9000" />
<property id="protocols"
label="Ejb Protocols:"
type="string"
@@ -35,294 +35,58 @@
<property id="classPath"
label="Classpath Variable:"
type="directory"
- default="/your_server_root/appservers/JOnAS-3.3.5" />
+ default="/your_server_root/JOnAS-4.1.4" />
<serverHome>${jonasRoot}</serverHome>
-<webModulesDeployDirectory>${jonasBase}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${jonasBase}/ejbjars</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${jonasBase}/apps</earModulesDeployDirectory>
+<webModulesDeployDirectory>${jonasBase}/webapps/autoload</webModulesDeployDirectory>
+<ejbModulesDeployDirectory>${jonasBase}/ejbjars/autoload</ejbModulesDeployDirectory>
+<earModulesDeployDirectory>${jonasBase}/apps/autoload</earModulesDeployDirectory>
<jndiInitialContextFactory>org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory</jndiInitialContextFactory>
<jndiProviderUrl>iiop://${serverAddress}:2001</jndiProviderUrl>
<startClass>org.objectweb.jonas.server.Bootstrap</startClass>
<startWorkingDirectory>${jonasRoot}</startWorkingDirectory>
-<startVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</startVmParameters>
+<startVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.endorsed.dirs=${jonasRoot}/lib/endorsed -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</startVmParameters>
<startProgramArguments>org.objectweb.jonas.server.Server</startProgramArguments>
<stopClass>org.objectweb.jonas.server.Bootstrap</stopClass>
<stopWorkingDirectory>${jonasRoot}</stopWorkingDirectory>
-<stopVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</stopVmParameters>
+<stopVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.endorsed.dirs=${jonasRoot}/lib/endorsed -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</stopVmParameters>
<stopProgramArguments>org.objectweb.jonas.adm.JonasAdmin -s</stopProgramArguments>
<serverClassPath>
- <jar type="variable">${classPathVariableName}/lib/common/ow_jonas_bootstrap.jar</jar>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/conf</jar>
+ <jar type="variable">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
+ <jar type="variable">${classPath}/conf</jar>
</serverClassPath>
<clientClassPath>
- <jar type="variable">${classPathVariableName}/lib/client.jar</jar>
+ <jar type="variable">${classPath}/lib/client.jar</jar>
</clientClassPath>
<projectClassPath>
- <jar type="variable">${classPathVariableName}/lib/common/ow_jonas_bootstrap.jar</jar>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/lib/common/j2ee/ejb/ejb-2_1-api.jar</jar>
+ <jar type="variable">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
+ <jar type="variable">${classPath}/lib/common/j2ee/ejb/ejb-2_1-api.jar</jar>
</projectClassPath>
<adminTool>
<web>
- <deploy><![CDATA[
+ <deploy>
+ <![CDATA[
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
<project name="deployextension" default="deploy" basedir=".">
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <target name="jonas-jar" unless="bypass-server-jar" />
- <target name="jonas-deploy" unless="bypass-server-deploy" >
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-a" />
- <arg value="%{deploy.dir}/%{war}.war" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- <target name="deploy" depends="jonas-jar,jonas-deploy" >
- </target>
+ <target name="deploy">
+ <jar destfile="${deploymentUnitName}.war">
+ <zipfileset dir="${moduleDir}">
+ <include name="**/*.*"/>
+ <exclude name="**/*.war"/>
+ </zipfileset>
+ </jar>
+ <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
+ </target>
</project>
- ]]></deploy>
- <undeploy><![CDATA[
-
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="undeploy" basedir=".">
- <target name="undeploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-r" />
- <arg value="%{deploy.dir}/%{war}.war" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- </project>
-
- ]]></undeploy>
+ ]]>
+
+ </deploy>
+ <undeploy>
+ </undeploy>
</web>
- <ejb>
- <deploy><![CDATA[
-
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="deploy" basedir=".">
- <!-- ejbjar task -->
- <taskdef name="jonasEjbJjar"
- classname="org.objectweb.jonas.ant.EjbJar"
- classpath="${jonasRoot}/lib/common/ow_jonas_ant.jar" />
-
- <path id="base.classpath">
- <!-- CLASSPATH is added for runtest target -->
- <fileset dir="${jonasRoot}/lib">
- <include name="**/*.jar"/>
- <include name="**/**/*.jar"/>
- <include name="**/**/**/*.jar"/>
- <exclude name="**/ow_jonas_bootstrap.jar"/>
- </fileset>
- </path>
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
-
- <target name="jonas-jar" unless="bypass-server-jar" >
- <delete dir="%{deploy.dir}/%{ejb}_jonas" failonerror="false" />
-
- <unjar src="%{deploy.dir}/%{ejb}.jar" dest="%{deploy.dir}/%{ejb}_jonas"/>
- <delete file="%{deploy.dir}/%{ejb}.jar" failonerror="false" />
-
- <jonasEjbJjar basejarname="%{ejb}"
- srcdir="%{deploy.dir}/%{ejb}_jonas"
- descriptordir="%{deploy.dir}/%{ejb}_jonas/META-INF"
- dependency="full" >
- <include name="**/ejb-jar.xml"/>
- <dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- location="${jonasRoot}/xml/ejb-jar_2_0.dtd" />
- <support dir="%{deploy.dir}/%{ejb}_jonas">
- <include name="**/*.*"/>
- <exclude name="**/MANIFEST.MF"/>
- <exclude name="**/ejb-jar.xml"/>
- <exclude name="**/jonas-ejb-jar.xml"/>
- </support>
- <jonas destdir="%{deploy.dir}"
- classpath="%{base.classpath}:%{deploy.dir}/%{ejb}_jonas"
- jonasroot="${jonasRoot}"
- mappernames="${mappernames}"
- protocols="${protocols}"
- keepgenerated="true" />
- </jonasEjbJjar>
- <delete dir="%{deploy.dir}/%{ejb}_jonas" failonerror="false" />
- </target>
- <target name="jonas-deploy" unless="bypass-server-deploy" >
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-a" />
- <arg value="%{deploy.dir}/%{ejb}.jar" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- <target name="deploy" depends="jonas-jar,jonas-deploy" >
- </target>
- </project>
-
- ]]></deploy>
- <undeploy><![CDATA[
-
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="undeploy" basedir=".">
- <target name="undeploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-r" />
- <arg value="%{ejb}.jar" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- </project>
-
- ]]></undeploy>
- </ejb>
- <ear>
- <deploy><![CDATA[
-
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-a" />
- <arg value="%{deploy.dir}/%{ear}.ear" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- </project>
-
- ]]></deploy>
- <undeploy><![CDATA[
-
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="undeploy" basedir=".">
- <target name="undeploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java
- classname="org.objectweb.jonas.server.Bootstrap"
- fork="true"
- classpathref="toolpath" >
- <arg value="org.objectweb.jonas.adm.JonasAdmin" />
- <arg value="-r" />
- <arg value="%{deploy.dir}/%{ear}.ear" />
- <jvmarg value="-Dinstall.root=${jonasRoot}" />
- <jvmarg value="-Djonas.base=${jonasBase}" />
- <jvmarg value="-Djava.security.policy=${jonasRoot}/conf/java.policy" />
- <jvmarg value="-Djonas.classpath=" />
- <jvmarg value="-Djonas.default.classloader=true" />
- <jvmarg value="-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate" />
- <jvmarg value="-Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory" />
- <jvmarg value="-Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config" />
- <jvmarg value="-Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi" />
- </java>
- </target>
- </project>
-
- ]]></undeploy>
- <webModule><deploy /><undeploy />
- </webModule>
- <ejbModule><deploy /><undeploy />
- </ejbModule>
- </ear>
</adminTool>
<adminToolPath>
<jar type="absolute">${jonasBase}/conf</jar>
- <jar type="variable">${classPathVariableName}/lib/common/ow_jonas_bootstrap.jar</jar>
+ <jar type="absolute">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
</adminToolPath>
</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/jrun.server b/plugins/org.eclipse.jst.server.generic.core/servers/jrun.server
deleted file mode 100644
index 1d9186f..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/jrun.server
+++ /dev/null
@@ -1,72 +0,0 @@
-
-<serverDefinition
- name="JRun v4"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="jrunHome"
- label="JRun Directory:"
- type="directory"
- default="/your_server_root/JRun4" />
-<property id="serverName"
- label="Server Name:"
- type="string"
- default="default" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="password" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8100" />
-<property id="jndiPort"
- label="JNDI Port:"
- type="string"
- default="2908" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="JRUN4" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/JRun4" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${jrunHome}/servers/${serverName}</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${jrunHome}/servers/${serverName}</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${jrunHome}/servers/${serverName}</earModulesDeployDirectory>
-<jndiInitialContextFactory>jrun.naming.JRunContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>${serverAddress}:${jndiPort}</jndiProviderUrl>
-<startClass>jrunx.kernel.JRun</startClass>
-<startWorkingDirectory>${jrunHome}</startWorkingDirectory>
-<startVmParameters>-Xms32m -Xmx128m</startVmParameters>
-<startProgramArguments>-start ${serverName}</startProgramArguments>
-<stopClass>jrunx.kernel.JRun</stopClass>
-<stopWorkingDirectory>${jrunHome}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>-stop ${serverName}</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/lib/jrun.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webservices.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/macromedia_drivers.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/lib/jrun.jar</jar>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/lib/jrun.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webservices.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/macromedia_drivers.jar</jar>
-</projectClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/oc4j.server b/plugins/org.eclipse.jst.server.generic.core/servers/oc4j.server
deleted file mode 100644
index 8cb5653..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/oc4j.server
+++ /dev/null
@@ -1,89 +0,0 @@
-
-<serverDefinition
- name="Oracle 9IAS"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="oc4jHome"
- label="OC4J Directory:"
- type="directory"
- default="/your_server_root/oc4j902" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="password" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8888" />
-<property id="ormiPort"
- label="ORMI Port:"
- type="string"
- default="23791" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="OC4J902" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/oc4j902" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${oc4jHome}/j2ee/home/applications</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${oc4jHome}/j2ee/home/applications</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${oc4jHome}/j2ee/home/applications</earModulesDeployDirectory>
-<jndiInitialContextFactory>com.evermind.server.rmi.RMIInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>ormi://${serverAddress}:${ormiPort}</jndiProviderUrl>
-<startClass>com.evermind.server.OC4JServer</startClass>
-<startWorkingDirectory>${oc4jHome}/j2ee/home</startWorkingDirectory>
-<startVmParameters></startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass>com.evermind.client.orion.OrionConsoleAdmin</stopClass>
-<stopWorkingDirectory>${oc4jHome}/j2ee/home</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>ormi://${serverAddress}:${ormiPort} ${userName} ${password} -shutdown </stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/oc4j.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/jdbc.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/connector.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/dms.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jsse.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/activation.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/jcert.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/jnet.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/jta.jar</jar>
- <jar type="variable">${classPathVariableName}/jdk/jre/lib/ext/mail.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/xmlparserv2.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/jaxp.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/jaas.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/jazn.jar</jar>
- <jar type="variable">${classPathVariableName}/jdbc/lib/classes12dms.jar</jar>
- <jar type="variable">${classPathVariableName}/jdbc/lib/nls_charset12.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/jaxb-rt-1.0-ea.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/lib/jasper.zip</jar>
- <jar type="variable">${classPathVariableName}/soap/lib/soap.jar</jar>
- <jar type="variable">${classPathVariableName}/soap/lib/wsdl.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/lib/aqapi.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/lib/jem.jar</jar>
- <jar type="variable">${classPathVariableName}/javacache/lib/cache.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/lib/http_client.jar</jar>
- <jar type="variable">${classPathVariableName}/jlib/jssl-1_1.jar</jar>
- <jar type="variable">${classPathVariableName}/sqlj/lib/runtime12ee.jar</jar>
- <jar type="variable">${classPathVariableName}/sqlj/lib/translator.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/j2ee/home/oc4jclient.jar</jar>
- <jar type="variable">${classPathVariableName}/j2ee/home/ejb.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/orion.server b/plugins/org.eclipse.jst.server.generic.core/servers/orion.server
deleted file mode 100644
index d6d7f3f..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/orion.server
+++ /dev/null
@@ -1,208 +0,0 @@
-
-<serverDefinition
- name="Orion v2.02"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="orionHome"
- label="Orion Directory:"
- type="directory"
- default="/your_server_root/orion" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="password" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="80" />
-<property id="ormiPort"
- label="ORMI Port:"
- type="string"
- default="23791" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="ORION202" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/orion" />
-
-<property id="defaultWebSite"
- label="Default web-site:"
- type="string"
- default="default-web-site" />
-
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${orionHome}/auto</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${orionHome}/auto</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${orionHome}/auto</earModulesDeployDirectory>
-<jndiInitialContextFactory>com.evermind.server.rmi.RMIInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>ormi://${serverAddress}:${ormiPort}</jndiProviderUrl>
-<startClass>com.evermind.server.ApplicationServer</startClass>
-<startWorkingDirectory>${orionHome}</startWorkingDirectory>
-<startVmParameters></startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass>com.evermind.client.orion.OrionConsoleAdmin</stopClass>
-<stopWorkingDirectory>${orionHome}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>ormi://${serverAddress}:${ormiPort} ${userName} ${password} -shutdown </stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/orion.jar</jar>
- <jar type="variable">${classPathVariableName}/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/jdbc.jar</jar>
- <jar type="variable">${classPathVariableName}/jta.jar</jar>
- <jar type="variable">${classPathVariableName}/jaxp.jar</jar>
- <jar type="variable">${classPathVariableName}/crimson.jar</jar>
- <jar type="variable">${classPathVariableName}/xalan.jar</jar>
- <jar type="variable">${classPathVariableName}/jsse.jar</jar>
- <jar type="variable">${classPathVariableName}/jnet.jar</jar>
- <jar type="variable">${classPathVariableName}/jcert.jar</jar>
- <jar type="variable">${classPathVariableName}/activation.jar</jar>
- <jar type="variable">${classPathVariableName}/mail.jar</jar>
- <jar type="variable">${classPathVariableName}/jaas.jar</jar>
- <jar type="variable">${classPathVariableName}/connector.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/orionclient.jar</jar>
- <jar type="variable">${classPathVariableName}/ejb.jar</jar>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/orion.jar</jar>
- <jar type="variable">${classPathVariableName}/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/jdbc.jar</jar>
- <jar type="variable">${classPathVariableName}/jta.jar</jar>
- <jar type="variable">${classPathVariableName}/jaxp.jar</jar>
- <jar type="variable">${classPathVariableName}/crimson.jar</jar>
- <jar type="variable">${classPathVariableName}/xalan.jar</jar>
- <jar type="variable">${classPathVariableName}/jsse.jar</jar>
- <jar type="variable">${classPathVariableName}/jnet.jar</jar>
- <jar type="variable">${classPathVariableName}/jcert.jar</jar>
- <jar type="variable">${classPathVariableName}/activation.jar</jar>
- <jar type="variable">${classPathVariableName}/mail.jar</jar>
- <jar type="variable">${classPathVariableName}/jaas.jar</jar>
- <jar type="variable">${classPathVariableName}/connector.jar</jar>
-</projectClassPath>
-<adminTool>
-
- <web> <deploy /> <undeploy /> </web>
- <ejb> <deploy /> <undeploy /> </ejb>
-
-
- <ear>
- <deploy>
- <![CDATA[
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java classname="com.evermind.client.orion.OrionConsoleAdmin"
- fork="true"
- classpathref="toolpath" >
- <arg value="ormi://${serverAddress}:${ormiPort}" />
- <arg value="${userName}" />
- <arg value="${password}" />
- <arg value="-deploy" />
- <arg value="-file" />
- <arg value="%{domain}/%{ear}.ear" />
- <arg value="-deploymentName" />
- <arg value="%{ear}" />
- <arg value="-cluster" />
- </java>
- </target>
- </project>
- ]]>
- </deploy>
- <undeploy>
- <![CDATA[
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="undeploy" basedir=".">
- <target name="undeploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- <java classname="com.evermind.client.orion.OrionConsoleAdmin"
- fork="true"
- classpathref="toolpath"
- args="%{domain}/%{ear}.ear" >
- <arg value="ormi://${serverAddress}:${ormiPort}" />
- <arg value="${userName}" />
- <arg value="${password}" />
- <arg value="-undeploy" />
- <arg value="-file" />
- <arg value="$%{ear}" />
- </java>
- </target>
- </project>
- ]]>
- </undeploy>
- <webModule>
- <deploy>
- <![CDATA[
- <!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
- <!-- DO NOT MODIFY THIS FILE CHANGE THE SERVER FILE INSTEAD -->
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy" >
- <path id="toolpath">
- <!-- append the external classpath lastly -->
- <pathelement path="%{java.class.path}" />
- <!-- append the path sent through eclipse to classpath -->
- <pathelement path="%{adminToolPath}" />
- </path>
- REPEAT[
- <java classname="com.evermind.client.orion.OrionConsoleAdmin"
- fork="true"
- classpathref="toolpath" >
- <arg value="ormi://${serverAddress}:${ormiPort}" />
- <arg value="${userName}" />
- <arg value="${password}" />
- <arg value="-bindWebApp" />
- <arg value="%{ear}" />
- <arg value="%{web-uri}" />
- <arg value="${defaultWebSite}" />
- <arg value="%{context-root}" />
- </java>
- ]ENDREPEAT
- </target>
- </project>
- ]]>
- </deploy>
- <undeploy />
- </webModule>
- <ejbModule>
- <deploy />
- <undeploy />
- </ejbModule>
- </ear>
-</adminTool>
-
-
-<adminToolPath>
- <jar type="variable">${classPathVariableName}/orion.jar</jar>
- <jar type="variable">${classPathVariableName}/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/jndi.jar</jar>
-</adminToolPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/resin21.server b/plugins/org.eclipse.jst.server.generic.core/servers/resin21.server
deleted file mode 100644
index c4df76f..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/resin21.server
+++ /dev/null
@@ -1,75 +0,0 @@
-
-<serverDefinition
- name="Resin v2.1.10"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="resinHome"
- label="Resin Directory:"
- type="directory"
- default="/your_server_root/resin-ee-2.1.10" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="123" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="RESIN21" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/resin-ee-2.1.10" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${resinHome}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${resinHome}/webapps/cmp/web-inf/lib</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${resinHome}/webapps</earModulesDeployDirectory>
-<jndiInitialContextFactory>com.caucho.hessian.HessianContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>http://${serverAddress}:${serverPort}/hessian</jndiProviderUrl>
-<startClass>com.caucho.server.http.HttpServer</startClass>
-<startWorkingDirectory>${resinHome}</startWorkingDirectory>
-<startVmParameters>-Dresin.home="${resinHome}"</startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass></stopClass>
-<stopWorkingDirectory>${resinHome}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments></stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/lib/resin.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/dom.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jaxp.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jdbc-mysql.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jdbc2_0-stdext.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jms.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jmx.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jsdk23.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jta_101.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/resin-ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/sax.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webutil.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/lib/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jms.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jsdk23.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jta_101.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/resin-ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webutil.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/resin30.server b/plugins/org.eclipse.jst.server.generic.core/servers/resin30.server
deleted file mode 100644
index 201067f..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/resin30.server
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<serverDefinition
- name="Resin v3.0"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="resinHome"
- label="Resin Directory:"
- type="directory"
- default="/your_server_root/resin30/resin-ee-3.0.s030725" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="123" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="RESIN30" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/resin30/resin-ee-3.0.s030725" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${resinHome}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${resinHome}/webapps/cmp/web-inf/lib</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${resinHome}/webapps</earModulesDeployDirectory>
-<jndiInitialContextFactory>com.caucho.hessian.HessianContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>http://${serverAddress}:${serverPort}/hessian</jndiProviderUrl>
-<startClass>com.caucho.server.resin.Resin</startClass>
-<startWorkingDirectory>${resinHome}</startWorkingDirectory>
-<startVmParameters>-Dresin.home="${resinHome}" -Djava.util.logging.manager=com.caucho.log.LogManagerImpl</startVmParameters>
-<startProgramArguments>-verbose -conf ${resinHome}/conf/resin.conf start</startProgramArguments>
-<stopClass></stopClass>
-<stopWorkingDirectory>${resinHome}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments></stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/lib/resin.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/isorelax.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jca-15.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jms-11.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jmx.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jsdk24.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jta_101.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/resin-ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webutil.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/lib/ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jca-15.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jms-11.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jmx.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/jta_101.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/resin-ejb.jar</jar>
- <jar type="variable">${classPathVariableName}/lib/webutil.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat401.server b/plugins/org.eclipse.jst.server.generic.core/servers/tomcat401.server
deleted file mode 100644
index a1ec199..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat401.server
+++ /dev/null
@@ -1,49 +0,0 @@
-
-<serverDefinition
- name="Apache Tomcat v4.0.1/4.0.2"
- ejbModules="true"
- webModules="true"
- earModules="false">
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.0.2" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="TOMCAT401" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.0.2" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${serverRootDirectory}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>NOTSUPPORTED</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>NOTSUPPORTED</earModulesDeployDirectory>
-<jndiInitialContextFactory>NOTSUPPORTED</jndiInitialContextFactory>
-<jndiProviderUrl>NOTSUPPORTED</jndiProviderUrl>
-<startClass>org.apache.catalina.startup.Bootstrap</startClass>
-<startWorkingDirectory>${serverRootDirectory}/bin</startWorkingDirectory>
-<startVmParameters>-DJAVA_HOME="${jrePath}" -Djava.security.policy="${serverRootDirectory}/conf/catalina.policy" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/lib"</startVmParameters>
-<startProgramArguments>start</startProgramArguments>
-<stopClass>org.apache.catalina.startup.Bootstrap</stopClass>
-<stopWorkingDirectory>${serverRootDirectory}/bin</stopWorkingDirectory>
-<stopVmParameters>-DJAVA_HOME="${jrePath}" -Djava.security.policy="${serverRootDirectory}/conf/catalina.policy" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/lib"</stopVmParameters>
-<stopProgramArguments>stop</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/common/lib/jndi.jar</jar>
- <jar type="variable">${classPathVariableName}/common/lib/servlet.jar</jar>
- <jar type="variable">${classPathVariableName}/bin/bootstrap.jar</jar>
-</serverClassPath>
-<clientClassPath>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat403.server b/plugins/org.eclipse.jst.server.generic.core/servers/tomcat403.server
deleted file mode 100644
index ca63ed8..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat403.server
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<serverDefinition
- name="Apache Tomcat v4.0.3/4.0.4"
- ejbModules="true"
- webModules="true"
- earModules="false">
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.0.4" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="TOMCAT403" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.0.2" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${serverRootDirectory}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>NOTSUPPORTED</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>NOTSUPPORTED</earModulesDeployDirectory>
-<jndiInitialContextFactory>NOTSUPPORTED</jndiInitialContextFactory>
-<jndiProviderUrl>NOTSUPPORTED</jndiProviderUrl>
-<startClass>org.apache.catalina.startup.Bootstrap</startClass>
-<startWorkingDirectory>${serverRootDirectory}/bin</startWorkingDirectory>
-<startVmParameters>-Duser.dir="${serverRootDirectory}" -DJAVA_HOME="${jrePath}" -Djava.security.manager -Djava.security.policy="${serverRootDirectory}/conf/catalina.policy" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/lib"</startVmParameters>
-<startProgramArguments>start</startProgramArguments>
-<stopClass>org.apache.catalina.startup.Bootstrap</stopClass>
-<stopWorkingDirectory>${serverRootDirectory}/bin</stopWorkingDirectory>
-<stopVmParameters>-Duser.dir="${serverRootDirectory}" -DJAVA_HOME="${jrePath}" -Djava.security.manager -Djava.security.policy="${serverRootDirectory}/conf/catalina.policy" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/lib"</stopVmParameters>
-<stopProgramArguments>stop</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/common/lib/servlet.jar</jar>
- <jar type="variable">${classPathVariableName}/bin/bootstrap.jar</jar>
-</serverClassPath>
-<clientClassPath>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat410.server b/plugins/org.eclipse.jst.server.generic.core/servers/tomcat410.server
deleted file mode 100644
index 1b59b2d..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat410.server
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<serverDefinition
- name="Apache Tomcat v4.1.0"
- ejbModules="true"
- webModules="true"
- earModules="false">
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.1.10-LE-jdk14" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="TOMCAT411" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/jakarta-tomcat-4.1.10-LE-jdk14" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${serverRootDirectory}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>NOTSUPPORTED</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>NOTSUPPORTED</earModulesDeployDirectory>
-<jndiInitialContextFactory>NOTSUPPORTED</jndiInitialContextFactory>
-<jndiProviderUrl>NOTSUPPORTED</jndiProviderUrl>
-<startClass>org.apache.catalina.startup.Bootstrap</startClass>
-<startWorkingDirectory>${serverRootDirectory}/bin</startWorkingDirectory>
-<startVmParameters>-DJAVA_HOME="${jrePath}" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/endorsed"</startVmParameters>
-<startProgramArguments>start</startProgramArguments>
-<stopClass>org.apache.catalina.startup.Bootstrap</stopClass>
-<stopWorkingDirectory>${serverRootDirectory}/bin</stopWorkingDirectory>
-<stopVmParameters>-DJAVA_HOME="${jrePath}" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/endorsed"</stopVmParameters>
-<stopProgramArguments>stop</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/common/lib/servlet.jar</jar>
- <jar type="variable">${classPathVariableName}/bin/bootstrap.jar</jar>
-</serverClassPath>
-<clientClassPath>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat50x.server b/plugins/org.eclipse.jst.server.generic.core/servers/tomcat50x.server
deleted file mode 100644
index 8c584bd..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/tomcat50x.server
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<serverDefinition
- name="Apache Tomcat v5.0.x"
- ejbModules="true"
- webModules="true"
- earModules="false">
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/appservers/jakarta-tomcat-5.0.16" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="TOMCAT_HOME" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/appservers/jakarta-tomcat-5.0.16" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${serverRootDirectory}/webapps</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>NOTSUPPORTED</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>NOTSUPPORTED</earModulesDeployDirectory>
-<jndiInitialContextFactory>NOTSUPPORTED</jndiInitialContextFactory>
-<jndiProviderUrl>NOTSUPPORTED</jndiProviderUrl>
-<startClass>org.apache.catalina.startup.Bootstrap</startClass>
-<startWorkingDirectory>${serverRootDirectory}/bin</startWorkingDirectory>
-<startVmParameters>-DJAVA_HOME="${jrePath}" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/endorsed"</startVmParameters>
-<startProgramArguments>start</startProgramArguments>
-<stopClass>org.apache.catalina.startup.Bootstrap</stopClass>
-<stopWorkingDirectory>${serverRootDirectory}/bin</stopWorkingDirectory>
-<stopVmParameters>-DJAVA_HOME="${jrePath}" -Dcatalina.base="${serverRootDirectory}" -Dcatalina.home="${serverRootDirectory}" -Djava.io.tmpdir="${serverRootDirectory}/temp" -Djava.endorsed.dirs="${serverRootDirectory}/bin;${serverRootDirectory}/common/endorsed"</stopVmParameters>
-<stopProgramArguments>stop</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/bin/bootstrap.jar</jar>
-</serverClassPath>
-<clientClassPath>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/bin/bootstrap.jar</jar>
- <jar type="variable">${classPathVariableName}/common/lib/servlet-api.jar</jar>
- <jar type="variable">${classPathVariableName}/common/lib/jsp-api.jar</jar>
-</projectClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic61.server b/plugins/org.eclipse.jst.server.generic.core/servers/weblogic61.server
deleted file mode 100644
index 0a77e8b..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic61.server
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<serverDefinition
- name="BEA Weblogic Server v6.1"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="beaHome"
- label="BEA Home Directory:"
- type="directory"
- default="/your_server_root/bea" />
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/bea/wlserver6.1" />
-<property id="domainName"
- label="Admin Domain Name:"
- type="string"
- default="mydomain" />
-<property id="domainDirectory"
- label="Admin Domain Directory:"
- type="directory"
- default="/your_server_root/bea/wlserver6.1/config/mydomain" />
-<property id="serverName"
- label="Server Name:"
- type="string"
- default="myserver" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="system" />
-<property id="password"
- label="Password:"
- type="string"
- default="weblogic" />
-<property id="productionMode"
- label="Production Mode:"
- type="boolean"
- default="false" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="7001" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="WEBLOGIC610" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/bea/wlserver6.1/lib" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${domainDirectory}/applications</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${domainDirectory}/applications</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${domainDirectory}/applications</earModulesDeployDirectory>
-<jndiInitialContextFactory>weblogic.jndi.WLInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>t3://${serverAddress}:${serverPort}</jndiProviderUrl>
-<startClass>weblogic.Server</startClass>
-<startWorkingDirectory>${domainDirectory}</startWorkingDirectory>
-<startVmParameters>-ms64m -mx64m -Dweblogic.Domain="${domainName}" -Dweblogic.Name="${serverName}" -Dbea.home="${beaHome}" -Dweblogic.RootDirectory="${serverRootDirectory}" -Dweblogic.management.password=${password} -Dweblogic.ProductionModeEnabled=${productionMode} -Djava.security.policy=="${serverRootDirectory}/server/lib/weblogic.policy"</startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass>weblogic.Admin</stopClass>
-<stopWorkingDirectory>${domainDirectory}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>-url t3://${serverAddress}:${serverPort} -username ${userName} -password ${password} SHUTDOWN</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/weblogic.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/weblogic.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic70.server b/plugins/org.eclipse.jst.server.generic.core/servers/weblogic70.server
deleted file mode 100644
index 7928fe2..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic70.server
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<serverDefinition
- name="BEA Weblogic Server v7.0"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="beaHome"
- label="BEA Home Directory:"
- type="directory"
- default="/your_server_root/bea" />
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/bea/weblogic700" />
-<property id="domainName"
- label="Admin Domain Name:"
- type="string"
- default="mydomain" />
-<property id="domainDirectory"
- label="Administration Domain Directory:"
- type="directory"
- default="/your_server_root/bea/user_projects/mydomain" />
-<property id="serverName"
- label="Server Name:"
- type="string"
- default="myserver" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="system" />
-<property id="password"
- label="Password:"
- type="string"
- default="weblogic" />
-<property id="productionMode"
- label="Production Mode:"
- type="boolean"
- default="false" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="7001" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="WEBLOGIC700" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/bea/weblogic700/server/lib" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${domainDirectory}/applications</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${domainDirectory}/applications</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${domainDirectory}/applications</earModulesDeployDirectory>
-<jndiInitialContextFactory>weblogic.jndi.WLInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>t3://${serverAddress}:${serverPort}</jndiProviderUrl>
-<startClass>weblogic.Server</startClass>
-<startWorkingDirectory>${domainDirectory}</startWorkingDirectory>
-<startVmParameters>-Xms32m -Xmx200m -Dweblogic.security.SSL.trustedCAKeyStore="${serverRootDirectory}/server/lib/cacerts" -Dweblogic.Name=${serverName} -Dbea.home="${beaHome}" -Dweblogic.management.username=${userName} -Dweblogic.management.password=${password} -Dweblogic.ProductionModeEnabled=${productionMode} -Djava.security.policy=="${serverRootDirectory}/server/lib/weblogic.policy"</startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass>weblogic.Admin</stopClass>
-<stopWorkingDirectory>${domainDirectory}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>-url t3://${serverAddress}:${serverPort} -username ${userName} -password ${password} SHUTDOWN</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/weblogic.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/weblogic.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server b/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server
index 0b0d80c..20cc120 100644
--- a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server
+++ b/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server
@@ -44,10 +44,10 @@
label="Port:"
type="string"
default="7001" />
-<property id="classPathVariableName"
+<!--<property id="classPathVariableName"
label="Classpath Variable Name:"
type="string"
- default="WEBLOGIC81" />
+ default="WEBLOGIC81" />-->
<property id="classPath"
label="Classpath Variable:"
type="directory"
@@ -82,4 +82,28 @@
<jar type="variable">${classPath}/ojdbc14.jar</jar>
<jar type="variable">${classPath}/webservices.jar</jar>
</projectClassPath>
+<adminTool>
+ <web>
+ <deploy>
+ <![CDATA[
+
+ <project name="deployextension" default="deploy" basedir=".">
+ <target name="deploy">
+ <jar destfile="${deploymentUnitName}.war">
+ <zipfileset dir="${moduleDir}">
+ <include name="**/*.*"/>
+ <exclude name="**/jsp_servlet/*.class"/>
+ <exclude name="**/*.war"/>
+ </zipfileset>
+ </jar>
+ <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
+ </target>
+ </project>
+
+ ]]>
+ </deploy>
+ <undeploy>
+ </undeploy>
+ </web>
+</adminTool>
</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/websphere50.server b/plugins/org.eclipse.jst.server.generic.core/servers/websphere50.server
deleted file mode 100644
index 8738ab6..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/websphere50.server
+++ /dev/null
@@ -1,78 +0,0 @@
-
-<serverDefinition
- name="IBM WebSphere v5.0"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="wasHome"
- label="WebSphere Directory:"
- type="directory"
- default="/your_server_root/WebSphere" />
-<property id="cellName"
- label="Cell Name:"
- type="string"
- default="lelosubmarine" />
-<property id="nodeName"
- label="Node Name:"
- type="string"
- default="lelosubmarine" />
-<property id="serverName"
- label="Server Name:"
- type="string"
- default="server1" />
-<property id="userName"
- label="User Name:"
- type="string"
- default="admin" />
-<property id="password"
- label="Password:"
- type="string"
- default="password" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="serverPort"
- label="Port:"
- type="string"
- default="8080" />
-<property id="jndiPort"
- label="JNDI Port:"
- type="string"
- default="2809" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="WAS50" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/WebSphere" />
-<serverHome>${wasHome}/AppServer</serverHome>
-<webModulesDeployDirectory>${wasHome}/AppServer/${cellName}/DefaultApplication.ear</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${wasHome}/AppServer/${cellName}/DefaultApplication.ear</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${wasHome}/AppServer/${cellName}</earModulesDeployDirectory>
-<jndiInitialContextFactory>com.ibm.websphere.naming.WsnInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>corbaloc:iiop:{serverAddress}:${jndiPort}</jndiProviderUrl>
-<startClass>com.ibm.ws.bootstrap.WSLauncher</startClass>
-<startWorkingDirectory>${wasHome}/AppServer</startWorkingDirectory>
-<startVmParameters>-Dws.output.encoding=console -Dcom.ibm.CORBA.ConfigURL=file:/${wasHome}/AppServer/properties/sas.client.props -Dws.ext.dirs=${jrePath}/lib;${wasHome}/AppServer/classes;${wasHome}/AppServer/lib;${wasHome}/AppServer/lib/ext;${wasHome}/AppServer/web/help;${wasHome}/AppServer/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime -Dwas.install.root=${wasHome}/AppServer -Dserver.root=${wasHome}/AppServer -Ddb2j.system.home=${wasHome}/AppServer/properties -Duser.install.root=${wasHome}/AppServer -Dcom.ibm.itp.location=${wasHome}/AppServer/bin -Djava.library.path=${jrePath}/bin;${wasHome}/AppServer/bin -Djava.security.auth.login.config=${wasHome}/AppServer/properties/wsjaas.conf -Djava.security.policy=${wasHome}/AppServer/properties/server.policy</startVmParameters>
-<startProgramArguments>com.ibm.ws.runtime.WsServer ${wasHome}/AppServer/config ${cellName} ${nodeName} ${serverName}</startProgramArguments>
-<stopClass>com.ibm.ws.bootstrap.WSLauncher</stopClass>
-<stopWorkingDirectory>${wasHome}/AppServer/bin</stopWorkingDirectory>
-<stopVmParameters>-Dws.output.encoding=console -Dcom.ibm.CORBA.ConfigURL=file:/${wasHome}/AppServer/properties/sas.client.props -Dws.ext.dirs=${jrePath}/lib;${wasHome}/AppServer/classes;${wasHome}/AppServer/lib;${wasHome}/AppServer/lib/ext;${wasHome}/AppServer/web/help;${wasHome}/AppServer/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime -Dwas.install.root=${wasHome}/AppServer</stopVmParameters>
-<stopProgramArguments>com.ibm.ws.management.tools.WsServerStop ${wasHome}/AppServer/config ${cellName} ${nodeName} ${serverName}</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">JDK_TOOLS</jar>
- <jar type="variable">${classPathVariableName}/AppServer/bin</jar>
- <jar type="variable">${classPathVariableName}/AppServer/properties</jar>
- <jar type="variable">${classPathVariableName}/AppServer/lib/bootstrap.jar</jar>
- <jar type="variable">${classPathVariableName}/AppServer/lib/j2ee.jar</jar>
- <jar type="variable">${classPathVariableName}/AppServer/lib/lmproxy.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPathVariableName}/AppServer/lib/j2ee.jar</jar>
- <jar type="variable">${classPathVariableName}/AppServer/lib/naming.jar</jar>
- <jar type="variable">${classPathVariableName}/AppServer/lib/namingclient.jar</jar>
-</clientClassPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java
index eb688d1..aeda021 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
index a17ac0c..345f459 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
@@ -29,23 +29,31 @@
***************************************************************************/
package org.eclipse.jst.server.generic.internal.core;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
-
+import java.util.Map;
import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.server.generic.core.CorePlugin;
import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
+import org.eclipse.jst.server.generic.modules.WebModule;
import org.eclipse.wst.server.core.model.IModule;
import org.eclipse.wst.server.core.model.IPublisher;
import org.eclipse.wst.server.core.resources.IModuleFolder;
import org.eclipse.wst.server.core.resources.IModuleResource;
import org.eclipse.wst.server.core.resources.IRemoteResource;
-
+/**
+ * Ant based publisher.
+ *
+ * @author Gorkem Ercan
+ */
public class AntPublisher implements IPublisher {
@@ -65,7 +73,7 @@
}
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#getMappedLocation(org.eclipse.wst.server.core.resources.IModuleResource)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#getMappedLocation(org.eclipse.wtp.server.core.resources.IModuleResource)
*/
public IPath getMappedLocation(IModuleResource resource) {
// TODO Auto-generated method stub
@@ -73,7 +81,7 @@
}
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#shouldMapMembers(org.eclipse.wst.server.core.resources.IModuleFolder)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#shouldMapMembers(org.eclipse.wtp.server.core.resources.IModuleFolder)
*/
public boolean shouldMapMembers(IModuleFolder folder) {
// TODO Auto-generated method stub
@@ -81,7 +89,7 @@
}
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#getRemoteResources(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#getRemoteResources(org.eclipse.core.runtime.IProgressMonitor)
*/
public IRemoteResource[] getRemoteResources(IProgressMonitor monitor)
throws CoreException {
@@ -90,74 +98,86 @@
}
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#delete(org.eclipse.wst.server.core.resources.IRemoteResource[], org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#delete(org.eclipse.wtp.server.core.resources.IRemoteResource[], org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus[] delete(IRemoteResource[] resource, IProgressMonitor monitor)
throws CoreException {
- // TODO Auto-generated method stub
- return null;
+
+ return new IStatus[]{new Status(IStatus.OK,CorePlugin.PLUGIN_ID,0,"DeleteResource",null)};
}
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#publish(org.eclipse.wst.server.core.resources.IModuleResource[], org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#publish(org.eclipse.wtp.server.core.resources.IModuleResource[], org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus[] publish(IModuleResource[] resource,
IProgressMonitor monitor) throws CoreException {
+ String deployAnt = serverTypeDefinition.getAdminTool().getWeb().getDeploy();
+ if(deployAnt == null || deployAnt.length()<1)
+ return new IStatus[]{new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0,"AntBuildFileDoesNotExist",null)};
+
+
+ IPath file = CorePlugin.getDefault().getStateLocation().append("tempAnt.xml");
+ try {
+ createNewFile(file.toFile(),deployAnt.getBytes());
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ runAnt(file.toString(),new String[]{"deploy"},getPublishProperties(resource),monitor);
+
+ file.toFile().delete();
+
// TODO Auto-generated method stub
return null;
}
+ private Map getPublishProperties(IModuleResource[] resource)
+ {
+ Map props = new HashMap();
+ props.put("deploymentUnitName",this.module.getName());
+ props.put("moduleDir",((WebModule)this.module).getLocation().toString());
+ props.put("deployDir",serverTypeDefinition.getWebModulesDeployDirectory());
+ return props;
+
+
+ }
+ private void runAnt(String buildFile,String[] targets,Map properties ,IProgressMonitor monitor)throws CoreException
+ {
+ AntRunner runner = new AntRunner();
+ runner.setBuildFileLocation(buildFile);
+ runner.setExecutionTargets(targets);
+ runner.addUserProperties(properties);
+ runner.run(monitor);
+ }
+
+
+
+ public boolean createNewFile(File f,byte[] content) throws IOException {
+ if (f != null) {
+ if (f.exists()) {
+ return false;
+ }
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(f);
+ fos.write(content);
+ } finally {
+ if (fos != null) {
+ fos.close();
+ }
+ }
+ return true;
+ }
+ return false;
+ }
/* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IPublisher#deleteAll(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.wtp.server.core.model.IPublisher#deleteAll(org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus deleteAll(IProgressMonitor monitor) throws CoreException {
// TODO Auto-generated method stub
return null;
}
-
- class AntUtil
- {
- public void runTask(IFile buildFile, String[] tasks, String arguments, String buildDir) {
- if (buildFile == null)
- return;
-
- try {
- String taskName = findExecutableTasks(tasks, buildFile);
- if (taskName != null) {
-
- AntLaunchShortcut antLaunchShortcut = new AntLaunchShortcut();
- antLaunchShortcut.setShowDialog(false);
- antLaunchShortcut.launch(buildFile, "run", taskName);
- }
- } catch (Exception e) {
- Trace.trace("Failed to launch ant publisher task",e);
- }
-
- }
- private String findExecutableTasks(String[] tasks, IFile buildFile)
- throws CoreException {
- AntRunner antRunner = new AntRunner();
-
- antRunner.setBuildFileLocation(buildFile.getLocation().toOSString());
- TargetInfo targetInfo[] = antRunner.getAvailableTargets();
-
- String taskName = null;
- for (int i = 0; i < tasks.length; i++) {
- for (int j = 0; j < targetInfo.length; j++) {
- TargetInfo info = targetInfo[j];
- if (info.getName().equals(tasks[i])) {
- if (taskName != null)
- taskName += ",";
- else
- taskName = "";
- taskName += tasks[i];
- break;
- }
- }
- }
- return taskName;
- }
- }
}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
index 7d0ba32..f80e97d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
@@ -30,13 +30,12 @@
***************************************************************************/
package org.eclipse.jst.server.generic.internal.core;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -61,10 +60,13 @@
import org.eclipse.jst.server.generic.core.CorePlugin;
import org.eclipse.jst.server.generic.internal.xml.ClasspathItem;
import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
+import org.eclipse.jst.server.generic.modules.J2eeSpecModuleFactoryDelegate;
import org.eclipse.jst.server.j2ee.IWebModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerConfiguration;
import org.eclipse.wst.server.core.IServerState;
import org.eclipse.wst.server.core.ITask;
+import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.model.IModule;
import org.eclipse.wst.server.core.model.IModuleEvent;
import org.eclipse.wst.server.core.model.IModuleFactoryEvent;
@@ -73,6 +75,7 @@
import org.eclipse.wst.server.core.model.IServerDelegate;
import org.eclipse.wst.server.core.model.IServerPort;
import org.eclipse.wst.server.core.model.IStartableServer;
+import org.eclipse.wst.server.core.model.IURLProvider;
import org.eclipse.wst.server.core.resources.IModuleResourceDelta;
import org.eclipse.wst.server.core.util.ServerPort;
import org.eclipse.wst.server.core.util.SocketUtil;
@@ -82,7 +85,7 @@
*
* @author Gorkem Ercan
*/
-public class GenericServer implements IServerDelegate, IStartableServer, IMonitorableServer {
+public class GenericServer implements IServerDelegate, IStartableServer, IMonitorableServer,IURLProvider {
private IServerState fLiveServer;
private static final String ATTR_STOP = "stop-server";
@@ -193,31 +196,10 @@
*/
public IModule[] getModules() {
// TODO Auto-generated method stub
-
- List l = doGetModules();
- return (IModule[]) l.toArray(new IModule[l.size()]);
+ List list = J2eeSpecModuleFactoryDelegate.getInstance().getModules();
+ return (IModule[])list.toArray(new IModule[list.size()]);
}
- private List doGetModules() {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = root.getProjects();
- if (projects == null)
- return new ArrayList(0);
-
- List list = new ArrayList();
- int size = projects.length;
- for (int i = 0; i < size; i++) {
- try {
- IWebModule module = getWebModule(projects[i]);
- if (module != null)
- list.add(module);
- } catch (CoreException ce) {
- Trace.trace("Could not determine nature", ce);
- }
- }
-
- return list;
- }
protected IWebModule getWebModule(IProject project) throws CoreException {
@@ -630,5 +612,38 @@
public int getStopTimeout() {
return 300000;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.wtp.server.core.model.IURLProvider#getModuleRootURL(org.eclipse.wtp.server.core.model.IModule)
+ */
+ public URL getModuleRootURL(IModule module) {
+
+ try {
+ if (module == null || !(module instanceof IWebModule))
+ return null;
+
+ IServerConfiguration serverConfig = fLiveServer
+ .getServerConfiguration();
+ if (serverConfig == null)
+ return null;
+
+ String url = "http://localhost";
+ int port = Integer.parseInt(getServerDefinition().getPort());
+ port = ServerCore.getServerMonitorManager().getMonitoredPort(
+ fLiveServer, port, "web");
+ if (port != 80)
+ url += ":" + port;
+
+ url += "/"+module.getName();
+
+ if (!url.endsWith("/"))
+ url += "/";
+
+ return new URL(url);
+ } catch (Exception e) {
+ Trace.trace("Could not get root URL", e);
+ return null;
+ }
+
+ }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java
index fe91b35..6055b70 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java
index 3ce1314..8de5783 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java
index c1f2e49..123816f 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java
new file mode 100644
index 0000000..a374bcc
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Eteration Bilisim A.S.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * Gorkem Ercan - initial API and implementation
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Eteration Bilisim A.S. For more
+ * information on eteration, please see
+ * <http://www.eteration.com/>.
+ ***************************************************************************/
+package org.eclipse.jst.server.generic.internal.core;
+
+import java.net.URL;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.*;
+import org.eclipse.wst.server.core.util.HttpLaunchable;
+import org.eclipse.wst.server.core.util.NullLaunchable;
+import org.eclipse.wst.server.core.util.NullModuleObject;
+import org.eclipse.jst.server.j2ee.IWebModule;
+import org.eclipse.jst.server.j2ee.Servlet;
+import org.eclipse.jst.server.j2ee.WebResource;
+/**
+ * Web Launchable adapter delegate
+ * @author Gorkem Ercan
+ */
+public class GenericServerLaunchableAdapterDelegate implements ILaunchableAdapterDelegate {
+ /*
+ * @see ILaunchableAdapterDelegate#getLaunchable(IServer, IModuleObject)
+ */
+ public ILaunchable getLaunchable(IServer server, IModuleObject moduleObject) {
+
+ IServerDelegate delegate = server.getDelegate();
+ if (!(delegate instanceof GenericServer))
+ return null;
+ if (!(moduleObject instanceof Servlet) &&
+ !(moduleObject instanceof WebResource) &&
+ !(moduleObject instanceof NullModuleObject))
+ return null;
+ if (!(moduleObject.getModule() instanceof IWebModule))
+ return null;
+
+ try {
+ URL url = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
+
+ Trace.trace("root: " + url);
+
+ if (moduleObject instanceof Servlet) {
+ Servlet servlet = (Servlet) moduleObject;
+ if (servlet.getAlias() != null) {
+ String path = servlet.getAlias();
+ if (path.startsWith("/"))
+ path = path.substring(1);
+ url = new URL(url, path);
+ } else
+ url = new URL(url, "servlet/" + servlet.getServletClassName());
+ } else if (moduleObject instanceof WebResource) {
+ WebResource resource = (WebResource) moduleObject;
+ String path = resource.getPath().toString();
+ Trace.trace("path: " + path);
+ if (path != null && path.startsWith("/") && path.length() > 0)
+ path = path.substring(1);
+ if (path != null && path.length() > 0)
+ url = new URL(url, path);
+ } else { // null
+ return new NullLaunchable();
+ }
+ return new HttpLaunchable(url);
+ } catch (Exception e) {
+ Trace.trace("Error getting URL for " + moduleObject, e);
+ return null;
+ }
+ }
+}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java
index 40faa3b..21907ee 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java
index baffe4c..b65951c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java
index f67694c..0b56df7 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java
index ef9788f..feb058e 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java
index dc2d0d6..99abdda 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java
@@ -9,8 +9,8 @@
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE
- * SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ETERATIOn A.S.
+ * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java
index 97c623d..6fafe3c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java
index 6133fc1..a56a381 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java
index f5d901c..ca2655d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java
@@ -13,7 +13,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java
index ca12ed1..ef0be15 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java
index cbb7d91..7d87d07 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
@@ -265,7 +265,7 @@
* @return String
*/
public String getWebModulesDeployDirectory() {
- return webModulesDeployDirectory;
+ return this.resolveProperties(webModulesDeployDirectory);
}
/**
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java
index 050f779..2e61a41 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java
index c486278..8d7c120 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java
index 37594bf..2c89fe4 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
index fa1fc48..16d7f61 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/build.properties b/plugins/org.eclipse.jst.server.generic.modules/build.properties
index 41f86ad..9815251 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.modules/build.properties
@@ -2,3 +2,5 @@
output.commonmodules.jar = bin/
bin.includes = plugin.xml,\
commonmodules.jar
+src.includes = plugin.xml,\
+ src/
diff --git a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml b/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
index a414d08..47858aa 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
@@ -4,7 +4,7 @@
id="org.eclipse.jst.server.generic.modules"
name="J2EE Common Modules Plug-in"
version="1.0.0"
- provider-name="Eteration"
+ provider-name="Eteration.com"
class="org.eclipse.jst.server.generic.modules.ModulesPlugin">
<runtime>
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java
index 9379de0..e826f1b 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java
index 2ef3f4c..b129599 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java
index 1d726e6..2d36805 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java
index 5736d7e..74be2be 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java
index a413067..ab4a0e9 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java
index b7a852f..00e074a 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java
index d4bee28..e404746 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java
index 03076dd..8489881 100644
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java
+++ b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java
@@ -11,7 +11,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/build.properties b/plugins/org.eclipse.jst.server.generic.ui/build.properties
index 48e5416..6b4a2a0 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/build.properties
@@ -1,4 +1,10 @@
source.genericui.jar = src/
output.genericui.jar = bin/
bin.includes = plugin.xml,\
- genericui.jar
+ genericui.jar,\
+ icons/,\
+ plugin.properties
+src.includes = icons/,\
+ plugin.xml,\
+ plugin.properties,\
+ src/
diff --git a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties b/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
index b582f22..958b586 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
@@ -1,3 +1,3 @@
pluginName= Generic J2EE Server Plugin UI
-providerName=Eclipse.org
+providerName=Eteration.com
diff --git a/plugins/org.eclipse.jst.server.generic.ui/plugin.xml b/plugins/org.eclipse.jst.server.generic.ui/plugin.xml
index 1bc0db8..7ec5282 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.ui/plugin.xml
@@ -17,11 +17,11 @@
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.jdt.debug.ui"/>
<import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.core" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.server.core" />
+ <import plugin="org.eclipse.jst.server.core" />
</requires>
<extension
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
index 210c888..23b6e10 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
index bc84f4e..9d7d80c 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
index 4fb4575..f1ba87f 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
@@ -13,7 +13,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
index 74d4a43..85468d8 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerRuntimePropertyComposite.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerRuntimePropertyComposite.java
index 5ac885a..5d4b62a 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerRuntimePropertyComposite.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerRuntimePropertyComposite.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
index dfcc4f2..e2cc51e 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
@@ -12,7 +12,7 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
index a9d83ab..4ed3d6f 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -15,14 +15,14 @@
</runtime>
<requires>
- <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.debug" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.launching" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.core" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.runtime" />
+ <import plugin="org.eclipse.core.resources" />
+ <import plugin="org.eclipse.debug.core" />
+ <import plugin="org.eclipse.jdt.core" />
+ <import plugin="org.eclipse.jdt.debug" />
+ <import plugin="org.eclipse.jdt.launching" />
+ <import plugin="org.eclipse.wst.server.core" />
+ <import plugin="org.eclipse.jst.server.core" />
</requires>
<extension point="org.eclipse.wst.server.core.runtimeTypes">
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java
index 35d324c..1296dbc 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java
@@ -19,6 +19,10 @@
* Factory for reading and writing from XML files.
*/
public class Factory implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+
protected String packageName;
protected Document document;
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
index cc09b07..400a526 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
@@ -15,6 +15,8 @@
* An XML element.
*/
public class XMLElement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private Element xmlElement;
protected Factory factory;
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
index 6c80f3d..15b4aae 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
@@ -15,23 +15,23 @@
</runtime>
<requires>
- <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.editors" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.forms" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.debug.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.debug" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.debug.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.launching" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.server.tomcat.core" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.runtime" />
+ <import plugin="org.eclipse.core.resources" />
+ <import plugin="org.eclipse.ui" />
+ <import plugin="org.eclipse.ui.ide" />
+ <import plugin="org.eclipse.ui.editors" />
+ <import plugin="org.eclipse.ui.forms" />
+ <import plugin="org.eclipse.debug.core" />
+ <import plugin="org.eclipse.debug.ui" />
+ <import plugin="org.eclipse.jdt.core" />
+ <import plugin="org.eclipse.jdt.debug" />
+ <import plugin="org.eclipse.jdt.debug.ui" />
+ <import plugin="org.eclipse.jdt.launching" />
+ <import plugin="org.eclipse.wst.server.core" />
+ <import plugin="org.eclipse.wst.server.ui" />
+ <import plugin="org.eclipse.jst.server.core" />
+ <import plugin="org.eclipse.jst.server.ui" />
+ <import plugin="org.eclipse.jst.server.tomcat.core" />
</requires>
<extension point="org.eclipse.wst.server.ui.serverImages">
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index 262c486..6ee0308 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -8,16 +8,16 @@
class="org.eclipse.jst.server.internal.ui.JavaServerUIPlugin">
<requires>
- <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.views" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.editors" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.launching" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.server.ui" version="3.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.jdt.launching"/>
+ <import plugin="org.eclipse.wst.server.core"/>
+ <import plugin="org.eclipse.wst.server.ui"/>
<import plugin="org.eclipse.jst.server.core"/>
</requires>
