From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 8 Jan 2015 23:40:21 +0000 (+0000)
Subject: merge validation editor branch to trunk
X-Git-Tag: 3.6.0~265
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3bb452c6c885c9f7e1ce1b07b43766ce64e4ea72

merge validation editor branch to trunk
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 057822629..0ad6b0dd8 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
@@ -29,6 +29,22 @@
 	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.4-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
@@ -51,7 +67,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
@@ -193,23 +209,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>