diff --git a/appserver/plugin.jelly b/appserver/plugin.jelly
index 3e49811c..b0771a3b 100644
--- a/appserver/plugin.jelly
+++ b/appserver/plugin.jelly
@@ -32,6 +32,7 @@
   <!--==================================================================-->
   <j:import inherit="true" file="${plugin.resources}/tomcat-4.0.x.jelly" />
   <j:import inherit="true" file="${plugin.resources}/tomcat-4.1.x.jelly" />
+  <j:import inherit="true" file="${plugin.resources}/orion-2.0.2.jelly" />
 
   <!--==================================================================-->
   <!-- B E G I N  C O R E  P R O C E S S I N G                          -->
@@ -138,6 +139,17 @@
           </j:otherwise>
         </j:choose>
       </j:when>
+      <j:when test="${context.getVariable('maven.appserver.name') == 'orion'}">
+        <j:choose>
+          <j:when test="${context.getVariable('maven.appserver.version') == '2.0.2'}" />
+          <j:otherwise>
+            <exception:appserverVersionNotSupported
+              appserver="${maven.appserver.name}"
+              propname="maven.appserver.version"
+              propvalue="${maven.appserver.version}" />
+          </j:otherwise>
+        </j:choose>
+      </j:when>
       <j:otherwise>
         <exception:appserverNameNotSupported propname="maven.appserver.name"
           propvalue="${maven.appserver.name}" />
diff --git a/appserver/plugin.properties b/appserver/plugin.properties
index 90653cc8..2e3ff8e6 100644
--- a/appserver/plugin.properties
+++ b/appserver/plugin.properties
@@ -40,6 +40,13 @@ maven.appserver.port.https=443
 #
 maven.appserver.host=localhost
 
+#
+#RMI port, Admin Username, and Admin Password used for orion support
+#
+maven.appserver.rmi.port=
+maven.appserver.adminusername=admin
+maven.appserver.adminpassword=admin
+
 #-------------------------------------------------------#
 
 
