Merge pull request #25 from jfederico/master

v1.0.7-b3-SNAPSHOT Created
sakaicontrib · Apr 18, 2012 · 0619ace · 0619ace
2 parents 1086a4a + 1017eaa
commit 0619ace
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 11 deletions.
diff --git a/bbb-tool/1.0.7-b3.txt → bbb-tool/1.0.7-b3-SNAPSHOT.txt b/bbb-tool/1.0.7-b3.txt → bbb-tool/1.0.7-b3-SNAPSHOT.txt
diff --git a/bbb-tool/api/pom.xml b/bbb-tool/api/pom.xml
@@ -7,7 +7,7 @@
   	<parent>
         <groupId>org.sakaiproject.bbb</groupId>
     	<artifactId>bbb</artifactId>
-    	<version>1.0.7-b3</version>
+    	<version>1.0.7-b3-SNAPSHOT</version>
   	</parent>
 
   	<name>BigBlueButton API</name>

diff --git a/bbb-tool/assembly/pom.xml b/bbb-tool/assembly/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.sakaiproject.bbb</groupId>
         <artifactId>bbb</artifactId>
-        <version>1.0.7-b3</version>
+        <version>1.0.7-b3-SNAPSHOT</version>
     </parent>
 
 	<name>BigBlueButton Assembly</name>

diff --git a/bbb-tool/bundle/pom.xml b/bbb-tool/bundle/pom.xml
@@ -7,7 +7,7 @@
   	<parent>
         <groupId>org.sakaiproject.bbb</groupId>
     	<artifactId>bbb</artifactId>
-    	<version>1.0.7-b3</version>
+    	<version>1.0.7-b3-SNAPSHOT</version>
   	</parent>
 
   	<name>BigBlueButton Bundles</name>

diff --git a/bbb-tool/components/pom.xml b/bbb-tool/components/pom.xml
@@ -7,7 +7,7 @@
   	<parent>
         <groupId>org.sakaiproject.bbb</groupId>
     	<artifactId>bbb</artifactId>
-    	<version>1.0.7-b3</version>
+    	<version>1.0.7-b3-SNAPSHOT</version>
   	</parent>
 
   	<name>BigBlueButton Component Pack</name>

diff --git a/bbb-tool/impl/pom.xml b/bbb-tool/impl/pom.xml
@@ -7,7 +7,7 @@
   	<parent>
         <groupId>org.sakaiproject.bbb</groupId>
     	<artifactId>bbb</artifactId>
-    	<version>1.0.7-b3</version>
+    	<version>1.0.7-b3-SNAPSHOT</version>
   	</parent>
 
   	<name>BigBlueButton Implementation</name>

diff --git a/bbb-tool/impl/src/java/org/sakaiproject/bbb/impl/BBBStorageManager.java b/bbb-tool/impl/src/java/org/sakaiproject/bbb/impl/BBBStorageManager.java
@@ -135,7 +135,9 @@ public void setupTables() {
 
                 Map<String, String> updateStatements = sqlGenerator.getUpdateStatements();
                 for (String updateStatement : updateStatements.keySet()) {
-                	String updateElements[] = updateStatement.split(":");
+                    logger.debug("Processing " + updateStatement);
+
+                    String updateElements[] = updateStatement.split(":");
                     boolean update = false;
 
                     String showColumn = sqlGenerator.getShowColumnStatement(updateElements[0],updateElements[1]);
@@ -148,7 +150,7 @@ public void setupTables() {
                         logger.info("Updating " + updateElements[0] + " in DB with " + updateStatement + ".");
                         statement.executeUpdate(updateStatements.get(updateStatement));
                     } else {
-                        // Column it does exist. Table doesn't need to be updated
+                        // Table doesn't need to be updated
                         logger.info("Update " + updateStatement + " does not need to be applied in DB.");
 
                     }

diff --git a/bbb-tool/impl/src/java/org/sakaiproject/bbb/impl/sql/DefaultSqlGenerator.java b/bbb-tool/impl/src/java/org/sakaiproject/bbb/impl/sql/DefaultSqlGenerator.java
@@ -21,6 +21,7 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -84,7 +85,7 @@ public String getShowTableStatement(String table) {
     //only add the table and the code that need to be updated
     //                              JFederico
     public Map<String, String> getUpdateStatements() {
-        Map<String, String> statements = new HashMap<String, String>();
+        Map<String, String> statements = new LinkedHashMap<String, String>();
 
         statements.put("BBB_MEETING:HOST_URL:ADD", 
         		"ALTER TABLE BBB_MEETING ADD COLUMN HOST_URL " + VARCHAR + "(255) NOT NULL AFTER NAME;");

diff --git a/bbb-tool/pom.xml b/bbb-tool/pom.xml
@@ -14,7 +14,7 @@
 	<name>BigBlueButton</name>
 	<groupId>org.sakaiproject.bbb</groupId>
 	<artifactId>bbb</artifactId>
-    <version>1.0.7-b3</version>
+    <version>1.0.7-b3-SNAPSHOT</version>
     <description>Sakai BigBlueButton integrates a Sakai instance with a BigBlueButton server, allowing Sakai users to easily create and join BigBlueButton meetings from a Sakai worksite and access playback recording.</description>
 
     <url>http://confluence.sakaiproject.org/confluence/display/BBB</url>
@@ -65,7 +65,7 @@
 	    <!-- Build tracking  -->
         <maven.build.timestamp.format>yyMMdd_HHmm</maven.build.timestamp.format>
         <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
-	    <buildSerial>20120413_174500</buildSerial>
+	    <buildSerial>20120418_153000</buildSerial>
         <!-- Regular properties -->
 		<entitybroker.version>[1.3.9,1.3.20)</entitybroker.version>
 		<entitybroker-utils.version>1.3.7</entitybroker-utils.version>

diff --git a/bbb-tool/tool/pom.xml b/bbb-tool/tool/pom.xml
@@ -7,7 +7,7 @@
   	<parent>
         <groupId>org.sakaiproject.bbb</groupId>
     	<artifactId>bbb</artifactId>
-    	<version>1.0.7-b3</version>
+    	<version>1.0.7-b3-SNAPSHOT</version>
   	</parent>
 
   	<name>BigBlueButton Tool</name>