Browse Source

Updates gemini version to 2.24.0

msmith 6 years ago
parent
commit
1afdedc761

+ 1 - 1
frameworks/Java/gemini/gemini-mysql.dockerfile

@@ -6,7 +6,7 @@ COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
 
 
 RUN mvn -q compile
 RUN mvn -q compile
-RUN mv src/main/webapp/WEB-INF/gemini-mysql.conf src/main/webapp/WEB-INF/GeminiHello.conf
+RUN mv src/main/webapp/WEB-INF/configuration/gemini-mysql.conf src/main/webapp/WEB-INF/configuration/Base.conf
 RUN mvn -q war:war
 RUN mvn -q war:war
 
 
 FROM openjdk:10-jdk
 FROM openjdk:10-jdk

+ 1 - 1
frameworks/Java/gemini/gemini-postgres.dockerfile

@@ -6,7 +6,7 @@ COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
 
 
 RUN mvn -q compile
 RUN mvn -q compile
-RUN mv src/main/webapp/WEB-INF/gemini-postgres.conf src/main/webapp/WEB-INF/GeminiHello.conf
+RUN mv src/main/webapp/WEB-INF/configuration/gemini-postgres.conf src/main/webapp/WEB-INF/configuration/Base.conf
 RUN mvn -q war:war
 RUN mvn -q war:war
 
 
 FROM openjdk:10-jdk
 FROM openjdk:10-jdk

+ 1 - 1
frameworks/Java/gemini/gemini.dockerfile

@@ -6,7 +6,7 @@ COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
 
 
 RUN mvn -q compile
 RUN mvn -q compile
-RUN mv src/main/webapp/WEB-INF/gemini.conf src/main/webapp/WEB-INF/GeminiHello.conf
+RUN mv src/main/webapp/WEB-INF/configuration/gemini.conf src/main/webapp/WEB-INF/configuration/Base.conf
 RUN mvn -q war:war
 RUN mvn -q war:war
 
 
 FROM openjdk:10-jdk
 FROM openjdk:10-jdk

+ 7 - 2
frameworks/Java/gemini/pom.xml

@@ -29,12 +29,17 @@
         <dependency>
         <dependency>
             <groupId>com.techempower</groupId>
             <groupId>com.techempower</groupId>
             <artifactId>gemini</artifactId>
             <artifactId>gemini</artifactId>
-            <version>2.21.1</version>
+            <version>2.24.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.techempower</groupId>
+            <artifactId>gemini-jdbc</artifactId>
+            <version>2.24.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.techempower</groupId>
             <groupId>com.techempower</groupId>
             <artifactId>gemini-resin</artifactId>
             <artifactId>gemini-resin</artifactId>
-            <version>2.21.1</version>
+            <version>2.24.0</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 

+ 8 - 0
frameworks/Java/gemini/src/main/java/GhApplication.java → frameworks/Java/gemini/src/main/java/hello/GhApplication.java

@@ -1,5 +1,7 @@
 package hello;
 package hello;
 
 
+import com.techempower.data.*;
+import com.techempower.data.jdbc.*;
 import com.techempower.*;
 import com.techempower.*;
 import com.techempower.gemini.*;
 import com.techempower.gemini.*;
 import com.techempower.gemini.exceptionhandler.*;
 import com.techempower.gemini.exceptionhandler.*;
@@ -82,6 +84,12 @@ public class GhApplication
     return new PathDispatcher<>(this, config);
     return new PathDispatcher<>(this, config);
   }
   }
 
 
+  @Override
+  protected ConnectorFactory constructConnectorFactory()
+  {
+    return new BasicConnectorFactory(this, null);
+  }
+
   //
   //
   // Static methods.
   // Static methods.
   //
   //

+ 1 - 1
frameworks/Java/gemini/src/main/java/GhServlet.java → frameworks/Java/gemini/src/main/java/hello/GhServlet.java

@@ -10,7 +10,7 @@ import com.techempower.gemini.transport.*;
  * then invokes the Dispatcher.  The Dispatcher determines what happens
  * then invokes the Dispatcher.  The Dispatcher determines what happens
  * next.
  * next.
  *
  *
