cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1424649 - in /cxf/fediz/trunk: examples/simpleWebapp/src/main/config/ examples/wsclientWebapp/webapp/src/main/config/ plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/ plugins/jetty/src/test/resources/ services/idp/src/main/webapp/WE...
Date Thu, 20 Dec 2012 19:30:47 GMT
Author: owulff
Date: Thu Dec 20 19:30:47 2012
New Revision: 1424649

URL: http://svn.apache.org/viewvc?rev=1424649&view=rev
Log:
Fixed port conflict during testing and moved to urn for wtrealm

Modified:
    cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml
    cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
    cxf/fediz/trunk/plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/BrowserTest.java
    cxf/fediz/trunk/plugins/jetty/src/test/resources/fediz_config.xml
    cxf/fediz/trunk/plugins/jetty/src/test/resources/fedserver.xml
    cxf/fediz/trunk/plugins/jetty/src/test/resources/idpserver.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/RPClaims.xml

Modified: cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml Thu Dec 20 19:30:47
2012
@@ -6,7 +6,7 @@
 <FedizConfig>
 	<contextConfig name="/fedizhelloworld">
 		<audienceUris>
-			<audienceItem>https://localhost:8443/fedizhelloworld/</audienceItem>
+			<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
 		</audienceUris>
 		<certificateStores>
 			<trustManager>
@@ -20,7 +20,7 @@
 		<maximumClockSkew>1000</maximumClockSkew>
 		<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:type="federationProtocolType" version="1.0.0">
-			<!--<realm>target realm</realm>-->
+			<realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
 			<issuer>https://localhost:9443/fedizidp/</issuer>
 			<roleDelimiter>,</roleDelimiter>
 			<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>

Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml Thu Dec
20 19:30:47 2012
@@ -6,7 +6,7 @@
 <FedizConfig>
 	<contextConfig name="/fedizhelloworld">
 		<audienceUris>
-			<audienceItem>https://localhost:8443/fedizhelloworld/</audienceItem>
+			<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
 		</audienceUris>
 		<certificateStores>
 			<trustManager>
@@ -20,7 +20,7 @@
 		<maximumClockSkew>1000</maximumClockSkew>
 		<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:type="federationProtocolType" version="1.0.0">
-			<!--<realm>target realm</realm>-->
+			<realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
 			<issuer>https://localhost:9443/fedizidp/</issuer>
 			<roleDelimiter>,</roleDelimiter>
 			<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>

Modified: cxf/fediz/trunk/plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/BrowserTest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/BrowserTest.java?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/BrowserTest.java
(original)
+++ cxf/fediz/trunk/plugins/jetty/src/test/java/org/apache/cxf/fediz/jetty/BrowserTest.java
Thu Dec 20 19:30:47 2012
@@ -100,15 +100,15 @@ public class BrowserTest {
         System.out.println(server.isRunning());
     }
     
-    //Ignore still IDP/STS is mocked also
+
     @org.junit.Test
     public void testGetSecureUrl() throws Exception {
-        String uri = "http://localhost:8080/fedizhelloworld/secure/fedservlet";
+        String uri = "http://localhost:54566/fedizhelloworld/secure/fedservlet";
         DefaultHttpClient httpclient = new DefaultHttpClient();
         String user = "alice";
         try {
             httpclient.getCredentialsProvider().setCredentials(
-                    new AuthScope("localhost", 9443),
+                    new AuthScope("localhost", 54567),
                     new UsernamePasswordCredentials(user, "ecila"));
 
             KeyStore trustStore  = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -124,7 +124,7 @@ public class BrowserTest {
             }
 
             SSLSocketFactory socketFactory = new SSLSocketFactory(trustStore);
-            Scheme sch = new Scheme("https", 9443, socketFactory);
+            Scheme sch = new Scheme("https", 54567, socketFactory);
             httpclient.getConnectionManager().getSchemeRegistry().register(sch);
             
             HttpGet httpget = new HttpGet(uri);

Modified: cxf/fediz/trunk/plugins/jetty/src/test/resources/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/src/test/resources/fediz_config.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/src/test/resources/fediz_config.xml (original)
+++ cxf/fediz/trunk/plugins/jetty/src/test/resources/fediz_config.xml Thu Dec 20 19:30:47
2012
@@ -6,8 +6,7 @@
 <FedizConfig>
 	<contextConfig name="/fedizhelloworld">
 		<audienceUris>
-			<audienceItem>https://localhost:8443/fedizhelloworld/</audienceItem>
-			<audienceItem>http://localhost:8080/fedizhelloworld/</audienceItem>
+			<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
 		</audienceUris>
 		<certificateStores>
 			<trustManager>
@@ -21,8 +20,8 @@
 		<maximumClockSkew>1000</maximumClockSkew>
 		<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:type="federationProtocolType" version="1.0.0">
-			<!--<realm>target realm</realm>-->
-			<issuer>https://localhost:9443/fedizidp/</issuer>
+                        <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
+			<issuer>https://localhost:54567/fedizidp/</issuer>
 			<roleDelimiter>,</roleDelimiter>
 			<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
 			<!--<authenticationType type="String">some auth type</authenticationType>-->

Modified: cxf/fediz/trunk/plugins/jetty/src/test/resources/fedserver.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/src/test/resources/fedserver.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/src/test/resources/fedserver.xml (original)
+++ cxf/fediz/trunk/plugins/jetty/src/test/resources/fedserver.xml Thu Dec 20 19:30:47 2012
@@ -12,7 +12,7 @@
     <Call name="addConnector">
       <Arg>
           <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-            <Set name="port">8080</Set>
+            <Set name="port">54566</Set>
           </New>
       </Arg>
     </Call>
@@ -49,4 +49,4 @@
       </Arg>
     </Call>      
     
-</Configure>
\ No newline at end of file
+</Configure>

Modified: cxf/fediz/trunk/plugins/jetty/src/test/resources/idpserver.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/src/test/resources/idpserver.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/src/test/resources/idpserver.xml (original)
+++ cxf/fediz/trunk/plugins/jetty/src/test/resources/idpserver.xml Thu Dec 20 19:30:47 2012
@@ -12,7 +12,7 @@
     <Call name="addConnector">
       <Arg>
           <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-            <Set name="port">9080</Set>
+            <Set name="port">54568</Set>
           </New>
       </Arg>
     </Call>
@@ -27,7 +27,7 @@
              <Set name="keyManagerPassword">tompass</Set>
            </New>
          </Arg>
-         <Set name="port">9443</Set>
+         <Set name="port">54567</Set>
          <Set name="maxIdleTime">30000</Set>
        </New>
      </Arg>
@@ -57,4 +57,4 @@
       </New>
     </Set>    
     
-</Configure>
\ No newline at end of file
+</Configure>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/RPClaims.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/RPClaims.xml?rev=1424649&r1=1424648&r2=1424649&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/RPClaims.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/RPClaims.xml Thu Dec 20 19:30:47
2012
@@ -15,9 +15,9 @@
 			value-ref="claimsWsfedhelloworld2" />
 		<entry key="https://localhost:8443/fedizhelloworld/"
 			value-ref="claimsWsfedhelloworld2" />
-		<entry key="urn:fediz:fedizhelloworld"
+		<entry key="urn:org:apache:cxf:fediz:fedizhelloworld"
 			value-ref="claimsWsfedhelloworld2" />
-		<entry key="urn:fediz:fedizhelloworld2"
+		<entry key="urn:org:apache:cxf:fediz:fedizhelloworld2"
 			value-ref="claimsWsfedhelloworld" />  			
 	</util:map>
 



Mime
View raw message