[jboss-svn-commits] JBL Code SVN: r23452 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product: rosetta/src/org/jboss/soa/esb/listeners/gateway and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2008-10-14 05:28:56 -0400 (Tue, 14 Oct 2008)
New Revision: 23452

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml
Log:
Pull over CR1_2 release of JBESB_4_4_GA_CP1

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java	2008-10-14 09:19:48 UTC (rev 23451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java	2008-10-14 09:28:56 UTC (rev 23452)
@@ -321,8 +321,12 @@
                         {
                         case Types.BLOB:
                             final Blob blob = resultSet.getBlob(1) ;
-                            final byte[] blobData = StreamUtils.readStream(blob.getBinaryStream()) ;
-                            value = new String(blobData) ;
+                            final byte[] blobData = ((blob != null) ? StreamUtils.readStream(blob.getBinaryStream()) : null);
+                            
+                            if (blobData != null)
+                                value = new String(blobData) ;
+                            else
+                                value = "";
                             break ;
                         case Types.BINARY:
                         case Types.VARBINARY:

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2008-10-14 09:19:48 UTC (rev 23451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2008-10-14 09:28:56 UTC (rev 23452)
@@ -490,7 +490,7 @@
                         final int type = meta.getColumnType(iCurr) ;
                         if (type == Types.BLOB) {
                             final Blob blob = RS.getBlob(iCurr) ;
-                            row.put(sCol, StreamUtils.readStreamString(blob.getBinaryStream(), "UTF-8"));
+                            row.put(sCol, ((blob != null) ? StreamUtils.readStreamString(blob.getBinaryStream(), "UTF-8") : null));
                         } else if (type == Types.CLOB) {
                             final Clob clob = RS.getClob(iCurr) ;
                             row.put(sCol, StreamUtils.readReader(clob.getCharacterStream()));

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml	2008-10-14 09:19:48 UTC (rev 23451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml	2008-10-14 09:28:56 UTC (rev 23452)
@@ -78,12 +78,6 @@
             <available type="dir" file="${mgmt.dir}/./lib"/>
         </condition>
 
-        <condition property="rosetta.src" value="${esb.root.dir}/rosetta/src">
-            <available type="dir" file="${esb.root.dir}/rosetta/src"/>
-        </condition>
-        <condition property="rosetta.src" value="${src.java.dir}">
-            <available type="dir" file="${src.java.dir}"/>
-        </condition>
         <property name="lib.dir" location="lib.dir.path"/>
     </target>
 
@@ -96,14 +90,6 @@
             description="Build the management war">
         <echo>${esb.root.dir}</echo>
 
-        <delete dir="${mgmt.build.dir}/src" quiet="true"/>
-        <mkdir dir="${mgmt.build.dir}/src"/>
-        <copy todir="${mgmt.build.dir}/src">
-          <fileset dir="${rosetta.src}">
-            <include name="org/jboss/soa/esb/monitoring/**"/>
-          </fileset>
-        </copy>
-
         <mkdir dir="${mgmt.build.dir}/classes"/>
         <javac classpathref="build.classpath"
                destdir="${mgmt.build.dir}/classes"
@@ -113,7 +99,6 @@
                deprecation="${javac.deprecation}"
                nowarn="on">
             <src path="${src.java.dir}"/>
-            <src path="${mgmt.build.dir}/src"/>
         </javac>
         <copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"
               todir="build/classes/org/jboss/soa/esb/monitoring">