Author: coheigea
Date: Tue Jan 15 15:51:26 2013
New Revision: 1433471
URL: http://svn.apache.org/viewvc?rev=1433471&view=rev
Log:
[FEDIZ-44] - Rename IDP + STS wars to use hypens (fediz-idp + fediz-idp-sts)
and update documentation
Modified:
cxf/fediz/trunk/apache-fediz/src/assembly/bin.xml
cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml
cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_config.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
cxf/fediz/trunk/services/idp/pom.xml
cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/services/sts/pom.xml
cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml
cxf/fediz/trunk/systests/tomcat7/pom.xml
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml
Modified: cxf/fediz/trunk/apache-fediz/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/apache-fediz/src/assembly/bin.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/apache-fediz/src/assembly/bin.xml (original)
+++ cxf/fediz/trunk/apache-fediz/src/assembly/bin.xml Tue Jan 15 15:51:26 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/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=1433471&r1=1433470&r2=1433471&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 Tue
Jan 15 15:51:26 2013
@@ -21,7 +21,7 @@
<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
<realm>urn:org:apache:cxf:fediz:fedizhelloworld</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/trunk/examples/springWebapp/src/main/config/fediz_config.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xml
(original)
+++ cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xml Tue
Jan 15 15:51:26 2013
@@ -21,7 +21,7 @@
<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
<realm>urn:org:apache:cxf:fediz:fedizhelloworld</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/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=1433471&r1=1433470&r2=1433471&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
Tue Jan 15 15:51:26 2013
@@ -21,7 +21,7 @@
<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
<realm>urn:org:apache:cxf:fediz:fedizhelloworld</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/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
Tue Jan 15 15:51:26 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/trunk/services/idp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Tue Jan 15 15:51:26 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/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml Tue Jan 15
15:51:26 2013
@@ -78,7 +78,7 @@
</init-param>
<init-param>
<param-name>sts.wsdl.url</param-name>
-
<param-value>https://localhost:0/fedizidpsts/STSService?wsdl</param-value>
+
<param-value>https://localhost:0/fediz-idp-sts/STSService?wsdl</param-value>
</init-param>
<init-param>
<param-name>sts.wsdl.service</param-name>
@@ -125,7 +125,7 @@
</init-param>
<init-param>
<param-name>sts.wsdl.url</param-name>
-
<param-value>https://localhost:0/fedizidpsts/STSServiceTransport?wsdl</param-value>
+
<param-value>https://localhost:0/fediz-idp-sts/STSServiceTransport?wsdl</param-value>
</init-param>
<init-param>
<param-name>sts.wsdl.service</param-name>
Modified: cxf/fediz/trunk/services/sts/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/pom.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/pom.xml (original)
+++ cxf/fediz/trunk/services/sts/pom.xml Tue Jan 15 15:51:26 2013
@@ -97,6 +97,6 @@
</plugin>
</plugins>
<!-- Name of the generated WAR file -->
- <finalName>fedizidpsts</finalName>
+ <finalName>fediz-idp-sts</finalName>
</build>
</project>
Modified: cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml
(original)
+++ cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml Tue Jan
15 15:51:26 2013
@@ -21,7 +21,7 @@
<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
<realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
-
<issuer>https://localhost:${idp.https.port}/fedizidp/</issuer>
+
<issuer>https://localhost:${idp.https.port}/fediz-idp/</issuer>
<roleDelimiter>,</roleDelimiter>
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<claimTypesRequested>
Modified:
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml
(original)
+++ cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml Tue
Jan 15 15:51:26 2013
@@ -31,14 +31,14 @@
<Array type="org.eclipse.jetty.server.Handler">
<Item>
<New class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath">/fedizidp</Set>
+ <Set name="contextPath">/fediz-idp</Set>
<Set name="war">./target/fediz-idp.war</Set>
<Set name="throwUnavailableOnStartupException">true</Set>
</New>
</Item>
<Item>
<New class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath">/fedizidpsts</Set>
+ <Set name="contextPath">/fediz-idp-sts</Set>
<Set name="war">./target/fediz-idp-sts.war</Set>
<Set name="throwUnavailableOnStartupException">true</Set>
</New>
Modified: cxf/fediz/trunk/systests/tomcat7/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tomcat7/pom.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/tomcat7/pom.xml (original)
+++ cxf/fediz/trunk/systests/tomcat7/pom.xml Tue Jan 15 15:51:26 2013
@@ -143,7 +143,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
-
<outputDirectory>target/tomcat/idp/webapps/fedizidp</outputDirectory>
+
<outputDirectory>target/tomcat/idp/webapps/fediz-idp</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz</groupId>
@@ -151,7 +151,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
-
<outputDirectory>target/tomcat/idp/webapps/fedizidpsts</outputDirectory>
+
<outputDirectory>target/tomcat/idp/webapps/fediz-idp-sts</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz.systests</groupId>
Modified:
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
---
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
(original)
+++
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
Tue Jan 15 15:51:26 2013
@@ -86,8 +86,8 @@ public class TomcatTest extends Abstract
idpServer.getService().addConnector(httpsConnector);
- idpServer.addWebapp("/fedizidpsts", "fedizidpsts");
- idpServer.addWebapp("/fedizidp", "fedizidp");
+ idpServer.addWebapp("/fediz-idp-sts", "fediz-idp-sts");
+ idpServer.addWebapp("/fediz-idp", "fediz-idp");
idpServer.start();
} catch (Exception e) {
Modified: cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml?rev=1433471&r1=1433470&r2=1433471&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml
(original)
+++ cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml Tue
Jan 15 15:51:26 2013
@@ -21,7 +21,7 @@
<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
<realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
-
<issuer>https://localhost:${idp.https.port}/fedizidp/</issuer>
+
<issuer>https://localhost:${idp.https.port}/fediz-idp/</issuer>
<roleDelimiter>,</roleDelimiter>
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
<claimTypesRequested>
