From 5b2dd108b59d3ba93d07a3133b6f0229d9f52b8a Mon Sep 17 00:00:00 2001 From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at> Date: Wed, 30 Oct 2013 12:55:09 +0000 Subject: [PATCH] converted to eclipse project using gradle instead of maven --- .checkstyle | 7 + .classpath | 147 ++++++++++++++++++ .project | 34 ++++ ...springsource.ide.eclipse.gradle.core.prefs | 5 + .settings/org.eclipse.jdt.core.prefs | 13 ++ .settings/org.eclipse.wst.common.component | 88 +++++++++++ ....eclipse.wst.common.project.facet.core.xml | 5 + build.gradle | 84 ++++++++++ executeTests.sh | 6 - pom.xml | 139 ----------------- settings.gradle | 1 + 11 files changed, 384 insertions(+), 145 deletions(-) create mode 100644 .checkstyle create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 build.gradle delete mode 100755 executeTests.sh delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.checkstyle b/.checkstyle new file mode 100644 index 00000000..94a347e7 --- /dev/null +++ b/.checkstyle @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> + <fileset name="all" enabled="true" check-config-name="NKrChecks" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..b04b45d6 --- /dev/null +++ b/.classpath @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="src" path="src/main/webapp"/> + <classpathentry kind="src" path="src/test/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/postgresql/postgresql/9.1-901.jdbc4/jar/153f2f92a786f12fc111d0111f709012df87c808/postgresql-9.1-901.jdbc4.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/postgresql/postgresql/9.1-901.jdbc4/source/8e9d82a070f2b4d9e8561a567bf4daca36eed4e2/postgresql-9.1-901.jdbc4-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/commons-dbutils/commons-dbutils/1.2/jar/d926d5feb17d3655464186ed2503bcda8b3ece40/commons-dbutils-1.2.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/commons-dbutils/commons-dbutils/1.2/source/3d15ae526397e2be90cd30972d56a664a0e25cd5/commons-dbutils-1.2-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/bayeux-api/2.4.3/jar/70709fa04899d406bbfdd9000eebf287e75661fb/bayeux-api-2.4.3.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/bayeux-api/2.4.3/source/6d2690bba05c108a35008cf640528c3e857d56bb/bayeux-api-2.4.3-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.javascript/cometd-javascript-jquery/2.4.3/war/ce2d80c81c928f215b34d3b43e23911e74ffa900/cometd-javascript-jquery-2.4.3.war"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-server/2.4.3/jar/4056c685f6df165aab503c2b237d92ccc17dc0ad/cometd-java-server-2.4.3.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-server/2.4.3/source/5f2f03d13b0505da3a7808f440b3ca1477dcb88b/cometd-java-server-2.4.3-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util-ajax/9.0.6.v20130930/jar/5b4c858eb0c82f931ece10864b1785f549d63fed/jetty-util-ajax-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util-ajax/9.0.6.v20130930/source/8cc66361c9a57e2c4ecf4aa4bf56dca08d16807a/jetty-util-ajax-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-servlets/9.0.6.v20130930/jar/5b27c4560fc9c2d1581edac90737a27d90ae5f31/jetty-servlets-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-servlets/9.0.6.v20130930/source/aef6d0e8f6d7b90f3d63ce0993b361fe318ba3df/jetty-servlets-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-jdbc/1.3.3/jar/350a8f88ef5077d33b2166d08ed3ca9897c020b9/postgis-jdbc-1.3.3.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-jdbc/1.3.3/source/dfc4d6d049f035bcd76de1423eb99276883ee642/postgis-jdbc-1.3.3-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.json/json/20090211/jar/c183aa3a2a6250293808bba12262c8920ce5a51c/json-20090211.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/commons-httpclient/commons-httpclient/3.1/jar/964cd74171f427720480efdec40a7c7f6e58426a/commons-httpclient-3.1.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/commons-httpclient/commons-httpclient/3.1/source/c6d6ea83d0cf16d3ed9c1b7e600fa0f60b9d3159/commons-httpclient-3.1-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/it.geosolutions/geoserver-manager/1.5.1/jar/4c672aca4b44af85fdbc626ce0db7b5180c8bfbd/geoserver-manager-1.5.1.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/it.geosolutions/geoserver-manager/1.5.1/source/fb7203527fb0bf53f5fe04e0f2b8a76e98fae33e/geoserver-manager-1.5.1-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/slf4j-api/1.6.6/jar/ce53b0a0e2cfbb27e8a59d38f79a18a5c6a8d2b0/slf4j-api-1.6.6.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/slf4j-api/1.6.6/source/bcd0e21b1572960cefd449f8a16efab5b6b8e644/slf4j-api-1.6.6-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/javax.servlet/servlet-api/2.5/jar/5959582d97d8b61f4d154ca9e495aafd16726e34/servlet-api-2.5.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/javax.servlet/servlet-api/2.5/source/21599814ad9a605b86f3e6381571beccd861a32/servlet-api-2.5-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/junit/junit/4.8.1/jar/f2975548f836416306ef1dee748d956f04733915/junit-4.8.1.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/junit/junit/4.8.1/source/2a699fa5026aef66411ed1f57be2af0b541f8990/junit-4.8.1-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.javascript/cometd-javascript-common/2.4.3/war/3d30ffc4b3e4a0c58abd5b9b4dd61f3a8d79e575/cometd-javascript-common-2.4.3.war"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util/9.0.6.v20130930/jar/f36c9e61559d1154be9b52803ef4f586e401dac6/jetty-util-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util/9.0.6.v20130930/source/f4d41d3f645411eab1a3f36a1bcfc7b5d57cefef/jetty-util-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-common/2.4.3/jar/d72bb3b05fab6a4068913cfbd2acbfcd1ee6a69b/cometd-java-common-2.4.3.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-common/2.4.3/source/a39ee3874e51928444be63b6228a38ca5445d8c6/cometd-java-common-2.4.3-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-jmx/7.6.4.v20120524/jar/d3b22f8ee9c78de3cec3b3734c68736f5588893b/jetty-jmx-7.6.4.v20120524.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-jmx/7.6.4.v20120524/source/fcccd37526590af7ac14a20f897f588eb5eb3632/jetty-jmx-7.6.4.v20120524-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-continuation/9.0.6.v20130930/jar/4f942a52a3e996634ff302ab98f46d224b0db9d2/jetty-continuation-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-continuation/9.0.6.v20130930/source/8c4499356facadd9ea9d169c438f64cbea9f67d4/jetty-continuation-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-http/9.0.6.v20130930/jar/b3a2302717ac1889b4a17ed03e2555f8291121b9/jetty-http-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-http/9.0.6.v20130930/source/a36c1a781cb7ad886941b76ce3771a1b992e6e3e/jetty-http-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-io/9.0.6.v20130930/jar/f3a66e0507d963c51e280243f0472a5b2eadc8b1/jetty-io-9.0.6.v20130930.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-io/9.0.6.v20130930/source/42261c3f8f492a72c71630a54a7910415aa615a8/jetty-io-9.0.6.v20130930-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-stubs/1.3.3/jar/71bc58069260f86338a00e6897de082759ae6a67/postgis-stubs-1.3.3.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-stubs/1.3.3/source/ccbb6260ff95b57adb206e522148c554803959d0/postgis-stubs-1.3.3-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/commons-logging/commons-logging/1.0.4/jar/f029a2aefe2b3e1517573c580f948caac31b1056/commons-logging-1.0.4.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/commons-logging/commons-logging/1.0.4/source/8d3424a318e818f88568dfb3b55c58583364ba9/commons-logging-1.0.4-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/commons-codec/commons-codec/1.2/jar/397f4731a9f9b6eb1907e224911c77ea3aa27a8b/commons-codec-1.2.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/commons-io/commons-io/2.0.1/jar/7ffdb02f95af1c1a208544e076cea5b8e66e731a/commons-io-2.0.1.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/commons-io/commons-io/2.0.1/source/8ace0a355c375f0d20d04fa0db7b986c6637a689/commons-io-2.0.1-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.jdom/jdom/1.1/jar/1d04c0f321ea337f3661cf7ede8f4c6f653a8fdd/jdom-1.1.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.jdom/jdom/1.1/source/a7ed425c4c46605b8f2bf2ee118c1609682f4f2c/jdom-1.1-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry exported="true" kind="lib" path="/home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/jcl-over-slf4j/1.5.11/jar/f65710db5a53237ff9bc1d923a0c1fdeccdd9664/jcl-over-slf4j-1.5.11.jar" sourcepath="/home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/jcl-over-slf4j/1.5.11/source/c9797fa63eafbdda4731d8121e6771d9f2ab25d9/jcl-over-slf4j-1.5.11-sources.jar"> + <attributes> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/.project b/.project new file mode 100644 index 00000000..5ea17e39 --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Isochrones</name> + <comment>Isochrones</comment> + <projects/> + <natures> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.springsource.ide.eclipse.gradle.core.nature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments/> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments/> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments/> + </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments/> + </buildCommand> + </buildSpec> + <linkedResources/> +</projectDescription> diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 00000000..3897724c --- /dev/null +++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs @@ -0,0 +1,5 @@ +#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences +#Wed Oct 30 13:25:07 CET 2013 +org.springsource.ide.eclipse.gradle.classpath.enableSorting=true +org.springsource.ide.eclipse.gradle.classpath.jar.remap.gradle.to.maven=true +org.springsource.ide.eclipse.gradle.rootprojectloc= diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..816353a1 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Wed Oct 30 13:24:48 CET 2013 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..f187ba01 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="Isochrones"> + <property name="context-root" value="/isochrones"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/> + <wb-resource deploy-path="/" source-path="src/main/webapp"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-common/2.4.3/jar/d72bb3b05fab6a4068913cfbd2acbfcd1ee6a69b/cometd-java-common-2.4.3.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/bayeux-api/2.4.3/jar/70709fa04899d406bbfdd9000eebf287e75661fb/bayeux-api-2.4.3.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util-ajax/9.0.6.v20130930/jar/5b4c858eb0c82f931ece10864b1785f549d63fed/jetty-util-ajax-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/it.geosolutions/geoserver-manager/1.5.1/jar/4c672aca4b44af85fdbc626ce0db7b5180c8bfbd/geoserver-manager-1.5.1.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/commons-dbutils/commons-dbutils/1.2/jar/d926d5feb17d3655464186ed2503bcda8b3ece40/commons-dbutils-1.2.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-continuation/9.0.6.v20130930/jar/4f942a52a3e996634ff302ab98f46d224b0db9d2/jetty-continuation-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/postgresql/postgresql/9.1-901.jdbc4/jar/153f2f92a786f12fc111d0111f709012df87c808/postgresql-9.1-901.jdbc4.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/javax.servlet/servlet-api/2.5/jar/5959582d97d8b61f4d154ca9e495aafd16726e34/servlet-api-2.5.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.javascript/cometd-javascript-jquery/2.4.3/war/ce2d80c81c928f215b34d3b43e23911e74ffa900/cometd-javascript-jquery-2.4.3.war"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-jmx/7.6.4.v20120524/jar/d3b22f8ee9c78de3cec3b3734c68736f5588893b/jetty-jmx-7.6.4.v20120524.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-servlets/9.0.6.v20130930/jar/5b27c4560fc9c2d1581edac90737a27d90ae5f31/jetty-servlets-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-io/9.0.6.v20130930/jar/f3a66e0507d963c51e280243f0472a5b2eadc8b1/jetty-io-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-http/9.0.6.v20130930/jar/b3a2302717ac1889b4a17ed03e2555f8291121b9/jetty-http-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-jdbc/1.3.3/jar/350a8f88ef5077d33b2166d08ed3ca9897c020b9/postgis-jdbc-1.3.3.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/commons-io/commons-io/2.0.1/jar/7ffdb02f95af1c1a208544e076cea5b8e66e731a/commons-io-2.0.1.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/commons-logging/commons-logging/1.0.4/jar/f029a2aefe2b3e1517573c580f948caac31b1056/commons-logging-1.0.4.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/commons-httpclient/commons-httpclient/3.1/jar/964cd74171f427720480efdec40a7c7f6e58426a/commons-httpclient-3.1.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.jdom/jdom/1.1/jar/1d04c0f321ea337f3661cf7ede8f4c6f653a8fdd/jdom-1.1.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.java/cometd-java-server/2.4.3/jar/4056c685f6df165aab503c2b237d92ccc17dc0ad/cometd-java-server-2.4.3.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/jcl-over-slf4j/1.5.11/jar/f65710db5a53237ff9bc1d923a0c1fdeccdd9664/jcl-over-slf4j-1.5.11.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/commons-codec/commons-codec/1.2/jar/397f4731a9f9b6eb1907e224911c77ea3aa27a8b/commons-codec-1.2.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.slf4j/slf4j-api/1.6.6/jar/ce53b0a0e2cfbb27e8a59d38f79a18a5c6a8d2b0/slf4j-api-1.6.6.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.json/json/20090211/jar/c183aa3a2a6250293808bba12262c8920ce5a51c/json-20090211.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.postgis/postgis-stubs/1.3.3/jar/71bc58069260f86338a00e6897de082759ae6a67/postgis-stubs-1.3.3.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.eclipse.jetty/jetty-util/9.0.6.v20130930/jar/f36c9e61559d1154be9b52803ef4f586e401dac6/jetty-util-9.0.6.v20130930.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//home/niko/.gradle/caches/artifacts-26/filestore/org.cometd.javascript/cometd-javascript-common/2.4.3/war/3d30ffc4b3e4a0c58abd5b9b4dd61f3a8d79e575/cometd-javascript-common-2.4.3.war"> + <dependency-type>uses</dependency-type> + </dependent-module> + </wb-module> +</project-modules> diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..58c48cab --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <installed facet="jst.web" version="3.0"/> + <installed facet="jst.java" version="1.7"/> +</faceted-project> diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..2e721f59 --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +apply plugin: 'eclipse-wtp' +apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'eclipse' +apply plugin: 'war' + +group = 'it.unibz.inf.isochrones' +status = 'snapshot' +version = '1.0' + +if (status.equalsIgnoreCase("snapshot")) { + version += '-SNAPSHOT' +} + +description = 'Isochrones' + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + +repositories { + maven { url "http://maven.geo-solutions.it" } + maven { url "http://repo.maven.apache.org/maven2" } +} + +buildscript { + apply from: 'http://www.krismer.de/files/checkstyle.gradle' +} + +dependencies { + compile group: 'postgresql', name: 'postgresql', version:'9.1-901.jdbc4' + compile group: 'commons-dbutils', name: 'commons-dbutils', version:'1.2' + compile group: 'org.cometd.java', name: 'bayeux-api', version:'2.4.3' + compile group: 'org.cometd.javascript', name: 'cometd-javascript-jquery', version:'2.4.3' + compile group: 'org.cometd.java', name: 'cometd-java-server', version:'2.4.3' + compile group: 'org.eclipse.jetty', name: 'jetty-util-ajax', version: '9.0.6.v20130930' + compile(group: 'org.eclipse.jetty', name: 'jetty-servlets', version:'9.0.6.v20130930') { + exclude(module: 'jetty-client') + } + compile group: 'org.postgis', name: 'postgis-jdbc', version:'1.3.3' + compile group: 'org.json', name: 'json', version:'20090211' + compile group: 'commons-httpclient', name: 'commons-httpclient', version:'3.1' + compile group: 'it.geosolutions', name: 'geoserver-manager', version:'1.5.1' + compile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.6' + testCompile group: 'junit', name: 'junit', version:'4.8.1' + compile(group: 'javax.servlet', name: 'servlet-api', version:'2.5') { + /* This dependency was originally in the Maven provided scope, but the project was not of type war. + This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. + Please review and delete this closure when resolved. */ + } +} + +checkstyle { + showViolations = false +} + +eclipse { + project { + name = 'Isochrones' + + buildCommand 'net.sf.eclipsecs.core.CheckstyleBuilder' + + natures = [ + 'net.sf.eclipsecs.core.CheckstyleNature', + 'org.springsource.ide.eclipse.gradle.core.nature', + 'org.eclipse.jem.workbench.JavaEMFNature', + 'org.eclipse.wst.common.modulecore.ModuleCoreNature', + 'org.eclipse.wst.common.project.facet.core.nature', + 'org.eclipse.jdt.core.javanature', + 'org.eclipse.wst.jsdt.core.jsNature' + ] + } + + wtp { + component { + contextPath = '/isochrones' + } + + facet { + facet name: 'jst.web', version: '3.0' + facet name: 'jst.java', version: '1.7' + } + } +} + diff --git a/executeTests.sh b/executeTests.sh deleted file mode 100755 index f7887dff..00000000 --- a/executeTests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# Plenty of memory is available.. don't crash just because the network is big -export MAVEN_OPTS=-Xmx4096m -mvn package && mvn exec:java - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 79919d20..00000000 --- a/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>it.unibz.inf.isochrones</groupId> - <artifactId>isochrones</artifactId> - <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> - <name>isochrones</name> - <url>http://maven.apache.org</url> - <repositories> - <repository> - <id>geoserver-manager</id> - <url>http://maven.geo-solutions.it</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> - </dependency> - <dependency> - <groupId>commons-dbutils</groupId> - <artifactId>commons-dbutils</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.cometd.java</groupId> - <artifactId>bayeux-api</artifactId> - <version>2.4.3</version> - </dependency> - <dependency> - <groupId>org.cometd.javascript</groupId> - <artifactId>cometd-javascript-jquery</artifactId> - <version>2.4.3</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.cometd.java</groupId> - <artifactId>cometd-java-server</artifactId> - <version>2.4.3</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>9.0.3.v20130506</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.postgis</groupId> - <artifactId>postgis-jdbc</artifactId> - <version>1.3.3</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>it.geosolutions</groupId> - <artifactId>geoserver-manager</artifactId> - <version>1.5.1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.6</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <configuration> - <mainClass>it.unibz.inf.isochrones.tests.RunSimple</mainClass> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>9.0.3.v20130506</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <webAppConfig> - <contextPath>/mineX</contextPath> - </webAppConfig> - </configuration> - - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <overlays> - <overlay /> - <overlay> - <groupId>org.cometd.javascript</groupId> - <artifactId>cometd-javascript-jquery</artifactId> - </overlay> - </overlays> - </configuration> - </plugin> - - </plugins> - </build> -</project> diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..236b762b --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'Isochrones' -- GitLab