You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/12/23 04:35:23 UTC
svn commit: r893391 - in /cxf/branches/2.2.x-fixes: ./
distribution/src/main/release/samples/wsdl_first/pom.xml
distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml
Author: dkulp
Date: Wed Dec 23 03:35:23 2009
New Revision: 893391
URL: http://svn.apache.org/viewvc?rev=893391&view=rev
Log:
Merged revisions 893389 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r893389 | dkulp | 2009-12-22 22:21:27 -0500 (Tue, 22 Dec 2009) | 1 line
Update wsdl_first to support a "war" version
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 03:35:23 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664,892890,892920,892953,892988,893011,893250,893388
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664,892890,892920,892953,892988,893011,893250,893388-893389
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=893391&r1=893390&r2=893391&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml Wed Dec 23 03:35:23 2009
@@ -21,6 +21,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>wsdl_first</artifactId>
<version>1.0</version>
+ <packaging>war</packaging>
<name>WSDL first demo using Document/Literal Style</name>
<properties>
<cxf.version>[2,)</cxf.version>
@@ -34,15 +35,41 @@
<directory>src/main/resources</directory>
</resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>../../etc/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>wsdl</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>*.wsdl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>**.*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<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>LATEST</version>
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml?rev=893391&r1=893390&r2=893391&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf-servlet.xml Wed Dec 23 03:35:23 2009
@@ -26,13 +26,13 @@
http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <jaxws:endpoint
- id="hello_world"
- implementor="demo.hw.server.GreeterImpl"
- wsdlLocation="WEB-INF/wsdl/hello_world.wsdl"
- address="/hello_world">
- <jaxws:features>
- <bean class="org.apache.cxf.feature.LoggingFeature"/>
- </jaxws:features>
- </jaxws:endpoint>
+ <jaxws:endpoint xmlns:customer="http://customerservice.example.com/"
+ id="CustomerServiceHTTP" address="/CustomerServicePort"
+ serviceName="customer:CustomerServiceService" endpointName="customer:CustomerServiceEndpoint"
+ implementor="com.example.customerservice.server.CustomerServiceImpl">
+ <!--jaxws:features>
+ <bean class="org.apache.cxf.feature.LoggingFeature" />
+ </jaxws:features-->
+ </jaxws:endpoint>
+
</beans>