Author: gmazza
Date: Mon Oct 22 18:17:10 2012
New Revision: 1400980
URL: http://svn.apache.org/viewvc?rev=1400980&view=rev
Log:
Merged revisions 1400978 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1400978 | gmazza | 2012-10-22 14:13:22 -0400 (Mon, 22 Oct 2012) | 1 line
Text, formatting updates to jms_spring_config sample
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/config/
- copied from r1400978,
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/config/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/config/CustomerService.wsdl
- copied unchanged from r1400978,
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/config/CustomerService.wsdl
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
- copied unchanged from r1400978,
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/config/binding.xml
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/README.txt
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/README.txt?rev=1400980&r1=1400979&r2=1400980&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/README.txt
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/README.txt
Mon Oct 22 18:17:10 2012
@@ -1,8 +1,10 @@
JMS Spring Config Demo
======================
-This is basically the wsdl first demo adapted to the jms transport. It uses
the jms config feature so the jms transport can be
-added to any existing service without changing the wsdl.
+This is basically the wsdl first demo adapted to the JMS transport. It uses
the JMS config feature so
+the JMS transport can be added to any existing service without changing the
wsdl (leaving the wsdl:service
+section disregarded.) While the service is deployed on Tomcat, no http
traffic is used to connect
+with the web service, instead the JMS transport is used.
The Demo consist of three parts:
@@ -21,9 +23,8 @@ zero objects would be used. This is main
For any other name the method will return a list of two Customer objects. The
number of objects can be increased to
test how fast CXF works for larger data.
-Now that the service is implemented it needs to be made available. In this
example a standalone server is used.
-This can be done either with the JAX-WS API demonstrated in the class
CustomerService or using a spring config as
-demonstrated in the class CustomerServiceSpringServer.
+Now that the service is implemented it needs to be made available. In this
example a standalone server is deployed
+via a WAR archive using the Spring config as demonstrated in the class
CustomerServiceSpringServer.
Client implementation
---------------------
@@ -52,7 +53,7 @@ located), the pom.xml file is used to bu
Using either UNIX or Windows:
- mvn install (builds the demo)
+ mvn clean install (builds the demo)
mvn -Pjms.broker (from one command line window)
mvn -Pserver (from as second command line window)
mvn -Pclient (from a third command line window)
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/pom.xml?rev=1400980&r1=1400979&r2=1400980&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/pom.xml
Mon Oct 22 18:17:10 2012
@@ -30,11 +30,14 @@
<artifactId>cxf-samples</artifactId>
<version>2.6.4-SNAPSHOT</version>
</parent>
+
<properties>
<cxf.version>${project.version}</cxf.version>
<cxf.xjc-utils.version>2.6.0</cxf.xjc-utils.version>
<cxf.release.base>${basedir}/../..</cxf.release.base>
+ <wsdl.dir>${basedir}/src/main/config</wsdl.dir>
</properties>
+
<build>
<defaultGoal>install</defaultGoal>
<resources>
@@ -54,7 +57,7 @@
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webResources>
<resource>
- <directory>wsdl</directory>
+ <directory>${wsdl.dir}</directory>
<targetPath>WEB-INF</targetPath>
<includes>
<include>*.wsdl</include>
@@ -91,9 +94,9 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/wsdl/CustomerService.wsdl</wsdl>
+
<wsdl>${wsdl.dir}/CustomerService.wsdl</wsdl>
<bindingFiles>
-
<bindingFile>${basedir}/wsdl/binding.xml</bindingFile>
+
<bindingFile>${wsdl.dir}/binding.xml</bindingFile>
</bindingFiles>
</wsdlOption>
</wsdlOptions>
@@ -147,7 +150,7 @@
<configuration>
<mainClass>com.example.customerservice.client.CustomerServiceSpringClient</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/CustomerService.wsdl</argument>
+
<argument>${wsdl.dir}/CustomerService.wsdl</argument>
</arguments>
</configuration>
</execution>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml?rev=1400980&r1=1400979&r2=1400980&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
Mon Oct 22 18:17:10 2012
@@ -1,53 +1,51 @@
<?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
+<!--
+ 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.
- -->
+ 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:context="http://www.springframework.org/schema/context";
- xmlns:jaxws="http://cxf.apache.org/jaxws";
- xmlns:p="http://www.springframework.org/schema/p";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
-">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:jaxws="http://cxf.apache.org/jaxws";
xmlns:p="http://www.springframework.org/schema/p";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
-<bean id="jmsConnectionFactory"
class="org.springframework.jms.connection.SingleConnectionFactory">
- <property name="targetConnectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="tcp://localhost:61616" />
- </bean>
- </property>
-</bean>
+ <bean id="jmsConnectionFactory"
+ class="org.springframework.jms.connection.SingleConnectionFactory">
+ <property name="targetConnectionFactory">
+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616" />
+ </bean>
+ </property>
+ </bean>
-<bean id="jmsConfig" class="org.apache.cxf.transport.jms.JMSConfiguration"
- p:connectionFactory-ref="jmsConnectionFactory"
- p:targetDestination="test.queue"
-/>
+ <bean id="jmsConfig" class="org.apache.cxf.transport.jms.JMSConfiguration"
+ p:connectionFactory-ref="jmsConnectionFactory"
+ p:targetDestination="test.queue" />
- <jaxws:client id="customerService"
- address="jms://"
- serviceClass="com.example.customerservice.CustomerService">
- <jaxws:features>
- <bean class="org.apache.cxf.feature.LoggingFeature" />
- <bean
class="org.apache.cxf.transport.jms.JMSConfigFeature"
p:jmsConfig-ref="jmsConfig" />
- </jaxws:features>
- </jaxws:client>
-
- <bean id="tester"
class="com.example.customerservice.client.CustomerServiceTester">
- <property name="customerService"
ref="customerService"></property>
- </bean>
+ <jaxws:client id="customerService" address="jms://"
+ serviceClass="com.example.customerservice.CustomerService">
+ <jaxws:features>
+ <bean class="org.apache.cxf.feature.LoggingFeature" />
+ <bean class="org.apache.cxf.transport.jms.JMSConfigFeature"
+ p:jmsConfig-ref="jmsConfig" />
+ </jaxws:features>
+ </jaxws:client>
+
+ <bean id="tester"
+ class="com.example.customerservice.client.CustomerServiceTester">
+ <property name="customerService" ref="customerService"></property>
+ </bean>
</beans>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml?rev=1400980&r1=1400979&r2=1400980&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
Mon Oct 22 18:17:10 2012
@@ -1,49 +1,49 @@
<?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
+<!--
+ 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.
- -->
+ 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:jaxws="http://cxf.apache.org/jaxws";
- xmlns:p="http://www.springframework.org/schema/p";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
-">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:jaxws="http://cxf.apache.org/jaxws";
+ xmlns:p="http://www.springframework.org/schema/p";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
-<bean id="jmsConnectionFactory"
class="org.springframework.jms.connection.SingleConnectionFactory">
- <property name="targetConnectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="tcp://localhost:61616" />
- </bean>
- </property>
-</bean>
+ <bean id="jmsConnectionFactory"
+ class="org.springframework.jms.connection.SingleConnectionFactory">
+ <property name="targetConnectionFactory">
+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616" />
+ </bean>
+ </property>
+ </bean>
-<bean id="jmsConfig" class="org.apache.cxf.transport.jms.JMSConfiguration"
- p:connectionFactory-ref="jmsConnectionFactory"
- p:targetDestination="test.queue"
-/>
+ <bean id="jmsConfig" class="org.apache.cxf.transport.jms.JMSConfiguration"
+ p:connectionFactory-ref="jmsConnectionFactory"
+ p:targetDestination="test.queue" />
- <!-- JMS Endpoint -->
- <jaxws:endpoint xmlns:customer="http://customerservice.example.com/";
- id="CustomerServiceHTTP" address="jms://"
-
implementor="com.example.customerservice.server.CustomerServiceImpl">
- <jaxws:features>
- <bean class="org.apache.cxf.feature.LoggingFeature" />
- <bean
class="org.apache.cxf.transport.jms.JMSConfigFeature"
p:jmsConfig-ref="jmsConfig" />
- </jaxws:features>
- </jaxws:endpoint>
+ <!-- JMS Endpoint -->
+ <jaxws:endpoint xmlns:customer="http://customerservice.example.com/";
+ id="CustomerServiceHTTP" address="jms://"
+ implementor="com.example.customerservice.server.CustomerServiceImpl">
+ <jaxws:features>
+ <bean class="org.apache.cxf.feature.LoggingFeature" />
+ <bean class="org.apache.cxf.transport.jms.JMSConfigFeature"
+ p:jmsConfig-ref="jmsConfig" />
+ </jaxws:features>
+ </jaxws:endpoint>
</beans>
