You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/02/04 22:43:38 UTC
svn commit: r906671 - in /cxf/xjc-utils: branches/ tags/ trunk/
trunk/boolean-test/ trunk/boolean/ trunk/bug671/ trunk/dv-test/ trunk/dv/
trunk/ts-test/ trunk/ts/ trunk/wsdlextension-test/ trunk/wsdlextension/
trunk/xsd/ trunk/xsd/src/main/java/org/apa...
Author: dkulp
Date: Thu Feb 4 21:43:37 2010
New Revision: 906671
URL: http://svn.apache.org/viewvc?rev=906671&view=rev
Log:
copy the xjc stuff to new subproject
Major update to xsdtojava plugin to support
a) Separate xsdtojava and xsdtojava-tests mojos
b) Loading extension jars itself instead of relying on
them being a plugin dep.
c) remove ant deps
Use improved xsdtojava plugin for tests
Added:
cxf/xjc-utils/branches/
cxf/xjc-utils/tags/
cxf/xjc-utils/trunk/ (with props)
cxf/xjc-utils/trunk/boolean/
- copied from r906610, cxf/trunk/common/xjc/boolean/
cxf/xjc-utils/trunk/boolean-test/
- copied from r906610, cxf/trunk/common/xjc/boolean-test/
cxf/xjc-utils/trunk/bug671/
- copied from r906610, cxf/trunk/common/xjc/bug671/
cxf/xjc-utils/trunk/dv/
- copied from r906610, cxf/trunk/common/xjc/dv/
cxf/xjc-utils/trunk/dv-test/
- copied from r906610, cxf/trunk/common/xjc/dv-test/
cxf/xjc-utils/trunk/pom.xml (with props)
cxf/xjc-utils/trunk/ts/
- copied from r906610, cxf/trunk/common/xjc/ts/
cxf/xjc-utils/trunk/ts-test/
- copied from r906610, cxf/trunk/common/xjc/ts-test/
cxf/xjc-utils/trunk/wsdlextension/
- copied from r906610, cxf/trunk/common/xjc/wsdlextension/
cxf/xjc-utils/trunk/wsdlextension-test/
- copied from r906610, cxf/trunk/common/xjc/wsdlextension-test/
cxf/xjc-utils/trunk/xsd/
- copied from r906610, cxf/trunk/common/xsd/
cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java (with props)
cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java (with props)
Modified:
cxf/xjc-utils/trunk/boolean-test/pom.xml
cxf/xjc-utils/trunk/boolean/pom.xml
cxf/xjc-utils/trunk/bug671/pom.xml
cxf/xjc-utils/trunk/dv-test/pom.xml
cxf/xjc-utils/trunk/dv/pom.xml
cxf/xjc-utils/trunk/ts-test/pom.xml
cxf/xjc-utils/trunk/ts/pom.xml
cxf/xjc-utils/trunk/wsdlextension-test/pom.xml
cxf/xjc-utils/trunk/wsdlextension/pom.xml
cxf/xjc-utils/trunk/xsd/pom.xml
cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Propchange: cxf/xjc-utils/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 4 21:43:37 2010
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+
Modified: cxf/xjc-utils/trunk/boolean-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/boolean-test/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/boolean-test/pom.xml (original)
+++ cxf/xjc-utils/trunk/boolean-test/pom.xml Thu Feb 4 21:43:37 2010
@@ -20,23 +20,20 @@
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.xjcplugins</groupId>
+ <groupId>org.apache.cxf.xjcplugins.tests</groupId>
<artifactId>cxf-xjc-boolean-test</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-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>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
-
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -67,69 +64,32 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
-
- <executions>
- <execution>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>
- ${basedir}/target/generated/src/test/java
- </outputDirectory>
- <schemaDirectory>
- ${basedir}/src/test/resources/schemas/configuration
- </schemaDirectory>
- <arguments>-Xbg</arguments>
- <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>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-wsdlextension</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xsdtojava-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <xsdOptions>
+ <xsdOption>
+ <extension>true</extension>
+ <xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd>
+ <extensionArgs>
+ <arg>-Xbg</arg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-boolean:${project.version}</extension>
+ </extensions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: cxf/xjc-utils/trunk/boolean/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/boolean/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/boolean/pom.xml (original)
+++ cxf/xjc-utils/trunk/boolean/pom.xml Thu Feb 4 21:43:37 2010
@@ -21,17 +21,16 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-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>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
@@ -40,10 +39,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: cxf/xjc-utils/trunk/bug671/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/bug671/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/bug671/pom.xml (original)
+++ cxf/xjc-utils/trunk/bug671/pom.xml Thu Feb 4 21:43:37 2010
@@ -21,17 +21,16 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-bug671</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC Plugin To Workaround JAXB Bug 671</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
@@ -40,10 +39,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: cxf/xjc-utils/trunk/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/dv-test/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/dv-test/pom.xml (original)
+++ cxf/xjc-utils/trunk/dv-test/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,21 +18,20 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins.tests</groupId>
<artifactId>cxf-xjc-dv-test</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<dependencies>
<dependency>
@@ -63,60 +62,30 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
- <goal>xjc</goal>
+ <goal>xsdtojava-tests</goal>
</goals>
</execution>
</executions>
<configuration>
- <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory>
- <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
- <arguments>-Xdv</arguments>
- <extension>true</extension>
- <quiet>true</quiet>
+ <xsdOptions>
+ <xsdOption>
+ <extension>true</extension>
+ <xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd>
+ <extensionArgs>
+ <arg>-Xdv</arg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${project.version}</extension>
+ </extensions>
</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>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-wsdlextension</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/xjc-utils/trunk/dv/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/dv/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/dv/pom.xml (original)
+++ cxf/xjc-utils/trunk/dv/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,20 +18,19 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
@@ -40,10 +39,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Added: cxf/xjc-utils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/pom.xml?rev=906671&view=auto
==============================================================================
--- cxf/xjc-utils/trunk/pom.xml (added)
+++ cxf/xjc-utils/trunk/pom.xml Thu Feb 4 21:43:37 2010
@@ -0,0 +1,469 @@
+<!--
+ 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.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.0-SNAPSHOT</version>
+ <name>Apache CXF XJC Utils</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
+
+ <properties>
+ <jaxb.version>2.1</jaxb.version>
+ <jaxb.xjc.version>2.1.12</jaxb.xjc.version>
+ <jaxb.impl.version>2.1.12</jaxb.impl.version>
+
+ <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
+ <downloadSources>true</downloadSources>
+
+ <pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
+ <resources.base.path/>
+ <checkstyle.extension/>
+ </properties>
+
+ <modules>
+ <module>xsd</module>
+ <module>dv</module>
+ <module>dv-test</module>
+ <module>ts</module>
+ <module>ts-test</module>
+ <module>boolean</module>
+ <module>boolean-test</module>
+ <module>wsdlextension</module>
+ <module>wsdlextension-test</module>
+ <module>bug671</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <!--
+ [2] 'dependencies.dependency.version' is missing for org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar
+ [3] 'dependencies.dependency.version' is missing for org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar
+ [4] 'dependencies.dependency.artifactId' with value '${stax.impl.artifactId}' does not match a valid id pattern.
+ [5] 'dependencies.dependency.groupId' with value '${stax.impl.groupId}' does not match a valid id pattern.
+ [6] 'dependencies.dependency.version' is missing for ${stax.impl.groupId}:${stax.impl.artifactId}:jar
+-->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+
+ <!--dependency>
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ </dependency>
+ <dependency>
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ </dependency>
+ <dependency>
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ </dependency-->
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.cxf.site</id>
+ <url>scpexe://people.apache.org/www/cxf.apache.org/cxf/mvn_site/xjc-utils</url>
+ </site>
+ </distributionManagement>
+ <inceptionYear>2006</inceptionYear>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache CXF User List</name>
+ <subscribe>users-subscribe@cxf.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@cxf.apache.org</unsubscribe>
+ <post>users@cxf.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/cxf-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>Apache CXF Developer List</name>
+ <subscribe>dev-subscribe@cxf.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@cxf.apache.org</unsubscribe>
+ <post>dev@cxf.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/cxf-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Apache CXF Commits List</name>
+ <subscribe>commits-subscribe@cxf.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@cxf.apache.org</unsubscribe>
+ <post>commits@cxf.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/cxf-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Apache CXF Issues List</name>
+ <subscribe>issues-subscribe@cxf.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@cxf.apache.org</unsubscribe>
+ <post>issues@cxf.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/cxf-issues</archive>
+ </mailingList>
+ <mailingList>
+ <name>Apache CXF Build Notifications List</name>
+ <subscribe>notifications-subscribe@cxf.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@cxf.apache.org</unsubscribe>
+ <post>notifications@cxf.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/cxf-notifications</archive>
+ </mailingList>
+ </mailingLists>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/cxf/build-utils/tags</tagBase>
+ <useReleaseProfile>false</useReleaseProfile>
+ <preparationGoals>clean install</preparationGoals>
+ <goals>deploy</goals>
+ <arguments>-Prelease,deploy</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <attach>true</attach>
+ <source>1.5</source>
+ <quiet>true</quiet>
+ <bottom>Apache CXF</bottom>
+ <javadocVersion>1.5</javadocVersion>
+ <encoding>UTF-8</encoding>
+ <!--subpackages>org.apache.cxf</subpackages-->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <maxmem>256M</maxmem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>${name}</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${version}</Specification-Version>
+ <Implementation-Title>${name}</Implementation-Title>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Version>${version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
+ <buildcommands>
+ <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+ <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+ <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
+ </buildcommands>
+ <projectnatures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ </projectnatures>
+ <ajdtVersion>none</ajdtVersion>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle</name>
+ <location>/cxf-eclipse-checkstyle${checkstyle.extension}</location>
+ </file>
+ <file>
+ <name>.pmd</name>
+ <location>/cxf-eclipse-pmd</location>
+ </file>
+ <file>
+ <name>.ruleset</name>
+ <location>/${pmd.eclipse.ruleset}</location>
+ </file>
+ </additionalConfig>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.build-utils</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.build-utils</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <!-- Use the version specified by checkstyle:checkstyle instead -->
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${resources.base.path}cxf-checkstyle${checkstyle.extension}.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <linkXRef>false</linkXRef>
+ <suppressionsLocation>${resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <excludes>**/archetype-resources/**/*.java</excludes>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.build-utils</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <rulesets>
+ <ruleset>${resources.base.path}cxf-pmd-ruleset.xml</ruleset>
+ <ruleset>${resources.base.path}cxf-pmd-custom.xml</ruleset>
+ </rulesets>
+ <sourceEncoding>UTF-8</sourceEncoding>
+ <targetJdk>1.5</targetJdk>
+ <linkXRef>false</linkXRef>
+ <includeTests>true</includeTests>
+ <verbose>true</verbose>
+ <excludeRoots>
+ <excludeRoot>${basedir}/src/main/generated</excludeRoot>
+ </excludeRoots>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>fastinstall</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <pmd.skip>true</pmd.skip>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
+ </profile>
+ <profile>
+ <id>nochecks</id>
+ <properties>
+ <pmd.skip>true</pmd.skip>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
+
Propchange: cxf/xjc-utils/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/xjc-utils/trunk/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/xjc-utils/trunk/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/xjc-utils/trunk/ts-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/ts-test/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/ts-test/pom.xml (original)
+++ cxf/xjc-utils/trunk/ts-test/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,22 +18,20 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins.tests</groupId>
<artifactId>cxf-xjc-ts-test</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -60,61 +58,30 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
- <goal>xjc</goal>
+ <goal>xsdtojava-tests</goal>
</goals>
</execution>
</executions>
<configuration>
- <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory>
- <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
- <arguments>-Xts:style:org.apache.commons.lang.builder.ToStringStyle.DEFAULT_STYLE</arguments>
- <extension>true</extension>
- <quiet>true</quiet>
+ <xsdOptions>
+ <xsdOption>
+ <extension>true</extension>
+ <xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd>
+ <extensionArgs>
+ <arg>-Xts:style:org.apache.commons.lang.builder.ToStringStyle.DEFAULT_STYLE</arg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-ts:${project.version}</extension>
+ </extensions>
</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>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-wsdlextension</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/xjc-utils/trunk/ts/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/ts/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/ts/pom.xml (original)
+++ cxf/xjc-utils/trunk/ts/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,20 +18,19 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
@@ -40,10 +39,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: cxf/xjc-utils/trunk/wsdlextension-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/wsdlextension-test/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/wsdlextension-test/pom.xml (original)
+++ cxf/xjc-utils/trunk/wsdlextension-test/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,18 +18,16 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins.tests</groupId>
<artifactId>cxf-xjc-wsdlextension-test</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC WSDL Extension Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
@@ -52,72 +50,42 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
- <goal>xjc</goal>
+ <goal>xsdtojava-tests</goal>
</goals>
</execution>
</executions>
<configuration>
- <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory>
- <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
- <arguments>-Xwsdlextension</arguments>
- <extension>true</extension>
- <quiet>true</quiet>
+ <xsdOptions>
+ <xsdOption>
+ <extension>true</extension>
+ <xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd>
+ <extensionArgs>
+ <arg>-Xwsdlextension</arg>
+ </extensionArgs>
+ </xsdOption>
+ </xsdOptions>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-wsdlextension:${project.version}</extension>
+ </extensions>
</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>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-wsdlextension</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: cxf/xjc-utils/trunk/wsdlextension/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/wsdlextension/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/wsdlextension/pom.xml (original)
+++ cxf/xjc-utils/trunk/wsdlextension/pom.xml Thu Feb 4 21:43:37 2010
@@ -18,20 +18,19 @@
-->
<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>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-wsdlextension</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
<name>Apache CXF XJC WSDL Extension Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
@@ -40,10 +39,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: cxf/xjc-utils/trunk/xsd/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/xsd/pom.xml?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/xsd/pom.xml (original)
+++ cxf/xjc-utils/trunk/xsd/pom.xml Thu Feb 4 21:43:37 2010
@@ -19,27 +19,29 @@
<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>
+ <artifactId>cxf-xjc-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.3.0-SNAPSHOT</version>
- <name>Apache CXF Common XSD2Java Plugins</name>
+ <name>Apache CXF XSD2Java Plugin</name>
<url>http://cxf.apache.org</url>
-
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>xjc-utils</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-downloader</artifactId>
+ <version>1.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -62,27 +64,5 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupId}</groupId>
- <artifactId>${stax.impl.artifactId}</artifactId>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- </dependency>
</dependencies>
-
</project>
Added: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java?rev=906671&view=auto
==============================================================================
--- cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java (added)
+++ cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java Thu Feb 4 21:43:37 2010
@@ -0,0 +1,294 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.maven_plugin;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.shared.downloader.Downloader;
+
+/**
+ * @description CXF XSD To Java Tool
+ */
+public abstract class AbstractXSDToJavaMojo extends AbstractMojo {
+ /**
+ * @parameter expression="${project}"
+ * @required
+ */
+ MavenProject project;
+
+
+ /**
+ * @parameter
+ */
+ XsdOption xsdOptions[];
+
+ /**
+ * Directory in which the "DONE" markers are saved that
+ * @parameter expression="${cxf.markerDirectory}"
+ * default-value="${project.build.directory}/cxf-xsd-plugin-markers"
+ */
+ File markerDirectory;
+
+
+ /**
+ * The extension artifacts that will be retrieved and added to the classpath.
+ *
+ * @parameter
+ */
+ private List<String> extensions;
+
+
+ /**
+ * Artifact downloader.
+ *
+ * @component
+ * @readonly
+ * @required
+ */
+ private Downloader downloader;
+
+ /**
+ * The local repository taken from Maven's runtime. Typically $HOME/.m2/repository.
+ *
+ * @parameter expression="${localRepository}"
+ * @readonly
+ * @required
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * List of Remote Repositories used by the resolver
+ *
+ * @parameter expression="${project.remoteArtifactRepositories}"
+ * @readonly
+ * @required
+ */
+ private List<ArtifactRepository> remoteArtifactRepositories;
+
+
+ /**
+ * Project builder -- builds a model from a pom.xml
+ *
+ * @component role="org.apache.maven.project.MavenProjectBuilder"
+ * @required
+ * @readonly
+ */
+ private MavenProjectBuilder mavenProjectBuilder;
+
+
+ /**
+ * Artifact factory, needed to download source jars for inclusion in classpath.
+ *
+ * @component role="org.apache.maven.artifact.factory.ArtifactFactory"
+ * @required
+ * @readonly
+ */
+ private ArtifactFactory artifactFactory;
+
+
+ abstract String getOutputDir();
+
+ public void execute() throws MojoExecutionException {
+ String outputDir = getOutputDir();
+
+ File outputDirFile = new File(outputDir);
+ outputDirFile.mkdirs();
+ markerDirectory.mkdirs();
+
+ boolean result = true;
+
+ if (xsdOptions == null) {
+ throw new MojoExecutionException("Must specify xsdOptions");
+ }
+
+
+ for (int x = 0; x < xsdOptions.length; x++) {
+ String[] args = getArguments(xsdOptions[x], outputDir);
+
+ String xsdLocation = xsdOptions[x].getXsd();
+ File xsdFile = new File(xsdLocation);
+ URI basedir = project.getBasedir().toURI();
+ URI xsdURI;
+ if (xsdFile.exists()) {
+ xsdURI = xsdFile.toURI();
+ } else {
+ xsdURI = basedir.resolve(xsdLocation);
+ }
+
+ String doneFileName = xsdURI.toString();
+ if (doneFileName.startsWith(basedir.toString())) {
+ doneFileName = doneFileName.substring(basedir.toString().length());
+ }
+
+ doneFileName = doneFileName.replace('?', '_')
+ .replace('&', '_').replace('/', '_').replace('\\', '_');
+
+ // If URL to WSDL, replace ? and & since they're invalid chars for file names
+ File doneFile =
+ new File(markerDirectory, "." + doneFileName + ".DONE");
+
+ long srctimestamp = 0;
+ if ("file".equals(xsdURI.getScheme())) {
+ srctimestamp = new File(xsdURI).lastModified();
+ } else {
+ try {
+ srctimestamp = xsdURI.toURL().openConnection().getDate();
+ } catch (Exception e) {
+ //ignore
+ }
+ }
+
+ boolean doWork = false;
+ if (!doneFile.exists()) {
+ doWork = true;
+ } else if (srctimestamp > doneFile.lastModified()) {
+ doWork = true;
+ } else {
+ File files[] = xsdOptions[x].getDependencies();
+ if (files != null) {
+ for (int z = 0; z < files.length; ++z) {
+ if (files[z].lastModified() > doneFile.lastModified()) {
+ doWork = true;
+ }
+ }
+ }
+ }
+
+ if (doWork) {
+ try {
+ int i = com.sun.tools.xjc.Driver.run(args, System.out, System.err);
+ if (i == 0) {
+ doneFile.delete();
+ doneFile.createNewFile();
+ }
+ File dirs[] = xsdOptions[x].getDeleteDirs();
+ if (dirs != null) {
+ for (int idx = 0; idx < dirs.length; ++idx) {
+ result = result && deleteDir(dirs[idx]);
+ }
+ }
+ } catch (Exception e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+
+ if (!result) {
+ throw new MojoExecutionException("Could not delete redundant dirs");
+ }
+ }
+ }
+
+ private String[] getArguments(XsdOption option, String outputDir) throws MojoExecutionException {
+ List<String> list = new ArrayList<String>();
+ if (extensions != null && extensions.size() > 0) {
+ Set<Artifact> artifacts = new HashSet<Artifact>();
+
+ try {
+ for (String ext : extensions) {
+ String[] s = ext.split(":");
+
+
+ Artifact artifact = artifactFactory.createBuildArtifact(s[0], s[1], s[2], "jar");
+ artifacts.add(artifact);
+ MavenProject p = mavenProjectBuilder
+ .buildFromRepository(artifact, remoteArtifactRepositories, localRepository);
+ Set a2 = p.createArtifacts(artifactFactory, Artifact.SCOPE_RUNTIME,
+ new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME));
+
+ for (Iterator i = a2.iterator(); i.hasNext();) {
+ Artifact a = (Artifact)i.next();
+ artifacts.add(a);
+ }
+ }
+ for (Artifact art : artifacts) {
+ File f = downloader.download(art.getGroupId(), art.getArtifactId(), art.getVersion(),
+ localRepository, remoteArtifactRepositories);
+ list.add("-classpath");
+ list.add(f.getAbsolutePath());
+
+ }
+ } catch (Exception ex) {
+ throw new MojoExecutionException("Could not download extension artifact", ex);
+ }
+ }
+
+ if (option.getPackagename() != null) {
+ list.add("-p");
+ list.add(option.getPackagename());
+ }
+ if (option.getBindingFile() != null) {
+ list.add("-b");
+ list.add(option.getBindingFile());
+ }
+ if (option.getCatalog() != null) {
+ list.add("-catalog");
+ list.add(option.getCatalog());
+ }
+ if (option.isExtension()) {
+ list.add("-extension");
+ }
+ if (option.getExtensionArgs() != null) {
+ Iterator it = option.getExtensionArgs().iterator();
+ while (it.hasNext()) {
+ list.add(it.next().toString());
+ }
+ }
+ if (getLog().isDebugEnabled()) {
+ list.add("-verbose");
+ } else {
+ list.add("-quiet");
+ }
+ list.add("-d");
+ list.add(outputDir);
+ list.add(option.getXsd());
+
+ return list.toArray(new String[list.size()]);
+
+ }
+
+ private boolean deleteDir(File f) {
+ if (f.isDirectory()) {
+ File files[] = f.listFiles();
+ for (int idx = 0; idx < files.length; ++idx) {
+ deleteDir(files[idx]);
+ }
+ }
+
+ if (f.exists()) {
+ return f.delete();
+ }
+
+ return true;
+ }
+}
Propchange: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java?rev=906671&view=auto
==============================================================================
--- cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java (added)
+++ cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java Thu Feb 4 21:43:37 2010
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.maven_plugin;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * @goal xsdtojava-tests
+ * @phase generate-test-sources
+ * @description CXF XSD To Java Tool
+ */
+public class TestXSDToJavaMojo extends AbstractXSDToJavaMojo {
+ /**
+ * @parameter expression="${project.build.directory}/generated/src/test/java"
+ * @required
+ */
+ String testSourceRoot;
+
+
+ public void execute() throws MojoExecutionException {
+ super.execute();
+
+ if (project != null && testSourceRoot != null) {
+ project.addTestCompileSourceRoot(testSourceRoot);
+ }
+ }
+
+
+ @Override
+ String getOutputDir() {
+ return testSourceRoot;
+ }
+}
Propchange: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/TestXSDToJavaMojo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=906671&r1=906610&r2=906671&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java (original)
+++ cxf/xjc-utils/trunk/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java Thu Feb 4 21:43:37 2010
@@ -19,210 +19,32 @@
package org.apache.cxf.maven_plugin;
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.tools.ant.ExitException;
-import org.apache.tools.ant.util.optional.NoExitSecurityManager;
/**
* @goal xsdtojava
+ * @phase generate-sources
* @description CXF XSD To Java Tool
*/
-public class XSDToJavaMojo extends AbstractMojo {
+public class XSDToJavaMojo extends AbstractXSDToJavaMojo {
/**
- * @parameter
- */
- String testSourceRoot;
-
- /**
- * @parameter expression="${project.build.directory}/generated/src/main/java"
+ * @parameter expression="${project.build.directory}/generated/src/main/java"
* @required
*/
String sourceRoot;
-
- /**
- * @parameter expression="${project}"
- * @required
- */
- MavenProject project;
-
-
- /**
- * @parameter
- */
- XsdOption xsdOptions[];
-
- /**
- * Directory in which the "DONE" markers are saved that
- * @parameter expression="${cxf.markerDirectory}"
- * default-value="${project.build.directory}/cxf-xsd-plugin-markers"
- */
- File markerDirectory;
-
-
+
public void execute() throws MojoExecutionException {
- String outputDir = testSourceRoot == null ? sourceRoot : testSourceRoot;
- File outputDirFile = new File(outputDir);
- outputDirFile.mkdirs();
- markerDirectory.mkdirs();
-
- boolean result = true;
-
- if (xsdOptions == null) {
- throw new MojoExecutionException("Must specify xsdOptions");
- }
-
- for (int x = 0; x < xsdOptions.length; x++) {
- String[] args = getArguments(xsdOptions[x], outputDir);
-
- String xsdLocation = xsdOptions[x].getXsd();
- File xsdFile = new File(xsdLocation);
- URI basedir = project.getBasedir().toURI();
- URI xsdURI;
- if (xsdFile.exists()) {
- xsdURI = xsdFile.toURI();
- } else {
- xsdURI = basedir.resolve(xsdLocation);
- }
-
- String doneFileName = xsdURI.toString();
- if (doneFileName.startsWith(basedir.toString())) {
- doneFileName = doneFileName.substring(basedir.toString().length());
- }
-
- doneFileName = doneFileName.replace('?', '_')
- .replace('&', '_').replace('/', '_').replace('\\', '_');
-
- // If URL to WSDL, replace ? and & since they're invalid chars for file names
- File doneFile =
- new File(markerDirectory, "." + doneFileName + ".DONE");
-
- long srctimestamp = 0;
- if ("file".equals(xsdURI.getScheme())) {
- srctimestamp = new File(xsdURI).lastModified();
- } else {
- try {
- srctimestamp = xsdURI.toURL().openConnection().getDate();
- } catch (Exception e) {
- //ignore
- }
- }
-
- boolean doWork = false;
- if (!doneFile.exists()) {
- doWork = true;
- } else if (srctimestamp > doneFile.lastModified()) {
- doWork = true;
- } else {
- File files[] = xsdOptions[x].getDependencies();
- if (files != null) {
- for (int z = 0; z < files.length; ++z) {
- if (files[z].lastModified() > doneFile.lastModified()) {
- doWork = true;
- }
- }
- }
- }
-
- if (doWork) {
- SecurityManager oldSm = System.getSecurityManager();
- try {
- try {
- System.setSecurityManager(new NoExitSecurityManager());
-
- com.sun.tools.xjc.Driver.main(args);
-
- } catch (ExitException e) {
- if (e.getStatus() == 0) {
- doneFile.delete();
- doneFile.createNewFile();
- } else {
- throw e;
- }
- } finally {
- System.setSecurityManager(oldSm);
- File dirs[] = xsdOptions[x].getDeleteDirs();
- if (dirs != null) {
- for (int idx = 0; idx < dirs.length; ++idx) {
- result = result && deleteDir(dirs[idx]);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new MojoExecutionException(e.getMessage(), e);
- }
- }
-
- if (!result) {
- throw new MojoExecutionException("Could not delete redundant dirs");
- }
- }
-
+ super.execute();
if (project != null && sourceRoot != null) {
project.addCompileSourceRoot(sourceRoot);
}
- if (project != null && testSourceRoot != null) {
- project.addTestCompileSourceRoot(testSourceRoot);
- }
- }
-
- private String[] getArguments(XsdOption option, String outputDir) {
- List<String> list = new ArrayList<String>();
- if (option.getPackagename() != null) {
- list.add("-p");
- list.add(option.getPackagename());
- }
- if (option.getBindingFile() != null) {
- list.add("-b");
- list.add(option.getBindingFile());
- }
- if (option.getCatalog() != null) {
- list.add("-catalog");
- list.add(option.getCatalog());
- }
- if (option.isExtension()) {
- list.add("-extension");
- }
- if (option.getExtensionArgs() != null) {
- Iterator it = option.getExtensionArgs().iterator();
- while (it.hasNext()) {
- list.add(it.next().toString());
- }
- }
- if (getLog().isDebugEnabled()) {
- list.add("-verbose");
- } else {
- list.add("-quiet");
- }
- list.add("-d");
- list.add(outputDir);
- list.add(option.getXsd());
-
- return list.toArray(new String[list.size()]);
-
}
-
- private boolean deleteDir(File f) {
- if (f.isDirectory()) {
- File files[] = f.listFiles();
- for (int idx = 0; idx < files.length; ++idx) {
- deleteDir(files[idx]);
- }
- }
-
- if (f.exists()) {
- return f.delete();
- }
-
- return true;
+
+
+ @Override
+ String getOutputDir() {
+ // TODO Auto-generated method stub
+ return sourceRoot;
}
}