[jboss-svn-commits] JBL Code SVN: r37885 - in labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq: src/main/java/org/jboss/soa/esb/oracle/aq and 1 other directory.

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

Author: tcunning
Date: 2012-02-15 10:10:55 -0500 (Wed, 15 Feb 2012)
New Revision: 37885

Modified:
   labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/pom.xml
   labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java
   labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQUtil.java
Log:
JBESB-3738
Incorporating tips for working Oracle AQ.    


Modified: labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/pom.xml
===================================================================
--- labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/pom.xml	2012-02-13 21:40:39 UTC (rev 37884)
+++ labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/pom.xml	2012-02-15 15:10:55 UTC (rev 37885)
@@ -69,18 +69,18 @@
       <version>1.2</version>
       <scope>provided</scope>
     </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jbossall-client</artifactId>
-		<version>4.2.2</version>
-	</dependency>
     <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jbossall-client</artifactId>
+      <version>4.2.2.GA</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.1</version>
     </dependency>
     <dependency>
-      <groupId>mockejb</groupId>
+      <groupId>org.mockejb</groupId>
       <artifactId>mockejb</artifactId>
       <version>0.6-beta2</version>
     </dependency>

Modified: labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java
===================================================================
--- labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java	2012-02-13 21:40:39 UTC (rev 37884)
+++ labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java	2012-02-15 15:10:55 UTC (rev 37885)
@@ -212,6 +212,12 @@
         dbuser = (String) env.get(AQInitialContextFactory.DB_USER);
         dbpass = (String) env.get(AQInitialContextFactory.DB_PASSWD);
         aqConnectionUrl = (String) env.get(AQInitialContextFactory.DB_CONNECTION_URL);
+   
+        if (env.get(AQInitialContextFactory.DB_SCHEMA)!=null) { 
+            aqSchemaName = (String) env.get(AQInitialContextFactory.DB_SCHEMA);
+        } else { 
+            aqSchemaName = (String) env.get(AQInitialContextFactory.DB_USER);
+        }
 
         if (aqConnectionUrl == null )
         {
@@ -282,4 +288,4 @@
         aqConnectionUrl = url;
     }
 
-}
\ No newline at end of file
+}

Modified: labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQUtil.java
===================================================================
--- labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQUtil.java	2012-02-13 21:40:39 UTC (rev 37884)
+++ labs/jbossesb/trunk/product/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQUtil.java	2012-02-15 15:10:55 UTC (rev 37885)
@@ -50,7 +50,9 @@
     private static final String TOPIC_RECIPIENTS_STRING = "MULTIPLE";
     private static final String GET_QUEUES_SQL = "SELECT allq.OWNER as owner, allq.NAME as name, allq.QUEUE_TYPE as queue_type, allqt.RECIPIENTS as recipients" +
     " from SYS.ALL_QUEUES allq, SYS.ALL_QUEUE_TABLES allqt " +
-    " where allq.QUEUE_TABLE = allqt.QUEUE_TABLE order by name asc";
+    " where allq.QUEUE_TABLE = allqt.QUEUE_TABLE " +
+    " and upper(allq.OWNER) in (?) and allqt.owner = allq.owner " + 
+    " order by name asc";
     private static final String GET_QUEUES_PSQL = "SELECT allq.OWNER as owner, allq.NAME as name, allq.QUEUE_TYPE as queue_type, allqt.RECIPIENTS as recipients" +
     " from SYS.ALL_QUEUES allq, SYS.ALL_QUEUE_TABLES allqt " +
     " where allq.QUEUE_TABLE = allqt.QUEUE_TABLE and upper(allq.OWNER) in (?) order by name asc";
@@ -147,6 +149,7 @@
             }
             else {
                 statement = connection.prepareStatement(AQUtil.GET_QUEUES_SQL);
+                statement.setString(1, commaSeperatedQueueOwnerList.toUpperCase()); 
             }
             rs = statement.executeQuery();
             while(rs.next()) {