cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r447762 - in /incubator/cxf/trunk: ./ api/ api/src/main/resources/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ common/ common/common/ common/common/src/ common/common/src/main/ common/common/src/main/java/org/apache/cxf/spring...
Date Tue, 19 Sep 2006 06:42:44 GMT
Author: mmao
Date: Mon Sep 18 23:42:41 2006
New Revision: 447762

URL: http://svn.apache.org/viewvc?view=rev&rev=447762
Log:
Extract the xsd2java plugin from code gen plugin, moved to common module.
Re-struct the common module, 
 * Added common sub module (previous common module, i tried to name this sub module as utilities, but can not pass the checkstyle, should report a bug to maven)
 * Added xsd sub module (previous the maven plugin in codegen-plugin module, also moved beangen plugin into this module and moved the BeanGenerator from tools to common)
 * Added metacode sub module (previous generated in the api, now can be used in tools)

Added:
    incubator/cxf/trunk/common/common/
    incubator/cxf/trunk/common/common/.checkstyle
      - copied unchanged from r447740, incubator/cxf/trunk/common/.checkstyle
    incubator/cxf/trunk/common/common/.pmd
      - copied unchanged from r447740, incubator/cxf/trunk/common/.pmd
    incubator/cxf/trunk/common/common/.ruleset
      - copied unchanged from r447740, incubator/cxf/trunk/common/.ruleset
    incubator/cxf/trunk/common/common/pom.xml   (with props)
    incubator/cxf/trunk/common/common/src/
      - copied from r447740, incubator/cxf/trunk/common/src/
    incubator/cxf/trunk/common/common/src/main/
      - copied from r447761, incubator/cxf/trunk/common/src/main/
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/BeanGenerator.java
      - copied, changed from r447694, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/BeanGenerator.java
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/Messages.properties
      - copied unchanged from r447694, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/Messages.properties
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/SpringUtils.java
      - copied, changed from r447694, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/SpringUtils.java
    incubator/cxf/trunk/common/common/src/test/
      - copied from r447761, incubator/cxf/trunk/common/src/test/
    incubator/cxf/trunk/common/metacode/
    incubator/cxf/trunk/common/metacode/.checkstyle
    incubator/cxf/trunk/common/metacode/.pmd
    incubator/cxf/trunk/common/metacode/.ruleset
    incubator/cxf/trunk/common/metacode/pom.xml   (with props)
    incubator/cxf/trunk/common/metacode/src/
    incubator/cxf/trunk/common/metacode/src/main/
    incubator/cxf/trunk/common/metacode/src/main/java/
    incubator/cxf/trunk/common/metacode/src/main/java/org/
    incubator/cxf/trunk/common/metacode/src/main/java/org/apache/
    incubator/cxf/trunk/common/metacode/src/main/java/org/apache/cxf/
    incubator/cxf/trunk/common/metacode/src/main/java/org/apache/cxf/wsdl/
    incubator/cxf/trunk/common/metacode/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
      - copied unchanged from r447694, incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
    incubator/cxf/trunk/common/metacode/src/main/resources/
      - copied from r447694, incubator/cxf/trunk/api/src/main/resources/
    incubator/cxf/trunk/common/metacode/src/main/resources/META-INF/
      - copied from r447761, incubator/cxf/trunk/api/src/main/resources/META-INF/
    incubator/cxf/trunk/common/metacode/src/main/resources/config-metadata/
      - copied from r447761, incubator/cxf/trunk/api/src/main/resources/config-metadata/
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/
      - copied from r447761, incubator/cxf/trunk/api/src/main/resources/schemas/
    incubator/cxf/trunk/common/xsd/
    incubator/cxf/trunk/common/xsd/.checkstyle
    incubator/cxf/trunk/common/xsd/.pmd
    incubator/cxf/trunk/common/xsd/.ruleset
    incubator/cxf/trunk/common/xsd/pom.xml   (with props)
    incubator/cxf/trunk/common/xsd/src/
    incubator/cxf/trunk/common/xsd/src/main/
    incubator/cxf/trunk/common/xsd/src/main/java/
    incubator/cxf/trunk/common/xsd/src/main/java/org/
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java
      - copied, changed from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
      - copied, changed from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
      - copied unchanged from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
    incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
      - copied unchanged from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
