Skip to content

Commit

Permalink
dependency management
Browse files Browse the repository at this point in the history
  • Loading branch information
witek committed Jul 1, 2015
1 parent 1e282a8 commit f43efe7
Show file tree
Hide file tree
Showing 5 changed files with 160 additions and 79 deletions.
105 changes: 44 additions & 61 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,58 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry exported="true" kind="lib" path="lib/junit-3.8.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaudiotagger-1.0.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar" sourcepath="lib/src/commons-logging-1.1.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/tidy.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpunit-1.6.2.jar" sourcepath="lib/src/httpunit-1.6.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/jcip-annotations.jar" sourcepath="lib/src/jcip-annotations-src.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-user.jar"/>
<classpathentry exported="true" kind="lib" path="lib/testng-5.8.jar" sourcepath="lib/src/testng-5.8.src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b4.jar">
<attributes>
<attribute name="javadoc_location" value="http://www.beanshell.org/javadoc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/gdata-contacts-3.0.jar" sourcepath="lib/src/gdata-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/commons-fileupload-1.2.1.jar" sourcepath="lib/src/commons-fileupload-1.2.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.6.4.jar" sourcepath="lib/src/velocity-1-6.4.src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar" sourcepath="lib/src/commons-collections-3.2.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.5.jar" sourcepath="lib/src/commons-lang-2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/scribe-1.1.2.jar" sourcepath="lib/src/scribe-1.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.1.jar" sourcepath="lib/src/xstream-1.4.1-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.20-bin.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.mail.jar"/>
<classpathentry exported="true" kind="lib" path="lib/openid4java-0.9.8.jar" sourcepath="lib/src/openid4java-0.9.8.741-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guice-2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwtupload-1.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-dnd-3.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-codeserver.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-dev.jar"/>
<classpathentry exported="true" kind="lib" path="lib/servlet-api-3.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/itext-pdfa-5.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itext-xtra-5.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.2.jar" sourcepath="lib/src/itextpdf-5.5.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/codemirror_V-0.4-gwt16.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-fileupload-1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-net-3.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/core-1.47.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gdata-contacts-3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/google-api-client-1.19.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-18.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guice-4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-codeserver-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-dev-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-dnd-3.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-servlet-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwt-user-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gwtupload-1.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpunit-1.6.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itext-asian-5.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itext-pdfa-5.5.6-1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itext-xtra-5.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaudiotagger-2.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.mail-api-1.5.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jcip-annotations-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.23.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-jdk5-13.0.jar" sourcepath="lib/src/guava-jdk5-13.0-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gdata-core-1.47.1.jar" sourcepath="lib/src/gdata-core-1.47.1.srouces.jar">
<attributes>
<attribute name="javadoc_location" value="https://developers.google.com/gdata/javadoc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/google-api-client-1.19.1.jar" sourcepath="lib/src/google-api-client-1.19.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-net-3.3.jar" sourcepath="lib/src/commons-net-3.3-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jdom-2.0.6.jar" sourcepath="lib/src/jdom-2.0.6-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.12.jar">
<attributes>
<attribute name="javadoc_location" value="https://poi.apache.org/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.12.jar">
<attributes>
<attribute name="javadoc_location" value="https://poi.apache.org/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.35.jar"/>
<classpathentry exported="true" kind="lib" path="lib/nekohtml-1.9.14.jar"/>
<classpathentry exported="true" kind="lib" path="lib/openid4java-0.9.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/scribe-1.3.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/testng-6.9.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/tidy.jar"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
97 changes: 97 additions & 0 deletions download-dependencies.bsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#!/bin/bash -e

function mavendownload {
MVNGROUP=$1
MVNARTIFACT=$2
MVNVERSION=$3
FILENAME=$MVNARTIFACT-$MVNVERSION.jar

BASE_URL=http://central.maven.org/maven2

wget -N $BASE_URL/$MVNGROUP/$MVNARTIFACT/$MVNVERSION/$FILENAME
}

function servistodownload {
FILENAME=$1

BASE_URL=https://servisto.de/projects/ilarkesto/lib

wget -N $BASE_URL/$FILENAME
}

cd lib

mavendownload org/beanshell bsh 2.0b5
servistodownload codemirror_V-0.4-gwt16.jar

servistodownload gdata-contacts-3.0.jar
mavendownload com/google/gdata core 1.47.1
mavendownload com/google/api-client google-api-client 1.19.1
mavendownload com/google/guava guava 18.0
mavendownload com/google/inject guice 4.0

