From: Dominik D. <da...@us...> - 2005-02-02 13:45:59
|
dahlemd 05/02/02 05:45:49 Modified: axis plugin.jelly plugin.properties project.xml axis/xdocs changes.xml goals.xml index.xml properties.xml tasks.xml Log: merged dahlemd_update-axis-goals_29012005-branch Revision Changes Path 1.6 +156 -84 maven-plugins/axis/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/plugin.jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin.jelly 12 Dec 2004 22:37:58 -0000 1.5 +++ plugin.jelly 2 Feb 2005 13:45:48 -0000 1.6 @@ -4,6 +4,7 @@ xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" + xmlns:log="jelly:log" xmlns:u="jelly:util"> <!-- global definitions --> @@ -38,12 +39,29 @@ <!-- ================================================================== --> <goal name="axis:prepare-filesystem" description="Create the directory structure needed."> - <ant:mkdir dir="${axis.generated.dir}"/> - <ant:mkdir dir="${axis.build.dir}"/> + <ant:available property="wsdlPresent" file="${axis.url}" /> - <!-- move generated test cases to the maven.axis.test.dir --> - <j:if test="${maven.axis.testcase}"> - <ant:mkdir dir="${maven.axis.test.dir}"/> + <j:choose> + <!-- if dir exists --> + <j:when test="${wsdlPresent == 'true'}"> + <log:info>Invoking Axis plugin</log:info> + <j:set var="wsdlPresent" value="true"/> + </j:when> + <!-- if dir does not exist --> + <j:otherwise> + <log:info>Not invoking Axis plugin</log:info> + <j:set var="wsdlPresent" value="false"/> + </j:otherwise> + </j:choose> + + <j:if test="${wsdlPresent == 'true'}"> + <ant:mkdir dir="${axis.generated.dir}"/> + <ant:mkdir dir="${axis.build.dir}"/> + + <!-- move generated test cases to the maven.axis.test.dir --> + <j:if test="${maven.axis.testcase}"> + <ant:mkdir dir="${maven.axis.test.dir}"/> + </j:if> </j:if> </goal> @@ -54,21 +72,51 @@ <goal name="axis:axis" description="generate java files from wsdl definitions." prereqs="axis:prepare-filesystem,test:test-resources,java:jar-resources"> - <j:catch var="ex"> - <j:set var="wsdlSource" value="${axis.url}" /> - <j:set var="wsdlPostfix" value=".wsdl" /> - <j:if test="${!wsdlSource.endsWith(wsdlPostfix)}"> - <ant:echo>find all .wsdl files in directory ${axis.url}</ant:echo> - <!-- find all wsdl files --> - <ant:fileScanner var="wsdlFiles"> - <ant:fileset dir="${axis.url}"> - <ant:include name="**/*.wsdl" /> - </ant:fileset> - </ant:fileScanner> - - <!-- generate the java files for each wsdl file --> - <j:forEach var="wsdlFile" items="${wsdlFiles.iterator()}"> - <ant:echo>generate .java files from ${wsdlFile}</ant:echo> + <j:if test="${wsdlPresent == 'true'}"> + <j:catch var="ex"> + <j:set var="wsdlSource" value="${axis.url}" /> + <j:set var="wsdlPostfix" value=".wsdl" /> + <j:if test="${!wsdlSource.endsWith(wsdlPostfix)}"> + <log:info>find all .wsdl files in directory ${axis.url}</log:info> + <!-- find all wsdl files --> + <ant:fileScanner var="wsdlFiles"> + <ant:fileset dir="${axis.url}"> + <ant:include name="**/*.wsdl" /> + </ant:fileset> + </ant:fileScanner> + + <!-- generate the java files for each wsdl file --> + <j:forEach var="wsdlFile" items="${wsdlFiles.iterator()}"> + <log:info>generate .java files from ${wsdlFile}</log:info> + <!-- wsdl2java --> + <axis-wsdl2java + all="${maven.axis.all}" + debug="${maven.axis.debug}" + output="${axis.generated.dir}" + testcase="${maven.axis.testcase}" + verbose="${maven.axis.verbose}" + deployscope="${maven.axis.deployscope}" + factory="${maven.axis.factory}" + helpergen="${maven.axis.helpergen}" + skeletondeploy="${maven.axis.skeletondeploy}" + noimports="${maven.axis.noimports}" + typemappingVersion="${maven.axis.typemappingversion}" + serverside="${maven.axis.serverside}" + timeout="${maven.axis.timeout}" + url="${wsdlFile}"> + + <!-- mapping of namespaces to package names --> + <u:tokenize var="urnMappings" delim=",">${maven.wsdl2java.namespaceMappings}</u:tokenize> + <j:forEach var="urnMapping" items="${urnMappings}"> + <u:tokenize var="keyValue" delim="=">${urnMapping}</u:tokenize> + <mapping namespace="${keyValue[0]}" package="${keyValue[1]}"/> + </j:forEach> + </axis-wsdl2java> + + </j:forEach> + </j:if> + <j:if test="${wsdlSource.endsWith(wsdlPostfix)}"> + <log:info>generate .java files from ${axis.url}</log:info> <!-- wsdl2java --> <axis-wsdl2java all="${maven.axis.all}" @@ -84,7 +132,7 @@ typemappingVersion="${maven.axis.typemappingversion}" serverside="${maven.axis.serverside}" timeout="${maven.axis.timeout}" - url="${wsdlFile}"> + url="${axis.url}"> <!-- mapping of namespaces to package names --> <u:tokenize var="urnMappings" delim=",">${maven.wsdl2java.namespaceMappings}</u:tokenize> @@ -92,54 +140,26 @@ <u:tokenize var="keyValue" delim="=">${urnMapping}</u:tokenize> <mapping namespace="${keyValue[0]}" package="${keyValue[1]}"/> </j:forEach> - </axis-wsdl2java> - - </j:forEach> - </j:if> - <j:if test="${wsdlSource.endsWith(wsdlPostfix)}"> - <ant:echo>generate .java files from ${axis.url}</ant:echo> - <!-- wsdl2java --> - <axis-wsdl2java - all="${maven.axis.all}" - debug="${maven.axis.debug}" - output="${axis.generated.dir}" - testcase="${maven.axis.testcase}" - verbose="${maven.axis.verbose}" - deployscope="${maven.axis.deployscope}" - factory="${maven.axis.factory}" - helpergen="${maven.axis.helpergen}" - skeletondeploy="${maven.axis.skeletondeploy}" - noimports="${maven.axis.noimports}" - typemappingVersion="${maven.axis.typemappingversion}" - serverside="${maven.axis.serverside}" - timeout="${maven.axis.timeout}" - url="${axis.url}"> - <!-- mapping of namespaces to package names --> - <u:tokenize var="urnMappings" delim=",">${maven.wsdl2java.namespaceMappings}</u:tokenize> - <j:forEach var="urnMapping" items="${urnMappings}"> - <u:tokenize var="keyValue" delim="=">${urnMapping}</u:tokenize> - <mapping namespace="${keyValue[0]}" package="${keyValue[1]}"/> - </j:forEach> - - </axis-wsdl2java> - </j:if> - - <!-- move generated test cases to the maven.axis.test.dir --> - <j:if test="${maven.axis.testcase}"> - <ant:echo>move the generated testcases to folder ${maven.axis.test.dir}</ant:echo> + </axis-wsdl2java> + </j:if> - <ant:move todir="${maven.axis.test.dir}"> - <ant:fileset dir="${maven.axis.generated.dir}"> - <ant:include name="**/*TestCase*"/> - </ant:fileset> - </ant:move> + <!-- move generated test cases to the maven.axis.test.dir --> + <j:if test="${maven.axis.testcase}"> + <log:info>move the generated testcases to folder ${maven.axis.test.dir}</log:info> + + <ant:move todir="${maven.axis.test.dir}"> + <ant:fileset dir="${maven.axis.generated.dir}"> + <ant:include name="**/*TestCase*"/> + </ant:fileset> + </ant:move> + </j:if> + + </j:catch> + <j:if test="${ex != null}"> + <log:error>${ex}</log:error> + <ant:fail message="${ex}" /> </j:if> - - </j:catch> - <j:if test="${ex != null}"> - <ant:echo>${ex}</ant:echo> - <ant:fail message="${ex}" /> </j:if> </goal> @@ -150,18 +170,20 @@ description="Copies the generated java files into a separate build directory." prereqs="axis:axis"> - <ant:copy todir="${axis.build.dir}"> - <ant:fileset dir="${axis.generated.dir}"> - - <!-- ignore implementation classes --> - <u:tokenize var="impls" delim=";">${maven.axis.excludes}</u:tokenize> - <j:forEach var="impl" items="${impls.iterator()}"> - <ant:echo>exclude class ${impl}</ant:echo> - <ant:exclude name="${impl}"/> - </j:forEach> + <j:if test="${wsdlPresent == 'true'}"> + <ant:copy todir="${axis.build.dir}"> + <ant:fileset dir="${axis.generated.dir}"> + + <!-- ignore implementation classes --> + <u:tokenize var="impls" delim=";">${maven.axis.excludes}</u:tokenize> + <j:forEach var="impl" items="${impls.iterator()}"> + <log:info>exclude class ${impl}</log:info> + <ant:exclude name="${impl}"/> + </j:forEach> - </ant:fileset> - </ant:copy> + </ant:fileset> + </ant:copy> + </j:if> </goal> @@ -172,12 +194,14 @@ description="Compile the generated .java files." prereqs="axis:copy"> - <ant:path id="axis.src.set"> - <ant:pathelement location="${maven.axis.build.dir}" /> - </ant:path> + <j:if test="${wsdlPresent == 'true'}"> + <ant:path id="axis.src.set"> + <ant:pathelement location="${maven.axis.build.dir}" /> + </ant:path> - <ant:echo>adding ${maven.axis.generated.dir} to the maven.compile.src.set</ant:echo> - <maven:addPath id="maven.compile.src.set" refid="axis.src.set"/> + <log:info>adding ${maven.axis.generated.dir} to the maven.compile.src.set</log:info> + <maven:addPath id="maven.compile.src.set" refid="axis.src.set"/> + </j:if> </goal> @@ -197,13 +221,13 @@ <j:if test="${context.getVariable('maven.axis.classnames') == null}"> <j:set var="message" value="You must specify maven.axis.classnames property." /> - <ant:echo>${message}</ant:echo> + <log:error>${message}</log:error> <ant:fail message="${message}" /> </j:if> <u:tokenize var="classes" delim=",">${maven.axis.classnames}</u:tokenize> <j:forEach var="classname" items="${classes}"> - <ant:echo>generate .wsdl file from ${classname}</ant:echo> + <log:info>generate .wsdl file from ${classname}</log:info> <u:tokenize var="classDetail" delim=",">${context.getVariable(classname)}</u:tokenize> <j:set var="location" value="${classDetail[0]}" /> <j:set var="namespace" value="${classDetail[1]}" /> @@ -228,6 +252,54 @@ </goal> <!-- ================================================================== --> + <!-- C O P Y D E P L O Y --> + <!-- ================================================================== --> + <goal name="axis:copy-deploy" + description="Deploys the jar into the axis/WEB-INF/lib folder."> + + <j:if test="${maven.axis.copy.deploy}"> + <fail unless="maven.axis.home"> + Axis Home is not set: maven.axis.home=${maven.axis.home}. + </fail> + <copy + file="${maven.build.dir}/${maven.final.name}.jar" + todir="${maven.axis.home}/WEB-INF/lib"/> + + <!-- Copy each dependency --> + <j:forEach var="lib" items="${pom.artifacts}"> + <j:set var="dep" value="${lib.dependency}"/> + <j:if test="${dep.getProperty('dependencyType').equalsIgnoreCase('lib')}"> + <j:if test="${dep.type =='jar'}"> + <ant:copy todir="${maven.axis.home}/WEB-INF/lib" file="${lib.path}"/> + </j:if> + </j:if> + </j:forEach> + </j:if> + </goal> + + <!-- ================================================================== --> + <!-- D E P L O Y --> + <!-- ================================================================== --> + <goal name="axis:deploy" prereqs="axis:copy-deploy" + description="Deploys a web service with the admin service of axis."> + + <axis-admin + url="${maven.axis.admin.url}" + xmlfile="${maven.axis.wsdd.deploy}"/> + </goal> + + <!-- ================================================================== --> + <!-- U N D E P L O Y --> + <!-- ================================================================== --> + <goal name="axis:undeploy" + description="Undeploys a web service with the admin service of axis."> + + <axis-admin + url="${maven.axis.admin.url}" + xmlfile="${maven.axis.wsdd.undeploy}"/> + </goal> + + <!-- ================================================================== --> <!-- D E F A U L T G O A L --> <!-- ================================================================== --> <goal name="axis" 1.4 +7 -0 maven-plugins/axis/plugin.properties Index: plugin.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/plugin.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plugin.properties 6 Dec 2004 15:41:30 -0000 1.3 +++ plugin.properties 2 Feb 2005 13:45:48 -0000 1.4 @@ -19,6 +19,13 @@ maven.axis.build.dir=${maven.axis.dir}/build maven.axis.excludes= +maven.axis.copy.deploy=false +maven.axis.home= + +maven.axis.wsdd.deploy= +maven.axis.wsdd.undeploy= +maven.axis.admin.url=http://localhost:8080/axis/services/AdminService?wsdl + maven.wsdl2java.namespaceMappings= ############################# 1.4 +26 -12 maven-plugins/axis/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 6 Dec 2004 15:41:30 -0000 1.3 +++ project.xml 2 Feb 2005 13:45:48 -0000 1.4 @@ -10,7 +10,7 @@ <name>Maven Axis Plugin</name> <!-- groupId is in parent --> - <currentVersion>0.6-SNAPSHOT</currentVersion> + <currentVersion>0.7-SNAPSHOT</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> @@ -52,6 +52,11 @@ <name>0.5</name> <tag>MAVEN_PLUGINS_AXIS_0_5</tag> </version> + <version> + <id>0.7</id> + <name>0.7</name> + <tag>MAVEN_PLUGINS_AXIS_0_7</tag> + </version> </versions> <developers> @@ -97,23 +102,27 @@ <name>Matthew Demmer</name> <email>ma...@de...</email> </contributor> + <contributor> + <name>J. Joseph Benavidez</name> + <email>ha...@po...</email> + </contributor> </contributors> <dependencies> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.0</version> + <groupId>axis</groupId> + <artifactId>axis-wsdl4j</artifactId> + <version>1.2-RC2</version> </dependency> <dependency> <groupId>axis</groupId> <artifactId>axis</artifactId> - <version>1.1</version> + <version>1.2-RC2</version> </dependency> <dependency> <groupId>axis</groupId> <artifactId>axis-ant</artifactId> - <version>1.1</version> + <version>1.2-RC2</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -131,14 +140,14 @@ <version>2.4.0</version> </dependency> <dependency> - <groupId>jaxrpc</groupId> - <artifactId>jaxrpc-api</artifactId> - <version>1.1</version> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.2-RC2</version> </dependency> <dependency> - <groupId>saaj</groupId> - <artifactId>saaj-api</artifactId> - <version>1.1</version> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.2-RC2</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -150,6 +159,11 @@ <artifactId>commons-discovery</artifactId> <version>0.2</version> </dependency> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-log</artifactId> + <version>20030211.142821</version> + </dependency> </dependencies> <!-- build is in the parent --> 1.4 +16 -0 maven-plugins/axis/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/xdocs/changes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- changes.xml 8 Dec 2004 22:27:12 -0000 1.3 +++ changes.xml 2 Feb 2005 13:45:48 -0000 1.4 @@ -7,6 +7,22 @@ </properties> <body> + <release version="0.7" date="01.02.2005"> + <action dev="dahlemd" type="fix" due-to="J. Joseph Benavidez"> + Check to see that the wsdl url exists before it does anything. + </action> + <action dev="dahlemd" type="fix"> + Use logging instead of ant:echo. + </action> + <action dev="dahlemd" type="add"> + Added deploy goal to support deploying a WebService via the + admin task of axis and also copying the libs and classes to the + axis installation. + </action> + <action dev="dahlemd" type="update"> + Update axis dependencies to RC2. + </action> + </release> <release version="0.6" date="In CVS"> <action dev="evenisse" type="fix"> Fix wsdl2java ant tag usage when we use multiple wsdl files. 1.4 +21 -0 maven-plugins/axis/xdocs/goals.xml Index: goals.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/xdocs/goals.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- goals.xml 6 Dec 2004 15:41:31 -0000 1.3 +++ goals.xml 2 Feb 2005 13:45:48 -0000 1.4 @@ -38,6 +38,27 @@ <name>axis:wsdl2java</name> <description>Generate java classes from wsdl definitions and compile them.</description> </goal> + <goal> + <name>axis:copy-deploy</name> + <description> + Copies the classes and the dependencies into the ${maven.axis.home}/WEB-INF/lib + folder. This, however, is not the recommended practice. It is better to specify a + self-contained .war-file with all the axis libraries and deploy this one into the + server using the maven-war-plugin. + </description> + </goal> + <goal> + <name>axis:deploy</name> + <description> + Use the admin service to deploy the web service. + </description> + </goal> + <goal> + <name>axis:undeploy</name> + <description> + Use the admin service to undeploy the web service. + </description> + </goal> </goals> </body> </document> 1.3 +203 -21 maven-plugins/axis/xdocs/index.xml Index: index.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/xdocs/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.xml 23 Oct 2004 16:21:34 -0000 1.2 +++ index.xml 2 Feb 2005 13:45:48 -0000 1.3 @@ -23,27 +23,209 @@ </pre> </p> </section> - <section name="Requirements"> - <p> - These libraries are covered by a semi-restrictive Sun license. You can download them after - agreeing to the Sun license agreement. - </p> - <p> - <table> - <tr> - <th>Library</th> - <th>Download</th> - </tr> - <tr> - <td>JAX-RPC</td> - <td><a href="http://java.sun.com/xml/jaxrpc/index.jsp">java.sun.com</a></td> - </tr> - <tr> - <td>SAAJ</td> - <td><a href="http://java.sun.com/xml/saaj/index.jsp">java.sun.com</a></td> - </tr> - </table> - </p> + <section name="Examples"> + <subsection name="Basic"> + <p> + The basic example illustrates how to use this plugin to deploy an axis service to + localhost. It is assumed that a server (e.g. Tomcat) with Axis is installed and verified + to be working. + </p> + <p> + Dependencies in your project.xml file: + <source> + <![CDATA[ + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.2-RC2</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.2-RC2</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-wsdl4j</artifactId> + <version>1.2-RC2</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.2-RC2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.8</version> + <properties> + <dependencyType>lib</dependencyType> + </properties> + </dependency> + ]]> + </source> + </p> + <p> + Given that you already ran axis:wsdl2java and moved YourImplClass.java into your src tree + you would need the following properties in project.properties. + <source> + <![CDATA[ +# axis settings +maven.axis.excludes=*/**/YourImplClass.java +maven.axis.copy.deploy=true +maven.axis.home=/opt/jakarta-tomcat-5.5.4/webapps/axis +maven.axis.wsdd.deploy=${maven.axis.generated.dir}/org/web/service/deploy.wsdd +maven.axis.wsdd.undeploy=${maven.axis.generated.dir}/org/web/service/undeploy.wsdd + ]]> + </source> + </p> + <p> + Finally, your maven.xml file needs to be adjusted to run axis:compile prior to + java:compile. + <source> + <![CDATA[ + <preGoal name="java:compile"> + <attainGoal name="axis:compile" /> + </preGoal> + ]]> + </source> + </p> + <p> + This setup generates the .java files from all WebService description (.wsdl files) in the + default location src/wsdl. Further these generated files are compiled. In this example the + */**/YourImplClass.java is excluded from the compilation step in order to prevent + interference with the modified one in src/java.<br/> + After running <i>maven jar</i> you can deploy your WebService with <i>maven + axis:deploy</i>. This goal performs two steps. First it copies your component jar and all + dependencies with the property <i>dependencyType</i> set to <i>lib</i> in + ${maven.axis.home>/WEB-INF/lib folder. Second, it runs the axis-admin task to deploy the + ${maven.axis.home>WebService with the + ${maven.axis.home>${maven.axis.generated.dir}/org/web/service/deploy.wsdd file. + </p> + </subsection> + <subsection name="Advanced"> + <p> + This example illustrates how to use this plugin to create a self-contained .war-file + which then can be deployed. <b>Note:</b> the content of the web.xml file from axis has to + be copied into the component-specific web.xml file. + </p> + <p> + Dependencies in your project.xml file: + <source> + <![CDATA[ + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.2-RC2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.2-RC2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-wsdl4j</artifactId> + <version>1.2-RC2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.2-RC2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.8</version> + <properties> + <dependencyType>lib</dependencyType> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + <version>2.4.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.4.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.3</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + ]]> + </source> + </p> + <p> + Since we do not deploy via file-copy as in the basic example we remove two properties, + maven.axis.copy.deploy and maven.axis.home. Instead we specify the admin url of axis in + your web application. + <source> + <![CDATA[ +# axis settings +maven.axis.excludes=*/**/YourImplClass.java +maven.axis.admin.url=http://localhost:8080/yourAppContext/AdminService?wsdl +maven.axis.wsdd.deploy=${maven.axis.generated.dir}/org/web/service/deploy.wsdd +maven.axis.wsdd.undeploy=${maven.axis.generated.dir}/org/web/service/undeploy.wsdd + ]]> + </source> + </p> + <p> + maven.xml: + <source> + <![CDATA[ + <preGoal name="java:compile"> + <attainGoal name="axis:compile" /> + </preGoal> + ]]> + </source> + </p> + <p> + This setup creates a self-contained .war-file using the maven-war-plugin which can then be + deployed as a standalone application into the server. + </p> + </subsection> </section> </body> </document> 1.5 +57 -5 maven-plugins/axis/xdocs/properties.xml Index: properties.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/xdocs/properties.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- properties.xml 12 Dec 2004 22:37:58 -0000 1.4 +++ properties.xml 2 Feb 2005 13:45:48 -0000 1.5 @@ -75,11 +75,11 @@ <td>No</td> <td> Specifies a comma-separated list of classes names to import, eg. org.example.Foo. Required. - It's required too to define the namespace and location for these classes like this :<br> - classname=location,namespace<br> - example:<br> - maven.axis.classnames=foo.bar.class1,foo.bar.class2<br> - foo.bar.class1=http://localhost/services/service1,Namespace1<br> + It's required too to define the namespace and location for these classes like this :<br/> + classname=location,namespace<br/> + example:<br/> + maven.axis.classnames=foo.bar.class1,foo.bar.class2<br/> + foo.bar.class1=http://localhost/services/service1,Namespace1<br/> foo.bar.class2=http://localhost/services/service2,Namespace2 </td> </tr> @@ -237,5 +237,57 @@ </tr> </table> </section> + <section name="deploy properties"> + <table> + <tr> + <th>Property</th> + <th>Default</th> + <th>Optional?</th> + <th>Description</th> + </tr> + <tr> + <td>maven.axis.home</td> + <td></td> + <td>No (if maven.axis.copy.deploy is set to true)</td> + <td> + The axis webapps directory. This property is used to copy all classes and dependencies into + ${maven.axis.home}/WEB-INF/lib directory. + </td> + </tr> + <tr> + <td>maven.axis.copy.deploy</td> + <td>false</td> + <td>Yes</td> + <td> + If this property is set to true, copy all classes and dependencies into the + ${maven.axis.home}/WEB-INF/lib directory. + </td> + </tr> + <tr> + <td>maven.axis.wsdd.deploy</td> + <td></td> + <td>yes</td> + <td> + Path to the deploy.wsdd file. + </td> + </tr> + <tr> + <td>maven.axis.wsdd.undeploy</td> + <td></td> + <td>yes</td> + <td> + Path to the undeploy.wsdd file. + </td> + </tr> + <tr> + <td>maven.axis.admin.url</td> + <td>http://localhost:8080/axis/services/AdminService?wsdl</td> + <td>yes</td> + <td> + URL to the admin service of axis. + </td> + </tr> + </table> + </section> </body> </document> 1.4 +1 -1 maven-plugins/axis/xdocs/tasks.xml Index: tasks.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/axis/xdocs/tasks.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tasks.xml 6 Dec 2004 15:41:31 -0000 1.3 +++ tasks.xml 2 Feb 2005 13:45:48 -0000 1.4 @@ -14,7 +14,7 @@ <a href="/mail-lists.html">developers list</a> </p> - <subsection name="0.6 or later"> + <subsection name="0.8 or later"> <p> New features: <ul> |