diff -Naur jakarta-cactus/integration/ant/build.xml jakarta-cactus-oc4j/integration/ant/build.xml
--- jakarta-cactus/integration/ant/build.xml	2005-01-30 04:12:30.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/build.xml	2005-02-09 09:16:06.000000000 -0800
@@ -144,6 +144,7 @@
     <fileset id="container.share.resources" dir="${src.conf.dir}/share">
       <include name="orion1x/**/*.*"/>
       <include name="orion2x/**/*.*"/>
+      <include name="oc4j10x/**/*.*"/>
       <include name="resin2x/**/*.*"/>
       <include name="resin3x/**/*.*"/>
       <include name="tomcat4x/**/*.*"/>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/application.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/application.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/application.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/application.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE orion-application PUBLIC "-//Evermind//DTD J2EE Application runtime 1.2//EN" "http://www.orionserver.com/dtds/orion-application.dtd">
+
+<orion-application>
+
+    <web-module id="defaultWebApp" path="../default-web-app"/>
+
+	<persistence path="../persistence"/>
+	
+	<principals path="./principals.xml"/>
+
+	<log>
+		<file path="../log/global-application.log"/>
+	</log>
+
+	<namespace-access>
+		<read-access>
+			<namespace-resource root="">
+				<security-role-mapping>
+					<group name="administrators" />
+				</security-role-mapping>
+			</namespace-resource>
+		</read-access>
+		<write-access>
+			<namespace-resource root="">
+				<security-role-mapping>
+					<group name="administrators" />
+				</security-role-mapping>
+			</namespace-resource>
+		</write-access>
+	</namespace-access>
+
+</orion-application>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/default-web-site.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/default-web-site.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/default-web-site.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/default-web-site.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
+
+<web-site host="[ALL]" port="@cactus.port@" display-name="Default Orion WebSite">
+
+    <!-- The default web-app for this site, bound to the root -->
+    <default-web-app application="default" name="defaultWebApp"/>
+
+    <access-log path="../log/default-web-access.log"/>
+
+</web-site>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/server.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/server.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/ear/server.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/ear/server.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
+
+<application-server
+	application-auto-deploy-directory="../applications"
+	deployment-directory="../application-deployments">
+
+	<rmi-config path="./rmi.xml"/>
+	<log>
+		<file path="../log/server.log"/>
+	</log>
+
+    <global-application name="default" path="./application.xml"/>
+	<global-web-app-config path="./global-web-application.xml"/>
+    <web-site path="./default-web-site.xml"/>
+
+</application-server>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/global-web-application.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/global-web-application.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/global-web-application.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/global-web-application.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!DOCTYPE orion-web-app PUBLIC '//Evermind//Orion web-application' 'http://www.orionserver.com/dtds/orion-web.dtd'>
+
+<!-- Set development="true" to enabvle development, enable this if you
+want to debug JSP sources etc -->
+
+<orion-web-app
+	jsp-cache-directory="./persistence"
+	servlet-webdir="/servlet"
+	development="false"
	persistence-path="./persistence/state.ser"
