#5705 fixing library dependencies for local managed cdm-server

diff --git a/eu.etaxonomy.taxeditor.webapp/.classpath b/eu.etaxonomy.taxeditor.webapp/.classpath
index d162d85a25d63a82cc240ed5d91c290bc2617094..87c7de086c8bca23e12ac599c1ba2802515f3d7f 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/.classpath
+++ b/eu.etaxonomy.taxeditor.webapp/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 82c965c04718c6e0cf7e7fa9473318ba408e4fe2..7b6af277ffea82d3c5d4752485a552257d1c8cb4 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -12,7 +12,9 @@ Bundle-ClassPath: .,
  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
+ lib/c3p0-0.9.5.2.jar,
+ lib/h2-1.4.190.jar,
+ lib/mchange-commons-java-0.2.11.jar
 Bundle-Vendor: EDIT
 Import-Package: org.eclipse.jface.resource,
  org.eclipse.ui.plugin

diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties
index ca2dc6a5810733e398b8413f096e161c6d3ad297..be57fa3593e61756f708400c35c20a072c31b6ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/eu.etaxonomy.taxeditor.webapp/build.properties
@@ -2,9 +2,6 @@ source.. = src/main/java/,\
            src/main/resources/           
 bin.includes = META-INF/,\
                .,\
-               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/cdmlib-remote-webapp.war,\
-               lib/c3p0-0.9.5.2.jar
+               lib/,\
+               lib/h2-1.4.190.jar,\
+               lib/mchange-commons-java-0.2.11.jar

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 677c3164c5769485a9ace7b00194e01019e3bb24..7135effae979ac62b43e9312389228e486dc9e99 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -46,6 +46,24 @@
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-dependency-jars</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeArtifactIds><!--  Comma separated list of Artifact names to include -->
+                c3p0,mchange-commons-java,h2
+              </includeArtifactIds>
+              <outputDirectory>
+                ${basedir}/lib
+              </outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <excludeTransitive>true</excludeTransitive>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -105,6 +123,26 @@
       <version>${cdmlib.version}</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.190</version>
+    </dependency>
+     <dependency>
+      <groupId>com.mchange</groupId>
+      <artifactId>c3p0</artifactId>
+      <!-- 
+        IMPORTANT!!!
+        this must exactly match the version as set in 
+        cdmlib-parent pom.xml
+      -->
+      <version>0.9.5.2</version>
+     </dependency>
+     <dependency>
+        <groupId>com.mchange</groupId>
+        <artifactId>mchange-commons-java</artifactId>
+        <version>0.2.11</version>
+     </dependency>
   </dependencies>
 </project>