Author: dkulp
Date: Wed Jun 17 15:23:00 2009
New Revision: 785664
URL: http://svn.apache.org/viewvc?rev=785664&view=rev
Log:
Merged revisions 784893,785624 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r784893 | dkulp | 2009-06-15 14:10:43 -0400 (Mon, 15 Jun 2009) | 2 lines
First part of CXF-2285. Stuff from Mayank Mishra added, but needs some
changes for the maven poms to work.
........
r785624 | dkulp | 2009-06-17 10:31:30 -0400 (Wed, 17 Jun 2009) | 1 line
Get new security demoes working with maven poms
........
Added:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/build.xml
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/build.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/etc/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/etc/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/keystore/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/keystore/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
- copied, changed from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/client/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/client/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/common/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/common/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/server/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/demo/wssec/server/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Encrypt.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Client_Sign.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_Decrypt.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/etc/Server_SignVerf.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/client-keystore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/client-keystore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/client-truststore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/client-truststore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/server-keystore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/server-keystore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/server-truststore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/server-truststore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/wsdl/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/wsdl/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/wsdl/hello_world_wssec.wsdl
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/wsdl/hello_world_wssec.wsdl
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/build.xml
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/build.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/logging.properties
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/logging.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/wssec.xml
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/GreeterImpl.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/GreeterImpl.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/Server.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/wssec.xml
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/wsdl/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/wsdl/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/wsdl/hello_world_wssec.wsdl
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/wsdl/hello_world_wssec.wsdl
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/README.txt
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/build.xml
- copied, changed from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/build.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/etc/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/etc/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/keystore/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/keystore/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties
- copied, changed from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
- copied, changed from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/client/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/client/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/common/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/common/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/server/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/demo/wssec/server/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/wssec.xml
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/common/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/common/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/common/ConciseFormatter.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/GreeterImpl.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/GreeterImpl.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/wssec.xml
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/wssec.xml
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/
- copied from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-keystore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-keystore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-truststore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-truststore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-keystore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-keystore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-truststore.jks
- copied unchanged from r785624,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-truststore.jks
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/wsdl/
- copied from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/wsdl/
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/wsdl/hello_world_wssec.wsdl
- copied unchanged from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/wsdl/hello_world_wssec.wsdl
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 17 15:23:00 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785282,785468
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784893,784895,785279-785282,785468,785624
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 17 15:23:00 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785282,785468
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784893-785620,785622-785624
Modified:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=785664&r1=785663&r2=785664&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
Wed Jun 17 15:23:00 2009
@@ -22,6 +22,8 @@
<property environment="env"/>
<property name="build.dir" location ="${basedir}/build"/>
<property name="build.classes.dir" location ="${build.dir}/classes"/>
+ <available property="src.dir" value="${basedir}/src/main/java"
file="${basedir}/src/main/java" type="dir"/>
+ <property name="src.dir" location ="${basedir}/src"/>
<property name="build.src.dir" location ="${build.dir}/src"/>
<property name="build.var.dir" location ="${build.dir}/var"/>
<property name="codegen.timestamp.file"
value="${build.src.dir}/.CODEGEN_DONE"/>
@@ -111,8 +113,8 @@
<mkdir dir="${build.src.dir}"/>
<javac destdir="${build.classes.dir}" debug="true">
+ <src path="${src.dir}"/>
<src path="${build.src.dir}"/>
- <src path="${basedir}/src"/>
<classpath>
<path refid="cxf.classpath"/>
<pathelement path="${thirdparty.classpath}"/>
@@ -120,8 +122,9 @@
</javac>
<copy todir="${build.classes.dir}">
- <fileset dir="${basedir}/src" includes="**/*.xml, **/*.txt" />
- <fileset dir="${build.src.dir}" includes="**/*.xml, **/*.txt" />
+ <fileset dir="${src.dir}" excludes="**/*.java" />
+ <fileset dir="${build.src.dir}" includes="**/*.java" />
+ <fileset dir="${basedir}/src/main/resources" includes="**/*" />
</copy>
</target>
Copied:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
(from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml?p2=cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml&p1=cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml&r1=784893&r2=785664&rev=785664&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
Wed Jun 17 15:23:00 2009
@@ -9,7 +9,17 @@
<cxf.version>[2,)</cxf.version>
</properties>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -39,24 +49,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/demo/wssec/client/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/client"/>
- <copy
file="${basedir}/src/demo/wssec/server/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/server"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
@@ -117,12 +109,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!-- for jaxb-impl -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -139,16 +125,9 @@
</pluginRepositories>
</profile>
</profiles>
- <repositories>
- <!-- for jaxb-impl -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <dependencies>
+
+
+ <dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -189,6 +168,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${cxf.version}</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
Copied:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/build.xml
(from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/build.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/build.xml?p2=cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/build.xml&p1=cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/build.xml&r1=784893&r2=785664&rev=785664&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/build.xml
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/build.xml
Wed Jun 17 15:23:00 2009
@@ -22,13 +22,11 @@
<import file="../../common_build.xml"/>
<target name="client" description="run demo client" depends="build">
- <antcall target="copy-client-keystoreconfig-files"/>
<cxfrun classname="demo.wssec.client.Client"
logging-properties-file="logging.properties"/>
</target>
<target name="server" description="run demo server" depends="build">
- <antcall target="copy-server-keystoreconfig-files"/>
<cxfrun classname="demo.wssec.server.Server"
logging-properties-file="${basedir}/logging.properties"/>
@@ -48,30 +46,6 @@
</copy>
</target>
- <target name="copy-client-keystoreconfig-files">
- <mkdir dir="${build.classes.dir}/demo/wssec/client/etc"/>
- <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" />
- </copy>
-
- <copy todir="${build.classes.dir}/demo/wssec/client/keystore">
- <fileset dir="${basedir}/keystore" includes="client*.jks" />
- </copy>
- </target>
- <target name="copy-server-keystoreconfig-files">
- <mkdir dir="${build.classes.dir}/demo/wssec/server/etc"/>
- <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" />
- </copy>
-
- <copy todir="${build.classes.dir}/demo/wssec/server/keystore">
- <fileset dir="${basedir}/keystore" includes="server*.jks" />
- </copy>
- </target>
</project>
Copied:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties
(from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties?p2=cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties&p1=cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties&r1=784893&r2=785664&rev=785664&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties
Wed Jun 17 15:23:00 2009
@@ -36,7 +36,7 @@
# To also add the FileHandler, use the following line instead.
#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.formatter =
demos.wssec.common.ConciseFormatter
+java.util.logging.ConsoleHandler.formatter = demo.wssec.common.ConciseFormatter
# Default global logging level.
# This specifies which kinds of events are logged across
@@ -60,7 +60,7 @@
# Limit the message that are printed on the console to WARNING and above.
java.util.logging.ConsoleHandler.level = INFO
#java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.ConsoleHandler.formatter =
demos.wssec.common.ConciseFormatter
+java.util.logging.ConsoleHandler.formatter = demo.wssec.common.ConciseFormatter
############################################################
Copied:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
(from r784893,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml?p2=cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml&p1=cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml&r1=784893&r2=785664&rev=785664&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
Wed Jun 17 15:23:00 2009
@@ -9,7 +9,17 @@
<cxf.version>[2,)</cxf.version>
</properties>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -39,26 +49,8 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/demo/wssec/client/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/client"/>
- <copy
file="${basedir}/src/demo/wssec/server/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/server"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>server</id>
@@ -117,12 +109,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!-- for jaxb-impl -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -139,16 +125,9 @@
</pluginRepositories>
</profile>
</profiles>
- <repositories>
- <!-- for jaxb-impl -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <dependencies>
+
+
+ <dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -189,6 +168,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${cxf.version}</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
