Author: dkulp
Date: Mon Jan 11 17:16:42 2010
New Revision: 897953
URL: http://svn.apache.org/viewvc?rev=897953&view=rev
Log:
Merged revisions 897597 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r897597 | cschneider | 2010-01-10 02:50:50 -0500 (Sun, 10 Jan 2010) | 1 line
Added documentation to explain how the defaults in codegen plugin work.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml?rev=897953&r1=897952&r2=897953&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml Mon Jan 11
17:16:42 2010
@@ -1,77 +1,84 @@
-<!--
- 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.systests.wsdl_maven</groupId>
- <artifactId>cxf-systests-codegen</artifactId>
- <version>2.2.6-SNAPSHOT</version>
- <name>Test for reading wsdl from repo and generating code from it</name>
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>2.2.6-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
-
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
- <artifactId>cxf-systests-java2ws</artifactId>
- <version>${project.version}</version>
- <type>wsdl</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
- <artifactId>cxf-systests-java2ws</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
+<!--
+ 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.systests.wsdl_maven</groupId>
+ <artifactId>cxf-systests-codegen</artifactId>
+ <version>2.2.6-SNAPSHOT</version>
+ <name>Test for reading wsdl from repo and generating code from it</name>
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.2.6-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <!-- Codegen with default settings.
+ This test shows some of the defaults that work
without configuration.
+ In this case the wsdl dependency to the service
"cxf-systests-java2ws"
+ will be processed.
+ As we have a file named defaultBinding.xml in the
classpath
+ this binding will be applied.
+ The binding file contains an empty wsdlLocation.
This means that
+ the binding will be applied to the wsdl currently
processed. -->
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
+ <artifactId>cxf-systests-java2ws</artifactId>
+ <version>${project.version}</version>
+ <type>wsdl</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
+ <artifactId>cxf-systests-java2ws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
