brett 2004/04/16 18:09:51
Modified: appserver plugin.jelly
appserver/xdocs appserver.xml
Added: appserver/src/plugin-resources orion-2.0.x.jelly
Removed: appserver/src/plugin-resources orion-2.0.2.jelly
Log:
change name to 2.0.x for consistency
Revision Changes Path
1.8 +3 -3 maven-plugins/appserver/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/appserver/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 15 Apr 2004 06:09:05 -0000 1.7
+++ plugin.jelly 17 Apr 2004 01:09:51 -0000 1.8
@@ -32,7 +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" />
+ <j:import inherit="true" file="${plugin.resources}/orion-2.0.x.jelly" />
<!--==================================================================-->
<!-- B E G I N C O R E P R O C E S S I N G -->
@@ -141,7 +141,7 @@
</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:when test="${context.getVariable('maven.appserver.version') ==
'2.0.x'}" />
<j:otherwise>
<exception:appserverVersionNotSupported
appserver="${maven.appserver.name}"
@@ -621,4 +621,4 @@
</j:choose>
</goal>
-</project>
\ No newline at end of file
+</project>
1.1 maven-plugins/appserver/src/plugin-resources/orion-2.0.x.jelly
Index: orion-2.0.x.jelly
===================================================================
<?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.x-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.x"
prereqs="appserver:orion-2.0.x-reqs" description="Reinstall orion 2.0.x">
<orion202:install force="true"/>
</goal>
<!--==================================================================-->
<!-- I N S T A L L -->
<!--==================================================================-->
<goal name="appserver:install-orion-2.0.x" prereqs="appserver:orion-2.0.x-reqs"
description="Install orion 2.0.x">
<orion202:install force="false"/>
</goal>
<!--==================================================================-->
<!-- S T A R T -->
<!--==================================================================-->
<goal name="appserver:start-orion-2.0.x" prereqs="appserver:orion-2.0.x-reqs"
description="Start orion 2.0.x" >
<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.x" description="Restart orion 2.0.x"
prereqs="appserver:orion-2.0.x-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.x" description="Stop orion 2.0.x"
prereqs="appserver:orion-2.0.x-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.x" description="Clean orion 2.0.x"
prereqs="appserver:orion-2.0.x-reqs" >
<ant:delete dir="${maven.appserver.dir}"/>
<ant:mkdir dir="${maven.appserver.dir}"/>
</goal>
</project>
1.4 +2 -2 maven-plugins/appserver/xdocs/appserver.xml
Index: appserver.xml
===================================================================
RCS file: /home/cvs/maven-plugins/appserver/xdocs/appserver.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- appserver.xml 15 Apr 2004 06:09:05 -0000 1.3
+++ appserver.xml 17 Apr 2004 01:09:51 -0000 1.4
@@ -72,9 +72,9 @@
<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><a href="http://www.orionserver.com";>Orion 2.0.x</a></td>
<td><code>orion</code></td>
- <td><code>2.0.2</code></td>
+ <td><code>2.0.x</code></td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
