Author: gmazza
Date: Tue Nov 27 14:03:20 2012
New Revision: 1414194
URL: http://svn.apache.org/viewvc?rev=1414194&view=rev
Log:
Removed antrun plugin from configuration interceptor sample.
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/AntClient.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/wsdl/
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=1414194&r1=1414193&r2=1414194&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
Tue Nov 27 14:03:20 2012
@@ -52,7 +52,9 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <frontEnd>jaxws21</frontEnd>
+
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -62,25 +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}/client.xml"
todir="${basedir}/target/classes/demo/stream/client" />
- <copy file="${basedir}/server.xml"
todir="${basedir}/target/classes/demo/stream/server" />
- <copy file="${basedir}/wsdl/hello_world.wsdl"
todir="${basedir}/target/classes/demo/stream/client" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java?rev=1414194&r1=1414193&r2=1414194&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
Tue Nov 27 14:03:20 2012
@@ -36,7 +36,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
- URL wsdlURL = Client.class.getResource("hello_world.wsdl");
+ URL wsdlURL = Client.class.getResource("/wsdl/hello_world.wsdl");
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
Greeter port = ss.getSoapPort();
String resp;
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml?rev=1414194&view=auto
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml
(added)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml
Tue Nov 27 14:03:20 2012
@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:cxf="http://cxf.apache.org/core";
+ xmlns:http="http://cxf.apache.org/transports/http/configuration";
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+ <http:conduit
name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit";>
+ <http:client
DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
+ </http:conduit>
+
+ <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
+
+ <!-- We are adding the interceptors to the bus as we will have only one
endpoint/service/bus. -->
+
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inFaultInterceptors>
+ <!--cxf:outInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outInterceptors>
+ <cxf:outFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outFaultInterceptors-->
+ </cxf:bus>
+
+</beans>
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml?rev=1414194&view=auto
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml
(added)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml
Tue Nov 27 14:03:20 2012
@@ -0,0 +1,61 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:cxf="http://cxf.apache.org/core";
+ xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+ <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
+
+ <!-- We are adding the interceptors to the bus as we will have only one
endpoint/service/bus. -->
+
+ <cxf:bus>
+ <!--cxf:inInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:inFaultInterceptors-->
+ <cxf:outInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outInterceptors>
+ <!--cxf:outFaultInterceptors>
+ <ref bean="GZIPStream"/>
+ </cxf:outFaultInterceptors-->
+ </cxf:bus>
+
+ <bean id="org.apache.cxf.management.InstrumentationManager"
+ class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+ <property name="bus" ref="cxf" />
+ <property name="enabled" value="true"/>
+ <property name="threaded" value="false"/>
+ <property name="daemon" value="false"/>
+ <property name="JMXServiceURL"
+ value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi" />
+ </bean>
+
+ <bean id="org.apache.cxf.management.counters.CounterRepository"
+ class="org.apache.cxf.management.counters.CounterRepository">
+ <property name="bus" ref="cxf" />
+ </bean>
+
+</beans>
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl?rev=1414194&view=auto
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl
(added)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl
Tue Nov 27 14:03:20 2012
@@ -0,0 +1,181 @@
+<?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.
+-->
+<wsdl:definitions name="HelloWorld"
targetNamespace="http://apache.org/hello_world_soap_http";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:tns="http://apache.org/hello_world_soap_http";
+ xmlns:x1="http://apache.org/hello_world_soap_http/types";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <wsdl:types>
+ <schema
targetNamespace="http://apache.org/hello_world_soap_http/types";
+ xmlns="http://www.w3.org/2001/XMLSchema";
+ xmlns:tns="http://apache.org/hello_world_soap_http/types";
+ elementFormDefault="qualified">
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30" />
+ </restriction>
+ </simpleType>
+
+ <element name="sayHi">
+ <complexType/>
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="tns:MyStringType"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeOneWay">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="pingMe">
+ <complexType/>
+ </element>
+ <element name="pingMeResponse">
+ <complexType/>
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="short"/>
+ <element name="major" type="short"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest"
name="greetMeOneWayRequest"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHiRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeOneWayRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+ <soap:address
location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
+
