cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r899745 - in /cxf/trunk: common/xjc/boolean/ common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/ common/xjc/bug671/ common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/ common/xjc/dv/ common/xjc/dv/src/main/java/org/apache/cxf/xjc...
Date Fri, 15 Jan 2010 18:36:22 GMT
Author: dkulp
Date: Fri Jan 15 18:36:12 2010
New Revision: 899745

URL: http://svn.apache.org/viewvc?rev=899745&view=rev
Log:
Make the xjc plugins more self standing and usable without CXF stuff
Pull xjc plugins from the bundle as there isn't a way to really disable
them if on the classpath and they can cause problems with other xjc
plugins

Modified:
    cxf/trunk/common/xjc/boolean/pom.xml
    cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
    cxf/trunk/common/xjc/bug671/pom.xml
    cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
    cxf/trunk/common/xjc/dv/pom.xml
    cxf/trunk/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
    cxf/trunk/common/xjc/ts/pom.xml
    cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/src/main/assembly/bin.xml

Modified: cxf/trunk/common/xjc/boolean/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/boolean/pom.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/boolean/pom.xml (original)
+++ cxf/trunk/common/xjc/boolean/pom.xml Fri Jan 15 18:36:12 2010
@@ -38,11 +38,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>

Modified: cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
(original)
+++ cxf/trunk/common/xjc/boolean/src/main/java/org/apache/cxf/xjc/bg/BooleanGetterPlugin.java
Fri Jan 15 18:36:12 2010
@@ -28,7 +28,6 @@
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.Outline;
 
-import org.apache.cxf.common.logging.LogUtils;
 
 /**
  * Generate getters named getXXX() for Booleans instead of isXXX(). Useful to use generated
beans with tools
@@ -36,7 +35,7 @@
  */
 public class BooleanGetterPlugin {
 
-    private static final Logger LOG = LogUtils.getL7dLogger(BooleanGetterPlugin.class);
+    private static final Logger LOG = Logger.getLogger(BooleanGetterPlugin.class.getName());
//NOPMD
 
     public BooleanGetterPlugin() {
     }

Modified: cxf/trunk/common/xjc/bug671/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/bug671/pom.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/bug671/pom.xml (original)
+++ cxf/trunk/common/xjc/bug671/pom.xml Fri Jan 15 18:36:12 2010
@@ -38,11 +38,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>

Modified: cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
(original)
+++ cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java
Fri Jan 15 18:36:12 2010
@@ -42,7 +42,7 @@
     }
 
     public String getUsage() {
-        return "  -Xbug671             : Activate plugin to map package names that contain
keywords\n";
+        return "  -Xbug671             : Activate plugin to map package names that contain
keywords";
     }
 
     public void onActivated(Options opt) throws BadCommandLineException {

Modified: cxf/trunk/common/xjc/dv/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/dv/pom.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/dv/pom.xml (original)
+++ cxf/trunk/common/xjc/dv/pom.xml Fri Jan 15 18:36:12 2010
@@ -38,11 +38,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>

Modified: cxf/trunk/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java (original)
+++ cxf/trunk/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java Fri
Jan 15 18:36:12 2010
@@ -53,15 +53,13 @@
 import com.sun.xml.xsom.XSType;
 import com.sun.xml.xsom.XmlString;
 
-import org.apache.cxf.common.logging.LogUtils;
-
 /**
  * Modifies the JAXB code model to initialize fields mapped from schema elements 
  * with their default value.
  */
 public class DefaultValuePlugin {
     
-    private static final Logger LOG = LogUtils.getL7dLogger(DefaultValuePlugin.class);
+    private static final Logger LOG = Logger.getLogger(DefaultValuePlugin.class.getName());
//NOPMD
     
     public DefaultValuePlugin() {
     }
@@ -237,7 +235,7 @@
                 .arg(qn.getLocalPart())
                 .arg(qn.getPrefix());
         } else if ("javax.xml.datatype.Duration".equals(typeName)) {
-            dv = outline.getCodeModel().ref(org.apache.cxf.jaxb.DatatypeFactory.class)
+            dv = outline.getCodeModel().ref("org.apache.cxf.jaxb.DatatypeFactory")
                 .staticInvoke("createDuration").arg(defaultValue);
         } else if (type instanceof JDefinedClass) {
             JDefinedClass cls = (JDefinedClass)type;

Modified: cxf/trunk/common/xjc/ts/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/ts/pom.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/ts/pom.xml (original)
+++ cxf/trunk/common/xjc/ts/pom.xml Fri Jan 15 18:36:12 2010
@@ -38,11 +38,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>

Modified: cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java (original)
+++ cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java Fri Jan
15 18:36:12 2010
@@ -37,18 +37,13 @@
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.Outline;
 
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxb.JAXBToStringBuilder;
-import org.apache.cxf.jaxb.JAXBToStringStyle;
-
-
 /**
  * Modifies the JAXB code model to override the Object.toString() method with an 
  * implementation that provides a String representation of the xml content.
  */
 public class ToStringPlugin {
     
-    private static final Logger LOG = LogUtils.getL7dLogger(ToStringPlugin.class);
+    private static final Logger LOG = Logger.getLogger(ToStringPlugin.class.getName()); //NOPMD
 
     private String styleFieldName = "DEFAULT_STYLE";
     public String getOptionName() {
@@ -58,7 +53,7 @@
     public String getUsage() {
         return "  -Xts                 : Activate plugin to add a toString() method to generated
classes\n"
             +  "  -Xts:style:multiline : Have toString produce multi line output\n"
-            +  "  -Xts:style:simple    : Have toString produce single line terse output\n";
+            +  "  -Xts:style:simple    : Have toString produce single line terse output";
     }
 
     public int parseArgument(Options opt, String[] args, int index, com.sun.tools.xjc.Plugin
plugin) 
@@ -80,8 +75,9 @@
     public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
         LOG.fine("Running toString() plugin.");
         
-        final JClass toStringDelegateImpl = outline.getCodeModel().ref(JAXBToStringBuilder.class);
-        final JClass styleClass = outline.getCodeModel().ref(JAXBToStringStyle.class);
+        final JClass toStringDelegateImpl = outline.getCodeModel()
+            .ref("org.apache.cxf.jaxb.JAXBToStringBuilder");
+        final JClass styleClass = outline.getCodeModel().ref("org.apache.cxf.jaxb.JAXBToStringStyle");
         final JFieldRef toStringDelegateStyleParam = styleClass.staticRef(styleFieldName);
         
         for (ClassOutline co : outline.getClasses()) {

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Fri Jan 15 18:36:12 2010
@@ -98,28 +98,6 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-xjc-ts</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}.xjcplugins</groupId>
-            <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>
-            <artifactId>cxf-xjc-dv</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=899745&r1=899744&r2=899745&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Fri Jan 15 18:36:12 2010
@@ -154,11 +154,19 @@
             <unpack>false</unpack>
             <excludes>
                 <exclude>org.apache.cxf:*</exclude>
-                <exclude>org.apache.cxf.xjcplugins:*</exclude>
             </excludes>
             <scope>runtime</scope>
         </dependencySet>
         <dependencySet>
+            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
+                <include>org.apache.cxf:cxf-xjc-ts</include>
+                <include>org.apache.cxf:cxf-xjc-dv</include>
+            </includes>
+            <scope>runtime</scope>
+        </dependencySet>
+        <dependencySet>
             <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
             <unpack>false</unpack>
             <includes>



Mime
View raw message