diff --git a/appserver/src/plugin-resources/orion-2.0.2.jelly b/appserver/src/plugin-resources/orion-2.0.2.jelly
new file mode 100644
index 00000000..821adfef
--- /dev/null
+++ b/appserver/src/plugin-resources/orion-2.0.2.jelly
@@ -0,0 +1,209 @@
+<?xml version="1.0"?>
+
+<project xmlns:j="jelly:core" xmlns:log="jelly:log" xmlns:ant="jelly:ant"
+  xmlns:orion202="http://www.maven.org/plugin/appserver/orion202"
+  xmlns:define="jelly:define" >
+
+  <goal name="appserver:orion-2.0.2-reqs"
+    description="Intialize resources for tomcat processing">
+
+    <!-- Check if user has http.conf in a conf dir -->
+    <ant:available file="${maven.appserver.conf.dir}/config/server.xml"
+      type="file" property="maven.appserver.orion202.has.conf.server" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.server">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/server.xml
+    </ant:fail>
+    
+<ant:available file="${maven.appserver.conf.dir}/config/application.xml"
+      type="file" property="maven.appserver.orion202.has.conf.application" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.application">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/application.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/data-sources.xml"
+      type="file" property="maven.appserver.orion202.has.conf.datasources" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.datasources">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/data-sources.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/global-web-application.xml"
+      type="file" property="maven.appserver.orion202.has.conf.global" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.global">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/global-web-application.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/jms.xml"
+      type="file" property="maven.appserver.orion202.has.conf.jms" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.jms">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/jms.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/mime.types"
+      type="file" property="maven.appserver.orion202.has.conf.mime" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.mime">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/mime.types
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/principals.xml"
+      type="file" property="maven.appserver.orion202.has.conf.principals" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.principals">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/principals.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/config/rmi.xml"
+      type="file" property="maven.appserver.orion202.has.conf.rmi" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.rmi">
+To use this appserver, you must have a project specific
+configuration file at the following location:
+
+${maven.appserver.conf.dir}/config/rmi.xml
+    </ant:fail>
+    
+    <ant:available file="${maven.appserver.conf.dir}/lib/hsqldb.jar"
+      type="file" property="maven.appserver.orion202.has.conf.hsqldb" value="true" />
+
+    <ant:fail unless="maven.appserver.orion202.has.conf.hsqldb">
+To use this appserver, you must have a project specific
+library file at the following location:
+
+${maven.appserver.conf.dir}/lib/hsqldb.jar
+    </ant:fail>
+    
+    
+    <define:taglib uri="http://www.maven.org/plugin/appserver/orion202">
+
+      <!-- accept the force property with a value of true or false -->
+      <define:tag name="install">
+
+        <j:if test="${force == 'false'}">
+          <!-- Create common directories and copy configuration files -->
+          <mkdir dir="${maven.appserver.dir}/config"/>
+          <mkdir dir="${maven.appserver.dir}/applications"/>
+          <mkdir dir="${maven.appserver.dir}/database"/>
+          <mkdir dir="${maven.appserver.dir}/lib"/>
+          <mkdir dir="${maven.appserver.dir}/log"/>
+          <mkdir dir="${maven.appserver.dir}/persistence"/>
+        </j:if>
+
+        <!-- copy any user configuration files w/ filtering by forcing copy -->
+        <!-- if reinstall -->
+        <ant:copy todir="${maven.appserver.dir}" overwrite="${force}">
+          <ant:fileset dir="${maven.appserver.conf.dir}" />
+        </ant:copy>
+
+      </define:tag>
+    </define:taglib>
+
+  </goal>
+  
+  <!--==================================================================-->
+  <!-- R E I N S T A L L                                                -->
+  <!--==================================================================-->
+  <goal name="appserver:reinstall-orion-2.0.2"
+    prereqs="appserver:orion-2.0.2-reqs" description="Reinstall orion 2.0.2">
+    <orion202:install force="true"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- I N S T A L L                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:install-orion-2.0.2" prereqs="appserver:orion-2.0.2-reqs"
+    description="Install orion 2.0.2">
+    <orion202:install force="false"/>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T A R T                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:start-orion-2.0.2" prereqs="appserver:orion-2.0.2-reqs"
+    description="Start orion 2.0.2" >
+    <java jar="${maven.appserver.home}/orion.jar" fork="yes"
+        dir="${maven.appserver.dir}">
+        <classpath>
+          <!--<pathelement path="${maven.appserver.classpath}"/>-->
+          <fileset dir="${maven.appserver.home}">
+            <include name="*.jar"/>
+          </fileset>
+        </classpath>
+      </java>
+
+  </goal>
+
+  <!--==================================================================-->
+  <!-- R E S T A R T                                                    -->
+  <!--==================================================================-->
+  <goal name="appserver:restart-orion-2.0.2" description="Restart orion 2.0.2"
+    prereqs="appserver:orion-2.0.2-reqs" >
+    <java jar="${maven.appserver.home}/admin.jar" fork="yes"
+    		dir="${maven.appserver.dir}">
+      <arg value="ormi://${maven.appserver.host}:${maven.appserver.rmi.port}" />
+      <arg value="${maven.appserver.adminusername}" />
+      <arg value="${maven.appserver.adminpassword}" />
+      <arg value="-restart"/>
+      <classpath>
+        <pathelement location="${maven.appserver.home}/orion.jar" />
+        <pathelement location="${maven.appserver.home}/ejb.jar" />
+        <pathelement location="${maven.appserver.home}/jndi.jar" />
+       </classpath>
+     </java>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- S T O P                                                          -->
+  <!--==================================================================-->
+  <goal name="appserver:stop-orion-2.0.2" description="Stop orion 2.0.2"
+    prereqs="appserver:orion-2.0.2-reqs" >
+
+    <java jar="${maven.appserver.home}/admin.jar" fork="yes"
+    		dir="${maven.appserver.dir}">
+      <arg value="ormi://${maven.appserver.host}:${maven.appserver.rmi.port}" />
+      <arg value="${maven.appserver.adminusername}" />
+      <arg value="${maven.appserver.adminpassword}" />
+      <arg value="-shutdown"/>
+      <classpath>
+        <pathelement location="${maven.appserver.home}/orion.jar" />
+        <pathelement location="${maven.appserver.home}/ejb.jar" />
+        <pathelement location="${maven.appserver.home}/jndi.jar" />
+       </classpath>
+     </java>
+  </goal>
+
+  <!--==================================================================-->
+  <!-- C L E A N                                                        -->
+  <!--==================================================================-->
+  <goal name="appserver:clean-orion-2.0.2" description="Clean orion 2.0.2"
+    prereqs="appserver:orion-2.0.2-reqs" >
+	<ant:delete dir="${maven.appserver.dir}"/>
+	<ant:mkdir dir="${maven.appserver.dir}"/>
+  </goal>
+
+</project>
diff --git a/appserver/xdocs/appserver.xml b/appserver/xdocs/appserver.xml
index 8e00e6e8..3c3a11bf 100644
--- a/appserver/xdocs/appserver.xml
+++ b/appserver/xdocs/appserver.xml
@@ -71,12 +71,16 @@
         <td><code>40</code></td>
         <td><code>12</code> or <code>13</code></td>
       </tr>
