[jboss-cvs] JBossAS SVN: r71395 - in trunk/testsuite/src/resources/test-configs/tomcat-ssl: deploy and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 28 15:45:22 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-28 15:45:21 -0400 (Fri, 28 Mar 2008)
New Revision: 71395
Added:
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/keystore.password
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml
Removed:
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/jbossweb.deployer/
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/keystore.password
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/security-service.xml
Log:
Move server.xml to deploy
Copied: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml (from rev 71388, trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/jbossweb.deployer/server.xml)
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml (rev 0)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml 2008-03-28 19:45:21 UTC (rev 71395)
@@ -0,0 +1,64 @@
+<Server>
+
+ <!-- Use a custom version of StandardService that allows the
+ connectors to be started independent of the normal lifecycle
+ start to allow web apps to be deployed before starting the
+ connectors.
+ -->
+ <Service name="jboss.web">
+
+ <!-- A HTTP/1.1 Connector on port 8080 which redirects to 8443 for https -->
+ <Connector port="8080" address="${jboss.bind.address}"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+
+ <!-- SSL/TLS Connector configuration -->
+ <Connector port="8443" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true"
+ truststoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
+ truststorePass="unit-tests-server"
+ keystoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
+ keystorePass="unit-tests-server" sslProtocol = "TLS" />
+
+ <!-- A HTTP/1.1 Connector on port 9080 which redirects to 9443 for https -->
+ <Connector port="9080" address="${jboss.bind.address}"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="9443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+ <!-- SSL/TLS Connector configuration -->
+ <Connector port="9443" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true"
+ sslProtocol = "TLS" securityDomain="java:/jaas/jbosstest-ssl"
+ SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
+
+ <!-- SSL/TLS Connector with encrypted keystore password configuration -->
+ <Connector port="9943" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true"
+ sslProtocol = "TLS"
+ securityDomain="java:/jaas/encrypt-keystore-password"
+ SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
+
+ <Engine name="jboss.web" defaultHost="localhost">
+
+ <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ />
+
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="false">
+
+
+ <!-- Default context parameters -->
+ <DefaultContext cookies="true" crossContext="true" override="true"/>
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
Copied: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/keystore.password (from rev 71388, trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/keystore.password)
===================================================================
(Binary files differ)
Copied: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml (from rev 71388, trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/security-service.xml)
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml (rev 0)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml 2008-03-28 19:45:21 UTC (rev 71395)
@@ -0,0 +1,23 @@
+<server>
+ <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+ name="jboss.security:service=SecurityDomain">
+ <constructor>
+ <arg type="java.lang.String" value="jbosstest-ssl"/>
+ </constructor>
+ <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="KeyStorePass">unit-tests-server</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+ name="jboss.security:service=PBESecurityDomain">
+ <constructor>
+ <arg type="java.lang.String" value="encrypt-keystore-password"/>
+ </constructor>
+ <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="KeyStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
+ <attribute name="TrustStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="TrustStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
+ <attribute name="Salt">welcometojboss</attribute>
+ <attribute name="IterationCount">13</attribute>
+ </mbean>
+</server>
Deleted: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/keystore.password
===================================================================
(Binary files differ)
Deleted: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/security-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/security-service.xml 2008-03-28 19:31:46 UTC (rev 71394)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deployers/security-service.xml 2008-03-28 19:45:21 UTC (rev 71395)
@@ -1,23 +0,0 @@
-<server>
- <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
- name="jboss.security:service=SecurityDomain">
- <constructor>
- <arg type="java.lang.String" value="jbosstest-ssl"/>
- </constructor>
- <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
- <attribute name="KeyStorePass">unit-tests-server</attribute>
- </mbean>
-
- <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
- name="jboss.security:service=PBESecurityDomain">
- <constructor>
- <arg type="java.lang.String" value="encrypt-keystore-password"/>
- </constructor>
- <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
- <attribute name="KeyStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
- <attribute name="TrustStoreURL">resource:localhost.keystore</attribute>
- <attribute name="TrustStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
- <attribute name="Salt">welcometojboss</attribute>
- <attribute name="IterationCount">13</attribute>
- </mbean>
-</server>
More information about the jboss-cvs-commits
mailing list