jpaxjc-svn Mailing List for JPA-XJC
Brought to you by:
chanscte,
schulte2005
You can subscribe to this list here.
2010 |
Jan
|
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(18) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2011 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
From: <sch...@us...> - 2011-09-30 18:01:15
|
Revision: 112 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=112&view=rev Author: schulte2005 Date: 2011-09-30 18:01:09 +0000 (Fri, 30 Sep 2011) Log Message: ----------- o Synchronized 'svn:ignore' property. Modified Paths: -------------- trunk/.gitignore Modified: trunk/.gitignore =================================================================== --- trunk/.gitignore 2011-09-30 18:00:22 UTC (rev 111) +++ trunk/.gitignore 2011-09-30 18:01:09 UTC (rev 112) @@ -2,3 +2,6 @@ /jpa-xjc-plugin.iml /jpa-xjc-plugin.ipr /jpa-xjc-plugin.iws +/.settings +/.classpath +/.project This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-09-30 18:00:28
|
Revision: 111 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=111&view=rev Author: schulte2005 Date: 2011-09-30 18:00:22 +0000 (Fri, 30 Sep 2011) Log Message: ----------- o Updated 'svn:ignore' property. Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target jpa-xjc-plugin.iml jpa-xjc-plugin.ipr jpa-xjc-plugin.iws + target jpa-xjc-plugin.iml jpa-xjc-plugin.ipr jpa-xjc-plugin.iws .settings .classpath .project This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-09-30 17:49:09
|
Revision: 110 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=110&view=rev Author: schulte2005 Date: 2011-09-30 17:49:03 +0000 (Fri, 30 Sep 2011) Log Message: ----------- o Synchronized 'svn:ignore' property. Modified Paths: -------------- trunk/.gitignore Modified: trunk/.gitignore =================================================================== --- trunk/.gitignore 2011-09-30 17:48:11 UTC (rev 109) +++ trunk/.gitignore 2011-09-30 17:49:03 UTC (rev 110) @@ -1 +1,4 @@ /target +/jpa-xjc-plugin.iml +/jpa-xjc-plugin.ipr +/jpa-xjc-plugin.iws This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-09-30 17:48:17
|
Revision: 109 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=109&view=rev Author: schulte2005 Date: 2011-09-30 17:48:11 +0000 (Fri, 30 Sep 2011) Log Message: ----------- o Updated 'svn:ignore' property. Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target jpa-xjc-plugin.iml jpa-xjc-plugin.ipr jpa-xjc-plugin.iws This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-09-30 17:25:40
|
Revision: 108 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=108&view=rev Author: schulte2005 Date: 2011-09-30 17:25:34 +0000 (Fri, 30 Sep 2011) Log Message: ----------- o Synchronized 'svn:ignore' property. Added Paths: ----------- trunk/.gitignore Added: trunk/.gitignore =================================================================== --- trunk/.gitignore (rev 0) +++ trunk/.gitignore 2011-09-30 17:25:34 UTC (rev 108) @@ -0,0 +1 @@ +/target Property changes on: trunk/.gitignore ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-09-17 14:31:21
|
Revision: 107 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=107&view=rev Author: schulte2005 Date: 2011-09-17 14:31:14 +0000 (Sat, 17 Sep 2011) Log Message: ----------- o Updated 'svn:mime-type' property. Property Changed: ---------------- trunk/pom.xml trunk/src/main/assembly/bin.xml trunk/src/main/books/jpa-xjc.xml trunk/src/main/changes/changes.xml trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html trunk/src/main/jaxb/orm_1_0.xjb trunk/src/main/jaxb/orm_1_0.xsd trunk/src/main/jaxb/persistence_1_0.xjb trunk/src/main/jaxb/persistence_1_0.xsd trunk/src/site/site.xml Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/assembly/bin.xml ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/books/jpa-xjc.xml ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/changes/changes.xml ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/x-java Property changes on: trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/html Property changes on: trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/html Property changes on: trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/html Property changes on: trunk/src/main/jaxb/orm_1_0.xjb ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/jaxb/orm_1_0.xsd ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/jaxb/persistence_1_0.xjb ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/main/jaxb/persistence_1_0.xsd ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml Property changes on: trunk/src/site/site.xml ___________________________________________________________________ Modified: svn:mime-type - text/plain + text/xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-04-22 22:44:53
|
Revision: 106 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=106&view=rev Author: schulte2005 Date: 2011-04-22 22:44:46 +0000 (Fri, 22 Apr 2011) Log Message: ----------- o s/* Redistributions/o Redistributions/g Modified Paths: -------------- trunk/LICENSE.txt trunk/pom.xml trunk/src/main/assembly/bin.xml trunk/src/main/books/jpa-xjc.xml trunk/src/main/changes/changes.xml trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html trunk/src/main/jaxb/orm_1_0.xjb trunk/src/main/jaxb/persistence_1_0.xjb trunk/src/site/apt/download.apt trunk/src/site/apt/examples.apt trunk/src/site/apt/index.apt trunk/src/site/apt/license-info.apt trunk/src/site/site.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/LICENSE.txt 2011-04-22 22:44:46 UTC (rev 106) @@ -4,10 +4,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/pom.xml 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/assembly/bin.xml 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/books/jpa-xjc.xml =================================================================== --- trunk/src/main/books/jpa-xjc.xml 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/books/jpa-xjc.xml 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/changes/changes.xml =================================================================== --- trunk/src/main/changes/changes.xml 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/changes/changes.xml 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html =================================================================== --- trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/orm/package.html 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html =================================================================== --- trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/javadoc/net/sourceforge/jpaxjc/ns/persistence/package.html 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html =================================================================== --- trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/javadoc/net/sourceforge/jpaxjc/package.html 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/jaxb/orm_1_0.xjb =================================================================== --- trunk/src/main/jaxb/orm_1_0.xjb 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/jaxb/orm_1_0.xjb 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/main/jaxb/persistence_1_0.xjb =================================================================== --- trunk/src/main/jaxb/persistence_1_0.xjb 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/main/jaxb/persistence_1_0.xjb 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/site/apt/download.apt =================================================================== --- trunk/src/site/apt/download.apt 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/site/apt/download.apt 2011-04-22 22:44:46 UTC (rev 106) @@ -13,10 +13,10 @@ ~~ modification, are permitted provided that the following conditions ~~ are met: ~~ -~~ * Redistributions of source code must retain the above copyright +~~ o Redistributions of source code must retain the above copyright ~~ notice, this list of conditions and the following disclaimer. ~~ -~~ * Redistributions in binary form must reproduce the above copyright +~~ o Redistributions in binary form must reproduce the above copyright ~~ notice, this list of conditions and the following disclaimer in ~~ the documentation and/or other materials provided with the ~~ distribution. Modified: trunk/src/site/apt/examples.apt =================================================================== --- trunk/src/site/apt/examples.apt 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/site/apt/examples.apt 2011-04-22 22:44:46 UTC (rev 106) @@ -13,10 +13,10 @@ ~~ modification, are permitted provided that the following conditions ~~ are met: ~~ -~~ * Redistributions of source code must retain the above copyright +~~ o Redistributions of source code must retain the above copyright ~~ notice, this list of conditions and the following disclaimer. ~~ -~~ * Redistributions in binary form must reproduce the above copyright +~~ o Redistributions in binary form must reproduce the above copyright ~~ notice, this list of conditions and the following disclaimer in ~~ the documentation and/or other materials provided with the ~~ distribution. Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/site/apt/index.apt 2011-04-22 22:44:46 UTC (rev 106) @@ -13,10 +13,10 @@ ~~ modification, are permitted provided that the following conditions ~~ are met: ~~ -~~ * Redistributions of source code must retain the above copyright +~~ o Redistributions of source code must retain the above copyright ~~ notice, this list of conditions and the following disclaimer. ~~ -~~ * Redistributions in binary form must reproduce the above copyright +~~ o Redistributions in binary form must reproduce the above copyright ~~ notice, this list of conditions and the following disclaimer in ~~ the documentation and/or other materials provided with the ~~ distribution. Modified: trunk/src/site/apt/license-info.apt =================================================================== --- trunk/src/site/apt/license-info.apt 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/site/apt/license-info.apt 2011-04-22 22:44:46 UTC (rev 106) @@ -13,10 +13,10 @@ ~~ modification, are permitted provided that the following conditions ~~ are met: ~~ -~~ * Redistributions of source code must retain the above copyright +~~ o Redistributions of source code must retain the above copyright ~~ notice, this list of conditions and the following disclaimer. ~~ -~~ * Redistributions in binary form must reproduce the above copyright +~~ o Redistributions in binary form must reproduce the above copyright ~~ notice, this list of conditions and the following disclaimer in ~~ the documentation and/or other materials provided with the ~~ distribution. @@ -46,10 +46,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2011-04-22 22:42:22 UTC (rev 105) +++ trunk/src/site/site.xml 2011-04-22 22:44:46 UTC (rev 106) @@ -7,10 +7,10 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + o Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright + o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-04-22 22:42:28
|
Revision: 105 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=105&view=rev Author: schulte2005 Date: 2011-04-22 22:42:22 +0000 (Fri, 22 Apr 2011) Log Message: ----------- o Plugin updates. Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 20:46:45 UTC (rev 104) +++ trunk/pom.xml 2011-04-22 22:42:22 UTC (rev 105) @@ -49,6 +49,7 @@ <name>The JPA-XJC Project Copyright</name> <url>http://jpaxjc.sourceforge.net/LICENSE.txt</url> <distribution>repo</distribution> + <comments>Simplified BSD License.</comments> </license> </licenses> <developers> @@ -124,7 +125,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -137,12 +138,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> + <configuration> + <validate>true</validate> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> + <version>2.5</version> <configuration> <delimiters> <delimiter>${*}</delimiter> @@ -154,7 +158,7 @@ <plugin> <artifactId>buildnumber-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> - <version>1.0-beta-4</version> + <version>1.0</version> <executions> <execution> <id>create-buildnumber</id> @@ -175,7 +179,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> + <version>2.1</version> <configuration> <lineLength>120</lineLength> <tagBase>https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags</tagBase> @@ -202,7 +206,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.6</version> + <version>2.8.1</version> <configuration> <forkMode>once</forkMode> </configuration> @@ -230,7 +234,7 @@ <dependency> <groupId>net.sourceforge.ccxjc</groupId> <artifactId>cc-xjc-plugin</artifactId> - <version>1.3</version> + <version>1.5</version> </dependency> </dependencies> <executions> @@ -252,7 +256,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> + <version>2.2.1</version> <executions> <execution> <id>bin</id> @@ -297,8 +301,26 @@ <doctitle>${project.name} ${project.version}</doctitle> <windowtitle>${project.name} ${project.version}</windowtitle> <detectJavaApiLink>true</detectJavaApiLink> + <javaApiLinks> + <property> + <name>api_1.3</name> + <value>http://download.oracle.com/javase/1.3/docs/api/</value> + </property> + <property> + <name>api_1.4</name> + <value>http://download.oracle.com/javase/1.4.2/docs/api/</value> + </property> + <property> + <name>api_1.5</name> + <value>http://download.oracle.com/javase/1.5.0/docs/api/</value> + </property> + <property> + <name>api_1.6</name> + <value>http://download.oracle.com/javase/6/docs/api/</value> + </property> + </javaApiLinks> <detectOfflineLinks>false</detectOfflineLinks> - <!-- <detectLinks>true</detectLinks> Disabled due to http://jira.codehaus.org/browse/MJAVADOC-273 --> + <detectLinks>true</detectLinks> <archive> <index>true</index> <addMavenDescriptor>false</addMavenDescriptor> @@ -313,7 +335,7 @@ <plugin> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-maven-plugin</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> <executions> <execution> <phase>generate-resources</phase> @@ -339,12 +361,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> + <version>1.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.1</version> + <version>1.2</version> </plugin> <plugin> <artifactId>build-helper-maven-plugin</artifactId> @@ -388,9 +410,9 @@ <goal>run</goal> </goals> <configuration> - <tasks> + <target> <copy file="${project.build.directory}/generated-site/xhtml/jpa-xjc/jpa-xjc.xhtml" tofile="${project.build.outputDirectory}/META-INF/README.html" /> - </tasks> + </target> </configuration> </execution> </executions> @@ -411,21 +433,21 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.2</version> - <!-- version>2.3</version Upgrade breaks changes report due to http://jira.codehaus.org/browse/MCHANGES-190 --> - <configuration> - <issueLinkTemplatePerSystem> - <MantisBT>http://apps.sourceforge.net/mantisbt/jpaxjc/view.php?id=%ISSUE%</MantisBT> - </issueLinkTemplatePerSystem> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - <xmlPath>src/main/changes/changes.xml</xmlPath> - </configuration> + <version>2.4</version> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + <configuration> + <issueLinkTemplatePerSystem> + <MantisBT>http://apps.sourceforge.net/mantisbt/jpaxjc/view.php?id=%ISSUE%</MantisBT> + </issueLinkTemplatePerSystem> + <xmlPath>src/main/changes/changes.xml</xmlPath> + <escapeHTML>false</escapeHTML> + </configuration> + </reportSet> + </reportSets> </plugin> </plugins> </reporting> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 20:46:51
|
Revision: 104 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=104&view=rev Author: schulte2005 Date: 2010-08-18 20:46:45 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 20:46:37 UTC (rev 103) +++ trunk/pom.xml 2010-08-18 20:46:45 UTC (rev 104) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.2</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.2</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.2</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 20:46:43
|
Revision: 103 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=103&view=rev Author: schulte2005 Date: 2010-08-18 20:46:37 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] copy for tag jpa-xjc-plugin-1.0.2 Added Paths: ----------- tags/jpa-xjc-plugin-1.0.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 20:46:23
|
Revision: 102 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=102&view=rev Author: schulte2005 Date: 2010-08-18 20:46:17 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare release jpa-xjc-plugin-1.0.2 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 20:44:45 UTC (rev 101) +++ trunk/pom.xml 2010-08-18 20:46:17 UTC (rev 102) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.2</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.2</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.2</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 20:44:52
|
Revision: 101 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=101&view=rev Author: schulte2005 Date: 2010-08-18 20:44:45 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Added handling of attribute wildcard properties. Modified Paths: -------------- trunk/src/main/changes/changes.xml trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_de.properties trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_en.properties trunk/src/site/apt/index.apt Modified: trunk/src/main/changes/changes.xml =================================================================== --- trunk/src/main/changes/changes.xml 2010-08-18 10:23:00 UTC (rev 100) +++ trunk/src/main/changes/changes.xml 2010-08-18 20:44:45 UTC (rev 101) @@ -83,5 +83,10 @@ <action dev="schulte2005" type="fix"><![CDATA[Added an @XmlTransient annotation to generated JPA properties.]]> </action> </release> + <!-- *********************************************************************************************************** --> + <release version="1.0.2" date="2010-08-19"> + <action dev="schulte2005" type="fix"><![CDATA[Added handling of attribute wildcard properties.]]> + </action> + </release> </body> </document> Modified: trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java =================================================================== --- trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 10:23:00 UTC (rev 100) +++ trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 20:44:45 UTC (rev 101) @@ -334,8 +334,6 @@ this.addMandatoryAttributes( orm, e.getAttributes(), this.getClassOutline( model, e.getClazz() ) ); } - this.annotate( model, orm ); - final Persistence p = new Persistence(); final Persistence.PersistenceUnit u = new Persistence.PersistenceUnit(); u.setName( this.persistenceUnitName ); @@ -344,37 +342,33 @@ this.customizePersistenceUnit( model.getModel().getCustomizations(), u ); - for ( Iterator<Entity> it = orm.getEntity().iterator(); it.hasNext(); ) + for ( Entity e : orm.getEntity() ) { - final Entity e = it.next(); if ( !u.getClazz().contains( e.getClazz() ) ) { u.getClazz().add( e.getClazz() ); } - - it.remove(); } - for ( Iterator<Embeddable> it = orm.getEmbeddable().iterator(); it.hasNext(); ) + for ( Embeddable e : orm.getEmbeddable() ) { - final Embeddable e = it.next(); if ( !u.getClazz().contains( e.getClazz() ) ) { u.getClazz().add( e.getClazz() ); } - - it.remove(); } - for ( Iterator<MappedSuperclass> it = orm.getMappedSuperclass().iterator(); it.hasNext(); ) + for ( MappedSuperclass m : orm.getMappedSuperclass() ) { - final MappedSuperclass e = it.next(); - if ( !u.getClazz().contains( e.getClazz() ) ) + if ( !u.getClazz().contains( m.getClazz() ) ) { - u.getClazz().add( e.getClazz() ); + u.getClazz().add( m.getClazz() ); } - - it.remove(); } + this.annotate( model, orm ); + orm.getEmbeddable().clear(); + orm.getEntity().clear(); + orm.getMappedSuperclass().clear(); + final SchemaFactory schemaFactory = SchemaFactory.newInstance( XMLConstants.W3C_XML_SCHEMA_NS_URI ); final Schema persistenceSchema = schemaFactory.newSchema( this.getClass().getResource( PERSISTENCE_SCHEMA_CLASSPATH_LOCATION ) ); @@ -411,7 +405,10 @@ || orm.getSchema() != null || !orm.getSequenceGenerator().isEmpty() || !orm.getSqlResultSetMapping().isEmpty() - || !orm.getTableGenerator().isEmpty() ) + || !orm.getTableGenerator().isEmpty() + || !orm.getEmbeddable().isEmpty() + || !orm.getEntity().isEmpty() + || !orm.getMappedSuperclass().isEmpty() ) { final File ormFile = new File( metaInf, this.persistenceUnitName + ".xml" ); this.log( Level.INFO, "writing", ormFile.getAbsolutePath() ); @@ -530,6 +527,10 @@ private void toEntity( final Outline outline, final ClassOutline c, final Entity entity ) throws JAXBException { + if ( entity.getAccess() == null ) + { + entity.setAccess( AccessType.PROPERTY ); + } if ( entity.getClazz() == null ) { entity.setClazz( c.implClass.binaryName() ); @@ -551,10 +552,7 @@ entity.setAttributes( new Attributes() ); } - for ( FieldOutline f : c.getDeclaredFields() ) - { - this.toAttributes( outline, f, entity.getAttributes() ); - } + this.toAttributes( outline, c, entity.getAttributes() ); this.customizeEntity( c.target.getCustomizations(), entity ); } @@ -575,10 +573,7 @@ embeddable.setAttributes( new EmbeddableAttributes() ); } - for ( FieldOutline f : c.getDeclaredFields() ) - { - this.toEmbeddableAttributes( f, embeddable.getAttributes() ); - } + this.toEmbeddableAttributes( c, embeddable.getAttributes() ); this.customizeEmbeddable( c.target.getCustomizations(), embeddable ); } @@ -589,7 +584,7 @@ { if ( mappedSuperclass.getAccess() == null ) { - mappedSuperclass.setAccess( AccessType.FIELD ); + mappedSuperclass.setAccess( AccessType.PROPERTY ); } if ( mappedSuperclass.getClazz() == null ) { @@ -600,262 +595,283 @@ mappedSuperclass.setAttributes( new Attributes() ); } - for ( FieldOutline f : c.getDeclaredFields() ) - { - this.toAttributes( outline, f, mappedSuperclass.getAttributes() ); - } + this.toAttributes( outline, c, mappedSuperclass.getAttributes() ); this.customizeMappedSuperclass( c.target.getCustomizations(), mappedSuperclass ); } - private void toAttributes( final Outline outline, final FieldOutline f, final Attributes attributes ) + private void toAttributes( final Outline outline, final ClassOutline c, final Attributes attributes ) throws JAXBException { - boolean mapped = false; + if ( c.target.declaresAttributeWildcard() ) + { + final Transient t = new Transient(); + t.setName( "otherAttributes" ); + attributes.getTransient().add( t ); - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "id" ) != null ) + this.log( Level.WARNING, "cannotMapProperty", "OtherAttributes", c.implClass.binaryName() ); + } + + for ( FieldOutline f : c.getDeclaredFields() ) { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "id" ); - final Id id = JAXB.unmarshal( new DOMSource( pc.element ), Id.class ); + boolean mapped = false; - if ( id.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "id" ) != null ) { - id.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "id" ); + final Id id = JAXB.unmarshal( new DOMSource( pc.element ), Id.class ); - attributes.getId().add( id ); - mapped = true; + if ( id.getName() == null ) + { + id.setName( f.getPropertyInfo().getName( false ) ); + } - final Column defaultColumn = - this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), id.getColumn() ); + attributes.getId().add( id ); + mapped = true; - id.setColumn( defaultColumn ); + final Column defaultColumn = + this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), id.getColumn() ); - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + id.setColumn( defaultColumn ); + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ); - final Basic basic = JAXB.unmarshal( new DOMSource( pc.element ), Basic.class ); - - if ( basic.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ) != null ) { - basic.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ); + final Basic basic = JAXB.unmarshal( new DOMSource( pc.element ), Basic.class ); - attributes.getBasic().add( basic ); - mapped = true; + if ( basic.getName() == null ) + { + basic.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); - } + attributes.getBasic().add( basic ); + mapped = true; - final Column defaultColumn = - this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), basic.getColumn() ); + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } - basic.setColumn( defaultColumn ); - } + final Column defaultColumn = + this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), basic.getColumn() ); - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "version" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "version" ); - final Version version = JAXB.unmarshal( new DOMSource( pc.element ), Version.class ); + basic.setColumn( defaultColumn ); + } - if ( version.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "version" ) != null ) { - version.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "version" ); + final Version version = JAXB.unmarshal( new DOMSource( pc.element ), Version.class ); - attributes.getVersion().add( version ); - mapped = true; + if ( version.getName() == null ) + { + version.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); - } + attributes.getVersion().add( version ); + mapped = true; - final Column defaultColumn = - this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), version.getColumn() ); + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } - version.setColumn( defaultColumn ); - } + final Column defaultColumn = + this.applySchemaDefaults( f.getPropertyInfo().getSchemaComponent(), version.getColumn() ); - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-one" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-one" ); - final ManyToOne m = JAXB.unmarshal( new DOMSource( pc.element ), ManyToOne.class ); + version.setColumn( defaultColumn ); + } - if ( m.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-one" ) != null ) { - m.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-one" ); + final ManyToOne m = JAXB.unmarshal( new DOMSource( pc.element ), ManyToOne.class ); - attributes.getManyToOne().add( m ); - mapped = true; + if ( m.getName() == null ) + { + m.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + attributes.getManyToOne().add( m ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-many" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-many" ); - final OneToMany o = JAXB.unmarshal( new DOMSource( pc.element ), OneToMany.class ); - - if ( o.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-many" ) != null ) { - o.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-many" ); + final OneToMany o = JAXB.unmarshal( new DOMSource( pc.element ), OneToMany.class ); - attributes.getOneToMany().add( o ); + if ( o.getName() == null ) + { + o.setName( f.getPropertyInfo().getName( false ) ); + } - this.generateCollectionSetter( f.parent().parent().getCodeModel(), f.parent(), f.getPropertyInfo() ); - mapped = true; + attributes.getOneToMany().add( o ); - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + this.generateCollectionSetter( f.parent().parent().getCodeModel(), f.parent(), f.getPropertyInfo() ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-one" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-one" ); - final OneToOne o = JAXB.unmarshal( new DOMSource( pc.element ), OneToOne.class ); - - if ( o.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-one" ) != null ) { - o.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "one-to-one" ); + final OneToOne o = JAXB.unmarshal( new DOMSource( pc.element ), OneToOne.class ); - attributes.getOneToOne().add( o ); - mapped = true; + if ( o.getName() == null ) + { + o.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + attributes.getOneToOne().add( o ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-many" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-many" ); - final ManyToMany m = JAXB.unmarshal( new DOMSource( pc.element ), ManyToMany.class ); - - if ( m.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-many" ) != null ) { - m.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "many-to-many" ); + final ManyToMany m = JAXB.unmarshal( new DOMSource( pc.element ), ManyToMany.class ); - attributes.getManyToMany().add( m ); + if ( m.getName() == null ) + { + m.setName( f.getPropertyInfo().getName( false ) ); + } - this.generateCollectionSetter( f.parent().parent().getCodeModel(), f.parent(), f.getPropertyInfo() ); - mapped = true; + attributes.getManyToMany().add( m ); - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + this.generateCollectionSetter( f.parent().parent().getCodeModel(), f.parent(), f.getPropertyInfo() ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "embedded" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "embedded" ); - final Embedded e = JAXB.unmarshal( new DOMSource( pc.element ), Embedded.class ); - - if ( e.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "embedded" ) != null ) { - e.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "embedded" ); + final Embedded e = JAXB.unmarshal( new DOMSource( pc.element ), Embedded.class ); - attributes.getEmbedded().add( e ); - mapped = true; + if ( e.getName() == null ) + { + e.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + attributes.getEmbedded().add( e ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ); - final Transient t = JAXB.unmarshal( new DOMSource( pc.element ), Transient.class ); + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ) != null ) + { + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ); + final Transient t = JAXB.unmarshal( new DOMSource( pc.element ), Transient.class ); - if ( t.getName() == null ) - { - t.setName( f.getPropertyInfo().getName( false ) ); + if ( t.getName() == null ) + { + t.setName( f.getPropertyInfo().getName( false ) ); + } + + attributes.getTransient().add( t ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - attributes.getTransient().add( t ); - mapped = true; - - if ( !pc.isAcknowledged() ) + if ( !mapped ) { - pc.markAsAcknowledged(); + this.toDefaultAttribute( outline, f, attributes ); } } - - if ( !mapped ) - { - mapped = this.toDefaultAttribute( outline, f, attributes ); - } } - private void toEmbeddableAttributes( final FieldOutline f, final EmbeddableAttributes attributes ) + private void toEmbeddableAttributes( final ClassOutline c, final EmbeddableAttributes attributes ) throws JAXBException { - boolean mapped = false; + if ( c.target.declaresAttributeWildcard() ) + { + final Transient t = new Transient(); + t.setName( "otherAttributes" ); + attributes.getTransient().add( t ); - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ) != null ) + this.log( Level.WARNING, "cannotMapProperty", "OtherAttributes", c.implClass.binaryName() ); + } + + for ( FieldOutline f : c.getDeclaredFields() ) { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ); - final Basic basic = JAXB.unmarshal( new DOMSource( pc.element ), Basic.class ); + boolean mapped = false; - if ( basic.getName() == null ) + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ) != null ) { - basic.setName( f.getPropertyInfo().getName( false ) ); - } + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "basic" ); + final Basic basic = JAXB.unmarshal( new DOMSource( pc.element ), Basic.class ); - attributes.getBasic().add( basic ); - mapped = true; + if ( basic.getName() == null ) + { + basic.setName( f.getPropertyInfo().getName( false ) ); + } - if ( !pc.isAcknowledged() ) - { - pc.markAsAcknowledged(); + attributes.getBasic().add( basic ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - } - if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ) != null ) - { - final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ); - final Transient t = JAXB.unmarshal( new DOMSource( pc.element ), Transient.class ); + if ( f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ) != null ) + { + final CPluginCustomization pc = f.getPropertyInfo().getCustomizations().find( ORM_NS, "transient" ); + final Transient t = JAXB.unmarshal( new DOMSource( pc.element ), Transient.class ); - if ( t.getName() == null ) - { - t.setName( f.getPropertyInfo().getName( false ) ); + if ( t.getName() == null ) + { + t.setName( f.getPropertyInfo().getName( false ) ); + } + + attributes.getTransient().add( t ); + mapped = true; + + if ( !pc.isAcknowledged() ) + { + pc.markAsAcknowledged(); + } } - attributes.getTransient().add( t ); - mapped = true; - - if ( !pc.isAcknowledged() ) + if ( !mapped ) { - pc.markAsAcknowledged(); + this.toDefaultAttribute( f, attributes ); } } - - if ( !mapped ) - { - mapped = this.toDefaultAttribute( f, attributes ); - } } private boolean toDefaultAttribute( final Outline outline, final FieldOutline f, final Attributes a ) Modified: trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_de.properties =================================================================== --- trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_de.properties 2010-08-18 10:23:00 UTC (rev 100) +++ trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_de.properties 2010-08-18 20:44:45 UTC (rev 101) @@ -1,9 +1,9 @@ #$Id$ title=JPA-XJC Version ${project.version} Build ${buildNumber} -cannotMapProperty=Eigenschaft ''{0}'' der Klasse ''{1}'' kann nicht automatisch abgebildet werden. Anpassung mittels externer Abbildungsdatei n\u00F6tig. Transient-Markierung angeh\u00E4ngt. +cannotMapProperty=Eigenschaft ''{0}'' der Klasse ''{1}'' kann nicht automatisch abgebildet werden. Anpassung mittels externer Abbildungsdatei n\u00f6tig. Transient-Markierung angeh\u00e4ngt. writing=Schreibt ''{0}''. usage=JPA-XJC: aktiviert die JPA Generierung (-jpa <unit-name> <unit-root> [-persistenceSystemId <persistence system id>] [-ormSystemId <orm system id>]). usageUnitName=JPA-XJC: <unit-name> Name der Persistenz-Einheit. -usageUnitRoot=JPA-XJC: <unit-root>Name des Wurzel-Verzeichnisses der Persistenz-Einheit. +usageUnitRoot=JPA-XJC: <unit-root> Name des Wurzel-Verzeichnisses der Persistenz-Einheit. jpaSystemId=JPA-XJC: <persistence system id> System-Id des JPA Schemas (Standard: ''{0}''). ormSystemId=JPA-XJC: <orm system id> System-Id des JPA ORM Schemas (Standard: ''{0}''). Modified: trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_en.properties =================================================================== --- trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_en.properties 2010-08-18 10:23:00 UTC (rev 100) +++ trunk/src/main/resources/net/sourceforge/jpaxjc/PluginImpl_en.properties 2010-08-18 20:44:45 UTC (rev 101) @@ -2,7 +2,7 @@ title=JPA-XJC Version ${project.version} Build ${buildNumber} cannotMapProperty=Cannot map property ''{0}'' of class ''{1}''. Consider using a customization. Marking transient. writing=Writing ''{0}''. -usage=JPA-XJC: enables JPA generation (-jpa <unit-name> <unit-root> [-persistenceSystemId <persistence system id>] [-ormSystemId <orm system id>]). +usage=JPA-XJC: enables JPA generation (-jpa <unit-name> <unit-root> [-persistenceSystemId <persistence system id>] [-ormSystemId <orm system id>]). usageUnitName=JPA-XJC: <unit-name> Name of the persistence unit. usageUnitRoot=JPA-XJC: <unit-root> Name of the persistence unit root directory. jpaSystemId=JPA-XJC: <persistence system id> System id of the JPA schema (Default: ''{0}''). Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-08-18 10:23:00 UTC (rev 100) +++ trunk/src/site/apt/index.apt 2010-08-18 20:44:45 UTC (rev 101) @@ -47,20 +47,20 @@ the XJC classpath. When enabled, the following options can be used to control the behavior of the plugin. - * -jpa <unit-name> <unit-root> +** -jpa <unit-name> <unit-root> The '-jpa' option itself takes two mandatory arguments. The '<unit-name>' argument specifies the name of the persistence unit and the '<unit-root>' argument specifies the name of the persistence unit root directory. - * -persistenceSystemId (since 1.0-beta-6) +** -persistenceSystemId <system-id> (since 1.0-beta-6) The optional '-persistenceSystemId' option can be used to specify a system id to use in the 'schemaLocation' attribute of generated persistence unit XML documents. Default: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd - * -ormSystemId (since 1.0-beta-6) +** -ormSystemId <system-id> (since 1.0-beta-6) The optional '-ormSystemId' option can be used to specify a system id to use in the 'schemaLocation' attribute of generated orm XML documents. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:23:06
|
Revision: 100 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=100&view=rev Author: schulte2005 Date: 2010-08-18 10:23:00 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 10:22:52 UTC (rev 99) +++ trunk/pom.xml 2010-08-18 10:23:00 UTC (rev 100) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.1</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:22:58
|
Revision: 99 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=99&view=rev Author: schulte2005 Date: 2010-08-18 10:22:52 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] copy for tag jpa-xjc-plugin-1.0.1 Added Paths: ----------- tags/jpa-xjc-plugin-1.0.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:22:38
|
Revision: 98 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=98&view=rev Author: schulte2005 Date: 2010-08-18 10:22:32 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare release jpa-xjc-plugin-1.0.1 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 10:20:52 UTC (rev 97) +++ trunk/pom.xml 2010-08-18 10:22:32 UTC (rev 98) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.1</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:20:58
|
Revision: 97 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=97&view=rev Author: schulte2005 Date: 2010-08-18 10:20:52 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Added an @XmlTransient annotation to generated JPA temporal properties. Modified Paths: -------------- trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java Modified: trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java =================================================================== --- trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 10:14:31 UTC (rev 96) +++ trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 10:20:52 UTC (rev 97) @@ -1796,6 +1796,8 @@ final JFieldVar field = f.parent().implClass.field( JMod.PROTECTED, f.parent().parent().getCodeModel().ref( "java.util.Calendar" ), "jpa" + f.getPropertyInfo().getName( true ) ); + field.annotate( XmlTransient.class ); + final JMethod getter = f.parent().implClass.method( JMod.PUBLIC, f.parent().parent().getCodeModel().ref( Calendar.class ), "getJpa" + f.getPropertyInfo().getName( true ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:14:37
|
Revision: 96 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=96&view=rev Author: schulte2005 Date: 2010-08-18 10:14:31 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] rollback the release of jpa-xjc-plugin-1.0.1 Removed Paths: ------------- tags/jpa-xjc-plugin-1.0.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:13:29
|
Revision: 95 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=95&view=rev Author: schulte2005 Date: 2010-08-18 10:13:23 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] rollback the release of jpa-xjc-plugin-1.0.1 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 10:02:45 UTC (rev 94) +++ trunk/pom.xml 2010-08-18 10:13:23 UTC (rev 95) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:02:51
|
Revision: 94 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=94&view=rev Author: schulte2005 Date: 2010-08-18 10:02:45 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 10:02:37 UTC (rev 93) +++ trunk/pom.xml 2010-08-18 10:02:45 UTC (rev 94) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.1</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:02:43
|
Revision: 93 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=93&view=rev Author: schulte2005 Date: 2010-08-18 10:02:37 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] copy for tag jpa-xjc-plugin-1.0.1 Added Paths: ----------- tags/jpa-xjc-plugin-1.0.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 10:02:24
|
Revision: 92 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=92&view=rev Author: schulte2005 Date: 2010-08-18 10:02:18 +0000 (Wed, 18 Aug 2010) Log Message: ----------- [maven-release-plugin] prepare release jpa-xjc-plugin-1.0.1 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 09:59:25 UTC (rev 91) +++ trunk/pom.xml 2010-08-18 10:02:18 UTC (rev 92) @@ -36,7 +36,7 @@ <artifactId>jpa-xjc-plugin</artifactId> <packaging>jar</packaging> <name>JPA-XJC</name> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> <description>JAXB 2.1 Schema to Java compiler plugin for annotating schema derived classes with Java persistence annotations.</description> <url>http://jpaxjc.sourceforge.net</url> <inceptionYear>2009</inceptionYear> @@ -85,9 +85,9 @@ </mailingList> </mailingLists> <scm> - <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</connection> - <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/trunk</developerConnection> - <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/trunk</url> + <connection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</connection> + <developerConnection>scm:svn:https://jpaxjc.svn.sourceforge.net/svnroot/jpaxjc/tags/jpa-xjc-plugin-1.0.1</developerConnection> + <url>http://jpaxjc.svn.sourceforge.net/viewvc/jpaxjc/tags/jpa-xjc-plugin-1.0.1</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 09:59:31
|
Revision: 91 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=91&view=rev Author: schulte2005 Date: 2010-08-18 09:59:25 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Added release 1.0.1. Modified Paths: -------------- trunk/src/main/changes/changes.xml Modified: trunk/src/main/changes/changes.xml =================================================================== --- trunk/src/main/changes/changes.xml 2010-08-18 09:56:48 UTC (rev 90) +++ trunk/src/main/changes/changes.xml 2010-08-18 09:59:25 UTC (rev 91) @@ -78,5 +78,10 @@ group id and prepared for synching to the central Maven repository. </action> </release> + <!-- *********************************************************************************************************** --> + <release version="1.0.1" date="2010-08-18"> + <action dev="schulte2005" type="fix"><![CDATA[Added an @XmlTransient annotation to generated JPA properties.]]> + </action> + </release> </body> </document> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 09:56:54
|
Revision: 90 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=90&view=rev Author: schulte2005 Date: 2010-08-18 09:56:48 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Added an @XmlTransient annotation to generated JPA properties. Modified Paths: -------------- trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java Modified: trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java =================================================================== --- trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 09:27:49 UTC (rev 89) +++ trunk/src/main/java/net/sourceforge/jpaxjc/PluginImpl.java 2010-08-18 09:56:48 UTC (rev 90) @@ -138,6 +138,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; +import javax.xml.bind.annotation.XmlTransient; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -1748,13 +1749,15 @@ // -- // Code generation methods. // -- - private void generateProperty( final String name, final Class type, final ClassOutline c ) + private void generateProperty( final String name, final Class<?> type, final ClassOutline c ) { final char[] chars = name.toCharArray(); chars[0] = Character.toUpperCase( chars[0] ); final String publicName = String.valueOf( chars ); final String getterName = ( type == Boolean.TYPE || type == Boolean.class ? "is" : "get" ) + publicName; final JFieldVar field = c.implClass.field( JMod.PROTECTED, type, name ); + field.annotate( XmlTransient.class ); + final JMethod getter = c.implClass.method( JMod.PUBLIC, type, getterName ); getter.body().directStatement( "// " + getMessage( "title" ) ); getter.body()._return( field ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 09:27:55
|
Revision: 89 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=89&view=rev Author: schulte2005 Date: 2010-08-18 09:27:49 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Dependency updates. Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 09:27:26 UTC (rev 88) +++ trunk/pom.xml 2010-08-18 09:27:49 UTC (rev 89) @@ -439,13 +439,13 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.1.12</version> + <version>2.1.13</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>2.1.12</version> + <version>2.1.13</version> <scope>provided</scope> </dependency> <dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-08-18 09:27:32
|
Revision: 88 http://jpaxjc.svn.sourceforge.net/jpaxjc/?rev=88&view=rev Author: schulte2005 Date: 2010-08-18 09:27:26 +0000 (Wed, 18 Aug 2010) Log Message: ----------- o Plugin updates. Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-18 09:18:38 UTC (rev 87) +++ trunk/pom.xml 2010-08-18 09:27:26 UTC (rev 88) @@ -124,7 +124,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.1</version> + <version>2.3.1</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -142,7 +142,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.2</version> + <version>2.4.3</version> <configuration> <delimiters> <delimiter>${*}</delimiter> @@ -186,7 +186,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> <configuration> <archive> <index>true</index> @@ -202,7 +202,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> <configuration> <forkMode>once</forkMode> </configuration> @@ -210,7 +210,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.4</version> + <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -220,7 +220,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -230,7 +230,7 @@ <dependency> <groupId>net.sourceforge.ccxjc</groupId> <artifactId>cc-xjc-plugin</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> </dependencies> <executions> @@ -271,7 +271,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> + <version>2.1.2</version> <configuration> <archive> <index>true</index> @@ -287,7 +287,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> + <version>2.7</version> <configuration> <breakiterator>true</breakiterator> <keywords>true</keywords> @@ -313,7 +313,7 @@ <plugin> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-maven-plugin</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> <executions> <execution> <phase>generate-resources</phase> @@ -339,12 +339,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.0</version> + <version>1.1</version> </plugin> <plugin> <artifactId>build-helper-maven-plugin</artifactId> @@ -406,7 +406,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1.2</version> + <version>2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -505,7 +505,7 @@ <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |