[jboss-svn-commits] JBL Code SVN: r20996 - in labs/jbossesb/trunk: product/rosetta/src/org/jboss/soa/esb/helpers/persist and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-07-10 11:02:46 -0400 (Thu, 10 Jul 2008)
New Revision: 20996

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java
   labs/jbossesb/trunk/qa/build.xml
Log:
Added JDK6 support: JBESB-1674

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2008-07-10 15:00:08 UTC (rev 20995)
+++ labs/jbossesb/trunk/product/build.xml	2008-07-10 15:02:46 UTC (rev 20996)
@@ -5,10 +5,13 @@
 	</description>
 	
         <condition property="JDK_VERSION_OK">
+            <or>
                 <equals arg1="${java.specification.version}" arg2="1.5"/>
+                <equals arg1="${java.specification.version}" arg2="1.6"/>
+            </or>
         </condition>
         <fail unless="JDK_VERSION_OK"
-             message="JBoss ESB requires jdk1.5 to build."/>
+             message="JBoss ESB requires jdk1.5 or jdk1.6 to build."/>
 
 	<import file="esb-config.xml"/>
 	

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2008-07-10 15:00:08 UTC (rev 20995)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2008-07-10 15:02:46 UTC (rev 20996)
@@ -26,8 +26,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
@@ -177,4 +175,15 @@
 	{
 		m_oPW = out;
 	}
+	
+	public boolean isWrapperFor(final Class<?> iface)
+		throws SQLException
+	{
+		return false ;
+	}
+	
+	public <T> T unwrap(final Class<T> iface) throws SQLException
+	{
+		throw new SQLException("unwrap method not supported by this implementation") ;
+	}
 } // ______________________________________________________

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java	2008-07-10 15:00:08 UTC (rev 20995)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java	2008-07-10 15:02:46 UTC (rev 20996)
@@ -91,4 +91,15 @@
 		this.loginTimeout = loginTimeout;
 	}
 
+	
+	public boolean isWrapperFor(final Class<?> iface)
+		throws SQLException
+	{
+		return false ;
+	}
+	
+	public <T> T unwrap(final Class<T> iface) throws SQLException
+	{
+		throw new SQLException("unwrap method not supported by this implementation") ;
+	}
 }

Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml	2008-07-10 15:00:08 UTC (rev 20995)
+++ labs/jbossesb/trunk/qa/build.xml	2008-07-10 15:02:46 UTC (rev 20996)
@@ -3,10 +3,13 @@
 	<property name="build.sysclasspath" value="ignore"/>
 
         <condition property="JDK_VERSION_OK">
+            <or>
                 <equals arg1="${java.specification.version}" arg2="1.5"/>
+                <equals arg1="${java.specification.version}" arg2="1.6"/>
+            </or>
         </condition>
         <fail unless="JDK_VERSION_OK"
-             message="JBoss ESB requires jdk1.5 to build."/>
+             message="JBoss ESB requires jdk1.5 or jdk1.6 to build."/>
 
 	<property name="product.dir" location="../product"/>
 	<property name="build.location" location="build"/>