Author: gmazza
Date: Mon Nov 19 17:20:31 2012
New Revision: 1411318
URL: http://svn.apache.org/viewvc?rev=1411318&view=rev
Log:
Updated sample to remove antrun plugin.
Added:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/
- copied from r1411269,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/hello_world_wssec.wsdl
- copied unchanged from r1411269,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/wsdl/hello_world_wssec.wsdl
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
- copied unchanged from r1411269,
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/server/wssec.xml
Removed:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/logging.properties
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/demo/
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/wssec.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/wssec.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/wsdl/
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt?rev=1411318&r1=1411317&r2=1411318&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut/README.txt
Mon Nov 19 17:20:31 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/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=1411318&r1=1411317&r2=1411318&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml Mon
Nov 19 17:20:31 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.7.1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
<version>2.7.1-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>2.7.1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
<version>2.7.1-SNAPSHOT</version>
- </dependency>
- <dependency>
+ </dependency-->
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>2.7.1-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java?rev=1411318&r1=1411269&r2=1411318&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
Mon Nov 19 17:20:31 2012
@@ -47,7 +47,7 @@ public final class Client {
try {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = Client.class.getResource("wssec.xml");
+ URL busFile = Client.class.getResource("/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java?rev=1411318&r1=1411269&r2=1411318&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
Mon Nov 19 17:20:31 2012
@@ -25,7 +25,7 @@ import org.apache.cxf.hello_world_soap_h
@javax.jws.WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.hello_world_soap_http.Greeter",
- wsdlLocation = "file:./wsdl/hello_world_wssec.wsdl",
+ wsdlLocation = "file:./src/main/resources/hello_world_wssec.wsdl",
targetNamespace = "http://cxf.apache.org/hello_world_soap_http";)
public class GreeterImpl implements Greeter {
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java?rev=1411318&r1=1411269&r2=1411318&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
Mon Nov 19 17:20:31 2012
@@ -47,7 +47,7 @@ public class Server {
public static void main(String args[]) throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = Server.class.getResource("wssec.xml");
+ URL busFile = Server.class.getResource("/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
