Attachment 158400 Details for Bug 160220 – latest patch for WAS 6.1

latest patch for WAS 6.1

patch.txt (text/plain), 26.04 KB, created by Marcel Stör

on 2010-02-07 18:43:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Stör

Created: 2010-02-07 18:43:51 EST

Size: 26.04 KB

patch

obsolete

>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.21
>diff -u -r1.21 MANIFEST.MF
>--- META-INF/MANIFEST.MF	20 Jun 2008 15:10:09 -0000	1.21
>+++ META-INF/MANIFEST.MF	7 Feb 2010 23:34:41 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.jst.server.websphere.core; singleton:=true
>-Bundle-Version: 1.0.302.qualifier
>+Bundle-Version: 1.1.0.qualifier
> Bundle-ClassPath: webspherecore.jar
> Bundle-Activator: org.eclipse.jst.server.websphere.core.CorePlugin
> Bundle-Vendor: %providerName
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.websphere.core/plugin.xml,v
>retrieving revision 1.19
>diff -u -r1.19 plugin.xml
>--- plugin.xml	16 Apr 2008 15:10:54 -0000	1.19
>+++ plugin.xml	7 Feb 2010 23:34:41 -0000
>@@ -26,6 +26,29 @@
>          types="jst.utility"
>          versions="1.0"/>
>     </runtimeType>
>+    <runtimeType
>+       id="org.eclipse.jst.server.generic.runtime.websphere.6.1"
>+       name="%websphere.6.1.runtime.name"
>+       description="%websphere.6.1.runtime.description"
>+       vendor="%genericCategory"
>+       version="6.1"
>+       class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
>+      <moduleType
>+         types="jst.web"
>+         versions="2.2, 2.3, 2.4"/>
>+      <moduleType
>+         types="jst.ejb"
>+         versions="1.1, 2.0, 2.1"/>
>+      <moduleType
>+         types="jst.ear"
>+         versions="1.2, 1.3, 1.4"/>
>+      <moduleType
>+         types="jst.connector"
>+         versions="1.0, 1.5"/>
>+       <moduleType
>+         types="jst.utility"
>+         versions="1.0"/>
>+    </runtimeType>
>   </extension>
> 
>    <extension point="org.eclipse.wst.server.core.serverTypes">
>@@ -46,17 +69,34 @@
>            launchModes="run,debug"
>            startBeforePublish="true">
>      </serverType>
>+     <serverType
>+           runtime="true"
>+           class="org.eclipse.jst.server.generic.core.internal.GenericServer"
>+           id="org.eclipse.jst.servers.websphere.6.1"
>+           initialState="stopped"
>+		   startTimeout="300000"
>+           stopTimeout="15000"
>+           supportsRemoteHosts="false"
>+           runtimeTypeId="org.eclipse.jst.server.generic.runtime.websphere.6.1"
>+           description="%websphere.6.1.server.description"
>+           launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
>+           behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
>+           name="%websphere.6.1.server.name"
>+           hasConfiguration="false"
>+           launchModes="run,debug"
>+           startBeforePublish="true">
>+     </serverType>
> 	</extension>
> 
> 
>    <extension point="org.eclipse.wst.server.ui.wizardFragments">
>      <fragment
>         id="org.eclipse.jst.server.generic.runtime"
>-        typeIds="org.eclipse.jst.server.generic.runtime.websphere.6"
>+        typeIds="org.eclipse.jst.server.generic.runtime.websphere.6,org.eclipse.jst.server.generic.runtime.websphere.6.1"
>         class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment"/>           
>      <fragment
>         id="org.eclipse.jst.server.generic.server"
>-        typeIds="org.eclipse.jst.servers.websphere.6"
>+        typeIds="org.eclipse.jst.servers.websphere.6,org.eclipse.jst.servers.websphere.6.1"
>         class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>   
>   </extension>
>   
>@@ -64,17 +104,19 @@
>      <image
>          id="org.eclipse.jst.server.generic.image"
>          icon="icons/obj16/websphere.gif"
>-         typeIds="org.eclipse.jst.servers.websphere.6" />
>+         typeIds="org.eclipse.jst.servers.websphere.6,org.eclipse.jst.servers.websphere.6.1" />
>      <image
>          id="org.eclipse.jst.server.generic.image"
>          icon="icons/obj16/websphere.gif"
>-         typeIds="org.eclipse.jst.server.generic.runtime.websphere.6"/>
>+         typeIds="org.eclipse.jst.server.generic.runtime.websphere.6,org.eclipse.jst.server.generic.runtime.websphere.6.1"/>
> 	</extension>
>   
> 
>    <extension point="org.eclipse.jst.server.generic.core.serverdefinition">
> 		<serverdefinition id="org.eclipse.jst.server.generic.runtime.websphere.6" definitionfile="/serverdef/websphere.6.serverdef">
> 		</serverdefinition>
>+		<serverdefinition id="org.eclipse.jst.server.generic.runtime.websphere.6.1" definitionfile="/serverdef/websphere.6.1.serverdef">
>+		</serverdefinition>
>    </extension>
> 
>    <extension point="org.eclipse.jst.server.generic.core.genericpublisher">
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.websphere.core/plugin.properties,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.properties
>--- plugin.properties	30 Aug 2005 08:56:32 -0000	1.4
>+++ plugin.properties	7 Feb 2010 23:34:40 -0000
>@@ -11,6 +11,13 @@
> websphere.6.server.description=Publishes and runs J2EE 1.4 modules on a local server. \
> Provides basic server functionality
> 
>+websphere.6.1.runtime.name=IBM WebSphere v6.1
>+websphere.6.1.runtime.description=Publishes and runs J2EE 1.4 modules on a local server. \
>+Provides basic server functionality
>+websphere.6.1.server.name=IBM WebSphere v6.1
>+websphere.6.1.server.description=Publishes and runs J2EE 1.4 modules on a local server. \
>+Provides basic server functionality
>+
> wasHome=IBM WebSphere Installation Directory:
> port=Port:
> wasProfile=Server Profile Directory:
>Index: serverdef/scripts/websphere.6.1.xml
>===================================================================
>RCS file: serverdef/scripts/websphere.6.1.xml
>diff -N serverdef/scripts/websphere.6.1.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ serverdef/scripts/websphere.6.1.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,154 @@
>+<project name="deployextension"  default="deploy.j2ee.web"  basedir=".">
>+
>+	<property name="was.home" value="${wasHome}"/>
>+    <property name="module.working.dir" value="${project.working.dir}/${project.name}"></property>
>+	<path id="toolpath">
>+		<fileset dir="${was.home}/lib">
>+			<include name="*.jar" />
>+		</fileset>
>+		<fileset dir="${was.home}/plugins">
>+			<include name="*com.ibm.ws.runtime_6.1.0.jar" />
>+		</fileset>
>+		<pathelement path="${was.home}/lib/properties" />
>+		<pathelement path="${was.home}/optionalLibraries/jython.jar" />
>+	</path>
>+
>+	<taskdef classpathref="toolpath" name="wsadmin" classname="com.ibm.websphere.ant.tasks.WsAdmin" />
>+	<taskdef classpathref="toolpath" name="wsejbdeploy" classname="com.ibm.websphere.ant.tasks.WsEjbDeploy" />	
>+	<taskdef classpathref="toolpath" name="wsinstallapp" classname="com.ibm.websphere.ant.tasks.InstallApplication" />	
>+
>+	<target name="deploy.j2ee.web">
>+		<echo message="Module Working Day  ${module.working.dir} Project Working Dir=${project.working.dir} Message Dir=${module.dir} Module Name ${module.name}"></echo>
>+		<jar destfile="${project.working.dir}/${module.name}.war"> 
>+			<zipfileset dir="${module.working.dir}">
>+				<include name="**/*.*"/>
>+				<exclude name="**/*.war"/>
>+			</zipfileset>
>+		</jar>
>+		<wsadmin  
>+			washome="${was.home}" 	
>+			properties="${wasProfile}/properties/wsadmin.properties" 
>+			command="$AdminApp uninstall ${module.name}" 
>+			failonerror="false">
>+		</wsadmin>
>+	    <wsadmin  
>+			washome="${was.home}" 				
>+			properties="${wasProfile}/properties/wsadmin.properties" 
>+			command="$AdminApp install ${project.working.dir}/${module.name}.war {-appname ${module.name} -contextroot  ${contextRoot} -usedefaultbindings}" 
>+			failonerror="true">
>+		</wsadmin>
>+	    <wsadmin  
>+		  washome="${was.home}" 
>+		  properties="${wasProfile}/properties/wsadmin.properties" 
>+		  command="$AdminControl invoke [$AdminControl queryNames type=ApplicationManager,*] startApplication ${module.name}" 
>+		  failonerror="true">
>+	    </wsadmin>			
>+	</target>
>+	
>+	<target name="deploy.j2ee.ejb">
>+		<jar destfile="${project.working.dir}/${module.name}.jar"> 
>+			<zipfileset dir="${module.dir}">
>+	        	<include name="**/*.*"/>
>+	       		<exclude name="**/*.java"/>
>+			</zipfileset>
>+		</jar>
>+		<wsejbdeploy 
>+				inputJar="${project.working.dir}/${module.name}.jar" 
>+				wasHome="${was.home}" 
>+				washome="${was.home}" 
>+				classpathref="toolpath"
>+				outputJar="${project.working.dir}/${module.name}-was.jar" 
>+				codegen="true " 
>+				keepGenerated="true" 
>+				quiet="false" 
>+				noValidate="true" 
>+				noWarnings="false" 
>+				noInform="false" 
>+				compatible35="false" 
>+				failonerror="true" 
>+				trace="true" 
>+				jvmMaxMemory="256M" />
>+	
>+			<wsadmin  
>+				washome="${was.home}" 
>+				properties="${wasProfile}/properties/wsadmin.properties" 
>+				command="$AdminApp uninstall ${module.name}" 
>+				failonerror="false">
>+			</wsadmin>
>+
>+		    <wsadmin  
>+				washome="${was.home}" 				
>+				properties="${wasProfile}/properties/wsadmin.properties" 
>+				command="$AdminApp install ${project.working.dir}/${module.name}.jar {-appname ${module.name} -usedefaultbindings}" 
>+				failonerror="true">
>+			</wsadmin>
>+
>+			<wsadmin  
>+			  washome="${was.home}" 
>+			  properties="${wasProfile}/properties/wsadmin.properties" 
>+			  command="$AdminControl invoke [$AdminControl queryNames type=ApplicationManager,*] startApplication ${module.name}" 
>+			  failonerror="true">
>+		    </wsadmin>	
>+	</target>
>+	
>+	<target name="deploy.j2ee.ear">
>+		<jar destfile="${project.working.dir}/${module.name}.ear"> 
>+			<zipfileset dir="${module.dir}">
>+	        	<include name="**/*.*"/>
>+	       		<exclude name="**/*.java"/>
>+			</zipfileset>
>+		</jar>
>+
>+		<wsadmin  
>+					washome="${was.home}" 
>+					properties="${wasProfile}/properties/wsadmin.properties" 
>+					command="$AdminApp uninstall ${module.name}" 
>+					failonerror="false">
>+		</wsadmin>
>+
>+		<wsadmin  
>+					washome="${was.home}" 				
>+					properties="${wasProfile}/properties/wsadmin.properties" 
>+					command="$AdminApp install ${project.working.dir}/${module.name}.ear {-appname ${module.name} -deployejb -usedefaultbindings}" 
>+					failonerror="true">
>+		</wsadmin>
>+		<wsadmin  
>+				  washome="${was.home}" 
>+				  properties="${wasProfile}/properties/wsadmin.properties" 
>+				  command="$AdminControl invoke [$AdminControl queryNames type=ApplicationManager,*] startApplication ${module.name}" 
>+				  failonerror="true">
>+		 </wsadmin>	
>+		
>+	</target>	
>+	
>+	<target name="undeploy.j2ee.web">
>+		
>+		<wsadmin  
>+			washome="${was.home}" 
>+			
>+			properties="${wasProfile}/properties/wsadmin.properties" 
>+			command="$AdminApp uninstall ${module.name}" 
>+			failonerror="false">
>+		</wsadmin>
>+	</target>
>+	<target name="undeploy.j2ee.ejb">
>+		<wsadmin  
>+			washome="${was.home}" 
>+			
>+			properties="${wasProfile}/properties/wsadmin.properties" 
>+			command="$AdminApp uninstall ${module.name}" 
>+			failonerror="false">
>+		</wsadmin>
>+	</target>	
>+	
>+	<target name="undeploy.j2ee.ear">
>+		<wsadmin  
>+			washome="${was.home}" 
>+			
>+			properties="${wasProfile}/properties/wsadmin.properties" 
>+			command="$AdminApp uninstall ${module.name}" 
>+			failonerror="false">
>+		</wsadmin>
>+	</target>	
>+
>+</project>
>Index: serverdef/websphere.6.1.serverdef
>===================================================================
>RCS file: serverdef/websphere.6.1.serverdef
>diff -N serverdef/websphere.6.1.serverdef
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ serverdef/websphere.6.1.serverdef	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,188 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<tns:ServerRuntime
>+	xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
>+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+	xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd "
>+	name="IBM WebSphere 6.1" version="v6.1">
>+	<property id="wasHome"
>+		label="%wasHome"
>+		type="directory"
>+		context="runtime"
>+		default="/ibm_websphere_root/AppServer" />
>+
>+	<property id="port"
>+		label="%port"
>+		type="string"
>+		context="server"
>+		default="9080" />
>+
>+	<property id="wasProfile"
>+		label="%wasProfile"
>+		type="directory"
>+		context="server"
>+		default="/ibm_websphere_root/AppServer/profiles/AppSrv01" />
>+		
>+	<property id="wasCell"
>+		label="%wasCell"
>+		type="string"
>+		context="server"
>+		default="&lt;hostname&gt;Node01Cell" />
>+
>+	<property id="wasNode"
>+		label="%wasNode"
>+		type="string"
>+		context="server"
>+		default="&lt;hostname&gt;Node01" />
>+
>+	<property id="wasServer"
>+		label="%wasServer"
>+		type="string"
>+		context="server"
>+		default="server1" />
>+
>+	<port>
>+		<no>${port}</no>
>+		<name>Http</name>
>+		<protocol>http</protocol>
>+	</port>
>+
>+	<module>
>+		<type>jst.web</type>
>+		<publishDir>${wasHome}</publishDir>
>+		<publisherReference>org.eclipse.jst.server.generic.websphere.antpublisher</publisherReference>
>+	</module>
>+	<module>
>+		<type>jst.ejb</type>
>+		<publishDir>${wasHome}</publishDir>
>+		<publisherReference>org.eclipse.jst.server.generic.websphere.antpublisher</publisherReference>
>+	</module>
>+	<module>
>+		<type>jst.ear</type>
>+		<publishDir>${wasHome}</publishDir>
>+		<publisherReference>org.eclipse.jst.server.generic.websphere.antpublisher</publisherReference>
>+	</module>
>+	<module>
>+		<type>jst.connector</type>
>+		<publishDir>${wasHome}</publishDir>
>+		<publisherReference>org.eclipse.jst.server.generic.websphere.antpublisher</publisherReference>
>+	</module>
>+	<project>
>+		<classpathReference>was.project</classpathReference>
>+	</project>
>+
>+	<start>
>+		<mainClass>com.ibm.ws.bootstrap.WSLauncher</mainClass>
>+		<workingDirectory>${wasProfile}</workingDirectory>
>+		<programArguments>com.ibm.ws.management.tools.WsServerLauncher "${wasProfile}/config" "${wasCell}" "${wasNode}" "${wasServer}"</programArguments>
>+		
>+		<vmParameters>"-Duser.install.root=${wasProfile}" "-Dwas.install.root=${wasHome}" "-Dws.ext.dirs=${wasHome}/runtimes${pathChar}${wasHome}/java/lib${pathChar}${wasHome}/classes${pathChar}${wasHome}/lib${pathChar}${wasHome}/installedChannels${pathChar}${wasHome}/lib/ext${pathChar}${wasHome}/web/help${pathChar}${wasHome}/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime"-Xms50m -Xmx256m "-Dcom.ibm.CORBA.ConfigURL=file:${wasProfile}/properties/sas.client.props" "-Dcom.ibm.SOAP.ConfigURL=file:${wasProfile}/properties/soap.client.props" "-Djava.util.logging.manager=com.ibm.ws.bootstrap.WsLogManager" "-Djava.util.logging.configureByServer=true"</vmParameters>
>+		<classpathReference>was</classpathReference>
>+	</start>
>+
>+	<stop>
>+		<mainClass>com.ibm.ws.bootstrap.WSLauncher</mainClass>
>+		<workingDirectory>${wasHome}</workingDirectory>
>+		<programArguments>com.ibm.ws.runtime.WsServerStop "${wasProfile}/config" "${wasCell}" "${wasNode}" "${wasServer}"</programArguments>
>+		<vmParameters>"-Duser.install.root=${wasProfile}"  "-Dserver.root=${wasProfile}"  "-Dwas.install.root=${wasHome}" "-Dws.ext.dirs=${wasHome}/java/lib${pathChar}${wasHome}/classes${pathChar}${wasHome}/lib${pathChar}${wasHome}/installedChannels${pathChar}${wasHome}/lib/ext${pathChar}${wasHome}/web/help${pathChar}${wasHome}/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime"   "-Xbootclasspath/p:${wasHome}/java/jre/lib/ext/ibmorb.jar${pathChar}${wasHome}/java/jre/lib/ext/ibmext.jar" -Xms50m -Xmx256m "-Dcom.ibm.CORBA.ConfigURL=file:${wasProfile}/properties/sas.client.props" "-Dcom.ibm.SOAP.ConfigURL=file:${wasProfile}/properties/soap.client.props"   "-Djava.util.logging.manager=com.ibm.ws.bootstrap.WsLogManager" "-Djava.util.logging.configureByServer=true" "-Dibm.websphere.preload.classes=true"  "-Djava.library.path=${wasHome}/java/bin${pathChar}${wasHome}/bin${pathChar}${wasHome}/java/bin${pathChar}${wasHome}/java/jre/bin"</vmParameters>
>+		<classpathReference>was</classpathReference>
>+	</stop>
>+
>+	<publisher id="org.eclipse.jst.server.generic.antpublisher">
>+		<publisherdata>
>+			<dataname>build.file</dataname>
>+			<datavalue>/serverdef/scripts/websphere.6.1.xml</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.publish.jst.web</dataname>
>+			<datavalue>deploy.j2ee.web</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.publish.jst.ejb</dataname>
>+			<datavalue>deploy.j2ee.ejb</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.unpublish.jst.web</dataname>
>+			<datavalue>undeploy.j2ee.web</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.unpublish.jst.ejb</dataname>
>+			<datavalue>undeploy.j2ee.ejb</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.publish.jst.ear</dataname>
>+			<datavalue>deploy.j2ee.ear</datavalue>
>+		</publisherdata>
>+		<publisherdata>
>+			<dataname>target.unpublish.jst.ear</dataname>
>+			<datavalue>undeploy.j2ee.ear</datavalue>
>+		</publisherdata>		
>+	</publisher>
>+
>+	<classpath id="was" >
>+	    <archive path="${wasHome}/properties" />
>+	    <archive path="${wasHome}/lib/startup.jar" />
>+	    <archive path="${wasHome}/lib/bootstrap.jar" />
>+        <archive path="${wasHome}/lib/j2ee.jar" />
>+        <archive path="${wasHome}/lib/lmproxy.jar" />
>+        <archive path="${wasHome}/lib/urlprotocols.jar" />
>+	</classpath>
>+
>+	<classpath id="was.project">
>+	    <archive path="${wasHome}/lib/activation-impl.jar" />
>+	    <archive path="${wasHome}/lib/aspectjrt.jar" />
>+	    <archive path="${wasHome}/lib/base.jar" />
>+	    <archive path="${wasHome}/lib/bootstrap.jar" />
>+	    <archive path="${wasHome}/lib/bsf-engines.jar" />
>+	    <archive path="${wasHome}/lib/commandlineutils.jar" />
>+	    <archive path="${wasHome}/lib/EJBCommandTarget.jar" />
>+	    <archive path="${wasHome}/lib/htmlshell.jar" />
>+	    <archive path="${wasHome}/lib/installver.jar" />
>+	    <archive path="${wasHome}/lib/installxml.jar" />
>+	    <archive path="${wasHome}/lib/iscdeploy.jar" />
>+	    <archive path="${wasHome}/lib/ivblogbr.jar" />
>+	    <archive path="${wasHome}/lib/IVTClient.jar" />
>+	    <archive path="${wasHome}/lib/j2ee.jar" />
>+	    <archive path="${wasHome}/lib/jacl.jar" />
>+	    <archive path="${wasHome}/lib/launchclient.jar" />
>+	    <archive path="${wasHome}/lib/lmproxy.jar" />
>+	    <archive path="${wasHome}/lib/mail-impl.jar" />
>+	    <archive path="${wasHome}/lib/marshall.jar" />
>+	    <archive path="${wasHome}/lib/nif.jar" />
>+	    <archive path="${wasHome}/lib/pc-appext.jar" />
>+	    <archive path="${wasHome}/lib/physicalrep.jar" />
>+	    <archive path="${wasHome}/lib/pmirm4arm.jar" />
>+	    <archive path="${wasHome}/lib/rrd-appext.jar" />
>+	    <archive path="${wasHome}/lib/rsadbutils.jar" />
>+	    <archive path="${wasHome}/lib/rsahelpers.jar" />
>+	    <archive path="${wasHome}/lib/serviceadapter.jar" />
>+	    <archive path="${wasHome}/lib/sljc.jar" />
>+	    <archive path="${wasHome}/lib/spy-sl.jar" />
>+	    <archive path="${wasHome}/lib/spy.jar" />
>+	    <archive path="${wasHome}/lib/sqlserver.jar" />
>+	    <archive path="${wasHome}/lib/startup.jar" />
>+	    <archive path="${wasHome}/lib/tcljava.jar" />
>+	    <archive path="${wasHome}/lib/urlprotocols.jar" />
>+	    <archive path="${wasHome}/lib/util.jar" />
>+	    <archive path="${wasHome}/lib/wsatlib.jar" />
>+	    <archive path="${wasHome}/lib/wsif-compatb.jar" />
>+	</classpath>
>+	<jndiConnection>
>+		<providerUrl>iiop://${serverAddress}:2001</providerUrl>
>+		<initialContextFactory>org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory</initialContextFactory>
>+		<jndiProperty>
>+			<name></name>
>+			<value></value>
>+		</jndiProperty>
>+	</jndiConnection>
>+</tns:ServerRuntime>
>Index: src/org/eclipse/jst/server/websphere/core/WebSphere61_ExternalServerBehaviour.java
>===================================================================
>RCS file: src/org/eclipse/jst/server/websphere/core/WebSphere61_ExternalServerBehaviour.java
>diff -N src/org/eclipse/jst/server/websphere/core/WebSphere61_ExternalServerBehaviour.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jst/server/websphere/core/WebSphere61_ExternalServerBehaviour.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,112 @@
>+/**
>+ * 
>+ */
>+package org.eclipse.jst.server.websphere.core;
>+
>+import java.io.FileNotFoundException;
>+import java.net.HttpURLConnection;
>+import java.net.URL;
>+import java.net.URLConnection;
>+
>+import org.eclipse.debug.core.DebugEvent;
>+import org.eclipse.debug.core.DebugPlugin;
>+import org.eclipse.debug.core.IDebugEventSetListener;
>+import org.eclipse.debug.core.model.IProcess;
>+import org.eclipse.jst.server.generic.core.internal.ExternalServerBehaviour;
>+import org.eclipse.jst.server.generic.core.internal.Trace;
>+import org.eclipse.wst.server.core.IServer;
>+import org.eclipse.wst.server.core.ServerPort;
>+
>+/**
>+ * Customized the ExtneralServerBehavior to handle using the WebSphere start/stop scripts
>+ * which terminate after the external server process has be started/stopped.
>+ * 
>+ * @author <a href="Eric.Norman@softwareag.com">Eric Norman</a>
>+ */
>+public class WebSphere61_ExternalServerBehaviour extends ExternalServerBehaviour {
>+
>+	/**
>+	 * Override to change what happens when the script process terminates 
>+	 */
>+    protected void setProcess(final IProcess newProcess) {
>+    	if (process != null)
>+    		return;
>+    	if(processListener!=null)
>+    		DebugPlugin.getDefault().removeDebugEventListener(processListener);
>+    	if (newProcess==null)
>+    		return;
>+    	process = newProcess;
>+    	processListener = new IDebugEventSetListener() {
>+    		public void handleDebugEvents(DebugEvent[] events) {
>+    			if (events != null) {
>+    				int size = events.length;
>+    				for (int i = 0; i < size; i++) {
>+    					if (process!= null &&  process.equals(events[i].getSource()) && events[i].getKind() == DebugEvent.TERMINATE) {
>+    						DebugPlugin.getDefault().removeDebugEventListener(this);
>+
>+    						if (getServer().getServerState() == IServer.STATE_STARTING) {
>+        						try {
>+            						Trace.trace(Trace.FINEST, "Ping: pinging"); //$NON-NLS-1$
>+
>+            			    		String url = "http://"+getServer().getHost();; //$NON-NLS-1$
>+            			    	  	ServerPort[] ports = getServer().getServerPorts(null);
>+            			        	ServerPort sp = null;
>+            			    	    for(int p=0;p<ports.length;p++){
>+            			    	    	if(ports[i].getProtocol().equalsIgnoreCase("http")){//$NON-NLS-1$
>+            			    	    		sp=ports[p];
>+            			    	    	}
>+            			    	    }
>+            				    	if(sp==null){
>+            				    		Trace.trace(Trace.SEVERE, "Can't ping for server startup."); //$NON-NLS-1$
>+            							stopImpl();
>+            				    		return;
>+            				    	}
>+            			        	int port = sp.getPort();
>+            			    		if (port != 80)
>+            			    			url += ":" + port; //$NON-NLS-1$
>+            						
>+            						URL pingUrl = new URL(url);
>+            						URLConnection conn = pingUrl.openConnection();
>+            						((HttpURLConnection)conn).getResponseCode();
>+
>+            						//no exception.  So it seems to be working...
>+            						Trace.trace(Trace.FINEST, "Ping: success"); //$NON-NLS-1$
>+            						if (process != null) {
>+            							process = null;
>+            							DebugPlugin.getDefault().removeDebugEventListener(processListener);
>+            							processListener = null;
>+            						}
>+            						setServerStarted();
>+        						} catch (FileNotFoundException fe) {
>+        							//this is ok. just mark the server as started
>+            						Trace.trace(Trace.FINEST, "Ping: FileNotFound"); //$NON-NLS-1$
>+            						if (process != null) {
>+            							process = null;
>+            							DebugPlugin.getDefault().removeDebugEventListener(processListener);
>+            							processListener = null;
>+            						}
>+            						setServerStarted();
>+        						} catch (Exception e) {
>+        							Trace.trace(Trace.FINEST, "Ping: failed: "+ e); //$NON-NLS-1$
>+        							// pinging failed
>+        							stopImpl();
>+        						}
>+    						} else {
>+    							//some other type of stop happening.
>+    							stopImpl();
>+    						}
>+    					}
>+    				}
>+    			}
>+    		}
>+    	};
>+    	DebugPlugin.getDefault().addDebugEventListener(processListener);
>+    }
>+    
>+	/**
>+	 * Override to disable the ping thread
>+	 */
>+	protected void startPingThread() {
>+		//don't use ping thread, just wait for the script to terminate before pinging.
>+	}
>+}

Actions: View

Attachments on bug 160220: 53156 | 95764 | 118383 | 158400