cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1370712 - in /cxf/trunk/distribution/src/main: assembly/ release/samples/ release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/ release/samples/ws_security/interopfest/ release/samples/ws_security/interopfest/wssc/ release/sam...
Date Wed, 08 Aug 2012 09:15:53 GMT
Author: coheigea
Date: Wed Aug  8 09:15:51 2012
New Revision: 1370712

URL: http://svn.apache.org/viewvc?rev=1370712&view=rev
Log:
Removing interopfest from trunk + fixing some checkstyle errors in the samples

Removed:
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/Certs.zip
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/README.txt
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/resources/etc/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/style/makelocal.xsl
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/MutualCertificate10SignEncrypt.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/MutualCertificate10SignEncryptRsa15TripleDes.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/PingServiceBase.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/Server.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/server/UserNameOverTransport.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/resources/etc/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/PingService.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/java/interop/server/Server.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/style/makelocal.xsl
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/server/PingService.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/java/interop/server/Server.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/main/resources/etc/wssip.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/server/KeystorePasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/server/Server.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/style/makelocal.xsl
Modified:
    cxf/trunk/distribution/src/main/assembly/bin.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/pom.xml

Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=1370712&r1=1370711&r2=1370712&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Wed Aug  8 09:15:51 2012
@@ -78,7 +78,6 @@
                 <exclude>**/target</exclude>
                 <exclude>**/build/**/*</exclude>
                 <exclude>**/target/**/*</exclude>
-                <exclude>**/interopfest/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java?rev=1370712&r1=1370711&r2=1370712&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
Wed Aug  8 09:15:51 2012
@@ -19,11 +19,12 @@
 
 package httpsdemo.client;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.security.KeyStore;
 
 import javax.ws.rs.core.Response;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -31,8 +32,6 @@ import org.apache.http.conn.scheme.Schem
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicHeader;
-import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
-import org.apache.cxf.jaxrs.client.WebClient;
 import httpsdemo.common.Customer;
 import httpsdemo.common.CustomerService;
 

Modified: cxf/trunk/distribution/src/main/release/samples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/pom.xml?rev=1370712&r1=1370711&r2=1370712&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/pom.xml Wed Aug  8 09:15:51 2012
@@ -98,16 +98,6 @@
 
         <module>jax_rs/minimal_osgi</module>
 
-        <!--
-        these are a bit fragile as they need to go off to external sites to get stuff like
-        wsdl's and certs and such
-        -->
-	
-        <!--module>ws_security/interopfest/wssc</module>
-        <module>ws_security/interopfest/wstrust10</module>
-        <module>ws_security/interopfest/wssec10</module>
-        <module>ws_security/interopfest/wssec11</module>
-        <module>ws_security/interopfest/wstrust13</module-->
     </modules>
     <dependencyManagement>
         <dependencies>



Mime
View raw message