[166528] OC4j 10.1.3.1 version
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/.classpath b/plugins/org.eclipse.jst.server.generic.oc4j/.classpath
index fb0f2c4..bc4dfbb 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/.classpath
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="servers/"/>
+ <classpathentry kind="src" path="servers"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore b/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore
index f0de311..fc5e414 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore
@@ -1,5 +1,3 @@
bin
build.xml
javaCompiler.genericoc4j.jar.args
-temp.folder
-genericoc4j.jar
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
index d79f6e9..733b19c 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
@@ -35,6 +35,17 @@
oracle.10_1_3.server.description=Oracle OC4J Standalone Server for v10.1.3 \
on the localhost using the default instance
+# ============ OC4J 10.1.3.1 ====================
+oc4j10131.pluginName= Oracle OC4J v10.1.3.1 Generic Server Definition Core Plug-in
+oc4j10131.pluginDescription=Provides server definition for Oracle OC4J Standalone 10.1.3.1.\
+Provides basic server functionality
+
+oracle.10_1_3_1.runtime.name=Oracle OC4J Standalone 10.1.3.1
+oracle.10_1_3_1.runtime.description=Oracle OC4J 10.1.3.1 runtime
+oracle.10_1_3_1.server.name=Oracle OC4J Standalone Server 10.1.3.1
+oracle.10_1_3_1.server.description=Oracle OC4J Standalone Server for v10.1.3.1 \
+on the localhost using the default instance
+
# UI Labels
label.j2ee.home=Oracle J2EE Home:
label.admin.user=User:
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
index c16c8a2..b2595c5 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
@@ -25,6 +25,29 @@
types="jst.utility"
versions="1.0"/>
</runtimeType>
+ <runtimeType
+ id="org.eclipse.jst.server.generic.runtime.oracle10131"
+ name="%oracle.10_1_3_1.runtime.name"
+ description="%oracle.10_1_3_1.runtime.description"
+ vendor="%oracleCategory"
+ version="10.1.3.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, 3.0"/>
+ <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">
@@ -43,6 +66,21 @@
startBeforePublish="true"
supportsRemoteHosts="false">
</serverType>
+ <serverType
+ behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
+ class="org.eclipse.jst.server.generic.core.internal.GenericServer"
+ description="%oracle.10_1_3_1.server.description"
+ hasConfiguration="false"
+ id="org.eclipse.jst.server.generic.oracle10131"
+ initialState="stopped"
+ launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
+ launchModes="run,debug"
+ name="%oracle.10_1_3_1.server.name"
+ runtime="true"
+ runtimeTypeId="org.eclipse.jst.server.generic.runtime.oracle10131"
+ startBeforePublish="true"
+ supportsRemoteHosts="false">
+ </serverType>
</extension>
<extension point="org.eclipse.wst.server.ui.wizardFragments">
@@ -53,7 +91,15 @@
<fragment
id="org.eclipse.jst.server.generic.server"
typeIds="org.eclipse.jst.server.generic.oracle1013"
- class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>
+ <fragment
+ id="org.eclipse.jst.server.generic.runtime"
+ typeIds="org.eclipse.jst.server.generic.runtime.oracle10131"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment"/>
+ <fragment
+ id="org.eclipse.jst.server.generic.server"
+ typeIds="org.eclipse.jst.server.generic.oracle10131"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>
</extension>
<extension point="org.eclipse.wst.server.ui.serverImages">
@@ -64,19 +110,33 @@
<image
id="org.eclipse.jst.server.generic.image"
icon="icons/obj16/oracle.gif"
- typeIds="org.eclipse.jst.server.generic.runtime.oracle1013"/>
+ typeIds="org.eclipse.jst.server.generic.runtime.oracle1013"/>
+ <image
+ id="org.eclipse.jst.server.generic.image"
+ icon="icons/obj16/oracle.gif"
+ typeIds="org.eclipse.jst.server.generic.oracle10131" />
+ <image
+ id="org.eclipse.jst.server.generic.image"
+ icon="icons/obj16/oracle.gif"
+ typeIds="org.eclipse.jst.server.generic.runtime.oracle10131"/>
</extension>
<extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
<runtimeClasspathProvider
id="org.eclipse.jst.server.generic.runtimeTarget"
runtimeTypeIds="org.eclipse.jst.server.generic.runtime.oracle1013"
- class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler"/>
+ class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler"/>
+ <runtimeClasspathProvider
+ id="org.eclipse.jst.server.generic.runtimeTarget"
+ runtimeTypeIds="org.eclipse.jst.server.generic.runtime.oracle10131"
+ class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler"/>
</extension>
<extension point="org.eclipse.jst.server.generic.core.serverdefinition">
<serverdefinition id="org.eclipse.jst.server.generic.runtime.oracle1013" definitionfile="/servers/oracle.10.1.3.serverdef">
- </serverdefinition>
+ </serverdefinition>
+ <serverdefinition id="org.eclipse.jst.server.generic.runtime.oracle10131" definitionfile="/servers/oracle.10.1.3.1.serverdef">
+ </serverdefinition>
</extension>
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
@@ -87,9 +147,14 @@
type="org.eclipse.jst.server.generic.runtime.oracle"
version="10.1.3"/>
+ <runtime-component-version
+ type="org.eclipse.jst.server.generic.runtime.oracle"
+ version="10.1.3.1"/>
+
<adapter>
<runtime-component
- id="org.eclipse.jst.server.generic.runtime.oracle"/>
+ id="org.eclipse.jst.server.generic.runtime.oracle"
+ />
<factory
class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/>
<type
@@ -112,6 +177,23 @@
version="1.0"/>
<facet id="jst.connector"
version="1.5"/>
+ </supported>
+ <supported>
+ <runtime-component
+ id="org.eclipse.jst.server.generic.runtime.oracle"
+ version="10.1.3.1"/>
+ <facet id="jst.web"
+ version="2.2,2.3,2.4"/>
+ <facet id="jst.ejb"
+ version="1.1,2.0,2.1"/>
+ <facet id="jst.ear"
+ version="1.2,1.3,1.4"/>
+ <facet id="jst.appclient"
+ version="1.2,1.3,1.4"/>
+ <facet id="jst.utility"
+ version="1.0"/>
+ <facet id="jst.connector"
+ version="1.5"/>
</supported>
</extension>
@@ -122,17 +204,23 @@
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.oracle"/>
+ <runtime-component
+ id="org.eclipse.jst.server.generic.runtime.oracle"
+ />
<factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
<type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
</adapter>
- </extension>
+ </extension>
<extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
<runtimeFacetMapping
runtimeTypeId="org.eclipse.jst.server.generic.runtime.oracle1013"
runtime-component="org.eclipse.jst.server.generic.runtime.oracle"
version="10.1.3"/>
+ <runtimeFacetMapping
+ runtimeTypeId="org.eclipse.jst.server.generic.runtime.oracle10131"
+ runtime-component="org.eclipse.jst.server.generic.runtime.oracle"
+ version="10.1.3.1"/>
</extension>
</plugin>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.1.serverdef b/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.1.serverdef
new file mode 100644
index 0000000..21d800c
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.1.serverdef
@@ -0,0 +1,164 @@
+<?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="Oracle OC4J Standalone Server v10.1.3.1" version="v10.1.3.1">
+
+ <property id="OC4J_HOME"
+ label = "%label.j2ee.home"
+ type="directory"
+ context="runtime"
+ default="C:/oracle/OC4J10.1.3.1/j2ee/home"/>
+
+ <property id="oc4j.admin.user"
+ label="%label.admin.user"
+ type="string"
+ context="server"
+ default="oc4jadmin" />
+
+ <property id="oc4j.admin.password"
+ label="%label.admin.pw"
+ type="string"
+ context="server"
+ default="welcome" />
+
+ <property id="oc4j.admin.port"
+ label="%label.host.port"
+ type="string"
+ context="server"
+ default="23791" />
+
+ <property id="oc4j.http.port"
+ label="%label.http.port"
+ type="string"
+ context="server"
+ default="8888" />
+
+ <property id="oc4j.bind.website"
+ label="%label.web.site"
+ type="string"
+ context="server"
+ default="default-web-site" />
+
+ <port>
+ <no>${oc4j.http.port}</no>
+ <name>Http</name>
+ <protocol>http</protocol>
+ </port>
+
+ <module>
+ <type>jst.web</type>
+ <publishDir>${OC4J_HOME}/applications</publishDir>
+ <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
+ </module>
+
+ <module>
+ <type>jst.ejb</type>
+ <publishDir>${OC4J_HOME}/applications</publishDir>
+ <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
+ </module>
+
+ <module>
+ <type>jst.ear</type>
+ <publishDir>${OC4J_HOME}/applications</publishDir>
+ <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
+ </module>
+
+ <project>
+ <classpathReference>oracle_oc4j</classpathReference>
+ </project>
+
+ <start >
+ <mainClass>oracle.oc4j.loader.boot.BootStrap</mainClass>
+ <workingDirectory>${OC4J_HOME}</workingDirectory>
+ <programArguments></programArguments>
+ <vmParameters></vmParameters>
+ <classpathReference>oracle_boot</classpathReference>
+ </start>
+
+ <stop>
+ <mainClass>com.evermind.client.orion.Oc4jAdminConsole</mainClass>
+ <workingDirectory>${OC4J_HOME}</workingDirectory>
+ <programArguments>ormi://localhost:${oc4j.admin.port} ${oc4j.admin.user} ${oc4j.admin.password} -shutdown </programArguments>
+ <vmParameters></vmParameters>
+ <classpathReference>oracle_admin</classpathReference>
+ </stop>
+
+ <publisher id="org.eclipse.jst.server.generic.antpublisher">
+ <publisherdata>
+ <dataname>build.file</dataname>
+ <datavalue>/buildfiles/oracle.10.1.3.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.publish.jst.ear</dataname>
+ <datavalue>deploy.j2ee.ear</datavalue>
+ </publisherdata>
+ <publisherdata>
+ <dataname>target.unpublish.jst.web</dataname>
+ <datavalue>undeploy.j2ee.module</datavalue>
+ </publisherdata>
+ <publisherdata>
+ <dataname>target.unpublish.jst.ejb</dataname>
+ <datavalue>undeploy.j2ee.module</datavalue>
+ </publisherdata>
+ <publisherdata>
+ <dataname>target.unpublish.jst.ear</dataname>
+ <datavalue>undeploy.j2ee.module</datavalue>
+ </publisherdata>
+ </publisher>
+
+ <classpath id="oracle_admin">
+ <archive path="${OC4J_HOME}/admin.jar"/>
+ </classpath>
+
+ <classpath id="oracle_boot">
+ <archive path="${OC4J_HOME}/oc4j.jar"/>
+ </classpath>
+
+ <classpath id="oracle_oc4j">
+ <archive path="${OC4J_HOME}/oc4j.jar"/>
+ <archive path="${OC4J_HOME}/oc4jclient.jar"/>
+ <archive path="${OC4J_HOME}/lib/activation.jar"/>
+ <archive path="${OC4J_HOME}/lib/asm.jar"/>
+ <archive path="${OC4J_HOME}/lib/asm-attrs.jar"/>
+ <archive path="${OC4J_HOME}/lib/connector.jar"/>
+ <archive path="${OC4J_HOME}/lib/ejb.jar"/>
+ <archive path="${OC4J_HOME}/lib/ejb30.jar"/>
+ <archive path="${OC4J_HOME}/lib/jacc-api.jar"/>
+ <archive path="${OC4J_HOME}/lib/javax77.jar"/>
+ <archive path="${OC4J_HOME}/lib/javax88.jar"/>
+ <archive path="${OC4J_HOME}/lib/jax-qname-namespace.jar"/>
+ <archive path="${OC4J_HOME}/lib/jms.jar"/>
+ <archive path="${OC4J_HOME}/lib/jmx_remote_api.jar"/>
+ <archive path="${OC4J_HOME}/lib/jta.jar"/>
+ <archive path="${OC4J_HOME}/lib/mail.jar"/>
+ <archive path="${OC4J_HOME}/lib/oc4j-unsupported-api.jar"/>
+ <archive path="${OC4J_HOME}/lib/servlet.jar"/>
+ <archive path="${OC4J_HOME}/../../lib/xmlparserv2.jar"/>
+ <archive path="${OC4J_HOME}/../../toplink/jlib/antlr.jar"/>
+ <archive path="${OC4J_HOME}/../../toplink/jlib/toplink.jar"/>
+ <archive path="${OC4J_HOME}/../../toplink/jlib/toplink-essentials.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/soap.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/wsdl.jar"/>
+ </classpath>
+
+ <jndiConnection>
+ <providerUrl>ormi://localhost:${oc4j.admin.port}</providerUrl>
+ <initialContextFactory>com.evermind.server.rmi.RMIInitialContextFactory</initialContextFactory>
+ <jndiProperty>
+ <name></name>
+ <value></value>
+ </jndiProperty>
+ </jndiConnection>
+
+</tns:ServerRuntime>
+