ccxjc-svn Mailing List for CC-XJC
Brought to you by:
chanscte,
schulte2005
Menu
▾
▴
ccxjc-svn — CC-XJC Commits List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(34) |
Jun
(7) |
Jul
(9) |
Aug
(38) |
Sep
(4) |
Oct
(8) |
Nov
(9) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(1) |
Feb
(7) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(16) |
Oct
(3) |
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sch...@us...> - 2012-03-02 12:08:09
|
Revision: 164
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=164&view=rev
Author: schulte2005
Date: 2012-03-02 12:08:03 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-plugin/pom.xml
trunk/pom.xml
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
+++ trunk/cc-xjc-dist/pom.xml 2012-03-02 12:08:03 UTC (rev 164)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
+++ trunk/cc-xjc-it/pom.xml 2012-03-02 12:08:03 UTC (rev 164)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
+++ trunk/cc-xjc-plugin/pom.xml 2012-03-02 12:08:03 UTC (rev 164)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
+++ trunk/pom.xml 2012-03-02 12:08:03 UTC (rev 164)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.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...> - 2012-03-02 12:07:56
|
Revision: 163
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=163&view=rev
Author: schulte2005
Date: 2012-03-02 12:07:50 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag cc-xjc-2.0.1
Modified Paths:
--------------
tags/cc-xjc-2.0.1/cc-xjc-dist/pom.xml
tags/cc-xjc-2.0.1/cc-xjc-it/pom.xml
tags/cc-xjc-2.0.1/cc-xjc-plugin/pom.xml
tags/cc-xjc-2.0.1/pom.xml
Added Paths:
-----------
tags/cc-xjc-2.0.1/
Modified: tags/cc-xjc-2.0.1/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2012-03-02 12:00:20 UTC (rev 162)
+++ tags/cc-xjc-2.0.1/cc-xjc-dist/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: tags/cc-xjc-2.0.1/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2012-03-02 12:00:20 UTC (rev 162)
+++ tags/cc-xjc-2.0.1/cc-xjc-it/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: tags/cc-xjc-2.0.1/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2012-03-02 12:00:20 UTC (rev 162)
+++ tags/cc-xjc-2.0.1/cc-xjc-plugin/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: tags/cc-xjc-2.0.1/pom.xml
===================================================================
--- trunk/pom.xml 2012-03-02 12:00:20 UTC (rev 162)
+++ tags/cc-xjc-2.0.1/pom.xml 2012-03-02 12:07:50 UTC (rev 163)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.sourceforge.net</url>
<inceptionYear>2009</inceptionYear>
@@ -85,9 +85,9 @@
</mailingList>
</mailingLists>
<scm>
- <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</connection>
- <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</developerConnection>
- <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/trunk</url>
+ <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.0.1</connection>
+ <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.0.1</developerConnection>
+ <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/tags/cc-xjc-2.0.1</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2012-03-02 12:00:31
|
Revision: 162
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=162&view=rev
Author: schulte2005
Date: 2012-03-02 12:00:20 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
o Exception 'java.lang.CloneNotSupportedException' is never thrown in body of corresponding try statement.
Modified Paths:
--------------
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
trunk/pom.xml
trunk/src/main/changes/changes.xml
Modified: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
===================================================================
--- trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java 2012-01-15 19:04:25 UTC (rev 161)
+++ trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java 2012-03-02 12:00:20 UTC (rev 162)
@@ -54,9 +54,16 @@
}
@Override
- public ReferencedClass clone() throws CloneNotSupportedException
+ public ReferencedClass clone()
{
- return (ReferencedClass) super.clone();
+ try
+ {
+ return (ReferencedClass) super.clone();
+ }
+ catch ( final CloneNotSupportedException e )
+ {
+ throw new AssertionError( e );
+ }
}
public void toString( final ToStringBuilder toStringBuilder )
Modified: trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
===================================================================
--- trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2012-01-15 19:04:25 UTC (rev 161)
+++ trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2012-03-02 12:00:20 UTC (rev 162)
@@ -2291,8 +2291,9 @@
ctor.body().directStatement( "// " + WARNING_PREFIX + ": of may be wrong and must be verified." );
}
- if ( clazz.getSuperClass() != null || ( clazz.implClass._extends() != null && !clazz.implClass._extends().
- binaryName().equals( "java.lang.Object" ) ) )
+ if ( clazz.getSuperClass() != null
+ || ( clazz.implClass._extends() != null
+ && !clazz.implClass._extends().binaryName().equals( "java.lang.Object" ) ) )
{
ctor.body().invoke( "super" ).arg( o );
}
@@ -2412,8 +2413,8 @@
private void warnOnReferencedSupertypes( final ClassOutline clazz )
{
- if ( clazz.getSuperClass() == null && ( clazz.implClass._extends() != null && !clazz.implClass._extends().
- binaryName().equals( "java.lang.Object" ) ) )
+ if ( clazz.getSuperClass() == null && clazz.implClass._extends() != null
+ && !clazz.implClass._extends().binaryName().equals( "java.lang.Object" ) )
{
this.log( Level.WARNING, "referencedSupertypeWarning", clazz.implClass.fullName(),
clazz.implClass._extends().binaryName(), WARNING_PREFIX );
@@ -2429,7 +2430,7 @@
private boolean needsWarningOnReferencedSupertypes( final ClassOutline clazz )
{
if ( clazz.getSuperClass() == null && ( clazz.implClass._extends() != null && !clazz.implClass._extends().
- binaryName().equals( "java.lang.Object" ) ) )
+ binaryName().equals( "java.lang.Object" ) ) )
{
return true;
}
@@ -2461,9 +2462,10 @@
cloneMethod.javadoc().addReturn().append( "A deep copy of this object." );
this.contextExceptions.clear();
- if ( clazz.getSuperClass() == null || clazz.getSuperClass().implClass.binaryName().equals( "java.lang.Object" )
- || ( clazz.implClass._extends() != null
- && clazz.implClass._extends().binaryName().equals( "java.lang.Object" ) ) )
+ if ( ( clazz.implClass._extends() != null
+ && clazz.implClass._extends().binaryName().equals( "java.lang.Object" ) )
+ || ( clazz.getSuperClass() != null
+ && clazz.getSuperClass().implClass.binaryName().equals( "java.lang.Object" ) ) )
{
// Cannot check the super classes 'clone' method throwing a 'CloneNotSupportedException'.
this.contextExceptions.add( CloneNotSupportedException.class );
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-01-15 19:04:25 UTC (rev 161)
+++ trunk/pom.xml 2012-03-02 12:00:20 UTC (rev 162)
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<configuration>
<remoteTagging>false</remoteTagging>
<suppressCommitBeforeTag>true</suppressCommitBeforeTag>
@@ -137,7 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.4</version>
<configuration>
<archive>
<index>true</index>
@@ -176,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -197,10 +197,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.8.1</version>
<configuration>
- <bottom><![CDATA[<table border="0" width="100%"><tr><td align="left">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</td><td align="right"><a href="http://sourceforge.net/projects/ccxjc"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=260900&type=10" width="80" height="15" alt="Get CC-XJC at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr></table>]]>
- </bottom>
+ <bottom><![CDATA[<table border="0" width="100%"><tr><td align="left">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</td><td align="right"><a href="http://sourceforge.net/projects/ccxjc"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=260900&type=10" width="80" height="15" alt="Get CC-XJC at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr></table>]]></bottom>
<breakiterator>true</breakiterator>
<keywords>true</keywords>
<linksource>true</linksource>
@@ -254,12 +253,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -289,8 +288,8 @@
<fail>false</fail>
<rules>
<requireMavenVersion>
- <message>This project should be built using Apache Maven 3.0.3 (r1075438; 2011-02-28 18:31:09+0100).</message>
- <version>[3.0.3]</version>
+ <message>This project should be built using Apache Maven 3.0.4 (r1232337; 2012-01-17 09:44:56+0100)</message>
+ <version>[3.0.4]</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -346,7 +345,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb21-plugin</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1</version>
</plugin>
</plugins>
</pluginManagement>
@@ -610,7 +609,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <surefire.version>2.9</surefire.version>
- <wagon.version>1.0</wagon.version>
+ <surefire.version>2.12</surefire.version>
+ <wagon.version>2.2</wagon.version>
</properties>
</project>
Modified: trunk/src/main/changes/changes.xml
===================================================================
--- trunk/src/main/changes/changes.xml 2012-01-15 19:04:25 UTC (rev 161)
+++ trunk/src/main/changes/changes.xml 2012-03-02 12:00:20 UTC (rev 162)
@@ -84,7 +84,7 @@
<!-- *********************************************************************************************************** -->
<release version="1.0-beta-8" date="2009-08-17">
<action dev="schulte2005" type="fix">
- Corrected an 'IllegalArgumentException' thrown by generated 'copyObject' methods.
+ Corrected an 'IllegalArgumentException' thrown by generated 'copyObject' methods.
</action>
<action dev="schulte2005" type="update">
Removed generated 'copyOfQName' methods and added 'QName' to the list of immutable types.
@@ -179,14 +179,20 @@
<release version="1.5" date="2011-03-11" description="Feature enhancements.">
<action dev="schulte2005" type="add">Added option '-cc-string-types'.</action>
<action dev="schulte2005" type="fix" issue="7" system="MantisBT">
- Corrected a 'NullPointerException' thrown with 'javaType' customizations.
+ Corrected a 'NullPointerException' thrown with 'javaType' customizations.
</action>
</release>
<!-- *********************************************************************************************************** -->
<release version="2.0" date="2011-09-16" description="Feature enhancements.">
<action dev="schulte2005" type="fix" issue="8" system="MantisBT">
- Generated 'clone' methods should call 'super.clone()'.
+ Generated 'clone' methods should call 'super.clone()'.
</action>
</release>
+ <!-- *********************************************************************************************************** -->
+ <release version="2.0.1" date="2012-03-02" description="Bugfix release.">
+ <action dev="schulte2005" type="fix" issue="9" system="MantisBT">
+ Exception 'java.lang.CloneNotSupportedException' is never thrown in body of corresponding try statement.
+ </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...> - 2012-01-15 19:04:32
|
Revision: 161
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=161&view=rev
Author: schulte2005
Date: 2012-01-15 19:04:25 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
o Rollback of release '2.1'.
Removed Paths:
-------------
tags/cc-xjc-2.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-11-09 14:01:43
|
Revision: 160
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=160&view=rev
Author: schulte2005
Date: 2011-11-09 14:01:32 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
o Reverted 159:153.
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-plugin/pom.xml
trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties
trunk/pom.xml
trunk/src/main/changes/changes.xml
trunk/src/site/apt/index.apt
Property Changed:
----------------
trunk/cc-xjc-dist/src/main/assembly/
trunk/cc-xjc-plugin/src/main/java/
trunk/cc-xjc-plugin/src/main/javadoc/
trunk/cc-xjc-plugin/src/main/resources/
trunk/src/main/books/cc-xjc.xml
trunk/src/site/apt/examples.apt
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-dist/pom.xml 2011-11-09 14:01:32 UTC (rev 160)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Property changes on: trunk/cc-xjc-dist/src/main/assembly
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-it/pom.xml 2011-11-09 14:01:32 UTC (rev 160)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-plugin/pom.xml 2011-11-09 14:01:32 UTC (rev 160)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Property changes on: trunk/cc-xjc-plugin/src/main/java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
===================================================================
--- trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-11-09 14:01:32 UTC (rev 160)
@@ -147,10 +147,6 @@
private static final String STRING_TYPES_OPTION_NAME = "-cc-string-types";
- private static final String DEPRECATED_CTOR_OPTION_NAME = "-cc-deprecated";
-
- private static final String SKIPPED_CTOR_OPTION_NAME = "-cc-skipped";
-
private static final String ELEMENT_SEPARATOR = ":";
private static final List<String> DEFAULT_IMMUTABLE_TYPES = Arrays.asList( new String[]
@@ -230,10 +226,6 @@
private boolean hierarchical = false;
- private String deprecateCopyConstructor;
-
- private boolean skipCopyConstructor;
-
private final List<String> immutableTypes = new ArrayList<String>( 64 );
private final List<String> cloneableTypes = new ArrayList<String>( 64 );
@@ -271,10 +263,6 @@
append( getMessage( "nullableUsage" ) ).append( n ).
append( " " ).append( HIERARCHICAL_OPTION_NAME ).append( " : " ).
append( getMessage( "hierarchicalUsage" ) ).append( n ).
- append( " " ).append( DEPRECATED_CTOR_OPTION_NAME ).append( " : " ).
- append( getMessage( "deprecatedUsage" ) ).append( n ).
- append( " " ).append( SKIPPED_CTOR_OPTION_NAME ).append( " : " ).
- append( getMessage( "skippedUsage", ELEMENT_SEPARATOR ) ).append( n ).
append( " " ).append( CLONEABLE_TYPES_OPTION_NAME ).append( ": " ).
append( getMessage( "cloneableTypesUsage", ELEMENT_SEPARATOR ) ).append( n ).
append( " " ).append( IMMUTABLE_TYPES_OPTION_NAME ).append( ": " ).
@@ -472,23 +460,6 @@
return 2;
}
- if ( args[i].startsWith( DEPRECATED_CTOR_OPTION_NAME ) )
- {
- if ( i + 1 >= args.length )
- {
- throw new BadCommandLineException( getMessage( "missingOptionArgument", DEPRECATED_CTOR_OPTION_NAME ) );
- }
-
- this.deprecateCopyConstructor = args[i + 1].trim();
- return 2;
- }
-
- if ( args[i].startsWith( SKIPPED_CTOR_OPTION_NAME ) )
- {
- this.skipCopyConstructor = true;
- return 1;
- }
-
return 0;
}
@@ -543,7 +514,7 @@
this.log( Level.WARNING, "couldNotAddStdCtor", clazz.implClass.binaryName() );
}
- if ( !this.skipCopyConstructor && this.getCopyConstructor( clazz ) == null )
+ if ( this.getCopyConstructor( clazz ) == null )
{
this.log( Level.WARNING, "couldNotAddCopyCtor", clazz.implClass.binaryName() );
}
@@ -2302,12 +2273,6 @@
ctor.javadoc().addParam( o ).add( "The instance to copy or {@code null}." );
}
- if ( this.deprecateCopyConstructor != null )
- {
- ctor.annotate( Deprecated.class );
- ctor.javadoc().addDeprecated().append( this.deprecateCopyConstructor );
- }
-
ctor.body().directStatement( "// " + getMessage( "title" ) );
if ( this.needsWarningOnReferencedSupertypes( clazz ) )
Property changes on: trunk/cc-xjc-plugin/src/main/javadoc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/cc-xjc-plugin/src/main/resources
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties 2011-11-09 14:01:32 UTC (rev 160)
@@ -29,5 +29,3 @@
immutableTypesInfo=Immutable types: {0}
stringTypesUsage=list of names of string based datatype classes separated by ''{0}''.
stringTypesInfo=String types: {0}
-deprecatedUsage=marks generated copy constructors deprecated providing the given message.
-skippedUsage=disables generation of copy constructors. Default: enabled
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties 2011-11-09 14:01:32 UTC (rev 160)
@@ -29,5 +29,3 @@
immutableTypesInfo=Unver\u00e4nderbare Typen: {0}
stringTypesUsage=Liste von Namen zeichenkettenbasierter Datentyp-Klassen getrennt mit ''{0}''.
stringTypesInfo=Zeichenkettenbasierte Datentypen: {0}
-deprecatedUsage=Markiert generierte Kopier-Konstruktoren mit angegebener Meldung ''@Deprecated''.
-skippedUsage=deaktiviert die Generierung von Kopier-Konstruktoren. Standard: aktiviert
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties 2011-11-09 14:01:32 UTC (rev 160)
@@ -29,5 +29,3 @@
immutableTypesInfo=Immutable types: {0}
stringTypesUsage=list of names of string based datatype classes separated by ''{0}''.
stringTypesInfo=String types: {0}
-deprecatedUsage=marks generated copy constructors deprecated providing the given message.
-skippedUsage=disables generation of copy constructors. Default: enabled
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/pom.xml 2011-11-09 14:01:32 UTC (rev 160)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.2-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.sourceforge.net</url>
<inceptionYear>2009</inceptionYear>
Property changes on: trunk/src/main/books/cc-xjc.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/src/main/changes/changes.xml
===================================================================
--- trunk/src/main/changes/changes.xml 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/src/main/changes/changes.xml 2011-11-09 14:01:32 UTC (rev 160)
@@ -188,9 +188,5 @@
Generated 'clone' methods should call 'super.clone()'.
</action>
</release>
- <!-- *********************************************************************************************************** -->
- <release version="2.1" date="2011-10-04" description="Feature enhancements.">
- <action dev="schulte2005" type="add">Added options '-cc-deprecated' and '-cc-skipped'.</action>
- </release>
</body>
</document>
Property changes on: trunk/src/site/apt/examples.apt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt 2011-10-04 01:48:22 UTC (rev 159)
+++ trunk/src/site/apt/index.apt 2011-11-09 14:01:32 UTC (rev 160)
@@ -197,19 +197,6 @@
* javax.activation.MimeType
-** -cc-deprecated (since 2.1)
-
- The '-cc-deprecated' option got introduced in version 2.1. It can be
- used to instruct the plugin to mark generated copy constructors deprecated.
- It takes one message argument added to generated <<<@deprecated>>>
- Javadoc tags.
-
-** -cc-skipped (since 2.1)
-
- The '-cc-skipped' option got introduced in version 2.1. It can be
- used to instruct the plugin to not generate any copy constructors and only
- generate 'clone' methods.
-
* Support
Development of CC-XJC is community driven. Please file any issues with the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-10-04 01:48:28
|
Revision: 159
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=159&view=rev
Author: schulte2005
Date: 2011-10-04 01:48:22 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-plugin/pom.xml
trunk/pom.xml
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
+++ trunk/cc-xjc-dist/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
+++ trunk/cc-xjc-it/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
+++ trunk/cc-xjc-plugin/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
+++ trunk/pom.xml 2011-10-04 01:48:22 UTC (rev 159)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.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...> - 2011-10-04 01:48:12
|
Revision: 158
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=158&view=rev
Author: schulte2005
Date: 2011-10-04 01:48:06 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag cc-xjc-2.1
Modified Paths:
--------------
tags/cc-xjc-2.1/cc-xjc-dist/pom.xml
tags/cc-xjc-2.1/cc-xjc-it/pom.xml
tags/cc-xjc-2.1/cc-xjc-plugin/pom.xml
tags/cc-xjc-2.1/pom.xml
Added Paths:
-----------
tags/cc-xjc-2.1/
Modified: tags/cc-xjc-2.1/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-10-04 01:40:03 UTC (rev 157)
+++ tags/cc-xjc-2.1/cc-xjc-dist/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: tags/cc-xjc-2.1/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-10-04 01:40:03 UTC (rev 157)
+++ tags/cc-xjc-2.1/cc-xjc-it/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: tags/cc-xjc-2.1/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-10-04 01:40:03 UTC (rev 157)
+++ tags/cc-xjc-2.1/cc-xjc-plugin/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: tags/cc-xjc-2.1/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-04 01:40:03 UTC (rev 157)
+++ tags/cc-xjc-2.1/pom.xml 2011-10-04 01:48:06 UTC (rev 158)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.sourceforge.net</url>
<inceptionYear>2009</inceptionYear>
@@ -85,9 +85,9 @@
</mailingList>
</mailingLists>
<scm>
- <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</connection>
- <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</developerConnection>
- <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/trunk</url>
+ <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.1</connection>
+ <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.1</developerConnection>
+ <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/tags/cc-xjc-2.1</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-10-04 01:40:10
|
Revision: 157
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=157&view=rev
Author: schulte2005
Date: 2011-10-04 01:40:03 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
o Added options '-cc-deprecated' and '-cc-skipped'.
Modified Paths:
--------------
trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties
trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties
trunk/src/main/changes/changes.xml
trunk/src/site/apt/index.apt
Modified: trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
===================================================================
--- trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-10-04 01:40:03 UTC (rev 157)
@@ -147,6 +147,10 @@
private static final String STRING_TYPES_OPTION_NAME = "-cc-string-types";
+ private static final String DEPRECATED_CTOR_OPTION_NAME = "-cc-deprecated";
+
+ private static final String SKIPPED_CTOR_OPTION_NAME = "-cc-skipped";
+
private static final String ELEMENT_SEPARATOR = ":";
private static final List<String> DEFAULT_IMMUTABLE_TYPES = Arrays.asList( new String[]
@@ -226,6 +230,10 @@
private boolean hierarchical = false;
+ private String deprecateCopyConstructor;
+
+ private boolean skipCopyConstructor;
+
private final List<String> immutableTypes = new ArrayList<String>( 64 );
private final List<String> cloneableTypes = new ArrayList<String>( 64 );
@@ -263,6 +271,10 @@
append( getMessage( "nullableUsage" ) ).append( n ).
append( " " ).append( HIERARCHICAL_OPTION_NAME ).append( " : " ).
append( getMessage( "hierarchicalUsage" ) ).append( n ).
+ append( " " ).append( DEPRECATED_CTOR_OPTION_NAME ).append( " : " ).
+ append( getMessage( "deprecatedUsage" ) ).append( n ).
+ append( " " ).append( SKIPPED_CTOR_OPTION_NAME ).append( " : " ).
+ append( getMessage( "skippedUsage", ELEMENT_SEPARATOR ) ).append( n ).
append( " " ).append( CLONEABLE_TYPES_OPTION_NAME ).append( ": " ).
append( getMessage( "cloneableTypesUsage", ELEMENT_SEPARATOR ) ).append( n ).
append( " " ).append( IMMUTABLE_TYPES_OPTION_NAME ).append( ": " ).
@@ -460,6 +472,23 @@
return 2;
}
+ if ( args[i].startsWith( DEPRECATED_CTOR_OPTION_NAME ) )
+ {
+ if ( i + 1 >= args.length )
+ {
+ throw new BadCommandLineException( getMessage( "missingOptionArgument", DEPRECATED_CTOR_OPTION_NAME ) );
+ }
+
+ this.deprecateCopyConstructor = args[i + 1].trim();
+ return 2;
+ }
+
+ if ( args[i].startsWith( SKIPPED_CTOR_OPTION_NAME ) )
+ {
+ this.skipCopyConstructor = true;
+ return 1;
+ }
+
return 0;
}
@@ -514,7 +543,7 @@
this.log( Level.WARNING, "couldNotAddStdCtor", clazz.implClass.binaryName() );
}
- if ( this.getCopyConstructor( clazz ) == null )
+ if ( !this.skipCopyConstructor && this.getCopyConstructor( clazz ) == null )
{
this.log( Level.WARNING, "couldNotAddCopyCtor", clazz.implClass.binaryName() );
}
@@ -2273,6 +2302,12 @@
ctor.javadoc().addParam( o ).add( "The instance to copy or {@code null}." );
}
+ if ( this.deprecateCopyConstructor != null )
+ {
+ ctor.annotate( Deprecated.class );
+ ctor.javadoc().addDeprecated().append( this.deprecateCopyConstructor );
+ }
+
ctor.body().directStatement( "// " + getMessage( "title" ) );
if ( this.needsWarningOnReferencedSupertypes( clazz ) )
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl.properties 2011-10-04 01:40:03 UTC (rev 157)
@@ -29,3 +29,5 @@
immutableTypesInfo=Immutable types: {0}
stringTypesUsage=list of names of string based datatype classes separated by ''{0}''.
stringTypesInfo=String types: {0}
+deprecatedUsage=marks generated copy constructors deprecated providing the given message.
+skippedUsage=disables generation of copy constructors. Default: enabled
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_de.properties 2011-10-04 01:40:03 UTC (rev 157)
@@ -29,3 +29,5 @@
immutableTypesInfo=Unver\u00e4nderbare Typen: {0}
stringTypesUsage=Liste von Namen zeichenkettenbasierter Datentyp-Klassen getrennt mit ''{0}''.
stringTypesInfo=Zeichenkettenbasierte Datentypen: {0}
+deprecatedUsage=Markiert generierte Kopier-Konstruktoren mit angegebener Meldung ''@Deprecated''.
+skippedUsage=deaktiviert die Generierung von Kopier-Konstruktoren. Standard: aktiviert
Modified: trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties
===================================================================
--- trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/cc-xjc-plugin/src/main/resources/net/sourceforge/ccxjc/PluginImpl_en.properties 2011-10-04 01:40:03 UTC (rev 157)
@@ -29,3 +29,5 @@
immutableTypesInfo=Immutable types: {0}
stringTypesUsage=list of names of string based datatype classes separated by ''{0}''.
stringTypesInfo=String types: {0}
+deprecatedUsage=marks generated copy constructors deprecated providing the given message.
+skippedUsage=disables generation of copy constructors. Default: enabled
Modified: trunk/src/main/changes/changes.xml
===================================================================
--- trunk/src/main/changes/changes.xml 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/src/main/changes/changes.xml 2011-10-04 01:40:03 UTC (rev 157)
@@ -188,5 +188,9 @@
Generated 'clone' methods should call 'super.clone()'.
</action>
</release>
+ <!-- *********************************************************************************************************** -->
+ <release version="2.1" date="2011-10-04" description="Feature enhancements.">
+ <action dev="schulte2005" type="add">Added options '-cc-deprecated' and '-cc-skipped'.</action>
+ </release>
</body>
</document>
Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt 2011-09-17 14:29:27 UTC (rev 156)
+++ trunk/src/site/apt/index.apt 2011-10-04 01:40:03 UTC (rev 157)
@@ -197,6 +197,19 @@
* javax.activation.MimeType
+** -cc-deprecated (since 2.1)
+
+ The '-cc-deprecated' option got introduced in version 2.1. It can be
+ used to instruct the plugin to mark generated copy constructors deprecated.
+ It takes one message argument added to generated <<<@deprecated>>>
+ Javadoc tags.
+
+** -cc-skipped (since 2.1)
+
+ The '-cc-skipped' option got introduced in version 2.1. It can be
+ used to instruct the plugin to not generate any copy constructors and only
+ generate 'clone' methods.
+
* Support
Development of CC-XJC is community driven. Please file any issues with the
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:29:33
|
Revision: 156
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=156&view=rev
Author: schulte2005
Date: 2011-09-17 14:29:27 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
o Updated 'svn:mime-type' property.
Property Changed:
----------------
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ChoiceComplexTypeTest.java
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/MimeTypeXmlAdapter.java
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/SimpleTypeAttributesCollectionsTest.java
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/SimpleTypeAttributesIndexedTest.java
trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
Property changes on: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ChoiceComplexTypeTest.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
Property changes on: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/MimeTypeXmlAdapter.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
Property changes on: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
Property changes on: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/SimpleTypeAttributesCollectionsTest.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
Property changes on: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/SimpleTypeAttributesIndexedTest.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
Property changes on: trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/x-java
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:29:05
|
Revision: 155
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=155&view=rev
Author: schulte2005
Date: 2011-09-17 14:28:58 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
o Updated 'svn:mime-type' property.
Property Changed:
----------------
trunk/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html
Property changes on: trunk/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/html
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:28:30
|
Revision: 154
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=154&view=rev
Author: schulte2005
Date: 2011-09-17 14:28:24 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
o Updated 'svn:mime-type' property.
Property Changed:
----------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-dist/src/main/assembly/bin.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb
trunk/cc-xjc-it/src/main/resources/net/sourceforge/ccxjc/it/ChoiceComplexTypeTest.xml
trunk/cc-xjc-it/src/main/schemas/cc-xjc-it.xsd
trunk/cc-xjc-plugin/pom.xml
trunk/pom.xml
trunk/src/main/books/cc-xjc.xml
trunk/src/main/changes/changes.xml
trunk/src/site/site.xml
Property changes on: trunk/cc-xjc-dist/pom.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-dist/src/main/assembly/bin.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/pom.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/resources/net/sourceforge/ccxjc/it/ChoiceComplexTypeTest.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/cc-xjc-it/src/main/schemas/cc-xjc-it.xsd
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ text/xml
Property changes on: trunk/cc-xjc-plugin/pom.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/pom.xml
___________________________________________________________________
Modified: svn:mime-type
- text/plain
+ text/xml
Property changes on: trunk/src/main/books/cc-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/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-09-16 22:40:14
|
Revision: 153
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=153&view=rev
Author: schulte2005
Date: 2011-09-16 22:40:08 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Synchronized 'svn:ignore' property.
Modified Paths:
--------------
trunk/.gitignore
trunk/cc-xjc-dist/.gitignore
trunk/cc-xjc-it/.gitignore
trunk/cc-xjc-plugin/.gitignore
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-09-16 22:16:05 UTC (rev 152)
+++ trunk/.gitignore 2011-09-16 22:40:08 UTC (rev 153)
@@ -1,2 +1,8 @@
+/cc-xjc.ipr
+/cc-xjc.iws
+/cc-xjc.iml
/target
/.LICENSE.txt.swp
+/catalog.xml
+/.settings
+/.project
Modified: trunk/cc-xjc-dist/.gitignore
===================================================================
--- trunk/cc-xjc-dist/.gitignore 2011-09-16 22:16:05 UTC (rev 152)
+++ trunk/cc-xjc-dist/.gitignore 2011-09-16 22:40:08 UTC (rev 153)
@@ -1 +1,4 @@
/target
+/cc-xjc-dist.iml
+/.settings
+/.project
Modified: trunk/cc-xjc-it/.gitignore
===================================================================
--- trunk/cc-xjc-it/.gitignore 2011-09-16 22:16:05 UTC (rev 152)
+++ trunk/cc-xjc-it/.gitignore 2011-09-16 22:40:08 UTC (rev 153)
@@ -1 +1,5 @@
/target
+/cc-xjc-it.iml
+/.settings
+/.classpath
+/.project
Modified: trunk/cc-xjc-plugin/.gitignore
===================================================================
--- trunk/cc-xjc-plugin/.gitignore 2011-09-16 22:16:05 UTC (rev 152)
+++ trunk/cc-xjc-plugin/.gitignore 2011-09-16 22:40:08 UTC (rev 153)
@@ -1 +1,5 @@
/target
+/cc-xjc-plugin.iml
+/.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-16 22:16:11
|
Revision: 152
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=152&view=rev
Author: schulte2005
Date: 2011-09-16 22:16:05 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Updated 'svn:ignore' property.
Property Changed:
----------------
trunk/
trunk/cc-xjc-dist/
trunk/cc-xjc-it/
trunk/cc-xjc-plugin/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- cc-xjc.ipr
cc-xjc.iws
cc-xjc.iml
target
.LICENSE.txt.swp
catalog.xml
+ cc-xjc.ipr
cc-xjc.iws
cc-xjc.iml
target
.LICENSE.txt.swp
catalog.xml
.settings
.project
Property changes on: trunk/cc-xjc-dist
___________________________________________________________________
Modified: svn:ignore
- target
cc-xjc-dist.iml
+ target
cc-xjc-dist.iml
.settings
.project
Property changes on: trunk/cc-xjc-it
___________________________________________________________________
Modified: svn:ignore
- target
cc-xjc-it.iml
+ target
cc-xjc-it.iml
.settings
.classpath
.project
Property changes on: trunk/cc-xjc-plugin
___________________________________________________________________
Modified: svn:ignore
- target
cc-xjc-plugin.iml
+ target
cc-xjc-plugin.iml
.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-16 21:59:14
|
Revision: 151
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=151&view=rev
Author: schulte2005
Date: 2011-09-16 21:59:08 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Updated 'svn:ignore' property.
Property Changed:
----------------
trunk/
trunk/cc-xjc-dist/
trunk/cc-xjc-it/
trunk/cc-xjc-plugin/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
.LICENSE.txt.swp
catalog.xml
+ cc-xjc.ipr
cc-xjc.iws
cc-xjc.iml
target
.LICENSE.txt.swp
catalog.xml
Property changes on: trunk/cc-xjc-dist
___________________________________________________________________
Modified: svn:ignore
- target
+ target
cc-xjc-dist.iml
Property changes on: trunk/cc-xjc-it
___________________________________________________________________
Modified: svn:ignore
- target
+ target
cc-xjc-it.iml
Property changes on: trunk/cc-xjc-plugin
___________________________________________________________________
Modified: svn:ignore
- target
+ target
cc-xjc-plugin.iml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 21:34:34
|
Revision: 150
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=150&view=rev
Author: schulte2005
Date: 2011-09-16 21:34:28 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Removed.
Removed Paths:
-------------
trunk/README
Deleted: trunk/README
===================================================================
--- trunk/README 2011-09-16 21:34:19 UTC (rev 149)
+++ trunk/README 2011-09-16 21:34:28 UTC (rev 150)
@@ -1,2 +0,0 @@
-This repository is backed by the Subversion repository located at:
-https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 21:34:25
|
Revision: 149
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=149&view=rev
Author: schulte2005
Date: 2011-09-16 21:34:19 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Added .gitignore files and README.
Added Paths:
-----------
trunk/README
Added: trunk/README
===================================================================
--- trunk/README (rev 0)
+++ trunk/README 2011-09-16 21:34:19 UTC (rev 149)
@@ -0,0 +1,2 @@
+This repository is backed by the Subversion repository located at:
+https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 21:28:42
|
Revision: 148
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=148&view=rev
Author: schulte2005
Date: 2011-09-16 21:28:36 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Removed.
Removed Paths:
-------------
trunk/README
Deleted: trunk/README
===================================================================
--- trunk/README 2011-09-16 21:27:38 UTC (rev 147)
+++ trunk/README 2011-09-16 21:28:36 UTC (rev 148)
@@ -1,2 +0,0 @@
-This repository is backed by the Subversion repository located at:
-https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 21:27:44
|
Revision: 147
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=147&view=rev
Author: schulte2005
Date: 2011-09-16 21:27:38 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Updated 'svn:mime-type' and 'svn:eol-style' properties.
Property Changed:
----------------
trunk/.gitignore
trunk/README
trunk/cc-xjc-dist/.gitignore
trunk/cc-xjc-it/.gitignore
trunk/cc-xjc-plugin/.gitignore
Property changes on: trunk/.gitignore
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/README
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/cc-xjc-dist/.gitignore
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/cc-xjc-it/.gitignore
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/cc-xjc-plugin/.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-16 21:22:58
|
Revision: 146
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=146&view=rev
Author: schulte2005
Date: 2011-09-16 21:22:52 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Added .gitignore files and README.
Added Paths:
-----------
trunk/.gitignore
trunk/README
trunk/cc-xjc-dist/.gitignore
trunk/cc-xjc-it/.gitignore
trunk/cc-xjc-plugin/.gitignore
Added: trunk/.gitignore
===================================================================
--- trunk/.gitignore (rev 0)
+++ trunk/.gitignore 2011-09-16 21:22:52 UTC (rev 146)
@@ -0,0 +1,2 @@
+/target
+/.LICENSE.txt.swp
Added: trunk/README
===================================================================
--- trunk/README (rev 0)
+++ trunk/README 2011-09-16 21:22:52 UTC (rev 146)
@@ -0,0 +1,2 @@
+This repository is backed by the Subversion repository located at:
+https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk
Added: trunk/cc-xjc-dist/.gitignore
===================================================================
--- trunk/cc-xjc-dist/.gitignore (rev 0)
+++ trunk/cc-xjc-dist/.gitignore 2011-09-16 21:22:52 UTC (rev 146)
@@ -0,0 +1 @@
+/target
Added: trunk/cc-xjc-it/.gitignore
===================================================================
--- trunk/cc-xjc-it/.gitignore (rev 0)
+++ trunk/cc-xjc-it/.gitignore 2011-09-16 21:22:52 UTC (rev 146)
@@ -0,0 +1 @@
+/target
Added: trunk/cc-xjc-plugin/.gitignore
===================================================================
--- trunk/cc-xjc-plugin/.gitignore (rev 0)
+++ trunk/cc-xjc-plugin/.gitignore 2011-09-16 21:22:52 UTC (rev 146)
@@ -0,0 +1 @@
+/target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 18:26:51
|
Revision: 145
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=145&view=rev
Author: schulte2005
Date: 2011-09-16 18:26:45 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-plugin/pom.xml
trunk/pom.xml
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
+++ trunk/cc-xjc-dist/pom.xml 2011-09-16 18:26:45 UTC (rev 145)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
+++ trunk/cc-xjc-it/pom.xml 2011-09-16 18:26:45 UTC (rev 145)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
+++ trunk/cc-xjc-plugin/pom.xml 2011-09-16 18:26:45 UTC (rev 145)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
+++ trunk/pom.xml 2011-09-16 18:26:45 UTC (rev 145)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.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...> - 2011-09-16 18:26:38
|
Revision: 144
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=144&view=rev
Author: schulte2005
Date: 2011-09-16 18:26:32 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag cc-xjc-2.0
Modified Paths:
--------------
tags/cc-xjc-2.0/cc-xjc-dist/pom.xml
tags/cc-xjc-2.0/cc-xjc-it/pom.xml
tags/cc-xjc-2.0/cc-xjc-plugin/pom.xml
tags/cc-xjc-2.0/pom.xml
Added Paths:
-----------
tags/cc-xjc-2.0/
Modified: tags/cc-xjc-2.0/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-09-16 18:14:15 UTC (rev 143)
+++ tags/cc-xjc-2.0/cc-xjc-dist/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: tags/cc-xjc-2.0/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-09-16 18:14:15 UTC (rev 143)
+++ tags/cc-xjc-2.0/cc-xjc-it/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: tags/cc-xjc-2.0/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-09-16 18:14:15 UTC (rev 143)
+++ tags/cc-xjc-2.0/cc-xjc-plugin/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: tags/cc-xjc-2.0/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-16 18:14:15 UTC (rev 143)
+++ tags/cc-xjc-2.0/pom.xml 2011-09-16 18:26:32 UTC (rev 144)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.sourceforge.net</url>
<inceptionYear>2009</inceptionYear>
@@ -85,9 +85,9 @@
</mailingList>
</mailingLists>
<scm>
- <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</connection>
- <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/trunk</developerConnection>
- <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/trunk</url>
+ <connection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.0</connection>
+ <developerConnection>scm:svn:https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags/cc-xjc-2.0</developerConnection>
+ <url>http://ccxjc.svn.sourceforge.net/viewvc/ccxjc/tags/cc-xjc-2.0</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 18:14:21
|
Revision: 143
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=143&view=rev
Author: schulte2005
Date: 2011-09-16 18:14:15 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Updated 'maven-release-plugin' configuration.
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-16 17:58:40 UTC (rev 142)
+++ trunk/pom.xml 2011-09-16 18:14:15 UTC (rev 143)
@@ -129,7 +129,6 @@
<configuration>
<remoteTagging>false</remoteTagging>
<suppressCommitBeforeTag>true</suppressCommitBeforeTag>
- <useEditMode>true</useEditMode>
<goals>deploy</goals>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>ccxjc-release</releaseProfiles>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sch...@us...> - 2011-09-16 17:58:48
|
Revision: 142
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=142&view=rev
Author: schulte2005
Date: 2011-09-16 17:58:40 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Plugin updates.
o Updated to Maven 3.0.3.
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-plugin/pom.xml
trunk/pom.xml
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
+++ trunk/cc-xjc-dist/pom.xml 2011-09-16 17:58:40 UTC (rev 142)
@@ -42,70 +42,80 @@
<name>CC-XJC Distribution</name>
<description>JAXB 2.0 Schema to Java compiler plugin binary distribution.</description>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-copy</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>readme</classifier>
+ <type>xhtml</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <destFileName>README.xhtml</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>license</classifier>
+ <type>txt</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <destFileName>LICENSE.txt</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc-plugin</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-single</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <finalName>cc-xjc-${project.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>readme</classifier>
- <type>xhtml</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <destFileName>README.xhtml</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>license</classifier>
- <type>txt</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <destFileName>LICENSE.txt</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc-plugin</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <finalName>cc-xjc-${project.version}</finalName>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
</project>
-
-
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
+++ trunk/cc-xjc-it/pom.xml 2011-09-16 17:58:40 UTC (rev 142)
@@ -42,554 +42,552 @@
<name>CC-XJC Test Suite</name>
<description>JAXB 2.0 Schema to Java compiler plugin test suite.</description>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-copy</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>readme</classifier>
+ <type>xhtml</type>
+ <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <destFileName>README.xhtml</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>license</classifier>
+ <type>txt</type>
+ <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <destFileName>LICENSE.txt</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb21-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.ccxjc</groupId>
+ <artifactId>cc-xjc-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>basic</artifactId>
+ <version>0.4.1.5</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>xjc-default-collection-type-private</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>private</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-cc-cloneable-types</arg>
+ <arg>javax.xml.datatype.XMLGregorianCalendar:java.util.Date:java.util.Calendar:java.util.TimeZone:java.util.Locale:@${basedir}/src/main/conf/cloneable-types</arg>
+ <arg>-cc-immutable-types</arg>
+ <arg>java.lang.Boolean:java.lang.Byte:java.lang.Character:java.lang.Double:java.lang.Enum:java.lang.Float:java.lang.Integer:java.lang.Long:java.lang.Short:java.lang.String:java.math.BigDecimal:java.math.BigInteger:java.util.UUID:javax.xml.namespace.QName:javax.xml.datatype.Duration:java.util.Currency:@${basedir}/src/main/conf/immutable-types</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-private.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-private</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>private</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-private.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-default-collection-type-no-value-class-private</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>private</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-no-value-class-private.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-no-value-class-private</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>private</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-no-value-class-private.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>xjc-default-collection-type-package</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>package</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-package.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-package</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>package</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-package.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-default-collection-type-no-value-class-package</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>package</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-no-value-class-package.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-no-value-class-package</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>package</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-no-value-class-package.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>xjc-default-collection-type-protected</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>protected</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-protected.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-protected</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>protected</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-protected.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-default-collection-type-no-value-class-protected</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>protected</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-no-value-class-protected.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-no-value-class-protected</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>protected</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-no-value-class-protected.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>xjc-default-collection-type-public</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>public</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-public.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-public</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>public</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-public.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-default-collection-type-no-value-class-public</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>public</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-collections-no-value-class-public.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xjc-indexed-collection-type-no-value-class-public</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-copy-constructor</arg>
+ <arg>-cc-visibility</arg>
+ <arg>public</arg>
+ <arg>-cc-nullable</arg>
+ <arg>-cc-hierarchical</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <schemaDirectory>src/main/schemas</schemaDirectory>
+ <bindingDirectory>src/main/jaxb</bindingDirectory>
+ <bindingIncludes>
+ <bindingInclude>cc-xjc-it-indexed-no-value-class-public.xjb</bindingInclude>
+ </bindingIncludes>
+ <extension>true</extension>
+ <episode>false</episode>
+ <forceRegenerate>true</forceRegenerate>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
- <artifactId>build-helper-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <executions>
- <execution>
- <id>maven-version</id>
- <phase>validate</phase>
- <goals>
- <goal>maven-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>readme</classifier>
- <type>xhtml</type>
- <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
- <destFileName>README.xhtml</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>license</classifier>
- <type>txt</type>
- <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
- <destFileName>LICENSE.txt</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb21-plugin</artifactId>
- <version>0.7.5</version>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.ccxjc</groupId>
- <artifactId>cc-xjc-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>basic</artifactId>
- <version>0.4.1.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>xjc-default-collection-type-private</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>private</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-cc-cloneable-types</arg>
- <arg>javax.xml.datatype.XMLGregorianCalendar:java.util.Date:java.util.Calendar:java.util.TimeZone:java.util.Locale:@${basedir}/src/main/conf/cloneable-types</arg>
- <arg>-cc-immutable-types</arg>
- <arg>java.lang.Boolean:java.lang.Byte:java.lang.Character:java.lang.Double:java.lang.Enum:java.lang.Float:java.lang.Integer:java.lang.Long:java.lang.Short:java.lang.String:java.math.BigDecimal:java.math.BigInteger:java.util.UUID:javax.xml.namespace.QName:javax.xml.datatype.Duration:java.util.Currency:@${basedir}/src/main/conf/immutable-types</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-private.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-private</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>private</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-private.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-default-collection-type-no-value-class-private</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>private</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-no-value-class-private.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-no-value-class-private</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>private</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-no-value-class-private.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
-
- <execution>
- <id>xjc-default-collection-type-package</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>package</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-package.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-package</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>package</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-package.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-default-collection-type-no-value-class-package</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>package</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-no-value-class-package.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-no-value-class-package</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>package</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-no-value-class-package.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
-
- <execution>
- <id>xjc-default-collection-type-protected</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>protected</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-protected.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-protected</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>protected</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-protected.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-default-collection-type-no-value-class-protected</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>protected</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-no-value-class-protected.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-no-value-class-protected</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>protected</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-no-value-class-protected.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
-
- <execution>
- <id>xjc-default-collection-type-public</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>public</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-public.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-public</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>public</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-public.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-default-collection-type-no-value-class-public</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>public</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-collections-no-value-class-public.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>xjc-indexed-collection-type-no-value-class-public</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-copy-constructor</arg>
- <arg>-cc-visibility</arg>
- <arg>public</arg>
- <arg>-cc-nullable</arg>
- <arg>-cc-hierarchical</arg>
- <arg>-XtoString</arg>
- <arg>-Xequals</arg>
- <arg>-XhashCode</arg>
- <arg>-Xcopyable</arg>
- </args>
- <schemaDirectory>src/main/schemas</schemaDirectory>
- <bindingDirectory>src/main/jaxb</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>cc-xjc-it-indexed-no-value-class-public.xjb</bindingInclude>
- </bindingIncludes>
- <extension>true</extension>
- <episode>false</episode>
- <forceRegenerate>true</forceRegenerate>
- <verbose>true</verbose>
- </configuration>
- </execution>
-
- </executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
- <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -624,28 +622,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>download.java.net.maven.2</id>
- <url>http://download.java.net/maven/2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>download.java.net.maven.2</id>
- <url>http://download.java.net/maven/2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
+++ trunk/cc-xjc-plugin/pom.xml 2011-09-16 17:58:40 UTC (rev 142)
@@ -48,54 +48,49 @@
<filtering>true</filtering>
</resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-copy</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>readme</classifier>
+ <type>xhtml</type>
+ <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <destFileName>README.xhtml</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cc-xjc</artifactId>
+ <version>${project.version}</version>
+ <classifier>license</classifier>
+ <type>txt</type>
+ <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <destFileName>LICENSE.txt</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
- <artifactId>build-helper-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <executions>
- <execution>
- <id>maven-version</id>
- <phase>validate</phase>
- <goals>
- <goal>maven-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>readme</classifier>
- <type>xhtml</type>
- <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
- <destFileName>README.xhtml</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cc-xjc</artifactId>
- <version>${project.version}</version>
- <classifier>license</classifier>
- <type>txt</type>
- <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
- <destFileName>LICENSE.txt</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
+++ trunk/pom.xml 2011-09-16 17:58:40 UTC (rev 142)
@@ -108,10 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <validate>true</validate>
- </configuration>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -128,10 +125,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<configuration>
- <tagBase>https://ccxjc.svn.sourceforge.net/svnroot/ccxjc/tags</tagBase>
- <preparationGoals>clean install</preparationGoals>
+ <remoteTagging>false</remoteTagging>
+ <suppressCommitBeforeTag>true</suppressCommitBeforeTag>
+ <useEditMode>true</useEditMode>
+ <goals>deploy</goals>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>ccxjc-release</releaseProfiles>
</configuration>
@@ -139,7 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<archive>
<index>true</index>
@@ -168,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -199,9 +198,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<configuration>
- <bottom><![CDATA[<table border="0" width="100%"><tr><td align="left">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</td><td align="right"><a href="http://sourceforge.net/projects/ccxjc"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=260900&type=10" width="80" height="15" alt="Get CC-XJC at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr></table>]]></bottom>
+ <bottom><![CDATA[<table border="0" width="100%"><tr><td align="left">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</td><td align="right"><a href="http://sourceforge.net/projects/ccxjc"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=260900&type=10" width="80" height="15" alt="Get CC-XJC at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr></table>]]>
+ </bottom>
<breakiterator>true</breakiterator>
<keywords>true</keywords>
<linksource>true</linksource>
@@ -210,25 +210,9 @@
<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>
+ <validateLinks>true</validateLinks>
<archive>
<index>true</index>
<addMavenDescripto...
[truncated message content] |
|
From: <sch...@us...> - 2011-09-16 12:07:48
|
Revision: 141
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=141&view=rev
Author: schulte2005
Date: 2011-09-16 12:07:36 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
o Updated to generate 'clone' methods calling 'super.clone()'.
o Improved names of various generated methods.
o Updated version to 2.0-SNAPSHOT.
Modified Paths:
--------------
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
trunk/cc-xjc-plugin/pom.xml
trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
trunk/pom.xml
trunk/src/main/changes/changes.xml
trunk/src/site/apt/examples.apt
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
.LICENSE.txt.swp
+ target
.LICENSE.txt.swp
catalog.xml
Modified: trunk/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/cc-xjc-dist/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-dist</artifactId>
Modified: trunk/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/cc-xjc-it/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-it</artifactId>
Modified: trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java
===================================================================
--- trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/cc-xjc-it/src/main/java/net/sourceforge/ccxjc/it/ReferencedClass.java 2011-09-16 12:07:36 UTC (rev 141)
@@ -54,16 +54,9 @@
}
@Override
- public Object clone()
+ public ReferencedClass clone() throws CloneNotSupportedException
{
- try
- {
- return super.clone();
- }
- catch ( CloneNotSupportedException e )
- {
- throw new AssertionError( e );
- }
+ return (ReferencedClass) super.clone();
}
public void toString( final ToStringBuilder toStringBuilder )
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/cc-xjc-plugin/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
@@ -34,7 +34,7 @@
<parent>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cc-xjc-plugin</artifactId>
Modified: trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java
===================================================================
--- trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/cc-xjc-plugin/src/main/java/net/sourceforge/ccxjc/PluginImpl.java 2011-09-16 12:07:36 UTC (rev 141)
@@ -240,6 +240,8 @@
private final Set<Class<?>> contextExceptions = new HashSet<Class<?>>();
+ private boolean tryCatchCopyExpression = false;
+
@Override
public String getOptionName()
{
@@ -636,7 +638,7 @@
jaxbElement
};
- final String methodName = "copyOFJAXBElement";
+ final String methodName = "copyOf";
final int mod = this.getVisibilityModifier();
if ( mod != JMod.PRIVATE )
@@ -672,6 +674,7 @@
m.javadoc().addReturn().append(
"A deep copy of {@code element} or {@code null} if {@code element} is {@code null}." );
+ m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
m.body().directStatement( "// " + getMessage( "title" ) );
final JConditional isNotNull = m.body()._if( element.ne( JExpr._null() ) );
@@ -708,18 +711,18 @@
final int mod = this.getVisibilityModifier();
final String methodName = "copyOf";
+ final JType[] signature = new JType[]
+ {
+ arrayType
+ };
if ( mod != JMod.PRIVATE )
{
for ( JMethod m : classOutline._package().objectFactory().methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
- final JType[] signature = m.listParamTypes();
- if ( signature.length == 1 && signature[0].binaryName().equals( arrayType.binaryName() ) )
- {
- return classOutline._package().objectFactory().staticInvoke( m ).arg( source );
- }
+ return classOutline._package().objectFactory().staticInvoke( m ).arg( source );
}
}
}
@@ -727,13 +730,9 @@
{
for ( JMethod m : classOutline.implClass.methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
- final JType[] signature = m.listParamTypes();
- if ( signature.length == 1 && signature[0].binaryName().equals( arrayType.binaryName() ) )
- {
- return JExpr.invoke( m ).arg( source );
- }
+ return JExpr.invoke( m ).arg( source );
}
}
}
@@ -774,7 +773,6 @@
{
final JClass object = clazz.parent().getCodeModel().ref( Object.class );
final JClass array = clazz.parent().getCodeModel().ref( Array.class );
-
final JType[] signature =
{
object
@@ -872,7 +870,7 @@
serializable
};
- final String methodName = "copyOfSerializable";
+ final String methodName = "copyOf";
final int mod = this.getVisibilityModifier();
if ( mod != JMod.PRIVATE )
@@ -987,14 +985,18 @@
final JClass objectArray = clazz.parent().getCodeModel().ref( Object[].class );
final JClass serializable = clazz.parent().getCodeModel().ref( Serializable.class );
- final String methodName = "copyOfObject";
+ final String methodName = "copyOf";
final int mod = this.getVisibilityModifier();
+ final JType[] signature = new JType[]
+ {
+ object
+ };
if ( mod != JMod.PRIVATE )
{
for ( JMethod m : clazz._package().objectFactory().methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
return clazz._package().objectFactory().staticInvoke( m );
}
@@ -1004,7 +1006,7 @@
{
for ( JMethod m : clazz.implClass.methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
return JExpr.invoke( m );
}
@@ -1022,6 +1024,7 @@
m.javadoc().append( "Creates and returns a deep copy of a given object." );
m.javadoc().addParam( o ).append( "The instance to copy or {@code null}." );
m.javadoc().addReturn().append( "A deep copy of {@code o} or {@code null} if {@code o} is {@code null}." );
+ m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
m.body().directStatement( "// " + getMessage( "title" ) );
@@ -1196,6 +1199,7 @@
}
final int mod = this.getVisibilityModifier();
+ boolean needsToCatchException = false;
if ( mod != JMod.PRIVATE )
{
@@ -1230,10 +1234,12 @@
m.javadoc().addParam( e ).append( "The instance to copy or {@code null}." );
m.javadoc().addReturn().append( "A deep copy of {@code e} or {@code null} if {@code e} is {@code null}." );
+ m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
- m.body().directStatement( "// " + getMessage( "title" ) );
+ final JBlock body = new JBlock( false, false );
+ body.directStatement( "// " + getMessage( "title" ) );
- final JConditional elementNotNull = m.body()._if( e.ne( JExpr._null() ) );
+ final JConditional elementNotNull = body._if( e.ne( JExpr._null() ) );
final JExpression newElement;
if ( element.hasClass() )
@@ -1243,6 +1249,7 @@
JExpr.cast( element.getContentType().toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ),
JExpr.invoke( e, "getValue" ) ), true ) );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
}
else
{
@@ -1264,10 +1271,30 @@
JExpr.cast( element.getContentType().toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ),
copy.invoke( "getValue" ) ), true ) ) );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
}
elementNotNull._then()._return( copy );
- m.body()._return( JExpr._null() );
+ body._return( JExpr._null() );
+
+ if ( needsToCatchException )
+ {
+ final JTryBlock tryCopy = m.body()._try();
+ tryCopy.body().add( body );
+
+ final JCatchBlock catchException =
+ tryCopy._catch( fieldOutline.parent().parent().getCodeModel().ref( Exception.class ) );
+
+ final JVar ex = catchException.param( "e" );
+ catchException.body()._throw( JExpr._new( fieldOutline.parent().parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( ex ) );
+
+ }
+ else
+ {
+ m.body().add( body );
+ }
+
this.methodCount = this.methodCount.add( BigInteger.ONE );
return ( mod != JMod.PRIVATE
? fieldOutline.parent()._package().objectFactory().staticInvoke( m ) : JExpr.invoke( m ) );
@@ -1289,6 +1316,7 @@
final String methodName = "copyOf" + fieldOutline.getPropertyInfo().getName( true );
final int mod = this.getVisibilityModifier();
+ boolean needsToCatchException = false;
if ( mod != JMod.PRIVATE )
{
@@ -1325,9 +1353,10 @@
m.javadoc().addReturn().append(
"A deep copy of {@code array} or {@code null} if {@code array} is {@code null}." );
- m.body().directStatement( "// " + getMessage( "title" ) );
+ final JBlock body = new JBlock( false, false );
+ body.directStatement( "// " + getMessage( "title" ) );
- final JConditional arrayNotNull = m.body()._if( a.ne( JExpr._null() ) );
+ final JConditional arrayNotNull = body._if( a.ne( JExpr._null() ) );
final JVar copy = arrayNotNull._then().decl( arrayType, "copy", JExpr.newArray( itemType, a.ref( "length" ) ) );
final JForLoop forEachItem = arrayNotNull._then()._for();
final JVar i = forEachItem.init(
@@ -1336,12 +1365,33 @@
forEachItem.test( i.gte( JExpr.lit( 0 ) ) );
forEachItem.update( i.decr() );
- final JExpression copyExpr =
- this.getCopyExpression( fieldOutline, array.getItemType(), forEachItem.body(), a.component( i ), true );
+ final JExpression copyExpr = this.getCopyExpression(
+ fieldOutline, array.getItemType(), forEachItem.body(), a.component( i ), true );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
forEachItem.body().assign( copy.component( i ), copyExpr );
arrayNotNull._then()._return( copy );
- m.body()._return( JExpr._null() );
+ body._return( JExpr._null() );
+
+ if ( needsToCatchException )
+ {
+ final JTryBlock tryCopy = m.body()._try();
+ tryCopy.body().add( body );
+
+ final JCatchBlock catchException =
+ tryCopy._catch( fieldOutline.parent().parent().getCodeModel().ref( Exception.class ) );
+
+ final JVar ex = catchException.param( "e" );
+ catchException.body()._throw( JExpr._new( fieldOutline.parent().parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( ex ) );
+
+ }
+ else
+ {
+ m.body().add( body );
+ }
+
this.methodCount = this.methodCount.add( BigInteger.ONE );
return ( mod != JMod.PRIVATE
? fieldOutline.parent()._package().objectFactory().staticInvoke( m ) : JExpr.invoke( m ) );
@@ -1350,10 +1400,15 @@
private JMethod getCopyOfPropertyMethod( final FieldOutline field )
{
- final String methodName = "copy" + field.getPropertyInfo().getName( true );
+ final String methodName = "copyOf" + field.getPropertyInfo().getName( true );
+ final JType[] signature = new JType[]
+ {
+ field.getRawType()
+ };
+
for ( JMethod m : field.parent().implClass.methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
return m;
}
@@ -1365,7 +1420,6 @@
this.getVisibilityModifier() | JMod.STATIC, field.getRawType(), methodName );
final JVar source = m.param( JMod.FINAL, field.getRawType(), "source" );
-
m.javadoc().append( "Creates and returns a deep copy of property {@code "
+ field.getPropertyInfo().getName( true ) + "}." );
@@ -1373,10 +1427,13 @@
m.javadoc().addReturn().append(
"A deep copy of {@code source} or {@code null} if {@code source} is {@code null}." );
- m.body().directStatement( "// " + getMessage( "title" ) );
+ m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
- final JConditional sourceNotNull = m.body()._if( source.ne( JExpr._null() ) );
+ final JBlock body = new JBlock( false, false );
+ body.directStatement( "// " + getMessage( "title" ) );
+ final JConditional sourceNotNull = body._if( source.ne( JExpr._null() ) );
+
// m.body()._if( source.eq( JExpr._null() ) )._then()._throw( JExpr._new( nullPointerException ).arg( "source" ) );
// m.body()._if( target.eq( JExpr._null() ) )._then()._throw( JExpr._new( nullPointerException ).arg( "target" ) );
@@ -1453,6 +1510,8 @@
Collections.reverse( referencedElementInfosWithClass );
Collections.reverse( referencedTypeInfos );
+ boolean needsToCatchException = false;
+
if ( !( referencedElementInfos.isEmpty() && referencedElementInfosWithClass.isEmpty() ) )
{
final JBlock elementBlock = sourceNotNull._then()._if( source._instanceof( jaxbElement ) )._then();
@@ -1466,6 +1525,8 @@
final JExpression copyExpr = this.getCopyExpression(
field, elementInfo, ifInstanceOf._then(), JExpr.cast( elementType, source ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1496,6 +1557,8 @@
final JExpression copyExpr = this.getCopyExpression(
field, elementInfo, ifInstanceOf._then(), JExpr.cast( jaxbElement, source ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1522,6 +1585,8 @@
final JExpression copyExpr =
this.getCopyExpression( field, classInfo, ifInstanceOf._then(), JExpr.cast( javaType, source ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1541,6 +1606,8 @@
final JExpression copyExpr =
this.getCopyExpression( field, typeInfo, ifInstanceOf._then(), JExpr.cast( javaType, source ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1558,17 +1625,58 @@
plus( source ).plus( JExpr.lit( "' for property '" + field.getPropertyInfo().getName( true )
+ "' of class '" + field.parent().implClass.binaryName() + "'." ) ) ) );
- m.body()._return( JExpr._null() );
+ body._return( JExpr._null() );
+
+ if ( needsToCatchException )
+ {
+ final JTryBlock tryCopy = m.body()._try();
+ tryCopy.body().add( body );
+
+ final JCatchBlock catchException =
+ tryCopy._catch( field.parent().parent().getCodeModel().ref( Exception.class ) );
+
+ final JVar ex = catchException.param( "e" );
+ catchException.body()._throw( JExpr._new( field.parent().parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( ex ) );
+
+ }
+ else
+ {
+ m.body().add( body );
+ }
+
this.methodCount = this.methodCount.add( BigInteger.ONE );
return m;
}
private JMethod getCopyOfCollectionMethod( final FieldOutline field )
{
- final String methodName = "copy" + field.getPropertyInfo().getName( true );
+ final String methodName;
+ final JType[] signature;
+
+ if ( field.getRawType().isArray() )
+ {
+ methodName = "copyOf" + field.getPropertyInfo().getName( true );
+ signature = new JType[]
+ {
+ field.getRawType()
+ };
+
+ }
+ else
+ {
+ methodName = "copy" + field.getPropertyInfo().getName( true );
+ signature = new JType[]
+ {
+ field.getRawType(),
+ field.getRawType()
+ };
+
+ }
+
for ( JMethod m : field.parent().implClass.methods() )
{
- if ( m.name().equals( methodName ) )
+ if ( m.name().equals( methodName ) && m.hasSignature( signature ) )
{
return m;
}
@@ -1579,13 +1687,24 @@
final JClass jaxbElement = field.parent().parent().getCodeModel().ref( JAXBElement.class );
final JClass nullPointerException = field.parent().parent().getCodeModel().ref( NullPointerException.class );
final JClass assertionError = field.parent().parent().getCodeModel().ref( AssertionError.class );
- final JMethod m = field.parent().implClass.method(
- field.getRawType().isArray() ? this.getVisibilityModifier() : this.getVisibilityModifier() | JMod.STATIC,
- Void.TYPE, methodName );
+ final JMethod m;
+ if ( field.getRawType().isArray() )
+ {
+ m = field.parent().implClass.method( this.getVisibilityModifier() | JMod.STATIC, field.getRawType(),
+ methodName );
+
+ }
+ else
+ {
+ m = field.parent().implClass.method( this.getVisibilityModifier() | JMod.STATIC, Void.TYPE, methodName );
+ }
+
final JVar source = m.param( JMod.FINAL, field.getRawType(), "source" );
final JVar target = field.getRawType().isArray() ? null : m.param( JMod.FINAL, field.getRawType(), "target" );
+ m.body().directStatement( "// " + getMessage( "title" ) );
+
m.javadoc().append( "Copies all values of property {@code " + field.getPropertyInfo().getName( true )
+ "} deeply." );
@@ -1594,18 +1713,20 @@
if ( !field.getRawType().isArray() )
{
m.javadoc().addParam( target ).append( "The target to copy {@code source} to." );
- m.javadoc().addThrows( nullPointerException ).
- append( "if {@code source} or {@code target} is {@code null}." );
+ m.javadoc().addThrows( nullPointerException ).append( "if {@code target} is {@code null}." );
+// m.body()._if( target.eq( JExpr._null() ) )._then()._throw(
+// JExpr._new( nullPointerException ).arg( "target" ) );
- m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
}
else
{
- m.javadoc().addThrows( nullPointerException ).append( "if {@code source} is {@code null}." );
+ m.javadoc().addReturn().append( "A deep copy of {@code source} or {@code null}." );
}
- m.body().directStatement( "// " + getMessage( "title" ) );
+ m.annotate( SuppressWarnings.class ).param( "value", "unchecked" );
+ final JBlock body = new JBlock( false, false );
+
// m.body()._if( source.eq( JExpr._null() ) )._then()._throw( JExpr._new( nullPointerException ).arg( "source" ) );
// m.body()._if( target.eq( JExpr._null() ) )._then()._throw( JExpr._new( nullPointerException ).arg( "target" ) );
@@ -1682,6 +1803,8 @@
Collections.reverse( referencedElementInfosWithClass );
Collections.reverse( referencedTypeInfos );
+ boolean needsToCatchException = false;
+
final JForLoop copyLoop;
final JVar it;
final JVar next;
@@ -1690,9 +1813,7 @@
if ( field.getRawType().isArray() )
{
- sourceNotEmpty =
- m.body()._if( source.ne( JExpr._null() ).cand( source.ref( "length" ).gt( JExpr.lit( 0 ) ) ) );
-
+ sourceNotEmpty = body._if( source.ne( JExpr._null() ).cand( source.ref( "length" ).gt( JExpr.lit( 0 ) ) ) );
copy = sourceNotEmpty._then().decl( JMod.FINAL, source.type(), "copy", JExpr.cast(
source.type(), array.staticInvoke( "newInstance" ).
arg( source.invoke( "getClass" ).invoke( "getComponentType" ) ).arg( source.ref( "length" ) ) ) );
@@ -1707,10 +1828,10 @@
}
else
{
- sourceNotEmpty = m.body()._if( JExpr.invoke( source, "isEmpty" ).not() );
+ sourceNotEmpty = body._if( source.ne( JExpr._null() ).cand( JExpr.invoke( source, "isEmpty" ).not() ) );
copyLoop = sourceNotEmpty._then()._for();
- it = copyLoop.init( field.parent().parent().getCodeModel().ref( Iterator.class ),
- "it", source.invoke( "iterator" ) );
+ it = copyLoop.init( JMod.FINAL, field.parent().parent().getCodeModel().ref( Iterator.class ).
+ narrow( field.parent().parent().getCodeModel().wildcard() ), "it", source.invoke( "iterator" ) );
copyLoop.test( JExpr.invoke( it, "hasNext" ) );
next = copyLoop.body().decl( JMod.FINAL, object, "next", JExpr.invoke( it, "next" ) );
@@ -1730,6 +1851,8 @@
final JExpression copyExpr = this.getCopyExpression(
field, elementInfo, ifInstanceOf._then(), JExpr.cast( elementType, next ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1766,10 +1889,11 @@
final JConditional ifInstanceOf = copyBlock._if( JExpr.invoke( JExpr.cast(
jaxbElement, next ), "getValue" )._instanceof( contentType ) );
- final JExpression copyExpr =
- this.getCopyExpression( field, elementInfo, ifInstanceOf._then(),
- JExpr.cast( jaxbElement, next ), false );
+ final JExpression copyExpr = this.getCopyExpression(
+ field, elementInfo, ifInstanceOf._then(), JExpr.cast( jaxbElement, next ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1802,9 +1926,11 @@
final JConditional ifInstanceOf = copyLoop.body()._if( next._instanceof( javaType ) );
- final JExpression copyExpr =
- this.getCopyExpression( field, classInfo, ifInstanceOf._then(), JExpr.cast( javaType, next ), false );
+ final JExpression copyExpr = this.getCopyExpression(
+ field, classInfo, ifInstanceOf._then(), JExpr.cast( javaType, next ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1830,9 +1956,11 @@
{
final JType javaType = typeInfo.toType( field.parent().parent(), Aspect.IMPLEMENTATION );
final JConditional ifInstanceOf = copyLoop.body()._if( next._instanceof( javaType ) );
- final JExpression copyExpr =
- this.getCopyExpression( field, typeInfo, ifInstanceOf._then(), JExpr.cast( javaType, next ), false );
+ final JExpression copyExpr = this.getCopyExpression(
+ field, typeInfo, ifInstanceOf._then(), JExpr.cast( javaType, next ), false );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
+
if ( copyExpr == null )
{
this.log( Level.SEVERE, "cannotCopyProperty", field.getPropertyInfo().getName( true ),
@@ -1861,54 +1989,78 @@
if ( field.getRawType().isArray() )
{
- sourceNotEmpty._then().add( JExpr.invoke( "set" + field.getPropertyInfo().getName( true ) ).arg( copy ) );
+ sourceNotEmpty._then()._return( copy );
+ body._return( JExpr._null() );
}
+ if ( needsToCatchException )
+ {
+ final JTryBlock tryCopy = m.body()._try();
+ tryCopy.body().add( body );
+
+ final JCatchBlock catchException =
+ tryCopy._catch( field.parent().parent().getCodeModel().ref( Exception.class ) );
+
+ final JVar ex = catchException.param( "e" );
+ catchException.body()._throw( JExpr._new( field.parent().parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( ex ) );
+
+ }
+ else
+ {
+ m.body().add( body );
+ }
+
this.methodCount = this.methodCount.add( BigInteger.ONE );
return m;
}
private JExpression getCopyExpression( final FieldOutline fieldOutline, final CTypeInfo type,
- final JBlock block, final JExpression source,
+ final JBlock block, final JExpression sourceExpr,
final boolean sourceMaybeNull )
{
JExpression expr = null;
+ this.tryCatchCopyExpression = false;
if ( type instanceof CBuiltinLeafInfo )
{
expr = this.getBuiltinCopyExpression(
- fieldOutline, (CBuiltinLeafInfo) type, block, source, sourceMaybeNull );
+ fieldOutline, (CBuiltinLeafInfo) type, block, sourceExpr, sourceMaybeNull );
}
else if ( type instanceof CWildcardTypeInfo )
{
expr = this.getWildcardCopyExpression(
- fieldOutline, (CWildcardTypeInfo) type, block, source, sourceMaybeNull );
+ fieldOutline, (CWildcardTypeInfo) type, block, sourceExpr, sourceMaybeNull );
}
else if ( type instanceof CClassInfo )
{
- expr = this.getClassInfoCopyExpression( fieldOutline, (CClassInfo) type, block, source, sourceMaybeNull );
+ expr = this.getClassInfoCopyExpression(
+ fieldOutline, (CClassInfo) type, block, sourceExpr, sourceMaybeNull );
+
}
else if ( type instanceof CEnumLeafInfo )
{
- expr = this.getEnumLeafInfoCopyExpression( fieldOutline, (CEnumLeafInfo) type, block, source );
+ expr = this.getEnumLeafInfoCopyExpression( fieldOutline, (CEnumLeafInfo) type, block, sourceExpr );
}
else if ( type instanceof CArrayInfo )
{
- expr = this.getArrayCopyExpression( fieldOutline, (CArrayInfo) type, block, source );
+ expr = this.getArrayCopyExpression( fieldOutline, (CArrayInfo) type, block, sourceExpr );
}
else if ( type instanceof CElementInfo )
{
- expr = this.getElementCopyExpression( fieldOutline, (CElementInfo) type, block, source );
+ expr = this.getElementCopyExpression( fieldOutline, (CElementInfo) type, block, sourceExpr );
}
else if ( type instanceof CNonElement )
{
- expr = this.getNonElementCopyExpression( fieldOutline, (CNonElement) type, block, source, sourceMaybeNull );
+ expr = this.getNonElementCopyExpression(
+ fieldOutline, (CNonElement) type, block, sourceExpr, sourceMaybeNull );
+
}
else if ( type instanceof CAdapterInfo )
{
- expr = this.getAdapterInfoCopyExpression( fieldOutline, (CAdapterInfo) type, block, source );
+ expr = this.getAdapterInfoCopyExpression( fieldOutline, (CAdapterInfo) type, block, sourceExpr );
}
if ( expr != null )
@@ -1920,7 +2072,7 @@
}
private JExpression getBuiltinCopyExpression( final FieldOutline fieldOutline, final CBuiltinLeafInfo type,
- final JBlock block, final JExpression source,
+ final JBlock block, final JExpression sourceExpr,
final boolean sourceMaybeNull )
{
JExpression expr = null;
@@ -1930,41 +2082,41 @@
if ( type == CBuiltinLeafInfo.ANYTYPE )
{
- expr = this.getCopyOfObjectInvocation( fieldOutline.parent() ).arg( source );
+ expr = this.getCopyOfObjectInvocation( fieldOutline.parent() ).arg( sourceExpr );
}
else if ( type == CBuiltinLeafInfo.BASE64_BYTE_ARRAY )
{
final JClass byteArray = fieldOutline.parent().parent().getCodeModel().ref( byte[].class );
- expr = this.getCopyOfPrimitiveArrayExpression( fieldOutline.parent(), byteArray, source );
+ expr = this.getCopyOfPrimitiveArrayExpression( fieldOutline.parent(), byteArray, sourceExpr );
}
else if ( type == CBuiltinLeafInfo.BIG_DECIMAL || type == CBuiltinLeafInfo.BIG_INTEGER
|| type == CBuiltinLeafInfo.STRING || type == CBuiltinLeafInfo.BOOLEAN || type == CBuiltinLeafInfo.INT
|| type == CBuiltinLeafInfo.LONG || type == CBuiltinLeafInfo.BYTE || type == CBuiltinLeafInfo.SHORT
|| type == CBuiltinLeafInfo.FLOAT || type == CBuiltinLeafInfo.DOUBLE )
{
- expr = source;
+ expr = sourceExpr;
}
else if ( type == CBuiltinLeafInfo.QNAME )
{
- expr = source;
+ expr = sourceExpr;
}
else if ( type == CBuiltinLeafInfo.CALENDAR )
{
final JClass xmlCal = fieldOutline.parent().parent().getCodeModel().ref( XMLGregorianCalendar.class );
if ( sourceMaybeNull )
{
- expr = JOp.cond( source.eq( JExpr._null() ), JExpr._null(),
- JExpr.cast( xmlCal, source.invoke( "clone" ) ) );
+ expr = JOp.cond( sourceExpr.eq( JExpr._null() ), JExpr._null(),
+ JExpr.cast( xmlCal, sourceExpr.invoke( "clone" ) ) );
}
else
{
- expr = JExpr.cast( xmlCal, source.invoke( "clone" ) );
+ expr = JExpr.cast( xmlCal, sourceExpr.invoke( "clone" ) );
}
}
else if ( type == CBuiltinLeafInfo.DURATION )
{
- expr = source;
+ expr = sourceExpr;
}
else if ( type == CBuiltinLeafInfo.DATA_HANDLER || type == CBuiltinLeafInfo.IMAGE
|| type == CBuiltinLeafInfo.XML_SOURCE )
@@ -1973,14 +2125,14 @@
type.toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ).fullName(),
fieldOutline.getPropertyInfo().getName( true ), fieldOutline.parent().implClass.fullName() );
- expr = source;
+ expr = sourceExpr;
}
return expr;
}
private JExpression getWildcardCopyExpression( final FieldOutline fieldOutline, final CWildcardTypeInfo type,
- final JBlock block, final JExpression source,
+ final JBlock block, final JExpression sourceExpr,
final boolean sourceMaybeNull )
{
block.directStatement( "// CWildcardTypeInfo: " + type.toType( fieldOutline.parent().parent(),
@@ -1989,21 +2141,21 @@
if ( sourceMaybeNull )
{
- return JOp.cond( source.eq( JExpr._null() ), JExpr._null(),
+ return JOp.cond( sourceExpr.eq( JExpr._null() ), JExpr._null(),
JExpr.cast( fieldOutline.parent().parent().getCodeModel().ref( Element.class ),
- source.invoke( "cloneNode" ).arg( JExpr.TRUE ) ) );
+ sourceExpr.invoke( "cloneNode" ).arg( JExpr.TRUE ) ) );
}
else
{
return JExpr.cast( fieldOutline.parent().parent().getCodeModel().ref( Element.class ),
- source.invoke( "cloneNode" ).arg( JExpr.TRUE ) );
+ sourceExpr.invoke( "cloneNode" ).arg( JExpr.TRUE ) );
}
}
private JExpression getClassInfoCopyExpression( final FieldOutline fieldOutline, final CClassInfo type,
- final JBlock block, final JExpression source,
+ final JBlock block, final JExpression sourceExpr,
final boolean sourceMaybeNull )
{
block.directStatement(
@@ -2011,16 +2163,16 @@
if ( sourceMaybeNull )
{
- return JOp.cond( source.eq( JExpr._null() ), JExpr._null(), source.invoke( "clone" ) );
+ return JOp.cond( sourceExpr.eq( JExpr._null() ), JExpr._null(), sourceExpr.invoke( "clone" ) );
}
else
{
- return source.invoke( "clone" );
+ return sourceExpr.invoke( "clone" );
}
}
private JExpression getNonElementCopyExpression( final FieldOutline fieldOutline, final CNonElement type,
- final JBlock block, final JExpression source,
+ final JBlock block, final JExpression sourceExpr,
final boolean sourceMaybeNull )
{
final JType jType = type.toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION );
@@ -2030,54 +2182,55 @@
block.directStatement( "// " + WARNING_PREFIX + ": type was not part of the compilation unit." );
block.directStatement( "// " + WARNING_PREFIX + ": "
- + "The plugin assumes that type to declare a 'public Object clone()' method which " );
+ + "The CC-XJC plugin assumes that type to declare a 'public Object clone()' method." );
block.directStatement( "// " + WARNING_PREFIX + ": "
- + "does not throw a 'CloneNotSupportedException' and to directly extend class" );
+ + "If this warning is part of an 'if instanceof' block, the order of 'if instanceof'" );
block.directStatement( "// " + WARNING_PREFIX + ": "
- + "'java.lang.Object'. If this warning is part of an 'if instanceof' block," );
+ + "statements may be wrong and must be verified." );
- block.directStatement( "// " + WARNING_PREFIX + ": "
- + "the order of 'if instanceof' statements may be wrong and must be verified." );
-
this.log( Level.WARNING, "nonElementWarning",
fieldOutline.parent().implClass.fullName(), fieldOutline.getPropertyInfo().getName( true ),
jType.binaryName(), WARNING_PREFIX );
+ this.tryCatchCopyExpression = true;
+
if ( sourceMaybeNull )
{
- return JOp.cond( source.eq( JExpr._null() ), JExpr._null(), JExpr.cast( jType, source.invoke( "clone" ) ) );
+ return JOp.cond( sourceExpr.eq( JExpr._null() ), JExpr._null(),
+ JExpr.cast( jType, sourceExpr.invoke( "clone" ) ) );
+
}
else
{
- return JExpr.cast( jType, source.invoke( "clone" ) );
+ return JExpr.cast( jType, sourceExpr.invoke( "clone" ) );
}
}
private JExpression getArrayCopyExpression( final FieldOutline fieldOutline, final CArrayInfo type,
- final JBlock block, final JExpression source )
+ final JBlock block, final JExpression sourceExpr )
{
block.directStatement( "// CArrayInfo: " + type.fullName() );
- return this.getCopyOfArrayInfoInvocation( fieldOutline, type ).arg( source );
+ return this.getCopyOfArrayInfoInvocation( fieldOutline, type ).arg( sourceExpr );
}
private JExpression getElementCopyExpression( final FieldOutline fieldOutline, final CElementInfo type,
- final JBlock block, final JExpression source )
+ final JBlock block, final JExpression sourceExpr )
{
- block.directStatement(
- "// CElementInfo: " + type.toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ).binaryName() );
+ block.directStatement( "// CElementInfo: "
+ + type.toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ).binaryName() );
- return this.getCopyOfElementInfoInvocation( fieldOutline, type ).arg( source );
+ return this.getCopyOfElementInfoInvocation( fieldOutline, type ).arg( sourceExpr );
}
private JExpression getEnumLeafInfoCopyExpression( final FieldOutline fieldOutline, final CEnumLeafInfo type,
- final JBlock block, final JExpression source )
+ final JBlock block, final JExpression sourceExpr )
{
block.directStatement(
"// CEnumLeafInfo: " + type.toType( fieldOutline.parent().parent(), Aspect.IMPLEMENTATION ).binaryName() );
- return source;
+ return sourceExpr;
}
private JExpression getAdapterInfoCopyExpression( final FieldOutline fieldOutline, final CAdapterInfo type,
@@ -2167,7 +2320,7 @@
for ( FieldOutline field : clazz.getDeclaredFields() )
{
hasFields = true;
- this.generateCopyOfProperty( field, source, copyBlock );
+ this.generateCopyOfProperty( field, JExpr._this(), source, copyBlock, false );
}
for ( JFieldVar field : clazz.implClass.fields().values() )
@@ -2217,6 +2370,15 @@
final JTryBlock tryCopy = ctor.body()._try();
effective = tryCopy.body();
+ if ( this.contextExceptions.contains( Exception.class ) )
+ {
+ this.contextExceptions.retainAll( Arrays.asList( new Class<?>[]
+ {
+ Exception.class
+ } ) );
+
+ }
+
for ( Class<?> e : this.contextExceptions )
{
final JCatchBlock catchBlock = tryCopy._catch( clazz.parent().getCodeModel().ref( e ) );
@@ -2292,28 +2454,105 @@
private JMethod generateCloneMethod( final ClassOutline clazz )
{
- JMethod cloneMethod = null;
+ final JMethod cloneMethod = clazz.implClass.method( JMod.PUBLIC, clazz.implClass, "clone" );
+ cloneMethod.annotate( Override.class );
+ clazz.implClass._implements( clazz.parent().getCodeModel().ref( Cloneable.class ) );
+ cloneMethod.javadoc().append( "Creates and returns a deep copy of this object.\n" );
+ cloneMethod.javadoc().addReturn().append( "A deep copy of this object." );
+ this.contextExceptions.clear();
- if ( clazz.implClass.isAbstract() )
+ if ( clazz.getSuperClass() == null || clazz.getSuperClass().implClass.binaryName().equals( "java.lang.Object" )
+ || ( clazz.implClass._extends() != null
+ && clazz.implClass._extends().binaryName().equals( "java.lang.Object" ) ) )
{
- cloneMethod = clazz.implClass.method( JMod.ABSTRACT | JMod.PUBLIC, clazz.implClass, "clone" );
+ // Cannot check the super classes 'clone' method throwing a 'CloneNotSupportedException'.
+ this.contextExceptions.add( CloneNotSupportedException.class );
}
+
+ final JBlock copyBlock = new JBlock( false, false );
+ copyBlock.directStatement( "// " + getMessage( "title" ) );
+ final JVar clone = copyBlock.decl( JMod.FINAL, clazz.implClass, "clone",
+ JExpr.cast( clazz.implClass, JExpr._super().invoke( "clone" ) ) );
+
+ for ( FieldOutline field : clazz.getDeclaredFields() )
+ {
+ this.generateCopyOfProperty( field, clone, JExpr._this(), copyBlock, true );
+ }
+
+ for ( JFieldVar field : clazz.implClass.fields().values() )
+ {
+ if ( ( field.mods().getValue() & JMod.STATIC ) == JMod.STATIC )
+ {
+ continue;
+ }
+
+ final FieldOutline fieldOutline = this.getFieldOutline( clazz, field.name() );
+ if ( fieldOutline == null )
+ {
+ if ( field.type().isPrimitive() )
+ {
+ copyBlock.directStatement( "// Unknown primitive field '" + field.name() + "'." );
+ copyBlock.assign( clone.ref( field.name() ), JExpr.refthis( field.name() ) );
+// this.log( Level.WARNING, "fieldWithoutProperties", field.name(), clazz.implClass.name() );
+ }
+ else
+ {
+ if ( field.name().equals( "otherAttributes" ) && clazz.target.declaresAttributeWildcard() )
+ {
+ copyBlock.directStatement( "// Other attributes." );
+ copyBlock.add( clone.ref( field.name() ).invoke( "putAll" ).
+ arg( JExpr.refthis( field.name() ) ) );
+
+ }
+ else
+ {
+ copyBlock.directStatement( "// Unknown reference field '" + field.name() + "'." );
+ copyBlock.assign( clone.ref( field.name() ), JExpr.cast(
+ field.type(), this.getCopyOfObjectInvocation( clazz ).arg(
+ JExpr.refthis( field.name() ) ) ) );
+
+// this.log( Level.WARNING, "fieldWithoutProperties", field.name(), clazz.implClass.name() );
+ }
+ }
+ }
+ }
+
+ copyBlock._return( clone );
+
+ if ( !this.contextExceptions.isEmpty() )
+ {
+ final JTryBlock tryCopy = cloneMethod.body()._try();
+ tryCopy.body().add( copyBlock );
+
+ if ( this.contextExceptions.contains( Exception.class ) )
+ {
+ this.contextExceptions.retainAll( Arrays.asList( new Class<?>[]
+ {
+ Exception.class
+ } ) );
+
+ }
+
+ for ( Class<?> e : this.contextExceptions )
+ {
+ final JCatchBlock catchBlock = tryCopy._catch( clazz.parent().getCodeModel().ref( e ) );
+ catchBlock.body().directStatement( "// Please report this at " + getMessage( "bugtrackerUrl" ) );
+ catchBlock.body()._throw( JExpr._new( clazz.parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( catchBlock.param( "e" ) ) );
+
+ }
+ }
else
{
- cloneMethod = clazz.implClass.method( JMod.PUBLIC, clazz.implClass, "clone" );
- cloneMethod.body().directStatement( "// " + getMessage( "title" ) );
- cloneMethod.body()._return( JExpr._new( clazz.implClass ).arg( JExpr._this() ) );
+ cloneMethod.body().add( copyBlock );
}
- cloneMethod.annotate( Override.class );
- clazz.implClass._implements( clazz.parent().getCodeModel().ref( Cloneable.class ) );
- cloneMethod.javadoc().append( "Creates and returns a deep copy of this object.\n" );
- cloneMethod.javadoc().addReturn().append( "A deep copy of this object." );
this.methodCount = this.methodCount.add( BigInteger.ONE );
return cloneMethod;
}
- private void generateCopyOfProperty( final FieldOutline field, final JExpression o, final JBlock block )
+ private void generateCopyOfProperty( final FieldOutline field, final JExpression targetExpr,
+ final JExpression sourceExpr, final JBlock block, final boolean cloneMethod )
{
final JMethod getter = this.getPropertyGetter( field );
@@ -2324,31 +2563,44 @@
if ( field.getRawType().isArray() )
{
block.directStatement( "// '" + field.getPropertyInfo().getName( true ) + "' array." );
- final JConditional fieldNotNull =
- block._if( JExpr.ref( o, field.getPropertyInfo().getName( false ) ).ne( JExpr._null() ) );
+ final JConditional fieldNotNull = block._if(
+ JExpr.ref( sourceExpr, field.getPropertyInfo().getName( false ) ).ne( JExpr._null() ) );
- fieldNotNull._then().invoke( this.getCopyOfCollectionMethod( field ) ).
- arg( JExpr.invoke( o, getter ) );
+ fieldNotNull._then().assign(
+ targetExpr.ref( field.getPropertyInfo().getName( false ) ),
+ JExpr.invoke( this.getCopyOfCollectionMethod( field ) ).
+ arg( JExpr.invoke( sourceExpr, getter ) ) );
}
else
{
block.directStatement( "// '" + field.getPropertyInfo().getName( true ) + "' collection." );
- final JConditional fieldNotNull =
- block._if( JExpr.ref( o, field.getPropertyInfo().getName( false ) ).ne( JExpr._null() ) );
+ final JConditional fieldNotNull = block._if(
+ JExpr.ref( sourceExpr, field.getPropertyInfo().getName( false ) ).ne( JExpr._null() ) );
+ if ( cloneMethod )
+ {
+ fieldNotNull._then().assign( JExpr.ref( targetExpr, field.getPropertyInfo().getName( false ) ),
+ JExpr._null() );
+
+ }
+
fieldNotNull._then().invoke( this.getCopyOfCollectionMethod( field ) ).
- arg( JExpr.invoke( o, getter ) ).arg( JExpr.invoke( getter ) );
+ arg( JExpr.invoke( sourceExpr, getter ) ).arg( JExpr.invoke( targetExpr, getter ) );
}
}
else
{
final JExpression copyExpr;
+ boolean needsToCatchException = false;
+
if ( field.getPropertyInfo().ref().size() != 1 )
{
block.directStatement( "// '" + field.getPropertyInfo().getName( true ) + "' property." );
- copyExpr = JExpr.invoke( this.getCopyOfPropertyMethod( field ) ).arg( o.invoke( getter ) );
+ copyExpr = JExpr.invoke( this.getCopyOfPropertyMethod( field ) ).
+ arg( sourceExpr.invoke( getter ) );
+
}
else
{
@@ -2374,10 +2626,11 @@
final JExpression source =
field.parent().parent().getModel().strategy == ImplStructureStrategy.BEAN_ONLY
- ? JExpr.invoke( o, getter )
- : JExpr.cast( javaType, JExpr.invoke( o, getter ) );
+ ? JExpr.invoke( sourceExpr, getter )
+ : JExpr.cast( javaType, JExpr.invoke( sourceExpr, getter ) );
copyExpr = this.getCopyExpression( field, typeInfo, block, source, true );
+ needsToCatchException = needsToCatchException || this.tryCatchCopyExpression;
}
if ( copyExpr == null )
@@ -2388,14 +2641,29 @@
}
else
{
+ JBlock copyBlock = block;
+ if ( needsToCatchException )
+ {
+ final JTryBlock tryCopy = block._try();
+ copyBlock = tryCopy.body();
+
+ final JCatchBlock catchException =
+ tryCopy._catch( field.parent().parent().getCodeModel().ref( Exception.class ) );
+
+ final JVar e = catchException.param( "e" );
+ catchException.body()._throw( JExpr._new( field.parent().parent().getCodeModel().
+ ref( AssertionError.class ) ).arg( e ) );
+
+ }
+
if ( field.getRawType().isPrimitive() )
{
- block.assign( JExpr.refthis( field.getPropertyInfo().getName( false ) ), copyExpr );
+ copyBlock.assign( targetExpr.ref( field.getPropertyInfo().getName( false ) ), copyExpr );
}
else
{
- block.assign( JExpr.refthis( field.getPropertyInfo().getName( false ) ),
- JOp.cond( JExpr.ref( o, field.getPropertyInfo().getName( false ) ).
+ copyBlock.assign( targetExpr.ref( field.getPropertyInfo().getName( false ) ),
+ JOp.cond( JExpr.ref( sourceExpr, field.getPropertyInfo().getName( false ) ).
eq( JExpr._null() ), JExpr._null(), copyExpr ) );
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/pom.xml 2011-09-16 12:07:36 UTC (rev 141)
@@ -36,7 +36,7 @@
<artifactId>cc-xjc</artifactId>
<packaging>pom</packaging>
<name>CC-XJC</name>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<description>JAXB 2.0 Schema to Java compiler plugin for adding a copy constructor to schema derived classes.</description>
<url>http://ccxjc.sourceforge.net</url>
<inceptionYear>2009</inceptionYear>
Modified: trunk/src/main/changes/changes.xml
===================================================================
--- trunk/src/main/changes/changes.xml 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/src/main/changes/changes.xml 2011-09-16 12:07:36 UTC (rev 141)
@@ -176,11 +176,17 @@
<action dev="schulte2005" type="update">Updated to stop initializing unset optional attributes to default values during copying.</action>
</release>
<!-- *********************************************************************************************************** -->
- <release version="1.5" date="2011-03-11" description="Bugfix release.">
+ <release version="1.5" date="2011-03-11" description="Feature enhancements.">
<action dev="schulte2005" type="add">Added option '-cc-string-types'.</action>
<action dev="schulte2005" type="fix" issue="7" system="MantisBT">
Corrected a 'NullPointerException' thrown with 'javaType' customizations.
</action>
</release>
+ <!-- *********************************************************************************************************** -->
+ <release version="2.0" date="2011-09-16" description="Feature enhancements.">
+ <action dev="schulte2005" type="fix" issue="8" system="MantisBT">
+ Generated 'clone' methods should call 'super.clone()'.
+ </action>
+ </release>
</body>
</document>
Modified: trunk/src/site/apt/examples.apt
===================================================================
--- trunk/src/site/apt/examples.apt 2011-04-22 22:25:38 UTC (rev 140)
+++ trunk/src/site/apt/examples.apt 2011-09-16 12:07:36 UTC (rev 141)
@@ -51,7 +51,7 @@
stax-api-1.0.jar:\
jaxb-impl-2.0.5.jar:\
jaxb-xjc-2.0.5.jar:\
- cc-xjc-plugin-1.5.jar\
+ cc-xjc-plugin-2.0.jar\
com.sun.tools.xjc.Driver -d /tmp/src -copy-constructor <schema files>
---
@@ -70,7 +70,7 @@
<dependency>
<groupId>net.sourceforge.ccxjc</groupId>
<artifactId>cc-xjc-plugin</artifactId>
- <version>1.5</version>
+ <version>2.0</version>
</dependency>
</dependencies>
<executions>
@@ -80,7 +80,7 @@
<goal>xjc</goal>
</goals>
<configuration>
- <arguments>-copy-constructor -cc-visibility private -cc-target 1.5</arguments>
+ <arguments>-copy-constructor</arguments>
<extension>true</extension>
</configuration>
</execution>
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:25:45
|
Revision: 140
http://ccxjc.svn.sourceforge.net/ccxjc/?rev=140&view=rev
Author: schulte2005
Date: 2011-04-22 22:25:38 +0000 (Fri, 22 Apr 2011)
Log Message:
-----------
o s/* Redistributions/o Redistributions/g
Modified Paths:
--------------
trunk/LICENSE.txt
trunk/cc-xjc-dist/pom.xml
trunk/cc-xjc-dist/src/main/assembly/bin.xml
trunk/cc-xjc-it/pom.xml
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb
trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb
trunk/cc-xjc-it/src/main/schemas/cc-xjc-it.xsd
trunk/cc-xjc-plugin/pom.xml
trunk/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html
trunk/pom.xml
trunk/src/main/books/cc-xjc.xml
trunk/src/main/changes/changes.xml
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:23:56 UTC (rev 139)
+++ trunk/LICENSE.txt 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-dist/pom.xml
===================================================================
--- trunk/cc-xjc-dist/pom.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-dist/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-dist/src/main/assembly/bin.xml
===================================================================
--- trunk/cc-xjc-dist/src/main/assembly/bin.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-dist/src/main/assembly/bin.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/pom.xml
===================================================================
--- trunk/cc-xjc-it/pom.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-package.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-private.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-protected.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-no-value-class-public.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-package.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-private.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-protected.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-collections-public.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-package.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-private.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-protected.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-no-value-class-public.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-package.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-private.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-protected.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb
===================================================================
--- trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-it/src/main/jaxb/cc-xjc-it-indexed-public.xjb 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-it/src/main/schemas/cc-xjc-it.xsd
===================================================================
(Binary files differ)
Modified: trunk/cc-xjc-plugin/pom.xml
===================================================================
--- trunk/cc-xjc-plugin/pom.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-plugin/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html
===================================================================
--- trunk/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/cc-xjc-plugin/src/main/javadoc/net/sourceforge/ccxjc/package.html 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/pom.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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/cc-xjc.xml
===================================================================
--- trunk/src/main/books/cc-xjc.xml 2011-04-22 22:23:56 UTC (rev 139)
+++ trunk/src/main/books/cc-xjc.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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:23:56 UTC (rev 139)
+++ trunk/src/main/changes/changes.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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:23:56 UTC (rev 139)
+++ trunk/src/site/apt/download.apt 2011-04-22 22:25:38 UTC (rev 140)
@@ -12,10 +12,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:23:56 UTC (rev 139)
+++ trunk/src/site/apt/examples.apt 2011-04-22 22:25:38 UTC (rev 140)
@@ -12,10 +12,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:23:56 UTC (rev 139)
+++ trunk/src/site/apt/index.apt 2011-04-22 22:25:38 UTC (rev 140)
@@ -12,10 +12,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:23:56 UTC (rev 139)
+++ trunk/src/site/apt/license-info.apt 2011-04-22 22:25:38 UTC (rev 140)
@@ -12,10 +12,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.
@@ -45,10 +45,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:23:56 UTC (rev 139)
+++ trunk/src/site/site.xml 2011-04-22 22:25:38 UTC (rev 140)
@@ -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.
|