- * @see com.techempower.gemini.InfrastructureServlet
+ * @see com.techempower.gemini.transport.InfrastructureServlet
  *
  *
  * Development history:
  * Development history:
  *   2012-04-19 - mh - Created
  *   2012-04-19 - mh - Created

+ 0 - 0
frameworks/Java/gemini/src/main/java/GhVersion.java → frameworks/Java/gemini/src/main/java/hello/GhVersion.java


+ 0 - 0
frameworks/Java/gemini/src/main/java/home/entity/CachedWorld.java → frameworks/Java/gemini/src/main/java/hello/home/entity/CachedWorld.java


+ 0 - 0
frameworks/Java/gemini/src/main/java/home/entity/Fortune.java → frameworks/Java/gemini/src/main/java/hello/home/entity/Fortune.java


+ 0 - 0
frameworks/Java/gemini/src/main/java/home/entity/GhDataEntity.java → frameworks/Java/gemini/src/main/java/hello/home/entity/GhDataEntity.java


+ 0 - 0
frameworks/Java/gemini/src/main/java/home/entity/World.java → frameworks/Java/gemini/src/main/java/hello/home/entity/World.java


+ 0 - 0
frameworks/Java/gemini/src/main/java/home/handler/HelloHandler.java → frameworks/Java/gemini/src/main/java/hello/home/handler/HelloHandler.java


+ 0 - 0
frameworks/Java/gemini/src/main/webapp/WEB-INF/gemini-mysql.conf → frameworks/Java/gemini/src/main/webapp/WEB-INF/configuration/gemini-mysql.conf


+ 0 - 0
frameworks/Java/gemini/src/main/webapp/WEB-INF/gemini-postgres.conf → frameworks/Java/gemini/src/main/webapp/WEB-INF/configuration/gemini-postgres.conf


+ 0 - 0
frameworks/Java/gemini/src/main/webapp/WEB-INF/gemini.conf → frameworks/Java/gemini/src/main/webapp/WEB-INF/configuration/gemini.conf


+ 0 - 2
frameworks/Java/gemini/src/main/webapp/WEB-INF/robots-allowed.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: 

+ 0 - 2
frameworks/Java/gemini/src/main/webapp/WEB-INF/robots-disallowed.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /

+ 2 - 42
frameworks/Java/gemini/src/main/webapp/WEB-INF/web.xml

@@ -1,44 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-	<web-app version="2.4"
-	xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
--->
-
-<!--
-
-  GeminiHello web.xml
-
--->
-<web-app xmlns:resin="urn:java:com.caucho.resin"
-         xmlns:gemini="urn:java:com.techempower.gemini">
-  
-  <!-- These lines will force assets to be served be resin -->
-  <servlet-mapping url-pattern="/css/*" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="/js/*" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="/images/*" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="/html/*" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="favicon.ico" servlet-name="resin-file" />
-  
-  <!-- Disallow Resin 4 from compiling PHP or JSP pages directly. -->
-  <mime-mapping extension=".php" mime-type="text/plain" />
-  <mime-mapping extension=".jsp" mime-type="text/plain" />
-  <mime-mapping extension=".jspf" mime-type="text/plain" />
-  <mime-mapping extension=".jspx" mime-type="text/plain" />
-  <servlet-mapping url-pattern="*.php" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="*.jsp" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="*.jspf" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="*.jspx" servlet-name="resin-file" />
-  <servlet-mapping url-pattern="/WEB-INF/*.jsp" servlet-name="resin-jsp" />
-  <servlet-mapping url-pattern="/WEB-INF/*.jspf" servlet-name="resin-jsp" />
-  <servlet-mapping url-pattern="/WEB-INF/*.jspx" servlet-name="resin-jspx" />
-
-  <!-- Disallow URL rewriting for sessions.-->
-  <session-config enable-url-rewriting="false" />
-
-  <!-- Use UTF-8 for everything. -->
+<web-app>
   <character-encoding>UTF-8</character-encoding>
   <character-encoding>UTF-8</character-encoding>
-
-</web-app>
+</web-app>