+      <tr>
+        <td><a href="http://www.orionserver.com">Orion 2.0.2</a></td>
+        <td><code>orion</code></td>
+        <td><code>2.0.2</code></td>
+      </tr>
     </table>
 
     <p>The following application servers are expected to be supported soon:</p>
     <ul>
       <li><a href="http://enhydra.enhydra.org/">Enhydra</a></li>
-      <li><a href="http://www.orionserver.com/">Orion</a></li>
       <li><a href="http://www.caucho.com/products/resin/">Resin</a></li>
       <li><a href="http://www.weblogic.com/">Weblogic</a></li>
     </ul>
diff --git a/appserver/xdocs/changes.xml b/appserver/xdocs/changes.xml
index 1237677d..9d968757 100644
--- a/appserver/xdocs/changes.xml
+++ b/appserver/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="2.1-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="add" issue="MPAPPSERVER-4" due-to="Matt Smith">Add Orion 2.0.x support</action>
+    </release>
     <release version="2.0" date="2004-03-07"></release>
     <release version="1.1" date="Unknown">
       <action dev="dion" type="fix">Updated docs so that they referred to the current release and not b5</action>
diff --git a/appserver/xdocs/properties.xml b/appserver/xdocs/properties.xml
index 307c2b82..62b9ba8b 100644
--- a/appserver/xdocs/properties.xml
+++ b/appserver/xdocs/properties.xml
@@ -480,6 +480,30 @@
             are automatically built-in and do not need to be added here.</strong>
           </td>
         </tr>
+        <tr>
+          <td><a name="maven.appserver.rmi.port">maven.appserver.rmi.port</a></td>
+          <td>Yes</td>
+          <td>
+            RMI port you can specify.  
+            Example: used to start/stop/restart orion appserver.
+          </td>
+        </tr>
+        <tr>
+          <td><a name="maven.appserver.adminusername">maven.appserver.adminusername</a></td>
+          <td>Yes</td>
+          <td>
+            Admin username to use when communicating with appserver.
+            Example: used to start/stop/restart orion appserver.
+          </td>
+        </tr>
+        <tr>
+          <td><a name="maven.appserver.adminpassword">maven.appserver.adminpassword</a></td>
+          <td>Yes</td>
+          <td>
+            Admin password to use when communicating with appserver.
+            Example: used to start/stop/restart orion appserver.
+          </td>
+        </tr>
       </table>
     </section>
   </body>