You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by di...@apache.org on 2006/12/18 04:34:59 UTC
svn commit: r488110 - in /geronimo/server/trunk: ./
testsuite/itests/cxfPojoWS/war/ testsuite/itests/cxfPojoWS/war/src/main/java/
testsuite/itests/cxfPojoWS/war/src/main/java/org/
testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/ testsuite/itest...
Author: dims
Date: Sun Dec 17 19:34:58 2006
New Revision: 488110
URL: http://svn.apache.org/viewvc?view=rev&rev=488110
Log:
- Update to M1 release
- Copy the pojo sample (stripped down!) instead of loading it from cxf-testutils
[to get rid of the hardcoded wsdl path in the pojo's annotations mentioned here - http://www.mail-archive.com/dev@geronimo.apache.org/msg38745.html]
TODO:
- Need to fix the wsdl in the webapp to reflect the stripped down pojo.
- Now there is no deploy error, can't figure out what the url for the service is supposed to be. (oh well!)
Added:
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
Modified:
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=488110&r1=488109&r2=488110
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun Dec 17 19:34:58 2006
@@ -973,7 +973,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -988,7 +988,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-metacode</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1003,7 +1003,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1018,7 +1018,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1033,7 +1033,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1048,7 +1048,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1063,7 +1063,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1078,7 +1078,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1093,7 +1093,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1108,7 +1108,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1123,7 +1123,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
+ <version>2.0-incubator-M1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
Modified: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml?view=diff&rev=488110&r1=488109&r2=488110
==============================================================================
--- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml Sun Dec 17 19:34:58 2006
@@ -44,19 +44,25 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-testutils</artifactId>
- <version>2.0-incubator-M1-SNAPSHOT</version>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.0</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Added: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/Greeter.java?view=auto&rev=488110
==============================================================================
--- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/Greeter.java (added)
+++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/Greeter.java Sun Dec 17 19:34:58 2006
@@ -0,0 +1,47 @@
+/**
+ * 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.hello_world_soap_http;
+
+import javax.jws.WebParam.Mode;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding;
+import java.util.concurrent.Future;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.Response;
+import javax.xml.ws.ResponseWrapper;
+
+@WebService(targetNamespace = "http://apache.org/hello_world_soap_http", name = "Greeter")
+
+public interface Greeter {
+ @ResponseWrapper(targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMeResponse", localName = "greetMeResponse")
+ @RequestWrapper(targetNamespace = "http://apache.org/hello_world_soap_http/types", className = "org.apache.hello_world_soap_http.types.GreetMe", localName = "greetMe")
+ @WebResult(targetNamespace = "http://apache.org/hello_world_soap_http/types", name = "responseType")
+ @WebMethod(operationName = "greetMe")
+ public java.lang.String greetMe(
+ @WebParam(targetNamespace = "http://apache.org/hello_world_soap_http/types", name = "requestType")
+ java.lang.String requestType
+ );
+}
Added: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java?view=auto&rev=488110
==============================================================================
--- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java (added)
+++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java Sun Dec 17 19:34:58 2006
@@ -0,0 +1,56 @@
+/**
+ * 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.hello_world_soap_http;
+
+
+import java.io.IOException;
+import java.util.concurrent.Future;
+import java.util.logging.Logger;
+
+import javax.annotation.Resource;
+
+import javax.jws.WebService;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import javax.xml.ws.WebServiceContext;
+
+@WebService(serviceName = "SOAPService",
+ portName = "SoapPort",
+ endpointInterface = "org.apache.hello_world_soap_http.Greeter",
+ targetNamespace = "http://apache.org/hello_world_soap_http")
+public class GreeterImpl implements Greeter {
+
+ private static final Logger LOG = Logger.getLogger(GreeterImpl.class.getName());
+
+ @Resource
+ private WebServiceContext context;
+
+ private int invocationCount;
+
+ public WebServiceContext getContext() {
+ return context;
+ }
+
+ public String greetMe(String me) {
+ LOG.info("Invoking greetMe " + me);
+ invocationCount++;
+ return "Hello " + me;
+ }
+}