[jbpm-commits] JBoss JBPM SVN: r3601 - in jbpm3/branches/aguizar/modules: db/scripts and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-01-07 20:42:07 -0500 (Wed, 07 Jan 2009)
New Revision: 3601

Modified:
   jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java
   jbpm3/branches/aguizar/modules/db/scripts/antrun-jbpmschema.xml
   jbpm3/branches/aguizar/modules/enterprise/pom.xml
   jbpm3/branches/aguizar/modules/enterprise/src/main/etc/jbpm.cfg.xml
Log:
have jbpm schema task close its streams

Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java	2009-01-07 20:03:27 UTC (rev 3600)
+++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java	2009-01-08 01:42:07 UTC (rev 3601)
@@ -69,13 +69,14 @@
       }
       else if ("update".equalsIgnoreCase(action))
       {
-        PrintStream sysout = System.out;
+        PrintStream fileOut = null;
+        PrintStream systemOut = System.out;
         try
         {
           if (output != null)
           {
-            PrintStream prstr = new PrintStream(new FileOutputStream(output));
-            System.setOut(prstr);
+            fileOut = new PrintStream(new FileOutputStream(output));
+            System.setOut(fileOut);
           }
           SchemaUpdate schemaUpdate = getSchemaUpdate(configuration);
           schemaUpdate.execute(true, false);
@@ -83,7 +84,11 @@
         }
         finally
         {
-          System.setOut(sysout);
+          if (fileOut != null)
+          {            
+            System.setOut(systemOut);
+            fileOut.close();
+          }
         }
       }
       else
@@ -113,9 +118,16 @@
       if (inStream == null)
         throw new IllegalArgumentException("Cannot read properties: " + properties);
 
-      Properties properties = new Properties();
-      properties.load(inStream);
-      configuration.setProperties(properties);
+      try
+      {
+        Properties properties = new Properties();
+        properties.load(inStream);
+        configuration.setProperties(properties);
+      }
+      finally
+      {
+        inStream.close();
+      }
     }
     return configuration;
   }

Modified: jbpm3/branches/aguizar/modules/db/scripts/antrun-jbpmschema.xml
===================================================================
--- jbpm3/branches/aguizar/modules/db/scripts/antrun-jbpmschema.xml	2009-01-07 20:03:27 UTC (rev 3600)
+++ jbpm3/branches/aguizar/modules/db/scripts/antrun-jbpmschema.xml	2009-01-08 01:42:07 UTC (rev 3601)
@@ -39,7 +39,7 @@
     <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" config="hibernate.cfg.mssql.xml" action="create"/>
     <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" config="hibernate.cfg.mysql.xml" action="create" delimiter=";"/>
     <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" config="hibernate.cfg.oracle.xml" action="create" delimiter=";"/>
-    <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create"/>
+    <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create" delimiter=";"/>
     <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" config="hibernate.cfg.sapdb.xml" action="create"/>
     <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" config="hibernate.cfg.sybase.xml" action="create"/>
    

Modified: jbpm3/branches/aguizar/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/aguizar/modules/enterprise/pom.xml	2009-01-07 20:03:27 UTC (rev 3600)
+++ jbpm3/branches/aguizar/modules/enterprise/pom.xml	2009-01-08 01:42:07 UTC (rev 3601)
@@ -171,14 +171,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>jbpm.cfg.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>${surefire.security.args}</argLine>

Modified: jbpm3/branches/aguizar/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/branches/aguizar/modules/enterprise/src/main/etc/jbpm.cfg.xml	2009-01-07 20:03:27 UTC (rev 3600)
+++ jbpm3/branches/aguizar/modules/enterprise/src/main/etc/jbpm.cfg.xml	2009-01-08 01:42:07 UTC (rev 3601)
@@ -12,7 +12,7 @@
   <!-- 
     Note, that the default job executor needs to be overwritten with a null value. 
     In the enterprise configuration there should be no job executor. 
-    Async messaging is there bound to jms and timers to ejb timers.  
+    Async messaging is there bound to jms and scheduling to ejb timers.  
   -->  
   <null name="jbpm.job.executor" />