[jbpm-commits] JBoss JBPM SVN: r5768 - jbpm4/trunk/modules/db/src/main/java/org/jbpm/db.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-10-21 13:15:41 -0400 (Wed, 21 Oct 2009)
New Revision: 5768

Modified:
   jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java
   jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java
   jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java
Log:
JBPM-2509 method renamings

Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java
===================================================================
--- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java	2009-10-21 16:26:54 UTC (rev 5767)
+++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java	2009-10-21 17:15:41 UTC (rev 5768)
@@ -32,12 +32,12 @@
 
   public static void main(String[] args) {
     Create createOperation = new Create();
-    createOperation.setArgs(args);
+    createOperation.parseArgs(args);
     executeInTransaction(createOperation);
   }
 
   public void execute(Session session) {
-    executeSqlUpdate("create/jbpm."+database+".create.sql", session);
+    executeSqlResource("create/jbpm."+database+".create.sql", session);
     PropertyImpl.createProperties(session);
   }
   

Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java
===================================================================
--- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java	2009-10-21 16:26:54 UTC (rev 5767)
+++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java	2009-10-21 17:15:41 UTC (rev 5768)
@@ -47,7 +47,7 @@
   
   public abstract void execute(Session session);
   
-  public void setArgs(String[] args) {
+  public void parseArgs(String[] args) {
     if (args==null || args.length==0) {
       log("Syntax: java -cp ... "+getClass().getName()+" database [delimiter]"); 
       log("where database is one of {oracle, postgresql, mysql, hsqldb}"); 
@@ -95,7 +95,7 @@
     }
   }
   
-  public void executeSqlUpdate(String resource, Session session) {
+  public void executeSqlResource(String resource, Session session) {
     InputStream stream = Upgrade.class.getClassLoader().getResourceAsStream(resource);
     if (stream == null) {
       throw new JbpmException("resource "+resource+" does not exist");

Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java
===================================================================
--- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java	2009-10-21 16:26:54 UTC (rev 5767)
+++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java	2009-10-21 17:15:41 UTC (rev 5768)
@@ -38,7 +38,7 @@
 
   public static void main(String[] args) {
     Upgrade upgradeOperation = new Upgrade();
-    upgradeOperation.setArgs(args);
+    upgradeOperation.parseArgs(args);
     HibernateOperation.executeInTransaction(upgradeOperation);
   }
   
@@ -63,11 +63,11 @@
   }
 
   private void upgrade40To41(Session session) {
-    executeSqlUpdate("upgrade-4.0-to-4.1/jbpm."+database+".upgrade.sql", session);
+    executeSqlResource("upgrade-4.0-to-4.1/jbpm."+database+".upgrade.sql", session);
   }
 
   private void upgrade41To42(Session session) {
-    executeSqlUpdate("upgrade-4.1-to-4.2/jbpm."+database+".upgrade.sql", session);
+    executeSqlResource("upgrade-4.1-to-4.2/jbpm."+database+".upgrade.sql", session);
     addLangId(session);
     PropertyImpl.upgradeProperties(session);
   }