[188370] [hotbug] Update server adapter for Oracle Application Server OC4J 10.1.3.1
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
index b2595c5..38cd008 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
@@ -34,13 +34,13 @@
class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4"/>
+ versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
types="jst.ejb"
versions="1.1, 2.0, 2.1, 3.0"/>
<moduleType
types="jst.ear"
- versions="1.2, 1.3, 1.4"/>
+ versions="1.2, 1.3, 1.4, 5.0"/>
<moduleType
types="jst.connector"
versions="1.0, 1.5"/>
@@ -183,11 +183,11 @@
id="org.eclipse.jst.server.generic.runtime.oracle"
version="10.1.3.1"/>
<facet id="jst.web"
- version="2.2,2.3,2.4"/>
+ version="2.2,2.3,2.4,2.5"/>
<facet id="jst.ejb"
- version="1.1,2.0,2.1"/>
+ version="1.1,2.0,2.1,3.0"/>
<facet id="jst.ear"
- version="1.2,1.3,1.4"/>
+ version="1.2,1.3,1.4,5.0"/>
<facet id="jst.appclient"
version="1.2,1.3,1.4"/>
<facet id="jst.utility"
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
index 21d800c..9c9f97a 100644
--- 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
@@ -9,7 +9,7 @@
label = "%label.j2ee.home"
type="directory"
context="runtime"
- default="C:/oracle/OC4J10.1.3.1/j2ee/home"/>
+ default="C:/oracle/OC4J-10.1.3.1/j2ee/home"/>
<property id="oc4j.admin.user"
label="%label.admin.user"
@@ -126,7 +126,8 @@
<classpath id="oracle_oc4j">
<archive path="${OC4J_HOME}/oc4j.jar"/>
- <archive path="${OC4J_HOME}/oc4jclient.jar"/>
+ <archive path="${OC4J_HOME}/oc4jclient.jar"/>
+ <archive path="${OC4J_HOME}/oc4j-api.jar"/>
<archive path="${OC4J_HOME}/lib/activation.jar"/>
<archive path="${OC4J_HOME}/lib/asm.jar"/>
<archive path="${OC4J_HOME}/lib/asm-attrs.jar"/>
@@ -143,12 +144,18 @@
<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/ojsp.jar"/>
+ <archive path="${OC4J_HOME}/jsp/lib/taglib/ojsputil.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"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/wsdl.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/jaxr-api.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/jaxrpc-api.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/saaj-api.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/jws-api.jar"/>
+ <archive path="${OC4J_HOME}/../../webservices/lib/orawsmetadata.jar"/>
</classpath>
<jndiConnection>
