Menu
▾
▴
maven-plugins-cvs — CVS Commits - Maven Plugins
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
(12) |
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(9) |
Feb
(6) |
Mar
(1) |
Apr
(85) |
May
(9) |
Jun
|
Jul
(6) |
Aug
(85) |
Sep
(42) |
Oct
(27) |
Nov
(15) |
Dec
(27) |
| 2004 |
Jan
(39) |
Feb
(52) |
Mar
(43) |
Apr
(32) |
May
(18) |
Jun
(5) |
Jul
(63) |
Aug
(69) |
Sep
(12) |
Oct
(80) |
Nov
(55) |
Dec
(30) |
| 2005 |
Jan
(27) |
Feb
(6) |
Mar
(43) |
Apr
(5) |
May
(48) |
Jun
(48) |
Jul
(100) |
Aug
(16) |
Sep
(43) |
Oct
(25) |
Nov
(249) |
Dec
(2) |
| 2006 |
Jan
(9) |
Feb
(2) |
Mar
|
Apr
(26) |
May
(21) |
Jun
(8) |
Jul
(14) |
Aug
(104) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(32) |
Feb
|
Mar
(2) |
Apr
|
May
(38) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Siegfried G. <wd...@us...> - 2005-02-15 09:33:14
|
wdsgoe 05/02/15 01:33:08
Modified: javaapp/xdocs changes.xml
Log:
Applied patch 1121795 from Frank Cornelis fixing broken javaapp:run
Revision Changes Path
1.7 +6 -0 maven-plugins/javaapp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 19 Nov 2004 13:48:56 -0000 1.6
+++ changes.xml 15 Feb 2005 09:33:07 -0000 1.7
@@ -13,6 +13,12 @@
<body>
+ <release version="1.4" date="as in CVS">
+ <action dev="wdsgoe" type="fix">
+ Applied patch 1121795 from Frank Cornelis to fix broken
+ javaapp:run
+ </action>
+ </release>
<release version="1.3" date="2004-11-19">
<action dev="joehni" type="update">
Cumulate licenses in META-INF.
|
|
From: Siegfried G. <wd...@us...> - 2005-02-15 09:31:22
|
wdsgoe 05/02/15 01:31:16
Modified: javaapp plugin.jelly
Log:
Applied patch 1121795 from Frank Cornelis fixing broken javaapp:run
Revision Changes Path
1.13 +3 -3 maven-plugins/javaapp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 19 Nov 2004 16:44:42 -0000 1.12
+++ plugin.jelly 15 Feb 2005 09:31:15 -0000 1.13
@@ -277,12 +277,12 @@
<!-- Don't know how to split the thing to use <sysproperty> instead -->
<u:tokenize var="listOfJvmArgs" delim=" ">${maven.javaapp.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
- <j:jvmarg value="${somejvmarg}"/>
+ <ant:jvmarg value="${somejvmarg}"/>
</j:forEach>
<j:forEach var="someProperty" items="${listOfProperties}">
- <j:jvmarg value="${someProperty}"/>
+ <ant:jvmarg value="${someProperty}"/>
</j:forEach>
- <j:arg line="${maven.javaapp.cmdline}"/>
+ <ant:arg line="${maven.javaapp.cmdline}"/>
</ant:java>
</goal>
|
|
From: Carlos S. <car...@us...> - 2005-02-13 15:33:20
|
carlossg 05/02/13 07:33:13
Modified: sdocbook plugin.jelly
Log:
Revision Changes Path
1.17 +2 -1 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 8 Jan 2005 22:07:46 -0000 1.16
+++ plugin.jelly 13 Feb 2005 15:33:13 -0000 1.17
@@ -238,7 +238,8 @@
<!-- copy source docbook files to dest -->
<copy todir="${maven.sdocbook.generated}" filtering="no">
<fileset dir="${maven.sdocbook.src.dir}">
- <include name="**/*.xml, **/*.sgml"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.sgml"/>
</fileset>
</copy>
<fileScanner var="generatedScanner">
|
|
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>
|
|
From: Dominik D. <da...@us...> - 2005-02-02 13:39:26
|
dahlemd 05/02/02 05:39:19
Modified: axis Tag: dahlemd_update-axis-goals_29012005-branch
project.xml
Log:
use SNAPSHOT version
Revision Changes Path
No revision
No revision
1.3.2.2 +1 -1 maven-plugins/axis/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/axis/project.xml,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- project.xml 2 Feb 2005 13:37:37 -0000 1.3.2.1
+++ project.xml 2 Feb 2005 13:39:18 -0000 1.3.2.2
@@ -10,7 +10,7 @@
<name>Maven Axis Plugin</name>
<!-- groupId is in parent -->
- <currentVersion>0.7</currentVersion>
+ <currentVersion>0.7-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2004</inceptionYear>
|
|
From: Dominik D. <da...@us...> - 2005-02-02 13:37:46
|
dahlemd 05/02/02 05:37:39
Modified: axis Tag: dahlemd_update-axis-goals_29012005-branch
plugin.jelly plugin.properties project.xml
axis/xdocs Tag: dahlemd_update-axis-goals_29012005-branch
changes.xml goals.xml index.xml properties.xml
tasks.xml
Log:
use logging instead of echos; add deploy support
Revision Changes Path
No revision
No revision
1.5.2.1 +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.5.2.1
diff -u -r1.5 -r1.5.2.1
--- plugin.jelly 12 Dec 2004 22:37:58 -0000 1.5
+++ plugin.jelly 2 Feb 2005 13:37:37 -0000 1.5.2.1
@@ -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.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- plugin.properties 6 Dec 2004 15:41:30 -0000 1.3
+++ plugin.properties 2 Feb 2005 13:37:37 -0000 1.3.2.1
@@ -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.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- project.xml 6 Dec 2004 15:41:30 -0000 1.3
+++ project.xml 2 Feb 2005 13:37:37 -0000 1.3.2.1
@@ -10,7 +10,7 @@
<name>Maven Axis Plugin</name>
<!-- groupId is in parent -->
- <currentVersion>0.6-SNAPSHOT</currentVersion>
+ <currentVersion>0.7</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 -->
No revision
No revision
1.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- changes.xml 8 Dec 2004 22:27:12 -0000 1.3
+++ changes.xml 2 Feb 2005 13:37:38 -0000 1.3.2.1
@@ -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.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- goals.xml 6 Dec 2004 15:41:31 -0000 1.3
+++ goals.xml 2 Feb 2005 13:37:38 -0000 1.3.2.1
@@ -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.2.6.1 +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.2.6.1
diff -u -r1.2 -r1.2.6.1
--- index.xml 23 Oct 2004 16:21:34 -0000 1.2
+++ index.xml 2 Feb 2005 13:37:38 -0000 1.2.6.1
@@ -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.4.2.1 +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.4.2.1
diff -u -r1.4 -r1.4.2.1
--- properties.xml 12 Dec 2004 22:37:58 -0000 1.4
+++ properties.xml 2 Feb 2005 13:37:38 -0000 1.4.2.1
@@ -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.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- tasks.xml 6 Dec 2004 15:41:31 -0000 1.3
+++ tasks.xml 2 Feb 2005 13:37:38 -0000 1.3.2.1
@@ -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>
|
|
From: Siegfried G. <wd...@us...> - 2005-01-19 13:19:14
|
wdsgoe 05/01/19 05:19:07
Modified: javancss plugin.jelly
Log:
Fixed typo in deregistering report
Revision Changes Path
1.7 +1 -1 maven-plugins/javancss/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/javancss/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 22 Nov 2004 15:40:42 -0000 1.6
+++ plugin.jelly 19 Jan 2005 13:19:07 -0000 1.7
@@ -25,7 +25,7 @@
</goal>
- <goal name="maven-checkstyle-plugin:deregister"
+ <goal name="maven-javancss-plugin:deregister"
description="Unregister the plugin">
<j:set var="enable" value="${maven.javancss.enable}"/>
<j:if test="${enable.equalsIgnoreCase('true')}">
|
|
From: stephane b. <le...@us...> - 2005-01-14 16:15:12
|
le_phan 05/01/14 08:15:04
Modified: kodo/xdocs index.xml changes.xml
Log:
Release for 3.2.4 kodo's jars.
Revision Changes Path
1.3 +2 -2 maven-plugins/kodo/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/kodo/xdocs/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 29 Nov 2004 14:24:25 -0000 1.2
+++ index.xml 14 Jan 2005 16:15:04 -0000 1.3
@@ -19,8 +19,8 @@
your Kodo installation directory.
<source>
${maven.repo.local}/kodo/jars/
-${maven.repo.local}/kodo/jars/kodo-jdo-3.2.3.jar
-${maven.repo.local}/kodo/jars/kodo-jdo-runtime-3.2.3.jar
+${maven.repo.local}/kodo/jars/kodo-jdo-3.2.4.jar
+${maven.repo.local}/kodo/jars/kodo-jdo-runtime-3.2.4.jar
</source>
</p>
</section>
1.4 +5 -0 maven-plugins/kodo/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/kodo/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 29 Nov 2004 14:24:25 -0000 1.3
+++ changes.xml 14 Jan 2005 16:15:04 -0000 1.4
@@ -5,6 +5,11 @@
</properties>
<body>
+ <release version="3.2.4" date="14-Jan-2005" description="Released for Kodo 3.2.4">
+ <action dev="sbouchet" type="add">
+ This version requires Kodo 3.2.4 jars.
+ </action>
+ </release>
<release version="3.2.3" date="23-Nov-2004" description="Released for Kodo 3.2.3">
<action dev="sbouchet" type="add">
Removed the "schematool" goal.
|
|
From: stephane b. <le...@us...> - 2005-01-14 16:15:01
|
le_phan 05/01/14 08:14:53
Modified: kodo project.xml
Log:
Release for 3.2.4 kodo's jars.
Revision Changes Path
1.13 +4 -4 maven-plugins/kodo/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/kodo/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 7 Dec 2004 13:28:09 -0000 1.12
+++ project.xml 14 Jan 2005 16:14:51 -0000 1.13
@@ -8,7 +8,7 @@
<id>maven-kodo-plugin</id>
<name>Kodo Plugin</name>
<!-- groupId is in parent -->
- <currentVersion>3.2.3</currentVersion>
+ <currentVersion>3.2.4</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2003</inceptionYear>
<!-- package, logo are in parent. no gumpRepositoryId -->
@@ -16,7 +16,7 @@
<shortDescription>Maven plugin for Solarmetric's Kodo JDO implementation</shortDescription>
<url>http://maven-plugins.sourceforge.net/maven-kodo-plugin/</url>
<!-- issueTrackingUrl, siteAddress are in parent -->
- <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/kodo/</siteDirectory>
+ <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/maven-kodo-plugin/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:ano...@cv...:/cvsroot/maven-plugins:maven-plugins/kodo</connection>
<url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/maven-plugins/maven-plugins/kodo/</url>
@@ -61,13 +61,13 @@
<dependency>
<groupId>kodo</groupId>
<artifactId>kodo-jdo</artifactId>
- <version>3.2.3</version>
+ <version>3.2.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>kodo</groupId>
<artifactId>kodo-jdo-runtime</artifactId>
- <version>3.2.3</version>
+ <version>3.2.4</version>
<type>jar</type>
</dependency>
<dependency>
|
|
From: Carlos S. <car...@us...> - 2005-01-10 22:00:33
|
carlossg 05/01/10 14:00:21
Modified: sdocbook/xdocs goals.xml
Log:
Generate xhtml instead of html
Revision Changes Path
1.5 +1 -1 maven-plugins/sdocbook/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/goals.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goals.xml 8 Jan 2005 21:43:55 -0000 1.4
+++ goals.xml 10 Jan 2005 22:00:20 -0000 1.5
@@ -22,7 +22,7 @@
</tr>
<tr>
<td>sdocbook:generate-html</td>
- <td>Generate HTML documentation for the given docbook</td>
+ <td>Generate HTML documentation for the given docbook (actually it's xhtml)</td>
</tr>
<tr>
<td>sdocbook:generate-htmlchunk</td>
|
|
From: Carlos S. <car...@us...> - 2005-01-10 21:58:48
|
carlossg 05/01/10 13:58:42
Modified: sdocbook plugin.properties project.xml
sdocbook/xdocs changes.xml
Log:
Generate xhtml instead of html
Revision Changes Path
1.11 +2 -2 maven-plugins/sdocbook/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 8 Jan 2005 19:24:05 -0000 1.10
+++ plugin.properties 10 Jan 2005 21:58:41 -0000 1.11
@@ -22,13 +22,13 @@
maven.sdocbook.resources.include = **/*.png, **/*.gif, **/*.jpg, **/*.css
# stylesheet to use for html transformation
-maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl
+maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/xhtml/docbook.xsl
# can be set to the "-param ..." which user can use to parameterize the html stylesheets
maven.sdocbook.html.params =
# stylesheet to use for html chunk transformation
-maven.sdocbook.htmlchunk.xsl = ${maven.sdocbook.stylesheets.dir}/html/chunk.xsl
+maven.sdocbook.htmlchunk.xsl = ${maven.sdocbook.stylesheets.dir}/xhtml/chunk.xsl
# stylesheet to use for fo transformation
maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl
1.29 +1 -1 maven-plugins/sdocbook/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 8 Jan 2005 22:41:01 -0000 1.28
+++ project.xml 10 Jan 2005 21:58:41 -0000 1.29
@@ -8,7 +8,7 @@
<name>SDocBook Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.4.1</currentVersion>
+ <currentVersion>1.4.2-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2002</inceptionYear>
1.15 +3 -0 maven-plugins/sdocbook/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 8 Jan 2005 22:42:27 -0000 1.14
+++ changes.xml 10 Jan 2005 21:58:42 -0000 1.15
@@ -7,6 +7,9 @@
<author email="per...@us...">Per Olesen</author>
</properties>
<body>
+ <release version="1.4.2-SNAPSHOT" date="in CVS">
+ <action dev="carlossg" type="update">Generate xhtml instead of html</action>
+ </release>
<release version="1.4.1" date="2005-01-08">
<action dev="carlossg" type="add">Added sdocbook:generate-htmlchunk goal</action>
<action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action>
|
|
From: Carlos S. <car...@us...> - 2005-01-08 22:42:36
|
carlossg 05/01/08 14:42:27
Modified: sdocbook/xdocs changes.xml
Log:
Added sdocbook:generate-htmlchunk goal
Revision Changes Path
1.14 +1 -0 maven-plugins/sdocbook/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 8 Jan 2005 22:41:02 -0000 1.13
+++ changes.xml 8 Jan 2005 22:42:27 -0000 1.14
@@ -8,6 +8,7 @@
</properties>
<body>
<release version="1.4.1" date="2005-01-08">
+ <action dev="carlossg" type="add">Added sdocbook:generate-htmlchunk goal</action>
<action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action>
<action dev="carlossg" type="fix">Don't flatten resources when copying.</action>
<action dev="carlossg" type="add">Added maven.sdocbook.files property.</action>
|
|
From: Carlos S. <car...@us...> - 2005-01-08 22:41:10
|
carlossg 05/01/08 14:41:02
Modified: sdocbook project.xml
sdocbook/xdocs changes.xml
Log:
[maven-scm-plugin] prepare release 1.4.1
Revision Changes Path
1.28 +34 -33 maven-plugins/sdocbook/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 1 Jan 2005 20:39:20 -0000 1.27
+++ project.xml 8 Jan 2005 22:41:01 -0000 1.28
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
<project>
<extend>../plugin-project.xml</extend>
<!--pomVersion is in parent -->
+
<artifactId>maven-sdocbook-plugin</artifactId>
<name>SDocBook Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.4.1-SNAPSHOT</currentVersion>
+
+ <currentVersion>1.4.1</currentVersion>
<!-- organization is in parent -->
+
<inceptionYear>2002</inceptionYear>
<!-- package, logo are in parent. no gumpRepositoryId -->
- <description>
- A plugin for DOCBOOK processing. Uses the DocBook Open Repository project XSL stylesheets to
- process DocBook XML sources into different output formats.
- </description>
+
+ <description>A plugin for DOCBOOK processing. Uses the DocBook Open Repository project XSL stylesheets to process DocBook XML sources into different output formats.</description>
<shortDescription>MAVEN Plug-in for DOCBOOK</shortDescription>
<!-- issueTrackingUrl, siteAddress are in parent -->
@@ -21,7 +23,6 @@
<developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/maven-plugins:maven-plugins/sdocbook</developerConnection>
<url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/maven-plugins/maven-plugins/sdocbook/</url>
</repository>
-
<versions>
<version>
<id>1.4</id>
@@ -33,11 +34,13 @@
<name>1.3</name>
<tag>maven-sdocbook-plugin-1-3-0</tag>
</version>
+ <version>
+ <id>1.4.1</id>
+ <name>1.4.1</name>
+ <tag>maven-sdocbook-plugin-1-4-1</tag>
+ </version>
</versions>
-
- <branches>
- </branches>
-
+ <branches></branches>
<!-- mailingLists are in parent -->
<developers>
@@ -49,7 +52,7 @@
<roles>
<role>SQA Consultant</role>
</roles>
- </developer>
+ </developer>
<developer>
<name>Per Olesen</name>
<id>perolesen</id>
@@ -60,7 +63,7 @@
</roles>
<url>https://sourceforge.net/users/perolesen/</url>
<timezone>+1</timezone>
- </developer>
+ </developer>
<developer>
<name>Carlos Sanchez</name>
<id>carlossg</id>
@@ -69,12 +72,11 @@
<role>Developer</role>
</roles>
<timezone>+1</timezone>
- </developer>
+ </developer>
</developers>
-
<dependencies>
-
<!-- default docbook stylesheets -->
+
<dependency>
<groupId>docbook</groupId>
<artifactId>docbook-xsl</artifactId>
@@ -82,38 +84,38 @@
<url>http://docbook.sourceforge.net</url>
<type>zip</type>
</dependency>
-
<dependency>
<id>avalon-framework</id>
<version>4.0</version>
<url>http://avalon.apache.org/index.html</url>
- </dependency>
+ </dependency>
<dependency>
<id>batik</id>
<version>1.1.1</version>
- <url>http://xml.apache.org/batik/index.html</url>
- </dependency>
- <dependency>
+ <url>http://xml.apache.org/batik/index.html</url>
+ </dependency>
+ <dependency>
<id>fop</id>
<version>0.20.5</version>
- <url>http://xml.apache.org/fop/index.html</url>
- </dependency>
+ <url>http://xml.apache.org/fop/index.html</url>
+ </dependency>
<!-- if any of the jimi dependencies are updated remember to update ../maven-xml -->
- <dependency>
+
+ <dependency>
<id>jimi</id>
<version>1.0</version>
- <url>http://java.sun.com/products/jimi/</url>
- </dependency>
- <dependency>
+ <url>http://java.sun.com/products/jimi/</url>
+ </dependency>
+ <dependency>
<id>logkit</id>
<version>1.0.1</version>
<url>http://avalon.apache.org/logkit/index.html</url>
- </dependency>
+ </dependency>
<dependency>
<id>xalan</id>
<version>2.5.1</version>
- <url>http://xml.apache.org/xalan-j/</url>
- </dependency>
+ <url>http://xml.apache.org/xalan-j/</url>
+ </dependency>
<dependency>
<id>xerces</id>
<version>2.3.0</version>
@@ -123,12 +125,11 @@
<id>xml-apis</id>
<version>1.0.b2</version>
<url>http://xml.apache.org/xerces2-j/index.html</url>
- </dependency>
+ </dependency>
<dependency>
<id>xml-resolver</id>
<version>1.1</version>
<url>http://xml.apache.org/dist/commons/</url>
- </dependency>
+ </dependency>
</dependencies>
</project>
-
1.13 +24 -78 maven-plugins/sdocbook/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 1 Jan 2005 23:30:09 -0000 1.12
+++ changes.xml 8 Jan 2005 22:41:02 -0000 1.13
@@ -1,96 +1,42 @@
-<document>
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
<properties>
<title>Changes</title>
<author email="sie...@it...">Siegfried Goeschl</author>
<author email="per...@us...">Per Olesen</author>
</properties>
-
<body>
-
- <release version="1.4.1-SNAPSHOT" date="in CVS">
- <action dev="carlossg" type="add">
- Added **/*.jpg, **/*.css to maven.sdocbook.resources.include
- </action>
- <action dev="carlossg" type="fix">
- Don't flatten resources when copying.
- </action>
- <action dev="carlossg" type="add">
- Added maven.sdocbook.files property.
- </action>
- <action dev="carlossg" type="fix">
- Stylesheet version used may have not been already downloaded.
- </action>
+ <release version="1.4.1" date="2005-01-08">
+ <action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action>
+ <action dev="carlossg" type="fix">Don't flatten resources when copying.</action>
+ <action dev="carlossg" type="add">Added maven.sdocbook.files property.</action>
+ <action dev="carlossg" type="fix">Stylesheet version used may have not been already downloaded.</action>
</release>
<release version="1.4" date="2004-12-31">
- <action dev="carlossg" type="add">
- Added properties maven.sdocbook.html.xsl and maven.sdocbook.fo.xsl.
- </action>
- <action dev="carlossg" type="add">
- Allow using new stylesheet versions as dependencies in POM.
- </action>
- <action dev="carlossg" type="add">
- Added documentation to use custom stylesheets.
- </action>
- <action dev="carlossg" type="fix">
- Fail on transformation errors.
- </action>
- <action dev="perolesen" type="update">
- Update of documentation to include description of the new properties,
- how to set stylesheet parameters, how to update to use newer stylesheets etc.
- </action>
- <action dev="perolesen" type="add">
- The docbook DTDs are huge and take time to resolve externally.
- Added the EntityResolver from xml-commons and added properties to be
- able to use it.
- </action>
- <action dev="perolesen" type="add">
- Added the xalan25 extensions jar from stylesheet distribution to be able
- to use the stylesheet extensions.
- </action>
- <action dev="perolesen" type="add">
- Added possibility to set the stylesheet params.
- </action>
- <action dev="perolesen" type="add">
- Added copying of external resources like images, which the target output
- references externally (e.g. a HTML output which includes a IMG tag).
- </action>
+ <action dev="carlossg" type="add">Added properties maven.sdocbook.html.xsl and maven.sdocbook.fo.xsl.</action>
+ <action dev="carlossg" type="add">Allow using new stylesheet versions as dependencies in POM.</action>
+ <action dev="carlossg" type="add">Added documentation to use custom stylesheets.</action>
+ <action dev="carlossg" type="fix">Fail on transformation errors.</action>
+ <action dev="perolesen" type="update">Update of documentation to include description of the new properties, how to set stylesheet parameters, how to update to use newer stylesheets etc.</action>
+ <action dev="perolesen" type="add">The docbook DTDs are huge and take time to resolve externally. Added the EntityResolver from xml-commons and added properties to be able to use it.</action>
+ <action dev="perolesen" type="add">Added the xalan25 extensions jar from stylesheet distribution to be able to use the stylesheet extensions.</action>
+ <action dev="perolesen" type="add">Added possibility to set the stylesheet params.</action>
+ <action dev="perolesen" type="add">Added copying of external resources like images, which the target output references externally (e.g. a HTML output which includes a IMG tag).</action>
</release>
-
<release version="1.3" date="2003-10-17">
- <action dev="wdsgoe" type="add">
- Added on more example files
- </action>
- <action dev="wdsgoe" type="add">
- Check if the source directory exists and quit if not
- </action>
- <action dev="wdsgoe" type="fix">
- Andy Jefferson fixed a few flaws in the project.xml
- </action>
+ <action dev="wdsgoe" type="add">Added on more example files</action>
+ <action dev="wdsgoe" type="add">Check if the source directory exists and quit if not</action>
+ <action dev="wdsgoe" type="fix">Andy Jefferson fixed a few flaws in the project.xml</action>
</release>
-
<release version="1.2" date="2003-08-26">
- <action dev="wdsgoe" type="update">
- Updated to newer JARs
- </action>
- <action dev="wdsgoe" type="update">
- Update to use version 1.61.3 of Open DocBook
- </action>
- <action dev="wdsgoe" type="fix">
- Pulling in all the XML related stuff in the Java boot classpath
- to get it working with JDK 1,4
- </action>
- <action dev="wdsgoe" type="update">
- Updated documentation
- </action>
+ <action dev="wdsgoe" type="update">Updated to newer JARs</action>
+ <action dev="wdsgoe" type="update">Update to use version 1.61.3 of Open DocBook</action>
+ <action dev="wdsgoe" type="fix">Pulling in all the XML related stuff in the Java boot classpath to get it working with JDK 1,4</action>
+ <action dev="wdsgoe" type="update">Updated documentation</action>
</release>
-
<release version="1.1" date="2003-08-19">
- <action dev="wdsgoe" type="update">
- Migrate from Maven B7 to Maven B10
- </action>
+ <action dev="wdsgoe" type="update">Migrate from Maven B7 to Maven B10</action>
</release>
-
</body>
-
</document>
|
|
From: Carlos S. <car...@us...> - 2005-01-08 22:07:53
|
carlossg 05/01/08 14:07:47
Modified: sdocbook plugin.jelly
Log:
Fixed scanner
Revision Changes Path
1.16 +2 -2 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 8 Jan 2005 19:24:05 -0000 1.15
+++ plugin.jelly 8 Jan 2005 22:07:46 -0000 1.16
@@ -241,7 +241,7 @@
<include name="**/*.xml, **/*.sgml"/>
</fileset>
</copy>
- <fileScanner var="scanner">
+ <fileScanner var="generatedScanner">
<fileset dir="${maven.sdocbook.generated}">
<util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize>
<j:forEach var="file" items="${files}">
@@ -250,7 +250,7 @@
</fileset>
</fileScanner>
- <j:forEach var="file" items="${scanner.iterator()}">
+ <j:forEach var="file" items="${generatedScanner.iterator()}">
<attainGoal name="sdocbook:transform"/>
|
|
From: Carlos S. <car...@us...> - 2005-01-08 21:44:04
|
carlossg 05/01/08 13:43:57
Modified: sdocbook/xdocs goals.xml
Log:
Revision Changes Path
1.4 +4 -1 maven-plugins/sdocbook/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/goals.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goals.xml 8 Jan 2005 19:24:06 -0000 1.3
+++ goals.xml 8 Jan 2005 21:43:55 -0000 1.4
@@ -27,7 +27,10 @@
<tr>
<td>sdocbook:generate-htmlchunk</td>
<td>Generate HTML documentation for the given docbook,
- splitted in one html file per section</td>
+ splitted in one html file per section.
+ Note that this goal may override other docbook generated files,
+ e.g. index.html.
+ </td>
</tr>
<tr>
<td>sdocbook:generate-fo</td>
|
|
From: Carlos S. <car...@us...> - 2005-01-08 19:24:12
|
carlossg 05/01/08 11:24:06
Modified: sdocbook plugin.jelly plugin.properties
sdocbook/xdocs goals.xml
Log:
Added generate-htmlchunk
Revision Changes Path
1.15 +123 -86 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 5 Jan 2005 22:08:13 -0000 1.14
+++ plugin.jelly 8 Jan 2005 19:24:05 -0000 1.15
@@ -18,7 +18,7 @@
<goal name="sdocbook"
description="Create HTML and PDF generated from DOCBOOK"
- prereqs="sdocbook:info,sdocbook:generate-html,sdocbook:generate-pdf">
+ prereqs="sdocbook:info,sdocbook:generate-html,sdocbook:generate-htmlchunk,sdocbook:generate-pdf">
</goal>
<!-- ================================================================== -->
@@ -31,11 +31,12 @@
<j:set var="maven.sdocbook.stylesheets.version"
value="${sdocbookPlugin.getDependency('docbook:docbook-xsl').version}"/>
- <!-- get docbook stylesheets and unzip them if needed -->
+ <!-- get docbook stylesheets from project -->
<j:set var="docbookZipPath" value="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
- <j:if test="${docbookZipPath == null}">
- <echo>Using default stylesheets</echo>
- <j:set var="docbookZipPath" value="${maven.sdocbook.stylesheets.zip}"></j:set>
+ <!-- if there's a docbook dependency in project use it -->
+ <j:if test="${docbookZipPath != null}">
+ <echo>Using custom stylesheets</echo>
+ <j:set var="maven.sdocbook.stylesheets.zip" value="${docbookZipPath}"/>
<j:set var="maven.sdocbook.stylesheets.version" value="${pom.getDependency('docbook:docbook-xsl').version}"/>
</j:if>
@@ -51,6 +52,17 @@
<j:set var="maven.sdocbook.fo.xsl" value="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"/>
</j:if>
+ <!-- determine if entity-resolver is requested -->
+ <j:set var="useEntityResolver" value="${maven.sdocbook.use.entityresolver}" />
+ <j:if test="${useEntityResolver == 'true'}">
+ <j:set var="catalogManagerPropertiesFile" value="${maven.sdocbook.catalogmanager.properties}" />
+ <j:if test="${empty(catalogManagerPropertiesFile)}">
+ <fail message="property 'maven.sdocbook.catalogmanager.properties' required when using 'maven.sdocbook.use.entityresolver==true'" />
+ </j:if>
+ <dirname property="catalogManagerPropertiesDir" file="${maven.sdocbook.catalogmanager.properties}" />
+ <j:set var="catalogManagerPropertiesDir" value="${catalogManagerPropertiesDir}" />
+ </j:if>
+
</goal>
<!-- ================================================================== -->
@@ -82,7 +94,7 @@
<!-- P R E P A R E F I L E S Y S T E M -->
<!-- ================================================================== -->
- <goal name="sdocbook:prepare-filesystem">
+ <goal name="sdocbook:prepare-filesystem" prereqs="sdocbook:init">
<attainGoal name="xdoc:init"/>
@@ -107,44 +119,20 @@
<j:if test="${!unzipped}">
<!-- unzip docbook files -->
<ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.."
- src="${docbookZipPath}"/>
+ src="${maven.sdocbook.stylesheets.zip}"/>
</j:if>
</goal>
<!-- ================================================================== -->
- <!-- G E N E R A T E H T M L -->
+ <!-- T R A N S F O R M W I T H X S L T -->
<!-- ================================================================== -->
- <goal
- name="sdocbook:generate-html"
- prereqs="sdocbook:prepare-filesystem"
- description="Generate HTML for all docbooks in ${maven.sdocbook.src.dir}">
-
- <!-- create target directory for generated HTML -->
- <mkdir dir="${maven.sdocbook.generated.html}"/>
-
- <!-- determine if entity-resolver is requested -->
- <j:set var="useEntityResolver" value="${maven.sdocbook.use.entityresolver}" />
- <j:if test="${useEntityResolver == 'true'}">
- <j:set var="catalogManagerPropertiesFile" value="${maven.sdocbook.catalogmanager.properties}" />
- <j:if test="${empty(catalogManagerPropertiesFile)}">
- <fail message="property 'maven.sdocbook.catalogmanager.properties' required when using 'maven.sdocbook.use.entityresolver==true'" />
- </j:if>
- <dirname property="catalogManagerPropertiesDir" file="${maven.sdocbook.catalogmanager.properties}" />
- <j:set var="catalogManagerPropertiesDir" value="${catalogManagerPropertiesDir}" />
- </j:if>
-
- <j:forEach var="file" items="${scanner.iterator()}">
+ <goal name="sdocbook:transform">
- <echo>Processing ${file.absolutePath}</echo>
-
- <!-- strip the extension from the file name -->
- <j:set var="index" value="${file.name.lastIndexOf('.')}"/>
- <j:set var="basename" value="${file.name.substring(0,index)}"/>
+ <echo>Transforming ${file.absolutePath}</echo>
- <!-- Use XSLT processor to transform DOCBOOK into HTML -->
- <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="true">
+ <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="true" dir="${maven.sdocbook.generated}">
<jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/>
<classpath>
<pathelement location="${plugin.getDependencyPath('avalon-framework')}"/>
@@ -152,32 +140,65 @@
<pathelement location="${plugin.getDependencyPath('fop')}"/>
<pathelement location="${plugin.getDependencyPath('jimi')}"/>
<pathelement location="${plugin.getDependencyPath('logkit')}"/>
-
<!-- this is required for extensions to work with xalan -->
<pathelement location="${maven.sdocbook.stylesheets.dir}/extensions/xalan25.jar"/>
<j:if test="${useEntityResolver == 'true'}">
<pathelement location="${plugin.getDependencyPath('xml-resolver')}"/>
- <pathelement location="${catalogManagerPropertiesDir}"/> <!-- includes the users CatalogManager.properties in classpath -->
+ <!-- includes the users CatalogManager.properties in classpath -->
+ <pathelement location="${catalogManagerPropertiesDir}"/>
</j:if>
</classpath>
+
<sysproperty key="user.language" value="en"/>
<sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
+
<j:if test="${useEntityResolver == 'true'}">
<arg value="-ENTITYRESOLVER"/>
<arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
<arg value="-URIRESOLVER"/>
<arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
</j:if>
+
<arg value="-in"/>
<arg value="${file.absolutePath}"/>
- <arg value="-out"/>
- <arg value="${maven.sdocbook.generated.html}/${basename}.html"/>
+ <j:if test="${context.getVariable('maven.sdocbook.out') != null}">
+ <arg value="-out"/>
+ <arg value="${maven.sdocbook.out}"/>
+ </j:if>
<arg value="-xsl"/>
- <arg value="${maven.sdocbook.html.xsl}"/>
- <arg line="${maven.sdocbook.html.params}"/>
+ <arg value="${maven.sdocbook.xsl}"/>
+
+ <arg line="${maven.sdocbook.params}"/>
</java>
+
+ </goal>
+
+
+ <!-- ================================================================== -->
+ <!-- G E N E R A T E H T M L -->
+ <!-- ================================================================== -->
+
+ <goal
+ name="sdocbook:generate-html"
+ prereqs="sdocbook:prepare-filesystem"
+ description="Generate HTML for docbooks specified">
+
+ <!-- create target directory for generated HTML -->
+ <mkdir dir="${maven.sdocbook.generated.html}"/>
+
+ <j:set var="maven.sdocbook.xsl" value="${maven.sdocbook.html.xsl}"/>
+ <j:set var="maven.sdocbook.params" value="${maven.sdocbook.html.params}"/>
+ <j:set var="maven.sdocbook.generated" value="${maven.sdocbook.generated.html}"/>
+
+ <j:forEach var="file" items="${scanner.iterator()}">
+
+ <!-- strip the extension from the file name -->
+ <j:set var="index" value="${file.name.lastIndexOf('.')}"/>
+ <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${file.name.substring(0,index)}.html"/>
+
+ <attainGoal name="sdocbook:transform"/>
</j:forEach>
@@ -198,67 +219,83 @@
</goal>
<!-- ================================================================== -->
+ <!-- G E N E R A T E H T M L C H U N K -->
+ <!-- ================================================================== -->
+
+ <goal
+ name="sdocbook:generate-htmlchunk"
+ prereqs="sdocbook:prepare-filesystem"
+ description="Generate HTML chunk for docbooks specified">
+
+ <!-- create target directory for generated HTML -->
+ <mkdir dir="${maven.sdocbook.generated.html}"/>
+
+ <j:set var="maven.sdocbook.xsl" value="${maven.sdocbook.htmlchunk.xsl}"/>
+ <j:set var="maven.sdocbook.params" value="${maven.sdocbook.html.params}"/>
+ <j:set var="maven.sdocbook.generated" value="${maven.sdocbook.generated.html}"/>
+ <j:set var="maven.sdocbook.out" value="${null}"/>
+
+ <!-- copy source docbook files to dest -->
+ <copy todir="${maven.sdocbook.generated}" filtering="no">
+ <fileset dir="${maven.sdocbook.src.dir}">
+ <include name="**/*.xml, **/*.sgml"/>
+ </fileset>
+ </copy>
+ <fileScanner var="scanner">
+ <fileset dir="${maven.sdocbook.generated}">
+ <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize>
+ <j:forEach var="file" items="${files}">
+ <include name="${file}"/>
+ </j:forEach>
+ </fileset>
+ </fileScanner>
+
+ <j:forEach var="file" items="${scanner.iterator()}">
+
+ <attainGoal name="sdocbook:transform"/>
+
+ </j:forEach>
+
+ <!-- copy it to our documentation folder -->
+ <copy todir="${maven.sdocbook.target.dir}" filtering="no">
+ <fileset dir="${maven.sdocbook.generated.html}">
+ <include name="**/*.html"/>
+ </fileset>
+ </copy>
+
+ <!-- copy resources which html might reference too -->
+ <j:set var="resources" value="${maven.sdocbook.resources.include}" />
+ <j:if test="${!empty(resources)}">
+ <copy todir="${maven.sdocbook.target.dir}" filtering="no" flatten="false">
+ <fileset dir="${maven.sdocbook.src.dir}" includes="${resources}"/>
+ </copy>
+ </j:if>
+
+ </goal>
+
+ <!-- ================================================================== -->
<!-- G E N E R A T E F O -->
<!-- ================================================================== -->
<goal
name="sdocbook:generate-fo"
prereqs="sdocbook:prepare-filesystem"
- description="Generate FO for all docbooks in ${maven.sdocbook.src.dir}">
+ description="Generate FO for docbooks specified">
<!-- create target directory for generated FO -->
<mkdir dir="${maven.sdocbook.generated.fo}"/>
- <!-- determine if entity-resolver is requested -->
- <j:set var="useEntityResolver" value="${maven.sdocbook.use.entityresolver}" />
- <j:if test="${useEntityResolver == 'true'}">
- <j:set var="catalogManagerPropertiesFile" value="${maven.sdocbook.catalogmanager.properties}" />
- <j:if test="${empty(catalogManagerPropertiesFile)}">
- <fail message="property 'maven.sdocbook.catalogmanager.properties' required when using 'maven.sdocbook.use.entityresolver==true'" />
- </j:if>
- <dirname property="catalogManagerPropertiesDir" file="${maven.sdocbook.catalogmanager.properties}" />
- <j:set var="catalogManagerPropertiesDir" value="${catalogManagerPropertiesDir}" />
- </j:if>
+ <j:set var="maven.sdocbook.xsl" value="${maven.sdocbook.fo.xsl}"/>
+ <j:set var="maven.sdocbook.params" value="${maven.sdocbook.fo.params}"/>
+ <j:set var="maven.sdocbook.generated" value="${maven.sdocbook.generated.fo}"/>
<j:forEach var="file" items="${scanner.iterator()}">
- <echo>Processing ${file.absolutePath}</echo>
-
<!-- strip the extension from the file name -->
<j:set var="index" value="${file.name.lastIndexOf('.')}"/>
- <j:set var="basename" value="${file.name.substring(0,index)}"/>
-
- <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="true">
- <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/>
- <classpath>
- <pathelement location="${maven.sdocbook.stylesheets.dir}/extensions/xalan25.jar"/>
+ <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${file.name.substring(0,index)}.fo"/>
- <j:if test="${useEntityResolver == 'true'}">
- <pathelement location="${plugin.getDependencyPath('xml-resolver')}"/>
- <pathelement location="${catalogManagerPropertiesDir}"/> <!-- includes the users CatalogManager.properties in classpath -->
- </j:if>
- </classpath>
-
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
- <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
-
- <j:if test="${useEntityResolver == 'true'}">
- <arg value="-ENTITYRESOLVER"/>
- <arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
- <arg value="-URIRESOLVER"/>
- <arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
- </j:if>
- <arg value="-in"/>
- <arg value="${file.absolutePath}"/>
- <arg value="-out"/>
- <arg value="${maven.sdocbook.generated.fo}/${basename}.fo"/>
- <arg value="-xsl"/>
- <arg value="${maven.sdocbook.fo.xsl}"/>
-
- <arg line="${maven.sdocbook.fo.params}"/>
- </java>
-
+ <attainGoal name="sdocbook:transform"/>
</j:forEach>
1.10 +10 -7 maven-plugins/sdocbook/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 5 Jan 2005 21:47:43 -0000 1.9
+++ plugin.properties 8 Jan 2005 19:24:05 -0000 1.10
@@ -4,17 +4,17 @@
maven.sdocbook.src.dir = ${basedir}/sdocbook
-maven.sdocbook.dest.dir = ${maven.build.dir}/generated-docbooks
-maven.sdocbook.generated.html = ${maven.sdocbook.dest.dir}/html
-maven.sdocbook.generated.fo = ${maven.sdocbook.dest.dir}/fo
-maven.sdocbook.generated.pdf = ${maven.sdocbook.dest.dir}/pdf
+maven.sdocbook.generated.dir = ${maven.build.dir}/generated-docbooks
+maven.sdocbook.generated.html = ${maven.sdocbook.generated.dir}/html
+maven.sdocbook.generated.fo = ${maven.sdocbook.generated.dir}/fo
+maven.sdocbook.generated.pdf = ${maven.sdocbook.generated.dir}/pdf
maven.sdocbook.target.dir = ${maven.build.dir}/docs/docbook
# version got from project POM or plugin POM
#maven.sdocbook.stylesheets.version =
# the root dir of the stylesheet to use (defaults to version in plugin POM)
-#maven.sdocbook.stylesheets.dir = ${plugin.dir}/plugin-resources/docbook-xsl-${maven.sdocbook.stylesheets.version}
+maven.sdocbook.stylesheets.dir = ${plugin.dir}/plugin-resources/docbook-xsl-${maven.sdocbook.stylesheets.version}
# default stylesheets zip path
maven.sdocbook.stylesheets.zip = ${maven.repo.local}/docbook/zips/docbook-xsl-${maven.sdocbook.stylesheets.version}.zip
@@ -22,13 +22,16 @@
maven.sdocbook.resources.include = **/*.png, **/*.gif, **/*.jpg, **/*.css
# stylesheet to use for html transformation
-#maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl
+maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl
# can be set to the "-param ..." which user can use to parameterize the html stylesheets
maven.sdocbook.html.params =
+# stylesheet to use for html chunk transformation
+maven.sdocbook.htmlchunk.xsl = ${maven.sdocbook.stylesheets.dir}/html/chunk.xsl
+
# stylesheet to use for fo transformation
-#maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl
+maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl
# can be set to the "-param ..." which user can use to parameterize the fo stylesheets
maven.sdocbook.fo.params =
1.3 +7 -2 maven-plugins/sdocbook/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/goals.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- goals.xml 12 Apr 2004 09:40:16 -0000 1.2
+++ goals.xml 8 Jan 2005 19:24:06 -0000 1.3
@@ -23,11 +23,16 @@
<tr>
<td>sdocbook:generate-html</td>
<td>Generate HTML documentation for the given docbook</td>
- </tr>
+ </tr>
+ <tr>
+ <td>sdocbook:generate-htmlchunk</td>
+ <td>Generate HTML documentation for the given docbook,
+ splitted in one html file per section</td>
+ </tr>
<tr>
<td>sdocbook:generate-fo</td>
<td>Generate FO for the given docbook</td>
- </tr>
+ </tr>
<tr>
<td>sdocbook:generate-pdf</td>
<td>Generate PDF for the given FO file </td>
|
|
From: Carlos S. <car...@us...> - 2005-01-05 22:14:59
|
carlossg 05/01/05 14:14:53
Added: sdocbook maven.xml
Removed: sdocbook/xdocs/docbook 4SuiteCVS.pdf HelloWorldArticle.pdf
HelloWorldArticle.html 4SuiteCVS.html sdocbook.pdf
sdocbook.html emacsandxml.html LoaderDocbook.pdf
LoaderDocbook.html emacsandxml.pdf
Log:
Generate sample docbooks
Revision Changes Path
1.5 +5 -84 maven-plugins/sdocbook/maven.xml
|
|
From: Carlos S. <car...@us...> - 2005-01-05 22:08:20
|
carlossg 05/01/05 14:08:13
Modified: sdocbook plugin.jelly
Log:
Fixed maven.sdocbook.stylesheets.version
Revision Changes Path
1.14 +1 -1 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 5 Jan 2005 21:51:27 -0000 1.13
+++ plugin.jelly 5 Jan 2005 22:08:13 -0000 1.14
@@ -29,7 +29,7 @@
<maven:get plugin="maven-sdocbook-plugin" property="plugin" var="sdocbookPlugin" />
<j:set var="maven.sdocbook.stylesheets.version"
- value="${sdocbookPlugin.pom.getDependency('docbook:docbook-xsl').version}"/>
+ value="${sdocbookPlugin.getDependency('docbook:docbook-xsl').version}"/>
<!-- get docbook stylesheets and unzip them if needed -->
<j:set var="docbookZipPath" value="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
|
|
From: Carlos S. <car...@us...> - 2005-01-05 21:51:34
|
carlossg 05/01/05 13:51:28
Modified: sdocbook plugin.jelly
Log:
Reordered goals
Revision Changes Path
1.13 +34 -34 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 5 Jan 2005 21:47:43 -0000 1.12
+++ plugin.jelly 5 Jan 2005 21:51:27 -0000 1.13
@@ -22,40 +22,6 @@
</goal>
<!-- ================================================================== -->
- <!-- P R E P A R E F I L E S Y S T E M -->
- <!-- ================================================================== -->
-
- <goal name="sdocbook:prepare-filesystem">
-
- <attainGoal name="xdoc:init"/>
-
- <!-- create target directory for generated documentation -->
- <mkdir dir="${maven.sdocbook.target.dir}"/>
-
- <!-- get source docbook files -->
- <fileScanner var="scanner">
- <fileset dir="${maven.sdocbook.src.dir}">
- <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize>
- <j:forEach var="file" items="${files}">
- <include name="${file}"/>
- </j:forEach>
- </fileset>
- </fileScanner>
-
- <j:set var="unzipped" value="false" />
- <util:available file="${maven.sdocbook.stylesheets.dir}">
- <j:set var="unzipped" value="true" />
- <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo>
- </util:available>
- <j:if test="${!unzipped}">
- <!-- unzip docbook files -->
- <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.."
- src="${docbookZipPath}"/>
- </j:if>
-
- </goal>
-
- <!-- ================================================================== -->
<!-- I N I T -->
<!-- ================================================================== -->
@@ -113,6 +79,40 @@
</goal>
<!-- ================================================================== -->
+ <!-- P R E P A R E F I L E S Y S T E M -->
+ <!-- ================================================================== -->
+
+ <goal name="sdocbook:prepare-filesystem">
+
+ <attainGoal name="xdoc:init"/>
+
+ <!-- create target directory for generated documentation -->
+ <mkdir dir="${maven.sdocbook.target.dir}"/>
+
+ <!-- get source docbook files -->
+ <fileScanner var="scanner">
+ <fileset dir="${maven.sdocbook.src.dir}">
+ <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize>
+ <j:forEach var="file" items="${files}">
+ <include name="${file}"/>
+ </j:forEach>
+ </fileset>
+ </fileScanner>
+
+ <j:set var="unzipped" value="false" />
+ <util:available file="${maven.sdocbook.stylesheets.dir}">
+ <j:set var="unzipped" value="true" />
+ <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo>
+ </util:available>
+ <j:if test="${!unzipped}">
+ <!-- unzip docbook files -->
+ <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.."
+ src="${docbookZipPath}"/>
+ </j:if>
+
+ </goal>
+
+ <!-- ================================================================== -->
<!-- G E N E R A T E H T M L -->
<!-- ================================================================== -->
|
|
From: Carlos S. <car...@us...> - 2005-01-05 21:47:50
|
carlossg 05/01/05 13:47:43
Modified: sdocbook plugin.jelly plugin.properties
Log:
Added goal sdocbook:init
Revision Changes Path
1.12 +35 -15 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 1 Jan 2005 23:59:21 -0000 1.11
+++ plugin.jelly 5 Jan 2005 21:47:43 -0000 1.12
@@ -3,7 +3,8 @@
<project
xmlns:j="jelly:core"
xmlns:util="jelly:util"
- xmlns:ant="jelly:ant">
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
<!-- Determine path seperator for the platform -->
<j:set var="_sep" value="${path.separator}"/>
@@ -25,7 +26,7 @@
<!-- ================================================================== -->
<goal name="sdocbook:prepare-filesystem">
-
+
<attainGoal name="xdoc:init"/>
<!-- create target directory for generated documentation -->
@@ -41,6 +42,29 @@
</fileset>
</fileScanner>
+ <j:set var="unzipped" value="false" />
+ <util:available file="${maven.sdocbook.stylesheets.dir}">
+ <j:set var="unzipped" value="true" />
+ <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo>
+ </util:available>
+ <j:if test="${!unzipped}">
+ <!-- unzip docbook files -->
+ <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.."
+ src="${docbookZipPath}"/>
+ </j:if>
+
+ </goal>
+
+ <!-- ================================================================== -->
+ <!-- I N I T -->
+ <!-- ================================================================== -->
+
+ <goal name="sdocbook:init">
+
+ <maven:get plugin="maven-sdocbook-plugin" property="plugin" var="sdocbookPlugin" />
+ <j:set var="maven.sdocbook.stylesheets.version"
+ value="${sdocbookPlugin.pom.getDependency('docbook:docbook-xsl').version}"/>
+
<!-- get docbook stylesheets and unzip them if needed -->
<j:set var="docbookZipPath" value="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
<j:if test="${docbookZipPath == null}">
@@ -53,25 +77,21 @@
<j:set var="maven.sdocbook.stylesheets.dir" value="${plugin.dir}/plugin-resources/docbook-xsl-${maven.sdocbook.stylesheets.version}"/>
</j:if>
- <j:set var="unzipped" value="false" />
- <util:available file="${maven.sdocbook.stylesheets.dir}">
- <j:set var="unzipped" value="true" />
- <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo>
- </util:available>
- <j:if test="${!unzipped}">
- <!-- unzip docbook files -->
- <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.."
- src="${docbookZipPath}"/>
+ <j:if test="${context.getVariable('maven.sdocbook.html.xsl') == null}">
+ <j:set var="maven.sdocbook.html.xsl" value="${maven.sdocbook.stylesheets.dir}/html/docbook.xsl"/>
+ </j:if>
+
+ <j:if test="${context.getVariable('maven.sdocbook.fo.xsl') == null}">
+ <j:set var="maven.sdocbook.fo.xsl" value="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"/>
</j:if>
-
- </goal>
+ </goal>
+
<!-- ================================================================== -->
<!-- I N F O -->
<!-- ================================================================== -->
- <goal
- name="sdocbook:info">
+ <goal name="sdocbook:info" prereqs="sdocbook:init">
<echo>PathSeperator = ${_sep}</echo>
<echo>bootclasspath = ${_bootclasspath}</echo>
1.9 +8 -7 maven-plugins/sdocbook/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 1 Jan 2005 23:30:09 -0000 1.8
+++ plugin.properties 5 Jan 2005 21:47:43 -0000 1.9
@@ -4,14 +4,15 @@
maven.sdocbook.src.dir = ${basedir}/sdocbook
-maven.sdocbook.generated.html = ${maven.build.dir}/generated-docbooks/html
-maven.sdocbook.generated.fo = ${maven.build.dir}/generated-docbooks/fo
-maven.sdocbook.generated.pdf = ${maven.build.dir}/generated-docbooks/pdf
+maven.sdocbook.dest.dir = ${maven.build.dir}/generated-docbooks
+maven.sdocbook.generated.html = ${maven.sdocbook.dest.dir}/html
+maven.sdocbook.generated.fo = ${maven.sdocbook.dest.dir}/fo
+maven.sdocbook.generated.pdf = ${maven.sdocbook.dest.dir}/pdf
maven.sdocbook.target.dir = ${maven.build.dir}/docs/docbook
-# version should be the same as in the plugin POM
-maven.sdocbook.stylesheets.version = 1.67.2
+# version got from project POM or plugin POM
+#maven.sdocbook.stylesheets.version =
# the root dir of the stylesheet to use (defaults to version in plugin POM)
#maven.sdocbook.stylesheets.dir = ${plugin.dir}/plugin-resources/docbook-xsl-${maven.sdocbook.stylesheets.version}
# default stylesheets zip path
@@ -21,13 +22,13 @@
maven.sdocbook.resources.include = **/*.png, **/*.gif, **/*.jpg, **/*.css
# stylesheet to use for html transformation
-maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl
+#maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl
# can be set to the "-param ..." which user can use to parameterize the html stylesheets
maven.sdocbook.html.params =
# stylesheet to use for fo transformation
-maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl
+#maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl
# can be set to the "-param ..." which user can use to parameterize the fo stylesheets
maven.sdocbook.fo.params =
|
|
From: Carlos S. <car...@us...> - 2005-01-01 23:59:29
|
carlossg 05/01/01 15:59:22
Modified: sdocbook plugin.jelly
Log:
Fixed typo
Revision Changes Path
1.11 +1 -1 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 1 Jan 2005 20:54:37 -0000 1.10
+++ plugin.jelly 1 Jan 2005 23:59:21 -0000 1.11
@@ -186,7 +186,7 @@
prereqs="sdocbook:prepare-filesystem"
description="Generate FO for all docbooks in ${maven.sdocbook.src.dir}">
- <!-- create target directory for generated HTML -->
+ <!-- create target directory for generated FO -->
<mkdir dir="${maven.sdocbook.generated.fo}"/>
<!-- determine if entity-resolver is requested -->
|
|
From: Carlos S. <car...@us...> - 2005-01-01 23:42:41
|
carlossg 05/01/01 15:42:34 Modified: sdocbook project.properties Log: Remove uneeded properties Revision Changes Path 1.3 +0 -8 maven-plugins/sdocbook/project.properties <<Binary file>> |
|
From: Carlos S. <car...@us...> - 2005-01-01 23:39:41
|
carlossg 05/01/01 15:39:32
Modified: sdocbook/xdocs users-guide.xml
Log:
Changed xsl version
Revision Changes Path
1.7 +1 -1 maven-plugins/sdocbook/xdocs/users-guide.xml
Index: users-guide.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/users-guide.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- users-guide.xml 29 Dec 2004 22:32:05 -0000 1.6
+++ users-guide.xml 1 Jan 2005 23:39:31 -0000 1.7
@@ -51,7 +51,7 @@
<dependency>
<groupId>docbook</groupId>
<artifactId>docbook-xsl</artifactId>
- <version>1.66.1</version>
+ <version>1.67.2</version>
<url>http://docbook.sourceforge.net</url>
<type>zip</type>
</dependency>
|
|
From: Carlos S. <car...@us...> - 2005-01-01 23:38:21
|
carlossg 05/01/01 15:38:13
Modified: sdocbook/xdocs navigation.xml
Log:
Removed DTD to fit in page
Revision Changes Path
1.7 +0 -1 maven-plugins/sdocbook/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 1 Jan 2005 23:37:10 -0000 1.6
+++ navigation.xml 1 Jan 2005 23:38:13 -0000 1.7
@@ -8,7 +8,6 @@
<links>
<item name="DocBook XML" href="http://www.docbook.org/xml/" />
- <item name="DocBook XML DTD" href="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" />
<item name="DocBook XSL Stylesheets" href="http://docbook.sourceforge.net/" />
<item name="DocBook: The Definitive Guide" href="http://docbook.org/tdg/en/" />
<item name="DocBook Wiki" href="http://wiki.docbook.org/topic/" />
|
|
From: Carlos S. <car...@us...> - 2005-01-01 23:37:22
|
carlossg 05/01/01 15:37:11
Modified: sdocbook/xdocs navigation.xml
Log:
Fixed urls
Revision Changes Path
1.6 +2 -2 maven-plugins/sdocbook/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 12 Apr 2004 15:06:22 -0000 1.5
+++ navigation.xml 1 Jan 2005 23:37:10 -0000 1.6
@@ -8,10 +8,10 @@
<links>
<item name="DocBook XML" href="http://www.docbook.org/xml/" />
- <item name="DocBook XML DTD" href="http://www.docbook.org/xml/4.3/docbookx.dtd" />
+ <item name="DocBook XML DTD" href="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" />
<item name="DocBook XSL Stylesheets" href="http://docbook.sourceforge.net/" />
<item name="DocBook: The Definitive Guide" href="http://docbook.org/tdg/en/" />
- <item name="DocBook Wiki" href="http://docbook.org/wiki/" />
+ <item name="DocBook Wiki" href="http://wiki.docbook.org/topic/" />
</links>
<menu name="Overview">
|
5 messages has been excluded from this view by a project administrator.
