[jboss-cvs] JBossAS SVN: r90654 - in branches/Branch_5_x/testsuite: imports and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 26 16:25:31 EDT 2009
Author: smcgowan at redhat.com
Date: 2009-06-26 16:25:30 -0400 (Fri, 26 Jun 2009)
New Revision: 90654
Added:
branches/Branch_5_x/testsuite/src/resources/security-provider.properties
Modified:
branches/Branch_5_x/testsuite/build.xml
branches/Branch_5_x/testsuite/imports/server-config.xml
branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
branches/Branch_5_x/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
Log:
JBAS-6934, JBAS-6962, JBAS-6968, JBAS-6967
Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml 2009-06-26 19:09:55 UTC (rev 90653)
+++ branches/Branch_5_x/testsuite/build.xml 2009-06-26 20:25:30 UTC (rev 90654)
@@ -191,6 +191,9 @@
<!-- hibernate tests need slfj4 -->
<path refid="org.jboss.slf4j.classpath"/>
<path refid="org.slf4j.classpath"/>
+ <!-- JBAS-6934 -->
+ <path refid="net.jcip.classpath"/>
+
<!-- jbossts crash recovery tests need server manager -->
<path refid="jboss.server.manager.classpath"/>
<path refid="jboss.jbossts.classpath"/>
Modified: branches/Branch_5_x/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/server-config.xml 2009-06-26 19:09:55 UTC (rev 90653)
+++ branches/Branch_5_x/testsuite/imports/server-config.xml 2009-06-26 20:25:30 UTC (rev 90654)
@@ -1130,6 +1130,9 @@
<fileset dir="${jboss.cache.jbosscache.pojo.lib}">
<include name="jbosscache-pojo.jar"/>
</fileset>
+ <fileset dir="${net.jcip.lib}">
+ <include name="jcip-annotations.jar"/>
+ </fileset>
</copy>
</sequential>
</macrodef>
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-06-26 19:09:55 UTC (rev 90653)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-06-26 20:25:30 UTC (rev 90654)
@@ -154,6 +154,7 @@
public void testJBossQL() throws Exception
{
+ boolean ibmJDK = System.getProperty("java.vm.vendor").indexOf("IBM") > -1;
assertEquals("SELECT t0_u.USER_ID FROM USER_DATA t0_u WHERE (ucase(t0_u.USER_NAME) = ?)",
compileJBossQL("SELECT OBJECT(u) FROM user u WHERE UCASE(u.userName) = ?1",
Collection.class, new Class[]{String.class}));
@@ -163,11 +164,19 @@
Collection.class, new Class[]{String.class}));
String expected = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t2_o2_customer, CUSTOMEREJB t1_o1_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t3_o2.customer=t2_o2_customer.id AND t0_o1.customer=t1_o1_customer.id)";
+ String expected_IBM_JDK = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t1_o1_customer, CUSTOMEREJB t2_o2_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t0_o1.customer=t1_o1_customer.id AND t3_o2.customer=t2_o2_customer.id)";
+
String compiled = compileJBossQL(
"SELECT OBJECT(o1) FROM OrderX o1, OrderX o2 WHERE o1.customer <> o2.customer AND o1.creditCard = o2.creditCard",
Collection.class, NO_PARAMS);
- assertTrue("Expected: " + expected + " but got: " + compiled, expected.equals(compiled));
+ if (ibmJDK) {
+ assertTrue("Expected: " + expected_IBM_JDK + " but got: " + compiled, expected_IBM_JDK.equals(compiled));
+ } else {
+ assertTrue("Expected: " + expected + " but got: " + compiled, expected.equals(compiled));
+ }
+
+
assertEquals("SELECT t0_o.ORDER_NUMBER " +
"FROM ORDER_DATA t0_o " +
"WHERE ((t0_o.CC_TYPE=? " +
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-06-26 19:09:55 UTC (rev 90653)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-06-26 20:25:30 UTC (rev 90654)
@@ -38,6 +38,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
+import java.util.Properties;
import javax.management.ObjectName;
import javax.net.ServerSocketFactory;
import javax.net.ssl.SSLServerSocket;
@@ -63,7 +64,11 @@
{
static final String JAR = "https-service.sar";
static final String KEYSTORE_PASSWORD = "unit-tests";
+ private static final String PROP_FILE_NAME = "security-provider.properties";
+ private static final String PROP_NAME_PREFIX = "jsse.provider.class.";
+ private static final Logger log = Logger.getLogger(HttpsUnitTestCase.class);
+
public HttpsUnitTestCase(String name)
{
super(name);
@@ -168,7 +173,11 @@
{
super.setUp();
deploy(JAR);
- Security.addProvider(SecurityProviderUtil.getJSSEProvider());
+ String jsseProviderName = getJSSEProviderName();
+ Class providerClass = Class.forName(jsseProviderName);
+ java.security.Provider provider = (java.security.Provider)providerClass.newInstance();
+ Security.addProvider(provider);
+
}
protected void tearDown() throws Exception
{
@@ -179,6 +188,46 @@
return wrapper;
}
+ private static String getJSSEProviderName() {
+
+ String jsseProviderName = null;
+ //Logger log = Logger.getLogger(HttpsUnitTestCase.class.getName());
+
+ try {
+
+ Properties prop = new Properties();
+ prop.load(ClassLoader.getSystemResourceAsStream(PROP_FILE_NAME));
+
+ boolean searched = false;
+ int i=1;
+ while (!searched){
+ boolean found = prop.containsKey(PROP_NAME_PREFIX + i);
+ if (found){
+ String jsseProvider = prop.getProperty(PROP_NAME_PREFIX + i);
+ try {
+ Class.forName(jsseProvider);
+ jsseProviderName = jsseProvider;
+ log.debug ("Using JSEE Provider :" + jsseProvider);
+ } catch (ClassNotFoundException cnfe){
+ log.debug ("Could not find JSEE Provider :" + jsseProvider );
+ }
+
+ } else {
+ searched = true;
+ }
+ i++;
+ }
+
+ if (jsseProviderName == null) {
+ log.error ("No JSSE Providers found. Please add the appropriate provider in security-providers.properties");
+ }
+ } catch (Exception e){
+ log.error ("Error getting JSSE Provider : ");
+ e.printStackTrace();
+ }
+ return jsseProviderName;
+ }
+
/** A subclass of Thread that processes a single request sent to
the serverSocket.
*/
Added: branches/Branch_5_x/testsuite/src/resources/security-provider.properties
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/security-provider.properties (rev 0)
+++ branches/Branch_5_x/testsuite/src/resources/security-provider.properties 2009-06-26 20:25:30 UTC (rev 90654)
@@ -0,0 +1,9 @@
+# Specifies a list of possible jsse provider classes.
+# Numbers must start from 1 upwards and denotes priority.
+jsse.provider.class.1 com.sun.net.ssl.internal.ssl.Provider
+jsse.provider.class.2 com.ibm.jsse.IBMJSSEProvider
+
+# Specifies a list of possible www protocol classes.
+# Numbers must start from 1 upwards and denotes priority.
+www.protocol.class.1 com.sun.net.ssl.internal.www.protocol
+www.protocol.class.2 com.ibm.net.ssl.internal.www.protocol
More information about the jboss-cvs-commits
mailing list