[jboss-cvs] JBossAS SVN: r89012 - in trunk: testsuite/imports and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 18 17:19:52 EDT 2009
Author: anil.saldhana at jboss.com
Date: 2009-05-18 17:19:51 -0400 (Mon, 18 May 2009)
New Revision: 89012
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml
trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
Log:
JBAS-6940: re enable the tomcat ssl tests, also override dummy methods in JSSESocketFactory into JBossSocketFactory
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-05-18 19:47:04 UTC (rev 89011)
+++ trunk/testsuite/build.xml 2009-05-18 21:19:51 UTC (rev 89012)
@@ -975,7 +975,7 @@
<antcall target="tests-security-manager"/>
<antcall target="tests-clustering-all-stacks"/>
- <!-- <antcall target="tomcat-ssl-tests"/>-->
+ <antcall target="tomcat-ssl-tests"/>
<antcall target="tomcat-sso-tests"/>
<antcall target="tomcat-sso-clustered-tests"/>
<antcall target="tomcat-webctx-tests"/>
@@ -1114,8 +1114,12 @@
<include name="deployers/**"/>
<include name="deploy/jbossweb.sar/**"/>
<include name="deploy/ROOT.war/**"/>
+ <include name="deploy/security/**"/>
+ <include name="deploy/jca*"/>
+ <include name="deploy/legacy*"/>
<include name="lib/**"/>
<include name="deploy/jmx-invoker-service.xml"/>
+ <include name="deploy/transaction-jboss-beans.xml"/>
</patternset>
</create-config>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2009-05-18 19:47:04 UTC (rev 89011)
+++ trunk/testsuite/imports/server-config.xml 2009-05-18 21:19:51 UTC (rev 89012)
@@ -180,7 +180,7 @@
<server name="tomcat-ssl" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xms128m" />
- <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xms512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2009-05-18 19:47:04 UTC (rev 89011)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2009-05-18 21:19:51 UTC (rev 89012)
@@ -120,14 +120,6 @@
int responseCode = httpConn.executeMethod(get);
String status = get.getStatusText();
log.debug(status);
- assertTrue("Get HTTP_MOVED_TEMP("+responseCode+")", responseCode == HttpURLConnection.HTTP_MOVED_TEMP);
-
- Header hdr = get.getResponseHeader("Location");
- url = hdr.getValue();
- get = new GetMethod(url);
- responseCode = httpConn.executeMethod(get);
- status = get.getStatusText();
- log.debug(status);
assertTrue("Get OK("+responseCode+")", responseCode == HttpURLConnection.HTTP_OK);
}
public void doHttps(String httpsNoAuth) throws Exception
@@ -151,4 +143,4 @@
Test suite = getDeploySetup(SSLUnitTestCase.class, "clientcert-auth.war");
return suite;
}
-}
+}
\ No newline at end of file
Modified: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml 2009-05-18 19:47:04 UTC (rev 89011)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml 2009-05-18 21:19:51 UTC (rev 89012)
@@ -17,6 +17,7 @@
<Connector port="8443" address="${jboss.bind.address}"
maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
scheme="https" secure="true" clientAuth="true"
+ SSLEnabled="true"
truststoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
truststorePass="unit-tests-server"
keystoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
@@ -31,6 +32,7 @@
<Connector port="9443" address="${jboss.bind.address}"
maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
scheme="https" secure="true" clientAuth="true"
+ SSLEnabled="true"
sslProtocol = "TLS" securityDomain="java:/jaas/jbosstest-ssl"
SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
@@ -38,7 +40,8 @@
<Connector port="9943" address="${jboss.bind.address}"
maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
scheme="https" secure="true" clientAuth="true"
- sslProtocol = "TLS"
+ sslProtocol = "TLS"
+ SSLEnabled="true"
securityDomain="java:/jaas/encrypt-keystore-password"
SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
@@ -51,10 +54,6 @@
<Host name="localhost"
autoDeploy="false" deployOnStartup="false" deployXML="false">
-
- <!-- Default context parameters -->
- <DefaultContext cookies="true" crossContext="true" override="true"/>
-
</Host>
</Engine>
Modified: trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java 2009-05-18 19:47:04 UTC (rev 89011)
+++ trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java 2009-05-18 21:19:51 UTC (rev 89012)
@@ -167,7 +167,23 @@
}
return keyMgrs;
}
+
+ @Override
+ protected KeyManager[] getKeyManagers(String keystoreType, String keystoreProvider, String algorithm, String keyAlias)
+ throws Exception
+ {
+ return getKeyManagers(keystoreType, algorithm, keyAlias);
+ }
+
+
+ @Override
+ protected TrustManager[] getTrustManagers(String keystoreType, String keystoreProvider, String algorithm)
+ throws Exception
+ {
+ return getTrustManagers(keystoreType, algorithm);
+ }
+
private void verifySecurityDomain()
{
String str = "securityDomain is null." +
More information about the jboss-cvs-commits
mailing list