diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/.classpath b/plugins/org.eclipse.jst.server.generic.oc4j/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore b/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/.project b/plugins/org.eclipse.jst.server.generic.oc4j/.project
new file mode 100644
index 0000000..cdbf29f
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jst.server.generic.oc4j</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f168344
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.jst.server.generic.oc4j;singleton:=true
+Bundle-Version: 1.5.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.jst.server.generic.core,
+ org.eclipse.jst.server.generic.ui,
+ org.eclipse.jst.server.core
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/about.html b/plugins/org.eclipse.jst.server.generic.oc4j/about.html
new file mode 100644
index 0000000..6f6b96c
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/about.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>February 24, 2005</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/build.properties b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
new file mode 100644
index 0000000..9f41e7d
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
@@ -0,0 +1,11 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               buildfiles/,\
+               plugin.properties,\
+               servers/
+src.includes = build.properties
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml
new file mode 100644
index 0000000..33e460c
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml
@@ -0,0 +1,108 @@
+<project name="publish"  basedir="." xmlns:oracle="antlib:oracle">
+	<import file="oracle/ant-oracle.xml"/>
+		
+	<!-- Only localhost is currently supported by this implementation -->
+	<property name="oc4j.host" value="localhost"/> 
+
+	<property name="deployer.uri" value="deployer:oc4j:${oc4j.host}:${oc4j.admin.port}" />
+	
+	<target name="check.skip.web.deploy">
+		<uptodate property="skip.deploy" targetfile="${server.publish.dir}/${module.name}.war">
+			<srcfiles dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.war"/>
+				<exclude name="**/*.java"/>
+			</srcfiles>
+		</uptodate>
+	</target>
+	
+	<target name="check.skip.ejb.deploy">
+		<uptodate property="skip.deploy" targetfile="${server.publish.dir}/${module.name}.jar">
+			<srcfiles dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.java"/>
+			</srcfiles>
+		</uptodate>
+	</target>
+	
+	<target name="check.skip.ear.deploy">
+		<uptodate property="skip.deploy" targetfile="${server.publish.dir}/${module.name}.ear">
+			<srcfiles dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.java"/>
+			</srcfiles>
+		</uptodate>
+	</target>
+	
+	<target name="package.module.web">
+		<jar destfile="${server.publish.dir}/${module.name}.war"> 
+			<zipfileset dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.war"/>
+				<exclude name="**/*.java"/>
+			</zipfileset>
+		</jar>
+	</target>
+		
+	<target name="package.module.ejb">
+		<jar destfile="${server.publish.dir}/${module.name}.jar"> 
+			<zipfileset dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.java"/>
+			</zipfileset>
+		</jar>
+	</target>
+		
+	<target name="package.module.ear">
+		<jar destfile="${server.publish.dir}/${module.name}.ear"> 
+			<zipfileset dir="${module.dir}">
+				<include name="**/*.*"/>
+				<exclude name="**/*.java"/>
+			</zipfileset>
+		</jar>
+	</target>	
+	
+	<target name="deploy.j2ee.web" depends="check.skip.web.deploy" unless="skip.deploy">
+		<antcall target="package.module.web"/>
+		<oracle:deploy
+			deployerUri="${deployer.uri}" 
+			userId="${oc4j.admin.user}"
+			password="${oc4j.admin.password}"
+			file="${server.publish.dir}/${module.name}.war"
+			deploymentName="${module.name}"
+			contextRoot="${module.name}"
+			bindAllWebApps="${oc4j.bind.website}"/>
+	</target>
+	
+	<target name="deploy.j2ee.ejb" depends="check.skip.ejb.deploy" unless="skip.deploy" >
+		<antcall target="package.module.ejb"/>
+		<oracle:deploy
+			deployerUri="${deployer.uri}" 
+			userId="${oc4j.admin.user}"
+			password="${oc4j.admin.password}"
+			file="${server.publish.dir}/${module.name}.jar"
+			deploymentName="${module.name}"
+			bindAllWebApps="${oc4j.bind.website}"/>
+	</target>
+	
+	<target name="deploy.j2ee.ear" depends="check.skip.ear.deploy" unless="skip.deploy">
+		<antcall target="package.module.ear"/>
+		
+		<oracle:deploy
+			deployerUri="${deployer.uri}" 
+			userId="${oc4j.admin.user}"
+			password="${oc4j.admin.password}"			
+			file="${server.publish.dir}/${module.name}.ear"
+			deploymentName="${module.name}"
+			bindAllWebApps="${oc4j.bind.website}"/>
+	</target>
+	
+	<target name="undeploy.j2ee.module">
+		<oracle:undeploy
+			deployerUri="${deployer.uri}"
+			userId="${oc4j.admin.user}"
+			password="${oc4j.admin.password}"
+			deploymentName="${module.name}"/>
+	</target>
+	
+</project>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml
new file mode 100644
index 0000000..cfe8599
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name="anttasks">
+
+    <!--This file has been modified for use by the Oracle Eclipse WTP plugin. 	-->
+    
+    <property environment="env"/>     
+	
+    <property name="J2EE_HOME" value="${OC4J_HOME}"/>
+    <property name="ORACLE_HOME" value="${OC4J_HOME}/../.."/>
+    <property name="JAVA_HOME" value="${java.home}"/>
+    <property name="OJDK_HOME" value="${ORACLE_HOME}/jdk"/>
+    <property name="TOPLINK_HOME" value="${env.TOPLINK_HOME}"/>
+
+    <!-- If your OS does not support the environment variable
+         Comment out the 3 lines above, and un-comment the 2
+         below. -->
+    <!--
+    <property name="JAVA_HOME" value="d:\Program Files\jdk131"/>
+    <property name="OC4J_HOME" value="d:\Apps\OC4Jv2"/>
+    -->
+
+    <!-- Runtime classpath for J2EE based applications -->
+    <path id="common.j2ee.class.path">
+        <pathelement location="."/>
+        <pathelement location="${ORACLE_HOME}/jdbc/lib/classes12.jar"/>
+        <pathelement location="${J2EE_HOME}/oc4j.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jndi.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/ejb.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/servlet.jar"/>
+        <pathelement location="${ORACLE_HOME}/jdk/jre/lib/ext/jta.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jdbc.jar"/>
+        <pathelement location="./build"/>
+        <pathelement location="${J2EE_HOME}/lib/jms.jar"/>
+    </path>
+    <property name="common.j2ee.class.path" refid="common.j2ee.class.path"/>
+
+    <!-- Runtime classpath for webservices applications. -->
+    <path id="common.webservices.class.path">
+        <pathelement location="${J2EE_HOME}/lib/jax-qname-namespace.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/activation.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/mail.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/http_client.jar"/>
+        <pathelement location="${ORACLE_HOME}/lib/xmlparserv2.jar"/>
+        
+         <pathelement location="${ORACLE_HOME}/jlib/osdt_wss.jar"/>
+         <pathelement location="${ORACLE_HOME}/jlib/osdt_xmlsec.jar"/>
+         <pathelement location="${ORACLE_HOME}/jlib/osdt_cert.jar"/>
+         <pathelement location="${ORACLE_HOME}/jlib/osdt_core.jar"/>
+         <pathelement location="${ORACLE_HOME}/jlib/osdt_saml.jar"/>
+         
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wsserver.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wsclient.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wssecurity.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/dom4j.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/commons-logging.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/jaxrpc-api.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/jaxrpc.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/saaj-api.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/orasaaj.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/xsdlib.jar"/>
+    </path>
+    <property name="common.webservices.class.path" refid="common.webservices.class.path"/>
+
+    <!-- OC4J tasks classpath.  -->
+    <path id="common.tasks.class.path">
+        <pathelement location="${ORACLE_HOME}/ant/lib/ant-oracle.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/javax88.jar"/>
+        <pathelement location="${J2EE_HOME}/admin_client.jar"/>
+        <pathelement location="${J2EE_HOME}/oc4jclient.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wsa.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/bcel.jar"/>
+    </path>
+    <property name="common.tasks.class.path" refid="common.tasks.class.path"/>
+
+    <!-- Target for displaying build information. -->
+    <target name="common">
+        <echo message="BuildName: ${ant.project.name}"/>
+        <echo message="BuildHome: ${basedir}"/>
+        <echo message="BuildFile: ${ant.file}"/>
+        <echo message="BuildJVM: ${ant.java.version}"/>
+    </target>
+
+    <!-- Task definitions for oc4j deployment tasks -->
+    <taskdef resource="oracle/antlib.xml" uri="antlib:oracle" loaderRef="oracle.tasks.loader">
+    	<classpath>
+            <pathelement path="${common.tasks.class.path}"/> 
+        </classpath>
+    </taskdef>
+
+
+</project>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml
new file mode 100644
index 0000000..8178083
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name="anttasks">
+
+    <!--This file has been modified for use by the Oracle Eclipse WTP plugin. 	-->    
+    <property environment="env"/>     
+
+    <property name="J2EE_HOME" value="${OC4J_HOME}"/>
+    <property name="ORACLE_HOME" value="${OC4J_HOME}/../.."/>
+    <property name="JAVA_HOME" value="${java.home}"/>
+    <property name="OJDK_HOME" value="${ORACLE_HOME}/jdk"/>
+    <property name="TOPLINK_HOME" value="${env.TOPLINK_HOME}"/>
+	
+    <!-- Runtime classpath for J2EE based applications -->
+    <path id="common.j2ee.class.path">
+        <pathelement location="."/>
+        <pathelement location="${ORACLE_HOME}/jdbc/lib/ojdbc14dms.jar"/>
+        <pathelement location="${J2EE_HOME}/oc4j.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/ejb.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/servlet.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jta.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jms.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/javax88.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/javax77.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jmxri.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/jmx_remote_api.jar"/>
+        <pathelement location="./build"/>
+    </path>
+    <property name="common.j2ee.class.path" refid="common.j2ee.class.path"/>
+
+    <!-- Runtime classpath for webservices applications. -->
+    <path id="common.webservices.class.path">
+        <pathelement location="${J2EE_HOME}/lib/jax-qname-namespace.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/activation.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/mail.jar"/>
+        <pathelement location="${J2EE_HOME}/lib/http_client.jar"/>
+        <pathelement location="${ORACLE_HOME}/lib/xmlparserv2.jar"/>
+        <pathelement location="${ORACLE_HOME}/jlib/ojpwss.jar"/>
+        <pathelement location="${ORACLE_HOME}/jlib/ojpxml.jar"/>
+        <pathelement location="${ORACLE_HOME}/jlib/ojpse.jar"/>
+        <pathelement location="${ORACLE_HOME}/jlib/ojpsaml.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wsserver.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wsclient.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/wssecurity.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/dom4j.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/commons-logging.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/jaxrpc-api.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/jaxrpc.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/saaj-api.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/orasaaj.jar"/>
+        <pathelement location="${ORACLE_HOME}/webservices/lib/xsdlib.jar"/>
+    </path>
+    <property name="common.webservices.class.path" refid="common.webservices.class.path"/>
+
+    <!-- OC4J tasks classpath.  -->
+    <path id="common.tasks.class.path">
+    	<pathelement location="${ORACLE_HOME}/ant/lib/ant-oracle.jar"/>
+    </path>
+    <property name="common.tasks.class.path" refid="common.tasks.class.path"/>
+
+    <!-- Target for displaying build information. -->
+    <target name="common">
+        <echo message="BuildName: ${ant.project.name}"/>
+        <echo message="BuildHome: ${basedir}"/>
+        <echo message="BuildFile: ${ant.file}"/>
+        <echo message="BuildJVM: ${ant.java.version}"/>
+    </target>
+
+    <!-- Task definitions for oc4j deployment tasks -->
+    <taskdef resource="oracle/antlib.xml" uri="antlib:oracle" loaderRef="oracle.tasks.loader">
+    	<classpath>
+            <pathelement path="${common.tasks.class.path}"/> 
+        </classpath>
+    </taskdef>
+
+    <!-- Task definitions for oc4j webservices tasks -->
+    <taskdef resource="oracle/antlib.xml" uri="antlib:oracle" loaderRef="oracle.tasks.loader">
+        <classpath>
+            <pathelement path="${common.tasks.class.path}"/>
+        </classpath>
+    </taskdef>	
+	
+</project>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/icons/obj16/oracle.gif b/plugins/org.eclipse.jst.server.generic.oc4j/icons/obj16/oracle.gif
new file mode 100644
index 0000000..007585b
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/icons/obj16/oracle.gif
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
new file mode 100644
index 0000000..d79f6e9
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
@@ -0,0 +1,56 @@
+##################################################################################################
+# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
+# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors: Gorkem Ercan - initial API and implementation
+#               
+###################################################################################################
+pluginName= OC4J Generic server definitions
+providerName=Eclipse.org
+pluginDescription=Provides OC4J Generic server definitions
+
+
+# ============ OC4J 10.1.3 DP 4====================
+pluginName= Oracle OC4J v10.1.3 DP4 Generic Server Definition Core Plug-in
+pluginDescription=Provides server definition for Oracle OC4J Standalone 10.1.3 DP4.\
+Provides basic server functionality
+oracleCategory=Oracle
+
+oracle.10_1_3Preview.runtime.name=Oracle OC4J Standalone 10.1.3 DP4
+oracle.10_1_3Preview.runtime.description=Oracle OC4J 10.1.3 DP4 runtime
+oracle.10_1_3Preview.server.name=Oracle OC4J Standalone Server 10.1.3 DP4
+oracle.10_1_3Preview.server.description=Oracle OC4J Standalone Server for v10.1.3 \
+Developer Preview 4 on the localhost using the default instance
+
+# ============ OC4J 10.1.3 ====================
+oc4j.pluginName= Oracle OC4J v10.1.3 Generic Server Definition Core Plug-in
+oc4j.pluginDescription=Provides server definition for Oracle OC4J Standalone 10.1.3.\
+Provides basic server functionality
+
+oracle.10_1_3.runtime.name=Oracle OC4J Standalone 10.1.3
+oracle.10_1_3.runtime.description=Oracle OC4J 10.1.3 runtime
+oracle.10_1_3.server.name=Oracle OC4J Standalone Server 10.1.3
+oracle.10_1_3.server.description=Oracle OC4J Standalone Server for v10.1.3 \
+on the localhost using the default instance
+
+# UI Labels
+label.j2ee.home=Oracle J2EE Home:
+label.admin.user=User: 
+label.admin.pw=Password:
+label.host=Address:
+label.host.port=Admin Port:
+label.http.port=HTTP Port:
+label.web.site=Web Site:
+
+# ============== serverdef translations ================
+ApplicationServerDirectory=Application &Server Directory:
+serverAddress=A&ddress:
+serverPort=&Port:
+jndiPort=&JNDI Port:
+serverclassPath=&Classpath Variable:
+serverName=Ser&ver Name:
+username=Use&r Name:
+password=Pass&word:
+
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
new file mode 100644
index 0000000..c16c8a2
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension point="org.eclipse.wst.server.core.runtimeTypes">
+     <runtimeType
+       id="org.eclipse.jst.server.generic.runtime.oracle1013"
+       name="%oracle.10_1_3.runtime.name"
+       description="%oracle.10_1_3.runtime.description"
+       vendor="%oracleCategory"
+       version="10.1.3"
+       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">
+     <serverType
+           behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
+           class="org.eclipse.jst.server.generic.core.internal.GenericServer"
+           description="%oracle.10_1_3.server.description"
+           hasConfiguration="false"
+           id="org.eclipse.jst.server.generic.oracle1013"
+           initialState="stopped"
+           launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
+           launchModes="run,debug"
+           name="%oracle.10_1_3.server.name"
+           runtime="true"
+           runtimeTypeId="org.eclipse.jst.server.generic.runtime.oracle1013"
+           startBeforePublish="true"
+           supportsRemoteHosts="false">           
+      </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.oracle1013"
+        class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment"/>
+     <fragment
+        id="org.eclipse.jst.server.generic.server"
+        typeIds="org.eclipse.jst.server.generic.oracle1013"
+        class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>         
+   </extension>
+   
+   <extension point="org.eclipse.wst.server.ui.serverImages">   
+     <image
+         id="org.eclipse.jst.server.generic.image"
+         icon="icons/obj16/oracle.gif"
+         typeIds="org.eclipse.jst.server.generic.oracle1013" />
+     <image
+         id="org.eclipse.jst.server.generic.image"
+         icon="icons/obj16/oracle.gif"
+         typeIds="org.eclipse.jst.server.generic.runtime.oracle1013"/>   
+   </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"/>   
+   </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>		
+   </extension>
+   
+   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+    <runtime-component-type id="org.eclipse.jst.server.generic.runtime.oracle">
+    </runtime-component-type>
+       
+    <runtime-component-version
+       type="org.eclipse.jst.server.generic.runtime.oracle"
+       version="10.1.3"/>
+
+    <adapter>
+      <runtime-component
+         id="org.eclipse.jst.server.generic.runtime.oracle"/>
+      <factory
+         class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/>
+      <type
+         class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/>
+    </adapter>
+
+    <supported>
+      <runtime-component
+         id="org.eclipse.jst.server.generic.runtime.oracle"
+         version="10.1.3"/>
+      <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>
+   
+   <extension point="org.eclipse.wst.common.project.facet.ui.images">
+    <image runtime-component-type="org.eclipse.jst.server.generic.runtime.oracle"
+          path="icons/obj16/oracle.gif"/>   
+   </extension>
+   
+   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+    <adapter>
+      <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 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"/>
+    </extension>
+   
+</plugin>
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.serverdef b/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.serverdef
new file mode 100644
index 0000000..7467a21
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/servers/oracle.10.1.3.serverdef
@@ -0,0 +1,162 @@
+<?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" version="v10.1.3">
+	
+	<property id="OC4J_HOME"
+		label = "%label.j2ee.home"
+		type="directory"
+		context="runtime"
+		default="C:/oracle/OC4J10.1.3/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}/../../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>