cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r821224 - in /cxf/branches/2.2.x-fixes: ./ common/xjc/ common/xjc/boolean-test/ common/xjc/boolean-test/src/ common/xjc/boolean-test/src/test/ common/xjc/boolean-test/src/test/java/ common/xjc/boolean-test/src/test/java/org/ common/xjc/bool...
Date Sat, 03 Oct 2009 02:36:21 GMT
Author: dkulp
Date: Sat Oct  3 02:36:20 2009
New Revision: 821224

URL: http://svn.apache.org/viewvc?rev=821224&view=rev
Log:
Merged revisions 821223 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r821223 | dkulp | 2009-10-02 22:29:47 -0400 (Fri, 02 Oct 2009) | 2 lines
  
  [CXF-2410] Add xjc plugin for boolean getters.
  Patch from R?\195?\169mi Flament applied
........

Added:
    cxf/branches/2.2.x-fixes/common/xjc/boolean/
      - copied from r821223, cxf/trunk/common/xjc/boolean/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/pom.xml
      - copied, changed from r821223, cxf/trunk/common/xjc/boolean-test/pom.xml
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/apache/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/apache/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/apache/cxf/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/apache/cxf/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/bg/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/bg/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java
      - copied unchanged from r821223, cxf/trunk/common/xjc/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/resources/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/resources/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/resources/schemas/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/resources/schemas/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/resources/schemas/configuration/
      - copied from r821223, cxf/trunk/common/xjc/boolean-test/src/test/resources/schemas/configuration/
    cxf/branches/2.2.x-fixes/common/xjc/boolean-test/src/test/resources/schemas/configuration/foo.xsd
      - copied unchanged from r821223, cxf/trunk/common/xjc/boolean-test/src/test/resources/schemas/configuration/foo.xsd
    cxf/branches/2.2.x-fixes/common/xjc/boolean/pom.xml
      - copied, changed from r821223, cxf/trunk/common/xjc/boolean/pom.xml
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/xjc/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/xjc/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bg/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bg/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bg/BooleanGetterPlugin.java
      - copied unchanged from r821223, cxf/trunk/common/xjc/boolean/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bg/BooleanGetterPlugin.java
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/apache/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/apache/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/apache/cxf/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
      - copied unchanged from r821223, cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/resources/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/resources/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/resources/META-INF/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/resources/META-INF/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/resources/META-INF/services/
      - copied from r821223, cxf/trunk/common/xjc/boolean/src/main/resources/META-INF/services/
    cxf/branches/2.2.x-fixes/common/xjc/boolean/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
      - copied unchanged from r821223, cxf/trunk/common/xjc/boolean/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/common/xjc/dv-test/pom.xml
    cxf/branches/2.2.x-fixes/common/xjc/pom.xml
    cxf/branches/2.2.x-fixes/common/xjc/ts-test/pom.xml
    cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
    cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml
    cxf/branches/2.2.x-fixes/distribution/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Copied: cxf/branches/2.2.x-fixes/common/xjc/boolean-test/pom.xml (from r821223, cxf/trunk/common/xjc/boolean-test/pom.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/boolean-test/pom.xml?p2=cxf/branches/2.2.x-fixes/common/xjc/boolean-test/pom.xml&p1=cxf/trunk/common/xjc/boolean-test/pom.xml&r1=821223&r2=821224&rev=821224&view=diff
==============================================================================
--- cxf/trunk/common/xjc/boolean-test/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/xjc/boolean-test/pom.xml Sat Oct  3 02:36:20 2009
@@ -23,14 +23,14 @@
     <groupId>org.apache.cxf.xjcplugins</groupId>
 	<artifactId>cxf-xjc-boolean-test</artifactId>
 	<packaging>jar</packaging>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.2.4-SNAPSHOT</version>
 	<name>Apache CXF XJC Boolean Getter Plugin Tests</name>
 	<url>http://cxf.apache.org</url>
 
 	<parent>
 		<groupId>org.apache.cxf</groupId>
 		<artifactId>cxf-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.2.4-SNAPSHOT</version>
 		<relativePath>../../../parent/pom.xml</relativePath>
 	</parent>
 

Copied: cxf/branches/2.2.x-fixes/common/xjc/boolean/pom.xml (from r821223, cxf/trunk/common/xjc/boolean/pom.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/boolean/pom.xml?p2=cxf/branches/2.2.x-fixes/common/xjc/boolean/pom.xml&p1=cxf/trunk/common/xjc/boolean/pom.xml&r1=821223&r2=821224&rev=821224&view=diff
==============================================================================
--- cxf/trunk/common/xjc/boolean/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/xjc/boolean/pom.xml Sat Oct  3 02:36:20 2009
@@ -21,14 +21,14 @@
     <groupId>org.apache.cxf.xjcplugins</groupId>
     <artifactId>cxf-xjc-boolean</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.2.4-SNAPSHOT</version>
     <name>Apache CXF XJC Boolean Getter Plugin</name>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.2.4-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: cxf/branches/2.2.x-fixes/common/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/dv-test/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/dv-test/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/xjc/dv-test/pom.xml Sat Oct  3 02:36:20 2009
@@ -85,9 +85,28 @@
                     <extension>true</extension>
                     <quiet>true</quiet>
                 </configuration>
-
                 <dependencies>
                     <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>${jaxb.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>${jaxb.impl.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                        <version>${jaxb.xjc.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-boolean</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
                         <groupId>org.apache.cxf</groupId>
                         <artifactId>cxf-xjc-dv</artifactId>
                         <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/common/xjc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/xjc/pom.xml Sat Oct  3 02:36:20 2009
@@ -35,7 +35,9 @@
     <modules>
         <module>dv</module>
         <module>ts</module>
+	<module>boolean</module>
 	<module>bug671</module>
+	<module>boolean-test</module>
         <module>dv-test</module>
         <module>ts-test</module>
     </modules>

Modified: cxf/branches/2.2.x-fixes/common/xjc/ts-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/ts-test/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/ts-test/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/xjc/ts-test/pom.xml Sat Oct  3 02:36:20 2009
@@ -57,8 +57,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-           <groupId>commons-lang</groupId>
-           <artifactId>commons-lang</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
     </dependencies>
 
@@ -85,6 +85,26 @@
 
                 <dependencies>
                     <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>${jaxb.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>${jaxb.impl.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                        <version>${jaxb.xjc.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf.xjcplugins</groupId>
+                        <artifactId>cxf-xjc-boolean</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
                         <groupId>org.apache.cxf</groupId>
                         <artifactId>cxf-xjc-dv</artifactId>
                         <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Sat Oct  3 02:36:20 2009
@@ -106,6 +106,11 @@
             <artifactId>cxf-xjc-bug671</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
+            <artifactId>cxf-xjc-boolean</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml Sat Oct  3 02:36:20 2009
@@ -114,6 +114,11 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
+            <artifactId>cxf-xjc-boolean</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${pom.version}</version>

Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=821224&r1=821223&r2=821224&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/pom.xml Sat Oct  3 02:36:20 2009
@@ -119,6 +119,11 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
+            <groupId>${pom.groupId}.xjcplugins</groupId>
+            <artifactId>cxf-xjc-boolean</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${pom.version}</version>



Mime
View raw message