svn commit: r1211384 - in /cxf/trunk/services/sts: README.txt sts-war/pom.xml sts-war/src/main/resources/tomcatKeystore.jks

[co...@apache.org]

Author: coheigea
Date: Wed Dec  7 11:03:05 2011
New Revision: 1211384

URL: http://svn.apache.org/viewvc?rev=1211384&view=rev
Log:
Some updates for the sts-war module

Added:
    cxf/trunk/services/sts/sts-war/src/main/resources/tomcatKeystore.jks
Modified:
    cxf/trunk/services/sts/README.txt
    cxf/trunk/services/sts/sts-war/pom.xml

Modified: cxf/trunk/services/sts/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/README.txt?rev=1211384&r1=1211383&r2=1211384&view=diff
==============================================================================
--- cxf/trunk/services/sts/README.txt (original)
+++ cxf/trunk/services/sts/README.txt Wed Dec  7 11:03:05 2011
@@ -4,7 +4,16 @@ Apache CXF. It contains:
 
 sts-core - The core STS implementation
 
-sts-war - A sample war deployment for the STS
+sts-war - A sample war deployment for the STS. This can be deployed to Tomcat
+via "mvn tomcat:deploy". Note that to run the systests below against this
+deployment, it is necessary to configure TLS in Tomcat appropriately. Edit
+the conf/server.xml file to enable a TLS port on 8443, e.g.:
+
+<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               keystoreFile="$CXF_HOME/services/sts/sts-war/src/main/resources/tomcatKeystore.jks"
+               keystorePass="tompass"
+               clientAuth="false" sslProtocol="TLS" />
 
 systests/basic - System tests that use the STS. An embedded jetty version of
 the STS is used for testing by default. The tests can also be run using the

Modified: cxf/trunk/services/sts/sts-war/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/pom.xml?rev=1211384&r1=1211383&r2=1211384&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/pom.xml (original)
+++ cxf/trunk/services/sts/sts-war/pom.xml Wed Dec  7 11:03:05 2011
@@ -71,15 +71,15 @@
         </profile>
         <profile>
             <id>Tomcat6</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <tomcat.url>http://localhost:8080/manager</tomcat.url>
             </properties>
         </profile>
         <profile>
             <id>Tomcat7</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
             </properties>

Added: cxf/trunk/services/sts/sts-war/src/main/resources/tomcatKeystore.jks
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/resources/tomcatKeystore.jks?rev=1211384&view=auto
==============================================================================
Files cxf/trunk/services/sts/sts-war/src/main/resources/tomcatKeystore.jks (added) and cxf/trunk/services/sts/sts-war/src/main/resources/tomcatKeystore.jks Wed Dec  7 11:03:05 2011 differ