Removed:
    incubator/cxf/trunk/api/src/main/resources/
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
    incubator/cxf/trunk/common/.checkstyle
    incubator/cxf/trunk/common/.pmd
    incubator/cxf/trunk/common/.ruleset
    incubator/cxf/trunk/common/src/
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/
Modified:
    incubator/cxf/trunk/api/pom.xml
    incubator/cxf/trunk/checkstyle.xml
    incubator/cxf/trunk/common/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/rt/management/pom.xml
    incubator/cxf/trunk/rt/ws/addr/pom.xml
    incubator/cxf/trunk/systests/pom.xml
    incubator/cxf/trunk/tools/common/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg/pom.xml

Modified: incubator/cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Mon Sep 18 23:42:41 2006
@@ -55,10 +55,15 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-common-metacode</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -92,69 +97,6 @@
 		    <sourcepath>${basedir}/src/main/java${path.separator}${basedir}/target/generated/src/main/java</sourcepath>
 		    <subpackages>org.apache.cxf</subpackages>
 		</configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-                            <!-- REVISIT: generate schemas and configuration beans in projects where needed first -->
-                            <!-- may need to modify bean generator so it can pick up schemas from jars -->
-                            <xsdOptions>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</xsd>
-                                    <dependencies>
-                                        <dependency>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</dependency>
-                                        <dependency>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</dependency>
-                                        <dependency>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</dependency>
-                                    </dependencies>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
-                                    <packagename>org.apache.cxf.ws.addressing</packagename>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
-                                    <packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsrm.xjb</bindingFile>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-conf.xsd</xsd>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-context.xsd</xsd>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
-                                </xsdOption>
-                            </xsdOptions>
-                            <beanfiles>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/bus-config.xml</beanfile>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/http-client-config.xml</beanfile>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/http-listener-config.xml</beanfile>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/http-server-config.xml</beanfile>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/jms-client-config.xml</beanfile>
-                                <beanfile>${basedir}/src/main/resources/config-metadata/jms-server-config.xml</beanfile>
-                            </beanfiles>
-                        </configuration>
-                        <goals>
-                            <goal>xsdtojava</goal>
-                            <goal>beangen</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

Modified: incubator/cxf/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/checkstyle.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/checkstyle.xml (original)
+++ incubator/cxf/trunk/checkstyle.xml Mon Sep 18 23:42:41 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file

Added: incubator/cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (added)
+++ incubator/cxf/trunk/common/common/pom.xml Mon Sep 18 23:42:41 2006
@@ -0,0 +1,135 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-common-utilities</artifactId>
+    <packaging>jar</packaging>
+    <version>2.0-incubator-M1-SNAPSHOT</version>
+    <name>CXF Common Utilities</name>
+    <url>http://cxf.apache.org/</url>
+
+    <parent>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf-common</artifactId>
+	<version>2.0-incubator-M1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+	<topDirectoryLocation>../../</topDirectoryLocation>
+	<!-- 
+	     use the 2.0.1 version of jaxb.impl because that is the version used by the codegenerator 
+	     (maven xjc plugin) as opposed to codegen-plugin
+	-->
+	<jaxb.impl.version.test>2.0.1</jaxb.impl.version.test>
+
+    </properties>
+
+    <dependencies>
+	<dependency>
+	    <groupId>junit</groupId>
+	    <artifactId>junit</artifactId>
+	    <scope>test</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.easymock</groupId>
+	    <artifactId>easymockclassextension</artifactId>
+	    <scope>test</scope>
+	</dependency>
+	<dependency>
+	    <groupId>asm</groupId>
+	    <artifactId>asm</artifactId>
+	    <scope>test</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-core</artifactId>
+	    <scope>compile</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-beans</artifactId>
+	    <scope>compile</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-context</artifactId>
+	    <scope>compile</scope>
+	</dependency>
+	<dependency>
+	    <groupId>commons-logging</groupId>
+	    <artifactId>commons-logging</artifactId>
+	</dependency>
+
+	<dependency>
+	    <groupId>javax.annotation</groupId>
+	    <artifactId>jsr250-api</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>javax.jws</groupId>
+	    <artifactId>jsr181-api</artifactId>
+	</dependency>
+
+	<dependency>
+	    <groupId>javax.xml.bind</groupId>
+	    <artifactId>jaxb-api</artifactId>
+	</dependency>
+
+	<dependency>
+	    <groupId>com.sun.xml.bind</groupId>
+	    <artifactId>jaxb-impl</artifactId>
+	    <scope>test</scope>
+	</dependency>
+	<dependency>
+	    <groupId>com.sun.xml.bind</groupId>
+	    <artifactId>jaxb-xjc</artifactId>
+	    <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>javax.xml.ws</groupId>
+	    <artifactId>jaxws-api</artifactId>
+	    <scope>provided</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>stax</groupId>
+	    <artifactId>stax-api</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>wsdl4j</groupId>
+	    <artifactId>wsdl4j</artifactId>
+	</dependency>
+
+	<dependency>
+	    <groupId>woodstox</groupId>
+	    <artifactId>wstx-asl</artifactId>
+	    <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>jaxme</groupId>
+	    <artifactId>jaxme2</artifactId>
+	    <scope>test</scope>
+	</dependency>
+
+    </dependencies>
+
+</project>

