[jboss-svn-commits] JBL Code SVN: r18314 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product: services/jbpm/src/main/resources and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2008-02-05 10:12:33 -0500 (Tue, 05 Feb 2008)
New Revision: 18314

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-service.xml
Log:
Allow EOL separators: JBESB-1529

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	2008-02-05 15:00:18 UTC (rev 18313)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	2008-02-05 15:12:33 UTC (rev 18314)
@@ -47,6 +47,7 @@
    private String datasource;
    private String sqlFiles;
    private String existsSql;
+   private boolean useEOL ;
 
 
    public String getExistsSql()
@@ -59,6 +60,16 @@
       this.existsSql = existsSql;
    }
 
+   public boolean getUseEOL()
+   {
+      return useEOL;
+   }
+
+   public void setUseEOL(boolean useEOL)
+   {
+      this.useEOL = useEOL;
+   }
+
    public String getSqlFiles()
    {
       return sqlFiles;
@@ -118,7 +129,12 @@
       URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
       String sql = Configuration.getStringFromStream(url.openStream());
       sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines
-      String[] statements = sql.split(";");
+      final String[] statements ; 
+      if (useEOL) {
+          statements = sql.split("[\n;]");
+      } else {
+          statements = sql.split(";");
+      }
       for (String statement : statements)
       {
     	  if ((statement == null) || ("".equals(statement.trim()))) {

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	2008-02-05 15:00:18 UTC (rev 18313)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	2008-02-05 15:12:33 UTC (rev 18314)
@@ -37,6 +37,10 @@
    void setExistsSql(String existsSql)
            ;
 
+   boolean getUseEOL() ;
+
+   void setUseEOL(boolean useEOL) ;
+
    String getSqlFiles()
            ;
 

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-service.xml	2008-02-05 15:00:18 UTC (rev 18313)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-service.xml	2008-02-05 15:12:33 UTC (rev 18314)
@@ -12,6 +12,7 @@
       jbpm-sql/import.sql
       </attribute>
       <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
+      <attribute name="UseEOL">true</attribute>
     </mbean>
 
    <mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"