+>
+
+	<!-- The mime-mappings for this server -->
+	<mime-mappings path="./mime.types" />
+	<servlet-chaining servlet-name="xsl" mime-type="text/xml" />
+
+	<web-app>
+		<servlet>
+			<servlet-name>xsl</servlet-name>
+			<servlet-class>com.evermind.servlet.XSLServlet</servlet-class>
+			<init-param>
+				<param-name>defaultContentType</param-name>
+				<param-value>text/html</param-value>
+			</init-param>
+		</servlet>
+	
+		<servlet>
+			<servlet-name>jsp</servlet-name>
+			<servlet-class>com.evermind.server.http.JSPServlet</servlet-class>
+		</servlet>
+
+		<servlet>
+			<servlet-name>ssi</servlet-name>
+			<servlet-class>com.evermind.server.http.SSIServlet</servlet-class>
+		</servlet>
+
+		<servlet>
+			<servlet-name>cgi</servlet-name>
+			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
+		</servlet>
+
+		<servlet>
+			<servlet-name>perl</servlet-name>
+			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
+			<init-param>
+				<param-name>interpreter</param-name>
+				<param-value>perl</param-value>
+			</init-param>
+		</servlet>
+
+		<servlet>
+			<servlet-name>php</servlet-name>
+			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
+			<init-param>
+			<param-name>interpreter</param-name>
+				<param-value>php</param-value>
+			</init-param>
+		</servlet>
+		<servlet-mapping>
+			<servlet-name>jsp</servlet-name>
+			<url-pattern>/*.jsp</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>cgi</servlet-name>
+			<url-pattern>/*.cgi</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>perl</servlet-name>
+			<url-pattern>/*.pl</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>php</servlet-name>
+			<url-pattern>/*.php</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>php</servlet-name>
+			<url-pattern>/*.php3</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>php</servlet-name>
+			<url-pattern>/*.phtml</url-pattern>
+		</servlet-mapping>
+
+		<servlet-mapping>
+			<servlet-name>ssi</servlet-name>
+			<url-pattern>/*.shtml</url-pattern>
+		</servlet-mapping>
+		<welcome-file-list>
+			<welcome-file>index.html</welcome-file>
+			<welcome-file>default.jsp</welcome-file>
+		</welcome-file-list>
+	</web-app>
+</orion-web-app>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/mime.types jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/mime.types
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/mime.types	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/mime.types	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,109 @@
+# Registered mime-types
+
+application/activemessage
+application/andrew-inset
+application/applefile
+application/atomicmail
+application/dca-rft
+application/dec-dx
+application/mac-binhex40	hqx
+application/mac-compactpro	cpt
+application/macwriteii
+application/msword		doc
+application/news-message-id
+application/news-transmission
+application/octet-stream	bin dms lha lzh exe class
+application/jsp			jsp
+application/oda			oda
+application/pdf			pdf
+application/postscript		ai eps ps
+application/powerpoint		ppt
+application/remote-printing
+application/rtf			rtf
+application/slate
+application/wita
+application/wordperfect5.1
+application/x-bcpio		bcpio
+application/x-cdlink		vcd
+application/x-compress		Z
+application/x-cpio		cpio
+application/x-csh			csh
+application/x-director		dcr dir dxr
+application/x-dvi			dvi
+application/x-gtar		gtar
+application/x-gzip		gz
+application/x-hdf			hdf
+application/x-httpd-cgi		cgi
+application/x-java-jnlp-file	jnlp
+application/x-koan		skp skd skt skm
+application/x-latex		latex
+application/x-mif			mif
+application/x-netcdf		nc cdf
+application/x-sh			sh
+application/x-shar		shar
+application/x-stuffit		sit
+application/x-sv4cpio		sv4cpio
+application/x-sv4crc		sv4crc
+application/x-tar			tar
+application/x-tcl			tcl
+application/x-tex			tex
+application/x-texinfo		texinfo texi
+application/x-troff		t tr roff
+application/x-troff-man		man
+application/x-troff-me		me
+application/x-troff-ms		ms
+application/x-ustar		ustar
+application/x-wais-source	src
+text/xml  		       	xml ent cat sty
+text/dtd				dtd
+text/xsl				xsl
+application/jsp			jsp
+application/zip			zip
+audio/basic				au snd
+audio/mpeg				mpga mp2
+audio/x-aiff			aif aiff aifc
+audio/x-pn-realaudio		ram
+audio/x-pn-realaudio-plugin	rpm
+audio/x-realaudio			ra
+audio/x-wav				wav
+chemical/x-pdb			pdb xyz
+image/gif				gif
+image/ief				ief
+image/jpeg				jpeg jpg jpe
+image/png				png
+image/tiff				tiff tif
+image/x-cmu-raster		ras
+image/x-portable-anymap		pnm
+image/x-portable-bitmap		pbm
+image/x-portable-graymap	pgm
+image/x-portable-pixmap		ppm
+image/x-rgb				rgb
+image/x-xbitmap			xbm
+image/x-xpixmap			xpm
+image/x-xwindowdump		xwd
+message/external-body
+message/news
+message/partial
+message/rfc822
+multipart/alternative
+multipart/appledouble
+multipart/digest
+multipart/mixed
+multipart/parallel
+text/html				html htm
+text/plain				txt
+text/richtext			rtx
+text/tab-separated-values	tsv
+text/x-setext			etx
+text/x-sgml				sgml sgm
+video/mpeg				mpeg mpg mpe
+video/quicktime			qt mov
+video/x-msvideo			avi
+video/x-sgi-movie			movie
+x-conference/x-cooltalk		ice
+x-world/x-vrml			wrl vrml
+text/vnd.wap.wml                wml
+application/vnd.wap.wmlc        wmlc
+text/vnd.wap.wmlscript          wmls
+application/vnd.wap.wmlscriptc  wmlsc
+image/vnd.wap.wbmp              wbmp
\ No newline at end of file
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/principals.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/principals.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/principals.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/principals.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE principals PUBLIC "//Evermind - Orion Principals//" "http://www.orionserver.com/dtds/principals.dtd">
+
+<principals>
+	<groups>
+		<group name="administrators">
+			<description>administrators</description>
+			<permission name="administration" />
+			<permission name="com.evermind.server.AdministrationPermission" />
+		</group>
+		<group name="guests">
+			<description>guests</description>
+		</group>
+		<group name="users">
+			<description>users</description>
+			<permission name="rmi:login" />
+			<permission name="com.evermind.server.rmi.RMIPermission" />
+		</group>
+	</groups>
+	<users>
+		<user username="admin" password="password" deactivated="false">
+			<description>The default administrator</description>
+			<group-membership group="administrators" />
+			<group-membership group="guests" />
+			<group-membership group="users" />
+		</user>
+        <user username="testuser" password="testpassword" deactivated="false">
+            <description>Cactus Test User</description>
+        </user>
+	</users>
+</principals>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/rmi.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/rmi.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/rmi.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/rmi.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE rmi-server PUBLIC "Orion RMI-server" "http://www.orionserver.com/dtds/rmi-server.dtd">
+
+<rmi-server port="23791">	
+</rmi-server>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/web.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/web.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/share/web.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/share/web.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app>
+</web-app>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/application.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/application.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/application.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/application.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE orion-application PUBLIC "-//Evermind//DTD J2EE Application runtime 1.2//EN" "http://www.orionserver.com/dtds/orion-application.dtd">
+
+<orion-application>
+
+    <web-module id="defaultWebApp" path="../default-web-app"/>
+    <web-module id="test" path="../applications/@cactus.context@.war"/>
+
+	<persistence path="../persistence"/>
+	
+	<principals path="./principals.xml"/>
+
+	<log>
+		<file path="../log/global-application.log"/>
+	</log>
+
+    <!-- TODO: Remove security stuff from the default configuration. This must
+         be provided by the Sample Servlet project -->
+
+    <security-role-mapping name="test">
+        <user name="testuser"/>
+    </security-role-mapping>
+
+	<namespace-access>
+		<read-access>
+			<namespace-resource root="">
+				<security-role-mapping>
+					<group name="administrators" />
+				</security-role-mapping>
+			</namespace-resource>
+		</read-access>
+		<write-access>
+			<namespace-resource root="">
+				<security-role-mapping>
+					<group name="administrators" />
+				</security-role-mapping>
+			</namespace-resource>
+		</write-access>
+	</namespace-access>
+
+</orion-application>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/default-web-site.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/default-web-site.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/default-web-site.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/default-web-site.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
+
+<web-site host="[ALL]" port="@cactus.port@" display-name="Default Orion WebSite">
+
+    <!-- The default web-app for this site, bound to the root -->
+    <default-web-app application="default" name="defaultWebApp"/>
+
+    <!-- The Cactus test webapp -->
+    <web-app application="default" name="test" root="/@cactus.context@"/>
+
+    <access-log path="../log/default-web-access.log"/>
+    
+</web-site>
diff -Naur jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/server.xml jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/server.xml
--- jakarta-cactus/integration/ant/src/confs/share/oc4j10x/war/server.xml	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/confs/share/oc4j10x/war/server.xml	2005-02-09 08:55:50.000000000 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
+
+<application-server
+	application-directory="../applications"
+	deployment-directory="../application-deployments">
+
+	<rmi-config path="./rmi.xml"/>
+	<log>
+		<file path="../log/server.log"/>
+	</log>
+
+    <global-application name="default" path="./application.xml"/>
+	<global-web-app-config path="./global-web-application.xml"/>
+    <web-site path="./default-web-site.xml"/>
+
+</application-server>
diff -Naur jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/default.properties jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/default.properties
--- jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/default.properties	2004-01-18 03:03:04.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/default.properties	2005-02-09 09:14:00.000000000 -0800
@@ -1,6 +1,7 @@
 jboss3x = org.apache.cactus.integration.ant.container.jboss.JBoss3xContainer
 orion1x = org.apache.cactus.integration.ant.container.orion.Orion1xContainer
 orion2x = org.apache.cactus.integration.ant.container.orion.Orion2xContainer
+oc4j10x = org.apache.cactus.integration.ant.container.orion.Oc4j10xContainer
 resin2x = org.apache.cactus.integration.ant.container.resin.Resin2xContainer
 resin3x = org.apache.cactus.integration.ant.container.resin.Resin3xContainer
 tomcat3x = org.apache.cactus.integration.ant.container.tomcat.Tomcat3xContainer
diff -Naur jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/AbstractOrionContainer.java jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/AbstractOrionContainer.java
--- jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/AbstractOrionContainer.java	2005-01-29 07:49:18.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/AbstractOrionContainer.java	2005-02-09 09:19:56.000000000 -0800
@@ -123,7 +123,7 @@
         fileSet.setDir(this.dir);
         fileSet.createInclude().setName("*.jar");
         classpath.addFileset(fileSet);
-        java.setClassname("com.evermind.client.orion.OrionConsoleAdmin");
+        java.setClassname(getConsoleAdminClassName());
         java.createArg().setValue("ormi://" + this.getServer() + ":23791/");
         java.createArg().setValue("admin");
         java.createArg().setValue("password");
@@ -134,6 +134,16 @@
     // Private Methods ---------------------------------------------------------
 
     /**
+     * Returns the class name of the Console Admin tool
+     * 
+     * @return the fully qualified class name
+     */
+    protected String getConsoleAdminClassName()
+    {
+        return "com.evermind.client.orion.OrionConsoleAdmin";
+    }
+
+    /**
      * Invokes the command to start the Orion application server.
      */
     protected final void invokeServer()
