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 2007/02/14 18:08:39 UTC
svn commit: r507627 [1/2] - in /incubator/cxf/trunk: ./ api/ buildtools/
codegen-plugin/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/
codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/
codegen-plugin2/ common/common/ common/...
Author: dkulp
Date: Wed Feb 14 09:08:36 2007
New Revision: 507627
URL: http://svn.apache.org/viewvc?view=rev&rev=507627
Log:
Major pom/release/deploy updates
* Created a "parent" module to hold settings common for "jar" subtypes.
* Updated all "jar" types to point to the parent directly.
* Updated maven plugins to be jdk 1.5 (latest stuff supports 1.5)
* Fixed more URL's pointing at confluence
* Created "deploy" profile and a "release" profile to add plugins to help with those actions. (I'll document these on the wiki shortly) (mostly stolen^H^H^H^H^H^H^H grabbed from the maven team's release profiles)
* Make cxf/pom.xml parent of parent and buildtools (so release:prepare and release:perform should work)
* Fixed some more compile warnings
Added:
incubator/cxf/trunk/parent/ (with props)
incubator/cxf/trunk/parent/pom.xml (with props)
Modified:
incubator/cxf/trunk/api/pom.xml
incubator/cxf/trunk/buildtools/pom.xml
incubator/cxf/trunk/codegen-plugin/pom.xml
incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
incubator/cxf/trunk/codegen-plugin2/pom.xml
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java
incubator/cxf/trunk/common/schemas/pom.xml
incubator/cxf/trunk/common/xsd/pom.xml
incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
incubator/cxf/trunk/distribution/pom.xml
incubator/cxf/trunk/integration/jbi/pom.xml
incubator/cxf/trunk/integration/jca/pom.xml
incubator/cxf/trunk/metacode/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/bindings/http/pom.xml
incubator/cxf/trunk/rt/bindings/soap/pom.xml
incubator/cxf/trunk/rt/bindings/xml/pom.xml
incubator/cxf/trunk/rt/core/pom.xml
incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
incubator/cxf/trunk/rt/frontend/js/pom.xml
incubator/cxf/trunk/rt/frontend/simple/pom.xml
incubator/cxf/trunk/rt/management/pom.xml
incubator/cxf/trunk/rt/transports/http/pom.xml
incubator/cxf/trunk/rt/transports/http2/pom.xml
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/rt/transports/local/pom.xml
incubator/cxf/trunk/rt/ws/addr/pom.xml
incubator/cxf/trunk/rt/ws/policy/pom.xml
incubator/cxf/trunk/rt/ws/rm/pom.xml
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/testutils/pom.xml
incubator/cxf/trunk/tools/common/pom.xml
incubator/cxf/trunk/tools/eclipse-plugin/pom.xml
incubator/cxf/trunk/tools/eclipse3.1-plugin/pom.xml
incubator/cxf/trunk/tools/java2wsdl/pom.xml
incubator/cxf/trunk/tools/misctools/pom.xml
incubator/cxf/trunk/tools/validator/pom.xml
incubator/cxf/trunk/tools/wsdl2java/pom.xml
incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
incubator/cxf/trunk/tools/xjc/dv/pom.xml
incubator/cxf/trunk/tools/xjc/pom.xml
incubator/cxf/trunk/tools2/common/pom.xml
incubator/cxf/trunk/tools2/javato/pom.xml
incubator/cxf/trunk/tools2/validator/pom.xml
incubator/cxf/trunk/tools2/wsdlto/core/pom.xml
incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml
incubator/cxf/trunk/tools2/wsdlto/misc/pom.xml
incubator/cxf/trunk/tools2/wsdlto/test/pom.xml
Modified: incubator/cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Wed Feb 14 09:08:36 2007
@@ -27,8 +27,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
@@ -96,7 +97,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
<executions>
<execution>
<id>package</id>
Modified: incubator/cxf/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/buildtools/pom.xml (original)
+++ incubator/cxf/trunk/buildtools/pom.xml Wed Feb 14 09:08:36 2007
@@ -17,6 +17,11 @@
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">
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
@@ -26,34 +31,4 @@
<url>http://cwiki.apache.org/CXF</url>
<packaging>jar</packaging>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/</url>
- </scm>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <distributionManagement>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- <repository>
- <id>apache.incubating</id>
- <name>Apache Incubating Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </distributionManagement>
</project>
Modified: incubator/cxf/trunk/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin/pom.xml Wed Feb 14 09:08:36 2007
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
- <java.source.version>1.4</java.source.version>
</properties>
@@ -86,19 +86,5 @@
<artifactId>ant-nodeps</artifactId>
</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>
Modified: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java (original)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Wed Feb 14 09:08:36 2007
@@ -144,7 +144,7 @@
if (doWork) {
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
if (wsdlOption.getPackagenames() != null) {
Iterator it = wsdlOption.getPackagenames().iterator();
while (it.hasNext()) {
Modified: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java (original)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java Wed Feb 14 09:08:36 2007
@@ -76,8 +76,8 @@
return "/org/apache/cxf/maven_plugin/eclipse/" + version + "/plugin.xml.vm";
}
- private List listJars() throws Exception {
- List jars = new ArrayList();
+ private List<File> listJars() throws Exception {
+ List<File> jars = new ArrayList<File>();
if (dependencies != null && !dependencies.isEmpty()) {
for (Iterator it = dependencies.iterator(); it.hasNext();) {
Artifact artifact = (Artifact)it.next();
@@ -119,16 +119,15 @@
}
- private List getExportedPackages(List jars) throws Exception {
- List packages = new ArrayList();
- for (Iterator iter = jars.iterator(); iter.hasNext();) {
- File jarFile = (File) iter.next();
+ private List<String> getExportedPackages(List<File> jars) throws Exception {
+ List<String> packages = new ArrayList<String>();
+ for (File jarFile : jars) {
packages.addAll(ReflectionUtil.getPackagesFromJar(jarFile));
}
return packages;
}
- private void generatePluginXML(List jars) throws Exception {
+ private void generatePluginXML(List<File> jars) throws Exception {
initVelocity();
Template tmpl = null;
Modified: incubator/cxf/trunk/codegen-plugin2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin2/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/codegen-plugin2/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin2/pom.xml Wed Feb 14 09:08:36 2007
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
- <java.source.version>1.4</java.source.version>
</properties>
@@ -67,23 +67,23 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools2-wsdlto-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools2-wsdlto-databinding-jaxb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools2-wsdlto-frontend-jaxws</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-wsdlto-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-wsdlto-databinding-jaxb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-wsdlto-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
@@ -93,19 +93,5 @@
<artifactId>ant-nodeps</artifactId>
</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>
Modified: incubator/cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Wed Feb 14 09:08:36 2007
@@ -27,8 +27,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java Wed Feb 14 09:08:36 2007
@@ -310,6 +310,7 @@
}
}
+ @SuppressWarnings("fallthrough")
protected final void readCpool() throws IOException {
int count = readShort(); // cpool count
cpoolIndex = new int[count];
Modified: incubator/cxf/trunk/common/schemas/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/common/schemas/pom.xml (original)
+++ incubator/cxf/trunk/common/schemas/pom.xml Wed Feb 14 09:08:36 2007
@@ -26,8 +26,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/cxf/trunk/common/xsd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/common/xsd/pom.xml (original)
+++ incubator/cxf/trunk/common/xsd/pom.xml Wed Feb 14 09:08:36 2007
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
<topDirectoryLocation>../../</topDirectoryLocation>
- <java.source.version>1.4</java.source.version>
</properties>
@@ -79,19 +79,4 @@
<artifactId>ant-nodeps</artifactId>
</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>
Modified: incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java (original)
+++ incubator/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java Wed Feb 14 09:08:36 2007
@@ -137,7 +137,7 @@
}
private String[] getArguments(XsdOption option, String outputDir) {
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
if (option.getPackagename() != null) {
list.add("-p");
list.add(option.getPackagename());
@@ -164,7 +164,7 @@
list.add(outputDir);
list.add(option.getXsd());
- return (String[])list.toArray(new String[list.size()]);
+ return list.toArray(new String[list.size()]);
}
Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Wed Feb 14 09:08:36 2007
@@ -33,7 +33,6 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
- <java.source.version>1.4</java.source.version>
<cxf.version>${pom.version}</cxf.version>
</properties>
@@ -114,11 +113,11 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -183,16 +182,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.source.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency.plugin.version}</version>
<executions>
<execution>
<id>unpack-javadoc</id>
@@ -212,30 +202,30 @@
</artifactItems>
</configuration>
</execution>
- <execution>
- <!-- copy additional jars. These are jars we want included, but don't
- really don't want tem on the classpath in the normal case -->
- <id>add-jars</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-integration-jbi</artifactId>
- <version>${pom.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-integration-jca</artifactId>
- <version>${pom.version}</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
+ <execution>
+ <!-- copy additional jars. These are jars we want included, but don't
+ really don't want tem on the classpath in the normal case -->
+ <id>add-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-integration-jbi</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-integration-jca</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -254,7 +244,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly.version}</version>
<executions>
<execution>
<id>distribution-package</id>
@@ -287,7 +276,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
<dependencies>
<dependency>
<groupId>ant</groupId>
@@ -313,11 +301,11 @@
<property name="output.cp" value="export CXF_CLASSPATH=${cp}" />
<property name="output.ext" value="" />
<echo file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
- <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}" />
+ <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}" />
<copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml" overwrite="yes">
- <filterset>
- <filter token="CXF_VERSION" value="${pom.version}" />
- </filterset>
+ <filterset>
+ <filter token="CXF_VERSION" value="${pom.version}" />
+ </filterset>
</copy>
</tasks>
</configuration>
Modified: incubator/cxf/trunk/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/integration/jbi/pom.xml (original)
+++ incubator/cxf/trunk/integration/jbi/pom.xml Wed Feb 14 09:08:36 2007
@@ -27,8 +27,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-integration</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/integration/jca/pom.xml (original)
+++ incubator/cxf/trunk/integration/jca/pom.xml Wed Feb 14 09:08:36 2007
@@ -28,8 +28,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-integration</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/cxf/trunk/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.xml?view=diff&rev=507627&r1=507626&r2=507627
==============================================================================
--- incubator/cxf/trunk/metacode/pom.xml (original)
+++ incubator/cxf/trunk/metacode/pom.xml Wed Feb 14 09:08:36 2007
@@ -27,8 +27,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
@@ -59,7 +60,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
<executions>
<execution>
<id>package</id>
@@ -82,7 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency.plugin.version}</version>
<executions>
<execution>
<id>unpack-schemas</id>
Propchange: incubator/cxf/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 14 09:08:36 2007
@@ -0,0 +1,3 @@
+.checkstyle
+.pmd
+.ruleset
Added: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=auto&rev=507627
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (added)
+++ incubator/cxf/trunk/parent/pom.xml Wed Feb 14 09:08:36 2007
@@ -0,0 +1,765 @@
+<!--
+ 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">
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ <name>Apache CXF Parent</name>
+ <url>http://cwiki.apache.org/CXF</url>
+
+ <packaging>pom</packaging>
+
+
+
+ <properties>
+ <topDirectoryLocation>../</topDirectoryLocation>
+
+ <surefire.fork.mode>once</surefire.fork.mode>
+ <surefire.format>brief</surefire.format>
+ <surefire.usefile>false</surefire.usefile>
+ <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
+
+
+ <jsr250.version>1.0</jsr250.version>
+ <jsr181.version>1.0-MR1</jsr181.version>
+ <jaxb.version>2.0</jaxb.version>
+ <jaxb.impl.version>2.0.3</jaxb.impl.version>
+ <jaxws.version>2.0</jaxws.version>
+ <jetty.version>5.1.11</jetty.version>
+ <saaj.version>1.3</saaj.version>
+ <spring.version>2.0</spring.version>
+ <wsdl4j.version>1.6.1</wsdl4j.version>
+ <derby.version>10.1.1.0</derby.version>
+ <activemq.version>4.1.0-incubator</activemq.version>
+ <geronimo.version>1.0.1</geronimo.version>
+ <rhino.version>1.6R5</rhino.version>
+ <xmlbeans.version>2.2.0</xmlbeans.version>
+
+
+ <eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir>
+ <downloadSources>true</downloadSources>
+ </properties>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources-filtered</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>target/generated/src/main/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <exclude>**/*.xml</exclude>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>target/generated/src/test/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>cxf-checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <linkXRef>false</linkXRef>
+ <suppressionsLocation>cxf-checkstyle-suppressions.xml</suppressionsLocation>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <propertyExpansion>
+ apache.header.file=${basedir}/${topDirectoryLocation}/etc/apache-header.txt
+ </propertyExpansion>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <rulesets>
+ <ruleset>cxf-pmd-ruleset.xml</ruleset>
+ </rulesets>
+ <targetJdk>1.5</targetJdk>
+ <linkXRef>false</linkXRef>
+ </configuration>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <!-- do not exclude **/Abstract*Test.java **/Abstract*TestCase.java -->
+ <excludes>
+ <exclude>**/*$*</exclude>
+ <exclude>**/LocatorClientServerTest.java</exclude>
+ <exclude>**/AbstractServletTest.java</exclude>
+ </excludes>
+ <reportFormat>${surefire.format}</reportFormat>
+ <useFile>${surefire.usefile}</useFile>
+ <forkMode>${surefire.fork.mode}</forkMode>
+ <childDelegation>false</childDelegation>
+ <argLine>-ea</argLine>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/target/test-classes/logging.properties</value>
+ </property>
+ <property>
+ <name>activemq.store.dir</name>
+ <value>${basedir}/target/ActiveMQ</value>
+ </property>
+ <property>
+ <name>derby.system.home</name>
+ <value>${basedir}/target/derby</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <!--plugins>
+ This isn't quite ready yet. Needs the snapshots released.
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.0</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.1-SNAPSHOT</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins-->
+
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.4</version>
+ <scope>provided</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.4</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <scope>provided</scope>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</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>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${saaj.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${saaj.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jsr250.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jsr181.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <version>${geronimo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>${geronimo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>${rhino.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <profiles>
+ <profile>
+ <id>fastinstall</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </profile>
+ <profile>
+ <id>nochecks</id>
+ </profile>
+
+ <profile>
+ <!-- default profile enables checkstyle and Xlint stuff -->
+ <id>sourcecheck</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <compilerArgument>${compile.flags}</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>setup.eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>setup.eclipse.project</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>setup.eclipse.workspace</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>add-maven-repo</goal>
+ </goals>
+ <configuration>
+ <workspace>${eclipse.workspace.dir}</workspace>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>setup.workspace</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <path id="ecp.ws.path" location="${eclipse.workspace.dir}" />
+ <property name="full.eclipse.workspace" refid="ecp.ws.path" />
+
+ <whichresource resource="/cxf-eclipse-pmd" property="pmd.url" />
+ <whichresource resource="/cxf-pmd-ruleset.xml" property="pmdruleset.url" />
+ <whichresource resource="/cxf-eclipse-checkstyle" property="eclipse.checkstyle.url" />
+ <whichresource resource="/cxf-checkstyle.xml" property="checkstyle.url" />
+
+
+ <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" />
+ <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle" />
+ <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" />
+
+ <get src="${pmdruleset.url}" dest=".ruleset" />
+ <get src="${pmd.url}" dest=".pmd" />
+ <get src="${eclipse.checkstyle.url}" dest=".checkstyle" />
+ <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+
+ <copy file="${basedir}/${topDirectoryLocation}/etc/apache-header.txt" tofile="${full.eclipse.workspace}/apache-header.txt" />
+
+ <!-- Add checkstyle config -->
+ <copy file="${basedir}/${topDirectoryLocation}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="no">
+ <filterset>
+ <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+ <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" />
+ </filterset>
+ </copy>
+
+ <xslt style="${basedir}/${topDirectoryLocation}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new">
+ <param name="checkstyleconfig" expression="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+ </xslt>
+ <copy file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="yes" />
+
+
+ <!-- Add warning flags that we want -->
+ <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
+ <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion" value="ignore" />
+ <entry key="org.eclipse.jdt.core.compiler.problem.unusedImport" value="ignore" />
+ <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface" value="ignore" />
+ </propertyfile>
+
+
+ <!-- Add code format rules -->
+ <concat destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" append="true" fixlastline="true">
+ <filelist dir="${basedir}/${topDirectoryLocation}/etc/eclipse" files="org.eclipse.jdt.core.prefs" />
+ </concat>
+ <loadfile property="eclipse.code.format" srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/CXFCodeFormatter.xml" />
+ <loadfile property="eclipse.code.templates" srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/codetemplates.xml" />
+ <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
+ <entry key="formatter_profile" value="_CXF Java Conventions" />
+ <entry key="org.eclipse.jdt.ui.formatterprofiles" value="${eclipse.code.format}" />
+ <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}" />
+
+ <!-- Add import order -->
+ <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;junit;com;org;" />
+ <!-- Sort order -->
+ <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
+ <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />
+ <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true" />
+ </propertyfile>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
Propchange: incubator/cxf/trunk/parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml