You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/11/28 18:11:04 UTC
svn commit: r1414820 - in /cxf/branches/2.6.x-fixes: ./
distribution/src/main/release/samples/configuration_interceptor/
distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/
distribution/src/main/release/sam...
Author: gmazza
Date: Wed Nov 28 17:11:03 2012
New Revision: 1414820
URL: http://svn.apache.org/viewvc?rev=1414820&view=rev
Log:
Merged revisions 1414816 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414816 | gmazza | 2012-11-28 12:06:17 -0500 (Wed, 28 Nov 2012) | 1 line
Better Mavenized the configuration_interceptor example.
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/client.xml
- copied unchanged from r1414816, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/client.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/server.xml
- copied unchanged from r1414816, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/server.xml
Removed:
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
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.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/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=1414820&r1=1414819&r2=1414820&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 Wed Nov 28 17:11:03 2012
@@ -84,7 +84,7 @@
<configuration>
<executable>java</executable>
<arguments>
- <argument>-Dcxf.config.file=${project.build.directory}/classes/demo/stream/server/server.xml</argument>
+ <argument>-Dcxf.config.file=${project.build.directory}/classes/server.xml</argument>
<argument>-classpath</argument>
<classpath />
<argument>demo.stream.server.Server</argument>
@@ -113,7 +113,7 @@
<configuration>
<executable>java</executable>
<arguments>
- <argument>-Dcxf.config.file=${project.build.directory}/classes/demo/stream/client/client.xml</argument>
+ <argument>-Dcxf.config.file=${project.build.directory}/classes/client.xml</argument>
<argument>-classpath</argument>
<classpath />
<argument>demo.stream.client.Client</argument>