Author: dkulp
Date: Tue Mar 15 13:55:48 2011
New Revision: 1081784
URL: http://svn.apache.org/viewvc?rev=1081784&view=rev
Log:
Merged revisions 1081783 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1081783 | dkulp | 2011-03-15 09:54:33 -0400 (Tue, 15 Mar 2011) | 1 line
Use correct etc and keystore dir for ant script
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/build.xml
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
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/ws_security/sign_enc/build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/build.xml?rev=1081784&r1=1081783&r2=1081784&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/build.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/build.xml
Tue Mar 15 13:55:48 2011
@@ -53,11 +53,11 @@
<mkdir dir="${build.classes.dir}/demo/wssec/client/keystore"/>
<copy todir="${build.classes.dir}/demo/wssec/client/etc">
- <fileset dir="${basedir}/etc" includes="Client*.properties" />
+ <fileset dir="${basedir}/src/main/resources/etc"
includes="Client*.properties" />
</copy>
<copy todir="${build.classes.dir}/demo/wssec/client/keystore">
- <fileset dir="${basedir}/keystore" includes="client*.jks" />
+ <fileset dir="${basedir}/src/main/resources/keystore"
includes="client*.jks" />
</copy>
</target>
@@ -66,11 +66,11 @@
<mkdir dir="${build.classes.dir}/demo/wssec/server/keystore"/>
<copy todir="${build.classes.dir}/demo/wssec/server/etc">
- <fileset dir="${basedir}/etc" includes="Server*.properties" />
+ <fileset dir="${basedir}/src/main/resources/etc"
includes="Server*.properties" />
</copy>
<copy todir="${build.classes.dir}/demo/wssec/server/keystore">
- <fileset dir="${basedir}/keystore" includes="server*.jks" />
+ <fileset dir="${basedir}/src/main/resources/keystore"
includes="server*.jks" />
</copy>
</target>
