BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8fff4d8
)
adding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency
author
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Thu, 18 Feb 2016 11:56:57 +0000
(12:56 +0100)
committer
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Thu, 18 Feb 2016 11:56:57 +0000
(12:56 +0100)
eu.etaxonomy.taxeditor.webapp/.classpath
patch
|
blob
|
history
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
patch
|
blob
|
history
eu.etaxonomy.taxeditor.webapp/build.properties
patch
|
blob
|
history
eu.etaxonomy.taxeditor.webapp/pom.xml
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.webapp/.classpath
b/eu.etaxonomy.taxeditor.webapp/.classpath
index e932ef589261b790055bf68971aaf89b8e308eaf..d162d85a25d63a82cc240ed5d91c290bc2617094 100644
(file)
--- a/
eu.etaxonomy.taxeditor.webapp/.classpath
+++ b/
eu.etaxonomy.taxeditor.webapp/.classpath
@@
-1,5
+1,6
@@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <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"/>
<classpathentry exported="true" kind="lib" path="lib/jetty-all-9.2.9.v20150224.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"/>
<classpathentry exported="true" kind="lib" path="lib/jetty-all-9.2.9.v20150224.jar"/>
diff --git
a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 19cd2a23cb3469e702796d2daaea08fa8b415cd4..25f8c4122e76112bda52371d77f1daea634c9c84 100644
(file)
--- a/
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@
-11,7
+11,8
@@
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/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/mysql-connector-java-5.1.24.jar,
+ lib/c3p0-0.9.5.2.jar
Bundle-Vendor: EDIT
Import-Package: org.eclipse.jface.resource,
org.eclipse.ui.plugin
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 4ff6758de3a402a2f45dd354329f9d12041f3170..ca2dc6a5810733e398b8413f096e161c6d3ad297 100644
(file)
--- a/
eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/
eu.etaxonomy.taxeditor.webapp/build.properties
@@
-6,4
+6,5
@@
bin.includes = META-INF/,\
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/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/cdmlib-remote-webapp.war,\
+ lib/c3p0-0.9.5.2.jar
diff --git
a/eu.etaxonomy.taxeditor.webapp/pom.xml
b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 981a3daa282bfa8e34bc9b967796f1a9ced89165..599000551e53140df58bd2c6c887a42e26f09ab5 100644
(file)
--- a/
eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/
eu.etaxonomy.taxeditor.webapp/pom.xml
@@
-105,14
+105,6
@@
<version>${cdmlib.version}</version>
<type>war</type>
</dependency>
<version>${cdmlib.version}</version>
<type>war</type>
</dependency>
- <dependency>
- <!--
- this provides the datasource dependencies which are excluded from the war
- -->
- <groupId>eu.etaxonomy</groupId>
- <artifactId>cdmlib-persistence</artifactId>
- <version>${cdmlib.version}</version>
- </dependency>
</dependencies>
</project>
</dependencies>
</project>