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/19 18:23:37 UTC
svn commit: r1411320 - in /cxf/branches/2.6.x-fixes: ./
distribution/src/main/release/samples/ws_security/ut/
distribution/src/main/release/samples/ws_security/ut/src/demo/
distribution/src/main/release/samples/ws_security/ut/src/main/
distribution/src...
Author: gmazza
Date: Mon Nov 19 17:23:35 2012
New Revision: 1411320
URL: http://svn.apache.org/viewvc?rev=1411320&view=rev
Log:
Merged revisions 1411318 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411318 | gmazza | 2012-11-19 12:20:31 -0500 (Mon, 19 Nov 2012) | 1 line
Updated sample to remove antrun plugin.
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/resources/
- copied from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/resources/hello_world_wssec.wsdl
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/hello_world_wssec.wsdl
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
- copied unchanged from r1411318, cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/logging.properties
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
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/ws_security/ut/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt?rev=1411320&r1=1411319&r2=1411320&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt Mon Nov 19 17:23:35 2012
@@ -1,5 +1,5 @@
WS-Security Demo (UsernameToken and Timestamp)
-=================
+===============================================
This demo shows how WS-Security support in Apache CXF may be enabled.
@@ -20,16 +20,6 @@ Please review the README in the samples
Prerequisite
------------
-If your environment already includes cxf-manifest.jar on the CLASSPATH,
-and the JDK and ant bin directories on the PATH, it is not necessary to
-run the environment script described in the samples directory README.
-If your environment is not properly configured, or if you are planning
-on using wsdl2java, javac, and java to build and run the demos, you must
-set the environment by running the script.
-
-
-*** Requirements ***
-
The samples in this directory use STRONG encryption. The default encryption algorithms
included in a JRE is not adequate for these samples. The Java Cryptography Extension
(JCE) Unlimited Strength Jurisdiction Policy Files available on Oracle's JDK download
@@ -56,5 +46,3 @@ On startup, the client makes a sequence
To remove the code generated from the WSDL file and the .class
files, run "mvn clean".
-
-
Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=1411320&r1=1411319&r2=1411320&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml Mon Nov 19 17:23:35 2012
@@ -54,7 +54,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
- <wsdl>${basedir}/wsdl/hello_world_wssec.wsdl</wsdl>
+ <wsdl>${basedir}/src/main/resources/hello_world_wssec.wsdl</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -64,7 +64,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!--plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -81,7 +81,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
</plugins>
</build>
<profiles>
@@ -149,26 +149,26 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>2.6.4-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
<version>2.6.4-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>2.6.4-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
<version>2.6.4-SNAPSHOT</version>
- </dependency>
- <dependency>
+ </dependency-->
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>2.6.4-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>