mavendownload com/google/gwt gwt-codeserver 2.7.0
mavendownload com/google/gwt gwt-dev 2.7.0
mavendownload com/google/gwt gwt-servlet 2.7.0
mavendownload com/google/gwt gwt-user 2.7.0
mavendownload org/ow2/asm asm 5.0.4
mavendownload org/ow2/asm asm-commons 5.0.4
mavendownload org/ow2/asm asm-util 5.0.4
mavendownload com/allen-sauer/gwt/dnd gwt-dnd 3.3.0
mavendownload com/googlecode/gwtupload gwtupload 1.0.3

mavendownload org/apache/httpcomponents httpclient 4.5

servistodownload httpcore-4.2.2.jar
servistodownload httpunit-1.6.2.jar
servistodownload nekohtml-1.9.14.jar
servistodownload tidy.jar

mavendownload com/itextpdf itextpdf 5.5.6
mavendownload com/itextpdf itext-asian 5.2.0
mavendownload com/itextpdf itext-pdfa 5.5.6-1
mavendownload com/itextpdf itext-xtra 5.5.6

mavendownload org jaudiotagger 2.0.3

mavendownload javax/mail javax.mail-api 1.5.4

mavendownload net/jcip jcip-annotations 1.0

mavendownload org/jfree jcommon 1.0.23
mavendownload org/jfree jfreechart 1.0.19

mavendownload org/jdom jdom2 2.0.6

mavendownload junit junit 4.12

mavendownload mysql mysql-connector-java 5.1.35

servistodownload openid4java-0.9.8.jar

mavendownload org/apache/poi poi 3.12
mavendownload org/apache/poi poi-ooxml 3.12
mavendownload org/apache/poi poi-ooxml-schemas 3.12

mavendownload org/scribe scribe 1.3.7

mavendownload javax/servlet javax.servlet-api 3.1.0

mavendownload org/testng testng 6.9.4

mavendownload org/apache/velocity velocity 1.7

mavendownload xerces xercesImpl 2.11.0

mavendownload org/apache/xmlbeans xmlbeans 2.6.0

mavendownload com/thoughtworks/xstream xstream 1.4.8

mavendownload commons-fileupload commons-fileupload 1.3.1
mavendownload commons-collections commons-collections 3.2.1
mavendownload commons-io commons-io 2.4
mavendownload commons-lang commons-lang 2.6
mavendownload commons-logging commons-logging 1.2
mavendownload commons-net commons-net 3.3
mavendownload commons-codec commons-codec 1.10

7 changes: 0 additions & 7 deletions package-libs.bsh

This file was deleted.

23 changes: 19 additions & 4 deletions src/main/java/ilarkesto/webapp/GwtSuperDevMode.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*
* Copyright 2011 Witoslaw Koczewsi <[email protected]>
*
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero
* General Public License as published by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
*
* You should have received a copy of the GNU Affero General Public License along with this program. If not,
* see <http://www.gnu.org/licenses/>.
*/
Expand Down Expand Up @@ -47,6 +47,21 @@ public class GwtSuperDevMode {
private WebServer webServer;
private Proc proc;

public void startCodeServerInSeparateProcessWithJarsFromIlarkesto(File workDir) {
List<String> cp = new ArrayList<String>();
File ilarkestoDir = new File(workDir.getPath() + "/ilarkesto");
if (!ilarkestoDir.exists())
throw new RuntimeException("Ilarkesto directory does not exist: " + ilarkestoDir.getAbsolutePath());
for (File file : IO.listFiles(new File(ilarkestoDir.getPath() + "/lib"))) {
if (!file.isFile()) continue;
String name = file.getName();
if (!name.endsWith(".jar")) continue;
if (name.startsWith("gwt")) cp.add("ilarkesto/lib/" + name);
if (name.startsWith("asm")) cp.add("ilarkesto/lib/" + name);
}
startCodeServerInSeparateProcess(workDir, cp);
}

public void startCodeServerInSeparateProcess(File workDir, Collection<String> classpath) {
IO.delete(getWorkDir());

Expand All @@ -55,7 +70,7 @@ public void startCodeServerInSeparateProcess(File workDir, Collection<String> cl
Proc proc = new Proc("java");
proc.setWorkingDir(workDir);
proc.setRedirectOutputToSysout(true);
proc.addParameters("-classpath", Str.concat(classpath, Sys.getPathSeparator()));
if (!classpath.isEmpty()) proc.addParameters("-classpath", Str.concat(classpath, Sys.getPathSeparator()));
proc.addParameter("com.google.gwt.dev.codeserver.CodeServer");
if (!precompile) proc.addParameter("-noprecompile");
if (!incremental) proc.addParameter("-noincremental");
Expand Down
7 changes: 0 additions & 7 deletions update-libs.bsh

This file was deleted.

0 comments on commit f43efe7

Please sign in to comment.