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

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

Author: tcunning
Date: 2013-10-28 12:52:33 -0400 (Mon, 28 Oct 2013)
New Revision: 38429

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/build.xml
   labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
   labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java
   labs/jbossesb/branches/JBESB_4_11_CP2/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java
Log:
JBESB-3956
Make JBoss ESB buildable by JDK 1.7.


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/build.xml	2013-10-25 16:08:25 UTC (rev 38428)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/build.xml	2013-10-28 16:52:33 UTC (rev 38429)
@@ -8,6 +8,7 @@
 		    <or>
 			<equals arg1="${java.specification.version}" arg2="1.5"/>
 			<equals arg1="${java.specification.version}" arg2="1.6"/>
+ 		        <equals arg1="${java.specification.version}" arg2="1.7"/>
 		    </or>
 		</condition>
 		<fail unless="JDK_VERSION_OK"

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2013-10-25 16:08:25 UTC (rev 38428)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2013-10-28 16:52:33 UTC (rev 38429)
@@ -25,7 +25,9 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 
+
 import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
@@ -181,6 +183,10 @@
 	{
 		return false ;
 	}
+
+	public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
+		throw new SQLFeatureNotSupportedException();	
+	}
 	
 	public <T> T unwrap(final Class<T> iface) throws SQLException
 	{

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java	2013-10-25 16:08:25 UTC (rev 38428)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/common/tests/MockDataSource.java	2013-10-28 16:52:33 UTC (rev 38429)
@@ -24,6 +24,7 @@
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 
 import javax.sql.DataSource;
 
@@ -97,6 +98,10 @@
 	{
 		return false ;
 	}
+
+        public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
+                throw new SQLFeatureNotSupportedException();
+        }
 	
 	public <T> T unwrap(final Class<T> iface) throws SQLException
 	{

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java	2013-10-25 16:08:25 UTC (rev 38428)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java	2013-10-28 16:52:33 UTC (rev 38429)
@@ -130,7 +130,7 @@
 								EventSeverity.WARN,
 								((String)notifHash.get(NOTIFICATION_MESSAGE)));
 				    	EmsOperation clear = emsbean.getOperation(CLEAR_ALERT_OPERATION);
-				    	clear.invoke();
+				    	Object o = clear.invoke(new Object[1]);
 				    	events.add(event);
 				    }
    				}