Propchange: incubator/cxf/trunk/common/common/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/common/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/BeanGenerator.java (from r447694, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/BeanGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/BeanGenerator.java?view=diff&rev=447762&p1=incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/BeanGenerator.java&r1=447694&p2=incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/BeanGenerator.java&r2=447762
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/BeanGenerator.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/BeanGenerator.java Mon Sep 18 23:42:41 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.generators.spring;
+package org.apache.cxf.spring;
 
 import java.io.File;
 import java.io.FileOutputStream;

Copied: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/SpringUtils.java (from r447694, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/SpringUtils.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/SpringUtils.java?view=diff&rev=447762&p1=incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/SpringUtils.java&r1=447694&p2=incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/SpringUtils.java&r2=447762
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/generators/spring/SpringUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/spring/SpringUtils.java Mon Sep 18 23:42:41 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.generators.spring;
+package org.apache.cxf.spring;
 
 import java.util.logging.Logger;
 

Added: incubator/cxf/trunk/common/metacode/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/.checkstyle?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/metacode/.checkstyle (added)
+++ incubator/cxf/trunk/common/metacode/.checkstyle Mon Sep 18 23:42:41 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.1.0" simple-config="false">
+    <fileset name="all" enabled="true" check-config-name="CXF Checks" type="external" description="">
+	<file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
+    </fileset>
+</fileset-config>
\ No newline at end of file

Added: incubator/cxf/trunk/common/metacode/.pmd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/.pmd?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/metacode/.pmd (added)
+++ incubator/cxf/trunk/common/metacode/.pmd Mon Sep 18 23:42:41 2006
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
\ No newline at end of file

Added: incubator/cxf/trunk/common/metacode/.ruleset
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/.ruleset?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/metacode/.ruleset (added)
+++ incubator/cxf/trunk/common/metacode/.ruleset Mon Sep 18 23:42:41 2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pmd-eclipse">
+  <description>PMD Plugin preferences rule set</description>
+  
+  
+  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+  <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+  
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+  
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+  <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+  
+  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+ 
+  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+  
+  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+  
+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+  
+</ruleset>

Added: incubator/cxf/trunk/common/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/pom.xml?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/metacode/pom.xml (added)
+++ incubator/cxf/trunk/common/metacode/pom.xml Mon Sep 18 23:42:41 2006
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-common-metacode</artifactId>
+    <packaging>jar</packaging>
+    <name>CXF Common Metacode</name>
+    <version>2.0-incubator-M1-SNAPSHOT</version>
+
+    <parent>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf-common</artifactId>
+	<version>2.0-incubator-M1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+	<topDirectoryLocation>../../</topDirectoryLocation>
+    </properties>
+
+    <dependencies>
+	<dependency>
+	    <groupId>junit</groupId>
+	    <artifactId>junit</artifactId>
+	    <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-common-utilities</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-common-xsd</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+
+    </dependencies>
+
+    <build>
+	<plugins>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-javadoc-plugin</artifactId>
+		<version>${javadoc.version}</version>
+		<executions>
+		    <execution>
+			<id>package</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>jar</goal>
+			</goals>
+		    </execution>
+		</executions>
+		<configuration>
+		    <attach>true</attach>
+		    <quiet>true</quiet>
+		    <bottom>-</bottom>
+		    <header>CeltiXfire API</header>
+		    <footer>CeltiXfire API</footer>
+		    <sourcepath>${basedir}/target/generated/src/main/java</sourcepath>
+		    <subpackages>org.apache.cxf</subpackages>
+		</configuration>
+	    </plugin>
+	    <plugin>
+		<groupId>org.apache.cxf</groupId>
+		<artifactId>cxf-common-xsd</artifactId>
+		<version>${project.version}</version>
+		<executions>
+		    <execution>
+			<id>generate-sources</id>
+			<phase>generate-sources</phase>
+			<configuration>
+			    <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+			    <!-- REVISIT: generate schemas and configuration beans in projects where needed first -->
+			    <!-- may need to modify bean generator so it can pick up schemas from jars -->
+			    <xsdOptions>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</xsd>
+				    <dependencies>
+					<dependency>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</dependency>
+					<dependency>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</dependency>
+					<dependency>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</dependency>
+				    </dependencies>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
+				    <packagename>org.apache.cxf.ws.addressing</packagename>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+				    <packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd>
+				    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsrm.xjb</bindingFile>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-conf.xsd</xsd>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-context.xsd</xsd>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
+				    <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
+				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
+				</xsdOption>
+			    </xsdOptions>
+                            <beanfiles>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/bus-config.xml</beanfile>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/http-client-config.xml</beanfile>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/http-listener-config.xml</beanfile>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/http-server-config.xml</beanfile>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/jms-client-config.xml</beanfile>
+                                <beanfile>${basedir}/src/main/resources/config-metadata/jms-server-config.xml</beanfile>
+                            </beanfiles>
+			    
+			</configuration>
+			<goals>
+			    <goal>xsdtojava</goal>
+                            <goal>beangen</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+	</plugins>
+    </build>
+</project>

Propchange: incubator/cxf/trunk/common/metacode/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/metacode/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/metacode/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/common/pom.xml (original)
+++ incubator/cxf/trunk/common/pom.xml Mon Sep 18 23:42:41 2006
@@ -1,183 +1,60 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-common</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
-    <name>CXF Common Utilities</name>
-    <url>http://cxf.apache.org/</url>
+    <name>CXF Common</name>
+    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
 
     <parent>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf</artifactId>
-        <version>2.0-incubator-M1-SNAPSHOT</version>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf</artifactId>
+	<version>2.0-incubator-M1-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <!-- 
-            use the 2.0.1 version of jaxb.impl because that is the version used by the codegenerator 
-            (maven xjc plugin) as opposed to codegen-plugin
-        -->
-        <jaxb.impl.version.test>2.0.1</jaxb.impl.version.test>
-
+	<topDirectoryLocation>..</topDirectoryLocation>
     </properties>
-
-    <!--
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>https://maven-repository.dev.java.net/nonav/repository/</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-    -->
-
+    
+    <modules>
+	<module>common</module>	        
+	<module>xsd</module>
+	<module>metacode</module>
+    </modules>
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>jaxme</groupId>
-            <artifactId>jaxme2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
+	<dependency>
+	    <groupId>com.sun.xml.bind</groupId>
+	    <artifactId>jaxb-xjc</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>com.sun.xml.bind</groupId>
+	    <artifactId>jaxb-impl</artifactId>
+	</dependency>
+
+	<dependency>
+	    <groupId>javax.xml.bind</groupId>
+	    <artifactId>jsr173_api</artifactId>
+	    <version>1.0</version>
+	</dependency>
     </dependencies>
-
-    <!-- 
-        asmyth: It seems we cannot code-generate here without extensions and subsequently
-        run the plugin with extensions in cxf-tools-xjc-dv-test, cxf-tools-xjc-cfg-test.
-        Looks like a bug in maven. 
-    -->
-    
-    <!--         
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.sun.tools.xjc.maven2</groupId>
-                <artifactId>maven-jaxb-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <generateDirectory>${basedir}/target/generated/src/test/java</generateDirectory>
-                            <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
-                            <includeSchema>*.xsd</includeSchema>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-xjc-dv</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-    -->
-
 </project>

Added: incubator/cxf/trunk/common/xsd/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/.checkstyle?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/xsd/.checkstyle (added)
+++ incubator/cxf/trunk/common/xsd/.checkstyle Mon Sep 18 23:42:41 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.1.0" simple-config="false">
+    <fileset name="all" enabled="true" check-config-name="CXF Checks" type="external" description="">
+	<file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
+    </fileset>
+</fileset-config>
\ No newline at end of file

Added: incubator/cxf/trunk/common/xsd/.pmd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/.pmd?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/xsd/.pmd (added)
+++ incubator/cxf/trunk/common/xsd/.pmd Mon Sep 18 23:42:41 2006
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
\ No newline at end of file

Added: incubator/cxf/trunk/common/xsd/.ruleset
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/.ruleset?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/xsd/.ruleset (added)
+++ incubator/cxf/trunk/common/xsd/.ruleset Mon Sep 18 23:42:41 2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pmd-eclipse">
+  <description>PMD Plugin preferences rule set</description>
+  
+  
+  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+  <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+  
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+  
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+  <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+  
+  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+ 
+  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+  
+  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+  
+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+  
+</ruleset>

Added: incubator/cxf/trunk/common/xsd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/pom.xml?view=auto&rev=447762
==============================================================================
--- incubator/cxf/trunk/common/xsd/pom.xml (added)
+++ incubator/cxf/trunk/common/xsd/pom.xml Mon Sep 18 23:42:41 2006
@@ -0,0 +1,111 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-common-xsd</artifactId>
+    <packaging>maven-plugin</packaging>
+    <version>2.0-incubator-M1-SNAPSHOT</version>
+    <name>CXF Common XSD2Java  Plugins</name>
+    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+
+
+    <parent>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf-common</artifactId>
+	<version>2.0-incubator-M1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+	<topDirectoryLocation>../../</topDirectoryLocation>
+	<java.source.version>1.4</java.source.version>
+    </properties>
+
+
+    <dependencies>
+	
+	<dependency>
+	    <groupId>junit</groupId>
+	    <artifactId>junit</artifactId>
+	    <version>3.8.1</version>
+	    <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.maven</groupId>
+	    <artifactId>maven-plugin-api</artifactId>
+	    <version>2.0.1</version>
+	    <scope>compile</scope>
+	    <exclusions>
+		<exclusion>
+		    <groupId>junit</groupId>
+		    <artifactId>junit</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.maven</groupId>
+	    <artifactId>maven-project</artifactId>
+	    <version>2.0.1</version>
+	    <scope>compile</scope>
+	    <exclusions>
+		<exclusion>
+		    <groupId>junit</groupId>
+		    <artifactId>junit</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-common-utilities</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+
+	<dependency>
+	    <groupId>ant</groupId>
+	    <artifactId>ant</artifactId>
+	    <version>1.6.5</version>
+	</dependency>
+
+	<dependency>
+	    <groupId>ant</groupId>
+	    <artifactId>ant-nodeps</artifactId>
+	    <version>1.6.5</version>
+	</dependency>
+
+    </dependencies>
+
+
+    <build>
+	<plugins>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+		    <source>1.4</source>
+		    <target>1.4</target>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+
+</project>

Propchange: incubator/cxf/trunk/common/xsd/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/xsd/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/xsd/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java (from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java?view=diff&rev=447762&p1=incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java&r1=447694&p2=incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java&r2=447762
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java (original)
+++ incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/BeanGenMojo.java Mon Sep 18 23:42:41 2006
@@ -29,7 +29,7 @@
 
 import org.apache.cxf.resource.ClassLoaderResolver;
 import org.apache.cxf.resource.DefaultResourceManager;
-import org.apache.cxf.tools.generators.spring.BeanGenerator;
+import org.apache.cxf.spring.BeanGenerator;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;

Copied: incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java (from r447694, incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java?view=diff&rev=447762&p1=incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java&r1=447694&p2=incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java&r2=447762
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java (original)
+++ incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java Mon Sep 18 23:42:41 2006
@@ -27,9 +27,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.apache.cxf.tools.wsdl2java.WSDLToJava;
-
-
 public final class CodegenUtils {
     
     static long timestamp;
@@ -44,8 +41,6 @@
         }
         
         getClassTime(CodegenUtils.class);
-        getClassTime(WSDLToJava.class);
-
         
         return timestamp;
     }

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Mon Sep 18 23:42:41 2006
@@ -41,7 +41,12 @@
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-common-metacode</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>

Modified: incubator/cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/rt/management/pom.xml (original)
+++ incubator/cxf/trunk/rt/management/pom.xml Mon Sep 18 23:42:41 2006
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -75,7 +75,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
+                <artifactId>cxf-common-xsd</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -99,6 +99,7 @@
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
 

Modified: incubator/cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/addr/pom.xml Mon Sep 18 23:42:41 2006
@@ -57,7 +57,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Mon Sep 18 23:42:41 2006
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/tools/common/pom.xml (original)
+++ incubator/cxf/trunk/tools/common/pom.xml Mon Sep 18 23:42:41 2006
@@ -82,7 +82,7 @@
 
             <dependency>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-common</artifactId>
+                <artifactId>cxf-common-utilities</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>

Modified: incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml Mon Sep 18 23:42:41 2006
@@ -105,7 +105,7 @@
                     </dependency>
                     <dependency>
                         <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common</artifactId>
+                        <artifactId>cxf-common-utilities</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                 </dependencies>

Modified: incubator/cxf/trunk/tools/xjc/cfg/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg/pom.xml?view=diff&rev=447762&r1=447761&r2=447762
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/cfg/pom.xml Mon Sep 18 23:42:41 2006
@@ -39,7 +39,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common</artifactId>
+            <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>



Mime
View raw message