Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/jaxb plugin.jelly plugin.properties project.xml
|
From: Geoffrey De S. <ge0...@us...> - 2005-09-24 10:10:41
|
ge0ffrey 05/09/24 03:10:29
Modified: jaxb/xdocs changes.xml properties.xml
jaxb plugin.jelly plugin.properties project.xml
Log:
splitting of schema and binding directory
Revision Changes Path
1.3 +10 -0 maven-plugins/jaxb/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jaxb/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 19 Jun 2005 14:10:28 -0000 1.2
+++ changes.xml 24 Sep 2005 10:10:29 -0000 1.3
@@ -6,6 +6,16 @@
</properties>
<body>
+ <release version="1.1.1" date="2003-11-12">
+ <action dev="ge0ffrey" type="update">
+ Added maven.jaxb.schema.src.dir and maven.jaxb.binding.src.dir that default to
+ maven.jaxb.src.dir.
+ </action>
+ <action dev="ge0ffrey" type="update">
+ maven.jaxb.bindings.includes and maven.jaxb.bindings.excludes have been depredicated in
+ favor of maven.jaxb.binding.includes and maven.jaxb.binding.excludes
+ </action>
+ </release>
<release version="1.1.0" date="2005-06-19">
<action dev="ge0ffrey" type="update">
Upgraded to JAXB included in JWSDP 1.5
1.3 +23 -7 maven-plugins/jaxb/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jaxb/xdocs/properties.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- properties.xml 19 Jun 2005 14:10:28 -0000 1.2
+++ properties.xml 24 Sep 2005 10:10:29 -0000 1.3
@@ -18,11 +18,27 @@
<td>maven.jaxb.src.dir</td>
<td>Yes</td>
<td>
- Sets the directory for the XML schemas.
+ Sets the directory for the XML schemas and bindings.
Default value is <code>${maven.src.dir}/jaxb</code>.
</td>
</tr>
<tr>
+ <td>maven.jaxb.schema.src.dir</td>
+ <td>Yes</td>
+ <td>
+ Sets the directory for the XML schemas.
+ Default value is <code>${maven.jaxb.src.dir}</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.jaxb.binding.src.dir</td>
+ <td>Yes</td>
+ <td>
+ Sets the directory for the XML bindings.
+ Default value is <code>${maven.jaxb.src.dir}</code>.
+ </td>
+ </tr>
+ <tr>
<td>maven.jaxb.package</td>
<td>No</td>
<td>
@@ -49,7 +65,7 @@
<td>maven.jaxb.schemas.includes</td>
<td>Yes</td>
<td>
- Sets the XML schemas to include. Paths are relative to <code>maven.jaxb.src.dir</code>.
+ Sets the XML schemas to include. Paths are relative to <code>maven.jaxb.schema.src.dir</code>.
Default value is <code>**/*.xsd</code>.
</td>
</tr>
@@ -57,23 +73,23 @@
<td>maven.jaxb.schemas.excludes</td>
<td>Yes</td>
<td>
- Sets the XML schemas to exclude. Paths are relative to <code>maven.jaxb.src.dir</code>.
+ Sets the XML schemas to exclude. Paths are relative to <code>maven.jaxb.schema.src.dir</code>.
Default value is empty.
</td>
</tr>
<tr>
- <td>maven.jaxb.bindings.includes</td>
+ <td>maven.jaxb.binding.includes</td>
<td>Yes</td>
<td>
- Sets the XML bindings to include. Paths are relative to <code>maven.jaxb.src.dir</code>.
+ Sets the XML bindings to include. Paths are relative to <code>maven.jaxb.binding.src.dir</code>.
Default value is <code>**/*.xjb</code>.
</td>
</tr>
<tr>
- <td>maven.jaxb.bindings.excludes</td>
+ <td>maven.jaxb.binding.excludes</td>
<td>Yes</td>
<td>
- Sets the XML bindings to exclude. Paths are relative to <code>maven.jaxb.src.dir</code>.
+ Sets the XML bindings to exclude. Paths are relative to <code>maven.jaxb.binding.src.dir</code>.
Default value is empty.
</td>
</tr>
1.4 +11 -10 maven-plugins/jaxb/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jaxb/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 28 Aug 2005 17:33:50 -0000 1.3
+++ plugin.jelly 24 Sep 2005 10:10:29 -0000 1.4
@@ -11,23 +11,23 @@
<!-- TODO: use this for src.dir, but smarter for individual schemas -->
<!-- TODO: it seems that if target exists but the flagfile doesn't, it doesn't compile? -->
<ant:uptodate property="maven.jaxb.buildNotRequired" targetfile="${maven.jaxb.build.dir}/.flagfile">
- <ant:srcfiles dir="${maven.jaxb.src.dir}"
+ <ant:srcfiles dir="${maven.jaxb.schema.src.dir}"
includes="${maven.jaxb.schema.includes}"
excludes="${maven.jaxb.schema.excludes}"/>
- <ant:srcfiles dir="${maven.jaxb.src.dir}"
- includes="${maven.jaxb.bindings.includes}"
- excludes="${maven.jaxb.bindings.excludes}"/>
+ <ant:srcfiles dir="${maven.jaxb.binding.src.dir}"
+ includes="${maven.jaxb.binding.includes}"
+ excludes="${maven.jaxb.binding.excludes}"/>
</ant:uptodate>
<j:set var="jaxbBuildNotRequired" value="${maven.jaxb.buildNotRequired}" />
<j:if test="${jaxbBuildNotRequired == null}">
<xjc extension="${maven.jaxb.extension}" package="${maven.jaxb.package}"
target="${maven.jaxb.build.dir}">
- <schema dir="${maven.jaxb.src.dir}"
+ <schema dir="${maven.jaxb.schema.src.dir}"
includes="${maven.jaxb.schema.includes}"
excludes="${maven.jaxb.schema.excludes}"/>
- <binding dir="${maven.jaxb.src.dir}"
- includes="${maven.jaxb.bindings.includes}"
- excludes="${maven.jaxb.bindings.excludes}"/>
+ <binding dir="${maven.jaxb.binding.src.dir}"
+ includes="${maven.jaxb.binding.includes}"
+ excludes="${maven.jaxb.binding.excludes}"/>
<ant:classpath>
<ant:pathelement path="${maven.build.dest}" />
<ant:pathelement path="${maven.dependency.classpath}" />
@@ -44,8 +44,9 @@
<preGoal name="java:compile">
- <util:file var="jaxbSrcDir" name="${maven.jaxb.src.dir}" />
- <j:if test="${jaxbSrcDir.exists()}">
+ <util:file var="jaxbSchemaSrcDir" name="${maven.jaxb.schema.src.dir}" />
+ <util:file var="jaxbBindingSrcDir" name="${maven.jaxb.binding.src.dir}" />
+ <j:if test="${jaxbSchemaSrcDir.exists() or jaxbBindingSrcDir.exists()}">
<attainGoal name="jaxb:generate"/>
</j:if>
</preGoal>
1.3 +5 -0 maven-plugins/jaxb/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jaxb/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 19 Jun 2005 14:10:29 -0000 1.2
+++ plugin.properties 24 Sep 2005 10:10:29 -0000 1.3
@@ -1,4 +1,6 @@
maven.jaxb.src.dir = ${maven.src.dir}/jaxb
+maven.jaxb.schema.src.dir = ${maven.jaxb.src.dir}
+maven.jaxb.binding.src.dir = ${maven.jaxb.src.dir}
maven.jaxb.build.dir = ${maven.build.dir}/jaxb
# TODO as as maven supports maven.compile.resources.set
# Include the following properties
@@ -7,6 +9,9 @@
maven.jaxb.schema.includes = **/*.xsd
maven.jaxb.schema.excludes =
+maven.jaxb.binding.includes = ${maven.jaxb.bindings.includes}
+maven.jaxb.binding.excludes = ${maven.jaxb.bindings.excludes}
+# Depredicated in favor of *.binding.*
maven.jaxb.bindings.includes = **/*.xjb
maven.jaxb.bindings.excludes =
1.8 +1 -1 maven-plugins/jaxb/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jaxb/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 29 Aug 2005 16:52:09 -0000 1.7
+++ project.xml 24 Sep 2005 10:10:29 -0000 1.8
@@ -3,7 +3,7 @@
<extend>${basedir}/../plugin-project.xml</extend>
<id>maven-jaxb-plugin</id>
<name>Maven JAXB Plugin</name>
- <currentVersion>1.1.0</currentVersion>
+ <currentVersion>1.1.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<description>
|
