cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r886947 - in /cxf/branches/2.2.x-fixes: ./ systests/wsdl_maven/codegen/ systests/wsdl_maven/codegen/src/ systests/wsdl_maven/codegen/src/main/ systests/wsdl_maven/codegen/src/main/resources/ systests/wsdl_maven/java2ws/src/main/java/org/apa...
Date Thu, 03 Dec 2009 22:14:00 GMT
Author: dkulp
Date: Thu Dec  3 22:14:00 2009
New Revision: 886947

URL: http://svn.apache.org/viewvc?rev=886947&view=rev
Log:
Merged revisions 885212 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r885212 | cschneider | 2009-11-29 06:05:59 -0500 (Sun, 29 Nov 2009) | 1 line
  
  CXF-2275: Maven plugins: Support reading WSDLs from Maven repository - Should be complete
now
........

Added:
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/
      - copied from r885212, cxf/trunk/systests/wsdl_maven/codegen/src/
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/main/
      - copied from r885212, cxf/trunk/systests/wsdl_maven/codegen/src/main/
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/main/resources/
      - copied from r885212, cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
      - copied unchanged from r885212, cxf/trunk/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml
    cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java

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=886947&r1=886946&r2=886947&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 Thu Dec  3 22:14:00 2009
@@ -1,74 +1,77 @@
-<!--
-  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>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdlArtifact>
-				                        <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
-				                        <artifactId>cxf-systests-java2ws</artifactId>
-				                        <version>${project.version}</version>
-			                        </wsdlArtifact>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-
-    <dependencies>
-        <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>
+<!--
+  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>
+

Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java?rev=886947&r1=886946&r2=886947&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java
Thu Dec  3 22:14:00 2009
@@ -19,11 +19,13 @@
 
 package org.apache.cxf.systests.java2ws;
 
+import java.util.Date;
+
 import javax.jws.WebParam;
 import javax.jws.WebService;
 
 
 @WebService
 public interface HelloWorld {
-    String sayHi(@WebParam(name = "text") String text);
+    String sayHi(@WebParam(name = "text") String text, @WebParam(name = "date") Date date);
 }



Mime
View raw message