You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/07/08 04:49:11 UTC

svn commit: r1144134 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/samples/configuration_interceptor/pom.xml distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/server/server.xml

Author: ffang
Date: Fri Jul  8 02:49:10 2011
New Revision: 1144134

URL: http://svn.apache.org/viewvc?rev=1144134&view=rev
Log:
Merged revisions 1144133 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1144133 | ffang | 2011-07-08 10:44:26 +0800 (五, 08  7 2011) | 9 lines
  
  Merged revisions 1144131 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1144131 | ffang | 2011-07-08 10:38:35 +0800 (五, 08  7 2011) | 1 line
    
    [CXF-3645]configuration_interceptor simple doesn't work due to missing configuration file
  ........
................

Removed:
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/server/server.xml
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=1144134&r1=1144133&r2=1144134&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml Fri Jul  8 02:49:10 2011
@@ -101,7 +101,7 @@
                                 <configuration>
                                     <executable>java</executable>
                                     <arguments>
-                                        <argument>-Dcxf.config.file=${basedir}/src/demo/stream/server/server.xml</argument>
+                                        <argument>-Dcxf.config.file=${project.build.directory}/classes/demo/stream/server/server.xml</argument>
                                         <argument>-classpath</argument>
                                         <classpath />
                                         <argument>demo.stream.server.Server</argument>