Author: dkulp
Date: Mon Jun 11 07:46:43 2007
New Revision: 546163
URL: http://svn.apache.org/viewvc?view=rev&rev=546163
Log:
Move the HelloNoPackage thing to generated as it doesn't actually pass
the checkstyle rules (doesn't have a package).
The maven checkstyle plugin doesn't pick it up (bug in checkstyle 4.1)
but the checkstyle plugin in eclipse does. (eclipse is using
checkstyle 4.3)
Added:
incubator/cxf/trunk/tools/javato/test/src/test/generated/
incubator/cxf/trunk/tools/javato/test/src/test/generated/HelloNoPackage.java
- copied unchanged from r546153,
incubator/cxf/trunk/tools/javato/test/src/test/java/HelloNoPackage.java
Removed:
incubator/cxf/trunk/tools/javato/test/src/test/java/HelloNoPackage.java
Modified:
incubator/cxf/trunk/tools/javato/test/pom.xml
Modified: incubator/cxf/trunk/tools/javato/test/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/pom.xml?view=diff&rev=546163&r1=546162&r2=546163
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/test/pom.xml Mon Jun 11 07:46:43 2007
@@ -88,7 +88,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -102,7 +102,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-java2wsdl</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -131,49 +131,69 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/javato/test</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/javato/test</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-tools-java2wsdl-test</url>
- </scm>
+
<url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-tools-java2wsdl-test</url>
+ </scm>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
-
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/doc_wrapped_simple.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_lit.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl</wsdl>
- </wsdlOption>
-
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/doc_wrapped_simple.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_lit.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl</wsdl>
+ </wsdlOption>
+
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/test/generated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
</build>
</project>
