Browse Source

Merge branch 'gemini-1.4'

Mike Smith 11 years ago
parent
commit
4247b4550c

+ 1 - 1
gemini/.classpath

@@ -10,6 +10,6 @@
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mysql-connector-java-5.1.23-bin.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/guava-14.0.1.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/trove4j-3.0.3.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-1.3.7.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-1.4.jar"/>
 	<classpathentry kind="output" path="Docroot/WEB-INF/classes"/>
 </classpath>

+ 1 - 1
gemini/Docroot/WEB-INF/GeminiHello.conf

@@ -93,7 +93,7 @@ db.Driver.SupportsAbsolute = yes
 db.Driver.SupportsGetRow = yes
 db.Driver.Jdbc1 = no
 
-db.ConnectString = localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useServerPrepStmts=true&enableQueryTimeouts=false&useUnbufferedIO=false&useReadAheadInput=false&maintainTimeStats=false&cacheRSMetadata=true
+db.ConnectString = localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useServerPrepStmts&enableQueryTimeouts=false&useUnbufferedIO=false&useReadAheadInput=false&maintainTimeStats=false&cacheRSMetadata=true
 db.LoginName = benchmarkdbuser
 db.LoginPass = benchmarkdbpass
 

BIN
gemini/Docroot/WEB-INF/lib/gemini-1.3.7.jar


BIN
gemini/Docroot/WEB-INF/lib/gemini-1.4.jar


BIN
gemini/Docroot/WEB-INF/lib/guava-14.0.1.jar


BIN
gemini/Docroot/WEB-INF/lib/guava-16.0.1.jar


+ 0 - 1
gemini/Source/hello/GhApplication.java

@@ -22,7 +22,6 @@ import com.techempower.js.*;
  */
 public class GhApplication
      extends GeminiApplication
-  implements PyxisApplication
 {
   //
   // Static variables.

+ 1 - 2
gemini/Source/hello/GhVersion.java

@@ -17,7 +17,6 @@ import com.techempower.helper.*;
  */
 public class GhVersion
      extends Version
-  implements GeminiConstants
 {
 
   //
@@ -32,7 +31,7 @@ public class GhVersion
     this.setVersionString(getMajorVersion() + "." 
         + StringHelper.padZero(getMinorVersion(), 2)
         + "(" + StringHelper.padZero(getMicroVersion(), 2) 
-        + ") (Gemini " + GEMINI_VERSION + ")");
+        + ") (Gemini " + GeminiConstants.GEMINI_VERSION + ")");
   }
 
   /**