Browse Source

Update Gemini (#3194)

* Using maven for Gemini

* Don't include lib/
Mike Smith 7 years ago
parent
commit
94ec435be7

+ 22 - 14
frameworks/Java/gemini/.classpath

@@ -4,15 +4,7 @@
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mail.jar"/>
 	<classpathentry kind="src" path="Source"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mysql-connector-java-5.1.23-bin.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/trove4j-3.0.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Resin"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/guava-16.0.1.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jsr305-2.0.0.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mustache-compiler-0.8.13.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql-9.4.1208.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-2.18.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-2.18.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/reflectasm.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/reflections.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/java-image-scaling.jar"/>
@@ -20,13 +12,7 @@
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/kryonet-all.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/asm.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/compiler.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/dbdeploy-ant.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/filters.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/freemarker.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-admin.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-form.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/guava.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/im4java.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations.jar"/>
@@ -44,5 +30,27 @@
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mysql-connector-java.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/objenesis.jar"/>
 	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/trove4j.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-core-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-core-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-databind-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-databind-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javassist-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javassist-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail-api-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail-api-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jsr250-api.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql-javadoc.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql-sources.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/resin-javaee16.jar"/>
+	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/resin.jar"/>
 	<classpathentry kind="output" path="Docroot/WEB-INF/classes"/>
 </classpath>

+ 1 - 0
frameworks/Java/gemini/.gitignore

@@ -1,5 +1,6 @@
 Docroot/WEB-INF/classes/
 Docroot/WEB-INF/work/
+Docroot/WEB-INF/lib/
 Logs/
 jdbc-alerts.log
 Thumbs.db

BIN
frameworks/Java/gemini/Docroot/WEB-INF/lib/gemini-2.18.0-SNAPSHOT.jar


BIN
frameworks/Java/gemini/Docroot/WEB-INF/lib/gemini-resin-2.18.0-SNAPSHOT.jar


+ 2 - 0
frameworks/Java/gemini/ivy.xml

@@ -20,5 +20,7 @@
         <dependency org="kryonet" name="kryonet-all" rev="2.21" />
         <dependency org="org.reflections" name="reflections" rev="0.9.10" />
         <dependency org="javassist" name="javassist" rev="3.12.1.GA" />
+        <dependency org="com.techempower" name="gemini-public" rev="2.18.1" />
+        <dependency org="com.techempower" name="gemini-resin-public" rev="2.18.1" />
     </dependencies>
 </ivy-module>

+ 15 - 0
frameworks/Java/gemini/ivysettings.xml

@@ -8,6 +8,21 @@
             <ibiblio name='atlassian 3rd-party'
                      m2compatible='true'
                      root='https://maven.atlassian.com/3rdparty/' />
+            <ibiblio name='caucho'
+                     m2compatible='true'
+                     root='http://caucho.com/m2/' />
+            <ibiblio name='central' m2compatible='true'/>
+            <ibiblio name='nexus-snapshot' 
+                     m2compatible='true'
+                     usepoms='true'
+                     pattern='[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]' 
+                     root='https://maven.techempower.com:8081/nexus/content/repositories/snapshots/' />
+            <ibiblio name='nexus-releases' 
+                     m2compatible='true' 
+                     root='https://maven.techempower.com:8081/nexus/content/repositories/releases/' />
+            <ibiblio name='nexus-thirdparty' 
+                     m2compatible='true' 
+                     root='https://maven.techempower.com:8081/nexus/content/repositories/thirdparty/' />
             <ibiblio name='central' m2compatible='true'/>
         </chain>
     </resolvers>