From: Patrick Plitzner Date: Wed, 13 Apr 2016 11:29:46 +0000 (+0200) Subject: Merge branch 'LibrAlign' into develop X-Git-Tag: 4.0.0^2~30 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d4e581eb9d7a1717edd1bb8d24f3c3374645bf69?hp=cca70f19901a30eecbbe1f63f74a7f9cebecc5ba Merge branch 'LibrAlign' into develop --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war deleted file mode 100644 index 5ac0126b4..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/eu.etaxonomy.taxeditor.feature.jre.linux64-4.0.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/eu.etaxonomy.taxeditor.feature.jre.linux64-4.0.0-SNAPSHOT.jar deleted file mode 100644 index bc905a8ff..000000000 Binary files a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/eu.etaxonomy.taxeditor.feature.jre.linux64-4.0.0-SNAPSHOT.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/feature.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/feature.xml deleted file mode 100644 index 629f76d20..000000000 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/feature.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/local-artifacts.properties b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/local-artifacts.properties deleted file mode 100644 index 51afc476a..000000000 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/local-artifacts.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Mon Mar 21 14:25:08 CET 2016 -artifact.attached.p2metadata=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2content.xml -artifact.main=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.feature.jre.linux64/target/eu.etaxonomy.taxeditor.feature.jre.linux64-4.0.0-SNAPSHOT.jar -artifact.attached.p2artifacts=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2artifacts.xml diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/maven-archiver/pom.properties b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/maven-archiver/pom.properties deleted file mode 100644 index caba2c0f7..000000000 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Mar 21 14:25:08 CET 2016 -version=4.0.0-SNAPSHOT -groupId=eu.etaxonomy -artifactId=eu.etaxonomy.taxeditor.feature.jre.linux64 diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2artifacts.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2artifacts.xml deleted file mode 100644 index e911e9525..000000000 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2artifacts.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2content.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2content.xml deleted file mode 100644 index 57b862df8..000000000 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2content.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - (&(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk)) - - - - - - org.eclipse.equinox.p2.touchpoint.eclipse.setJvm(jvm:null); - - - org.eclipse.equinox.p2.touchpoint.eclipse.setJvm(jvm:features/eu.etaxonomy.taxeditor.feature.jre.linux64_3.12.0/jre/bin); - - - - - [Enter Copyright Description here.] - - - - - - - - - - - - - - - - - - - - (org.eclipse.update.install.features=true) - - - - - - - - - true - - - - - [Enter Copyright Description here.] - - - diff --git a/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war deleted file mode 100644 index 47a2b9f04..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/target/MANIFEST.MF deleted file mode 100644 index 57018d23a..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: eu.etaxonomy.taxeditor.webapp -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: .,lib/log4j-1.2.17.jar,lib/jetty-all-9.2.9.v20150224 - .jar,lib/javax.servlet-api-3.1.0.jar,lib/mysql-connector-java-5.1.24. - jar,lib/c3p0-0.9.5.2.jar -Bundle-Name: Webapp -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.eclipse.core.runtime -Bundle-Vendor: EDIT -Bundle-Version: 4.0.0.201603211324 -Bundle-Activator: eu.etaxonomy.taxeditor.webapp.TaxeditorWebappPlugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true -Import-Package: org.eclipse.jface.resource,org.eclipse.ui.plugin - diff --git a/eu.etaxonomy.taxeditor.webapp/target/antrun/build-main.xml b/eu.etaxonomy.taxeditor.webapp/target/antrun/build-main.xml deleted file mode 100644 index 4c0fc05e7..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/antrun/build-main.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - Anonymizing war - - - - - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/.svnignore b/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/.svnignore deleted file mode 100644 index a09ae971f..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/.svnignore +++ /dev/null @@ -1 +0,0 @@ -cdmlib-remote-webapp.war diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/jetty-runner-9.2.3.v20140905.jar b/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/jetty-runner-9.2.3.v20140905.jar deleted file mode 100644 index 91c88d6cd..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/jetty-runner-9.2.3.v20140905.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/start-9.2.3.v20140905.jar b/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/start-9.2.3.v20140905.jar deleted file mode 100644 index ef2faaf2a..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/start-9.2.3.v20140905.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMEmbeddedServerException.class b/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMEmbeddedServerException.class deleted file mode 100644 index c968eb159..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMEmbeddedServerException.class and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer$1.class b/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer$1.class deleted file mode 100644 index 97a67c287..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer$1.class and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer.class b/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer.class deleted file mode 100644 index 40e5cd0f5..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer.class and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/ICDMServerError.class b/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/ICDMServerError.class deleted file mode 100644 index c8c0ef044..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/ICDMServerError.class and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.class b/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.class deleted file mode 100644 index 9252d4b18..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.class and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/eu.etaxonomy.taxeditor.webapp-4.0.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.webapp/target/eu.etaxonomy.taxeditor.webapp-4.0.0-SNAPSHOT.jar deleted file mode 100644 index a2232305f..000000000 Binary files a/eu.etaxonomy.taxeditor.webapp/target/eu.etaxonomy.taxeditor.webapp-4.0.0-SNAPSHOT.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.webapp/target/local-artifacts.properties b/eu.etaxonomy.taxeditor.webapp/target/local-artifacts.properties deleted file mode 100644 index e2dbfb81e..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/local-artifacts.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Mon Mar 21 14:25:04 CET 2016 -artifact.attached.p2metadata=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.webapp/target/p2content.xml -artifact.main=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.webapp/target/eu.etaxonomy.taxeditor.webapp-4.0.0-SNAPSHOT.jar -artifact.attached.p2artifacts=/home/pplitzner/git/taxeditor/eu.etaxonomy.taxeditor.webapp/target/p2artifacts.xml diff --git a/eu.etaxonomy.taxeditor.webapp/target/maven-archiver/pom.properties b/eu.etaxonomy.taxeditor.webapp/target/maven-archiver/pom.properties deleted file mode 100644 index 5bffcb939..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Mar 21 14:25:00 CET 2016 -version=4.0.0-SNAPSHOT -groupId=eu.etaxonomy -artifactId=eu.etaxonomy.taxeditor.webapp diff --git a/eu.etaxonomy.taxeditor.webapp/target/p2artifacts.xml b/eu.etaxonomy.taxeditor.webapp/target/p2artifacts.xml deleted file mode 100644 index 700f62575..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/p2artifacts.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/eu.etaxonomy.taxeditor.webapp/target/p2content.xml b/eu.etaxonomy.taxeditor.webapp/target/p2content.xml deleted file mode 100644 index bd933a181..000000000 --- a/eu.etaxonomy.taxeditor.webapp/target/p2content.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true Bundle-Version: 4.0.0.201603211324 - - - - -