Author: gmazza
Date: Mon Nov 19 15:29:14 2012
New Revision: 1411248
URL: http://svn.apache.org/viewvc?rev=1411248&view=rev
Log:
Updated jaxws_handlers sample to remove Maven antrun plugin.
Added:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
(with props)
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
(with props)
Removed:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/demo_handlers.xml
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/wsdl/
Modified:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml?rev=1411248&r1=1411247&r2=1411248&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml Mon
Nov 19 15:29:14 2012
@@ -31,6 +31,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
+ <wsdl.file>${basedir}/src/main/resources/addNumbers.wsdl</wsdl.file>
</properties>
<build>
@@ -53,7 +54,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/wsdl/addNumbers.wsdl</wsdl>
+ <wsdl>${wsdl.file}</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -63,23 +64,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/main/java/demo/handlers/common/demo_handlers.xml"
todir="${basedir}/target/classes/demo/handlers/common" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
@@ -100,7 +84,7 @@
<configuration>
<mainClass>demo.handlers.server.Server</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/addNumbers.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
@@ -126,7 +110,7 @@
<configuration>
<mainClass>demo.handlers.client.Client</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/addNumbers.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
Modified:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java?rev=1411248&r1=1411247&r2=1411248&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
Mon Nov 19 15:29:14 2012
@@ -31,7 +31,7 @@ import org.apache.handlers.types.FaultDe
portName = "AddNumbersPort",
endpointInterface = "org.apache.handlers.AddNumbers",
serviceName = "AddNumbersService")
-@HandlerChain(file = "../common/demo_handlers.xml")
+@HandlerChain(file = "/demo_handlers.xml")
public class AddNumbersImpl implements AddNumbers {
Added:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl?rev=1411248&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
(added)
+++
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
Mon Nov 19 15:29:14 2012
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<definitions
+ name="AddNumbers"
+ targetNamespace="http://apache.org/handlers";
+ xmlns:tns="http://apache.org/handlers";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:x1="http://apache.org/handlers/types";>
+ <types>
+ <xsd:schema
+ xmlns="http://www.w3.org/2001/XMLSchema";
+ targetNamespace="http://apache.org/handlers/types";
+ elementFormDefault="qualified">
+
+ <complexType name="addNumbersResponse">
+ <sequence>
+ <element name="return" type="xsd:int" />
+ </sequence>
+ </complexType>
+ <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
+
+ <complexType name="addNumbers">
+ <sequence>
+ <element name="arg0" type="xsd:int" />
+ <element name="arg1" type="xsd:int" />
+ </sequence>
+ </complexType>
+ <element name="addNumbers" type="x1:addNumbers"/>
+
+ <element name="FaultDetail" type="x1:FaultDetail" />
+ <complexType name="FaultDetail">
+ <sequence>
+ <element name="faultInfo" type="xsd:string" />
+ <element name="message" type="xsd:string" />
+ </sequence>
+ </complexType>
+ </xsd:schema>
+ </types>
+ <message name="addNumbers">
+ <part name="parameters" element="x1:addNumbers" />
+ </message>
+ <message name="addNumbersResponse">
+ <part name="result" element="x1:addNumbersResponse" />
+ </message>
+ <message name="addNumbersFault">
+ <part name="AddNumbersFault" element="x1:FaultDetail" />
+ </message>
+ <portType name="AddNumbers">
+ <operation name="addNumbers">
+ <input message="tns:addNumbers" />
+ <output message="tns:addNumbersResponse" />
+ <fault name="addNumbersFault" message="tns:addNumbersFault"/>
+ </operation>
+ </portType>
+ <binding name="AddNumbersBinding" type="tns:AddNumbers">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document" />
+ <operation name="addNumbers">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ <fault name="addNumbersFault">
+ <soap:fault name="addNumbersFault" use="literal" />
+ </fault>
+ </operation>
+ </binding>
+ <service name="AddNumbersService">
+ <port name="AddNumbersPort" binding="tns:AddNumbersBinding">
+ <soap:address
location="http://localhost:9000/handlers/AddNumbersService/AddNumbersPort"; />
+ </port>
+ </service>
+</definitions>
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml?rev=1411248&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
(added)
+++
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
Mon Nov 19 15:29:14 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee";>
+ <handler-chain>
+ <handler>
+ <handler-name>LoggingHandler</handler-name>
+
<handler-class>demo.handlers.common.LoggingHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
