cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1433473 - in /cxf/fediz/branches/1.0.x-fixes: ./ apache-fediz/src/assembly/ examples/simpleWebapp/src/main/config/ examples/wsclientWebapp/webapp/src/main/config/ examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/ services/idp/ servic...
Date Tue, 15 Jan 2013 15:57:28 GMT
Author: coheigea
Date: Tue Jan 15 15:57:28 2013
New Revision: 1433473

URL: http://svn.apache.org/viewvc?rev=1433473&view=rev
Log:
[CXF-44] - Backmerged from trunk

Modified:
    cxf/fediz/branches/1.0.x-fixes/   (props changed)
    cxf/fediz/branches/1.0.x-fixes/apache-fediz/src/assembly/bin.xml
    cxf/fediz/branches/1.0.x-fixes/examples/simpleWebapp/src/main/config/fediz_config.xml
    cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
    cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
    cxf/fediz/branches/1.0.x-fixes/services/idp/pom.xml
    cxf/fediz/branches/1.0.x-fixes/services/sts/pom.xml

Propchange: cxf/fediz/branches/1.0.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/fediz/trunk:r1433471

Modified: cxf/fediz/branches/1.0.x-fixes/apache-fediz/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/apache-fediz/src/assembly/bin.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/apache-fediz/src/assembly/bin.xml (original)
+++ cxf/fediz/branches/1.0.x-fixes/apache-fediz/src/assembly/bin.xml Tue Jan 15 15:57:28 2013
@@ -71,6 +71,7 @@
                 <include>org.apache.cxf.fediz:fediz-idp</include>
                 <include>org.apache.cxf.fediz:fediz-idp-sts</include>
             </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <scope>runtime</scope>
         </dependencySet>
         <dependencySet>

Modified: cxf/fediz/branches/1.0.x-fixes/examples/simpleWebapp/src/main/config/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/examples/simpleWebapp/src/main/config/fediz_config.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/examples/simpleWebapp/src/main/config/fediz_config.xml
(original)
+++ cxf/fediz/branches/1.0.x-fixes/examples/simpleWebapp/src/main/config/fediz_config.xml
Tue Jan 15 15:57:28 2013
@@ -21,7 +21,7 @@
 		<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>
+			<issuer>https://localhost:9443/fediz-idp/</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/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
(original)
+++ cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
Tue Jan 15 15:57:28 2013
@@ -21,7 +21,7 @@
 		<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>
+			<issuer>https://localhost:9443/fediz-idp/</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/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
Tue Jan 15 15:57:28 2013
@@ -37,7 +37,7 @@
 			<entry key="ws-security.sts.client">
 				<bean class="org.apache.cxf.ws.security.trust.STSClient">
 					<constructor-arg ref="cxf" />
-					<property name="wsdlLocation" value="https://localhost:9443/fedizidpsts/STSServiceTransport?wsdl"
/>
+					<property name="wsdlLocation" value="https://localhost:9443/fediz-idp-sts/STSServiceTransport?wsdl"
/>
 					<property name="serviceName"
 						value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService" />
 					<property name="endpointName"

Modified: cxf/fediz/branches/1.0.x-fixes/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/services/idp/pom.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/services/idp/pom.xml (original)
+++ cxf/fediz/branches/1.0.x-fixes/services/idp/pom.xml Tue Jan 15 15:57:28 2013
@@ -93,6 +93,6 @@
             </plugin>
         </plugins>
         <!-- Name of the generated WAR file -->
-        <finalName>fedizidp</finalName>
+        <finalName>fediz-idp</finalName>
     </build>
 </project>

Modified: cxf/fediz/branches/1.0.x-fixes/services/sts/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/services/sts/pom.xml?rev=1433473&r1=1433472&r2=1433473&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/services/sts/pom.xml (original)
+++ cxf/fediz/branches/1.0.x-fixes/services/sts/pom.xml Tue Jan 15 15:57:28 2013
@@ -97,6 +97,6 @@
             </plugin>
         </plugins>
         <!-- Name of the generated WAR file -->
-        <finalName>fedizidpsts</finalName>
+        <finalName>fediz-idp-sts</finalName>
     </build>
 </project>



Mime
View raw message