diff -Naur jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/Oc4j10xContainer.java jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/Oc4j10xContainer.java
--- jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/Oc4j10xContainer.java	1969-12-31 16:00:00.000000000 -0800
+++ jakarta-cactus-oc4j/integration/ant/src/java/org/apache/cactus/integration/ant/container/orion/Oc4j10xContainer.java	2005-02-09 13:02:04.000000000 -0800
@@ -0,0 +1,68 @@
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2003 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus.integration.ant.container.orion;
+
+import java.io.IOException;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * Special container support for the OC4J 10.x application server.
+ * 
+ * @version $Id$
+ */
+public class Oc4j10xContainer extends AbstractOrionContainer
+{
+
+    // AbstractContainer Implementation ----------------------------------------
+
+    /**
+     * @see org.apache.cactus.integration.ant.container.Container#getName
+     */
+    public final String getName()
+    {
+        return "OC4J 10.x";
+    }
+
+    /**
+     * @see org.apache.cactus.integration.ant.container.Container#startUp
+     */
+    public final void startUp()
+    {
+        try
+        {
+            prepare("oc4j10x", "cactus/oc4j10x");
+            invokeServer();
+        }
+        catch (IOException ioe)
+        {
+            getLog().error("Failed to startup the container", ioe);
+            throw new BuildException(ioe);
+        }
+    }
+
+    /**
+     * @see org.apache.cactus.integration.ant.container.orion.AbstractOrionContainer#getConsoleAdminClassName
+     */
+    protected String getConsoleAdminClassName()
+    {
+        return "com.evermind.client.orion.Oc4jAdminConsole";
+    }
+}