preparations for cdmlib version 3

diff --git a/.gitignore b/.gitignore
index 173567566f49a59376555a038603d353a649a30e..293cc8308b3a1e48fc679761b19c9594c1d9bbae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,27 +44,43 @@ taxeditor-cdmlib/dist
 taxeditor-cdmlib/lib/cdmlib-commons-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-commons-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-commons-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-commons-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-commons-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-ext-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-ext-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-ext-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-ext-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-ext-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-io-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-io-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-io-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-io-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-io-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-model-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-model-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-model-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-model-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-model-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-persistence-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-persistence-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-persistence-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-persistence-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-persistence-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-print-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-print-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-print-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-print-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-print-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-remote-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-remote-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-remote-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-remote-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-remote-3.0.jar
 taxeditor-cdmlib/lib/cdmlib-services-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-services-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-services-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-services-3.0-sources.jar
+taxeditor-cdmlib/lib/cdmlib-services-3.0.jar
 taxeditor-cdmlib/log4j-1.2.14src.zip
 taxeditor-cdmlib/target
 taxeditor-editor/.classpath

diff --git a/taxeditor-cdmlib/META-INF/MANIFEST.MF b/taxeditor-cdmlib/META-INF/MANIFEST.MF
index b4d480e51bdf2f971b740457a871af121a663ffe..8497bd07c08d50e7b778e16c53bec42285ed4849 100644 (file)
--- a/taxeditor-cdmlib/META-INF/MANIFEST.MF
+++ b/taxeditor-cdmlib/META-INF/MANIFEST.MF
@@ -13,14 +13,6 @@ Bundle-ClassPath: lib/activation-1.1.jar,
  lib/avalon-framework-4.2.0.jar,
  lib/batik-all-1.7.jar,
  lib/c3p0-0.9.1.jar,
- lib/cdmlib-commons-2.5.jar,
- lib/cdmlib-ext-2.5.jar,
- lib/cdmlib-io-2.5.jar,
- lib/cdmlib-model-2.5.jar,
- lib/cdmlib-persistence-2.5.jar,
- lib/cdmlib-print-2.5.jar,
- lib/cdmlib-remote-2.5.jar,
- lib/cdmlib-services-2.5.jar,
  lib/cglib-2.1.3.jar,
  lib/commons-beanutils-1.7.0.jar,
  lib/commons-collections-3.2.jar,
@@ -112,7 +104,15 @@ Bundle-ClassPath: lib/activation-1.1.jar,
  lib/org.springframework.web-3.0.4.RELEASE.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,
  lib/dozer-5.3.0.jar,
- lib/google-api-translate-java-0.92.jar
+ lib/google-api-translate-java-0.92.jar,
+ lib/cdmlib-commons-2.5.jar,
+ lib/cdmlib-ext-2.5.jar,
+ lib/cdmlib-io-2.5.jar,
+ lib/cdmlib-model-2.5.jar,
+ lib/cdmlib-persistence-2.5.jar,
+ lib/cdmlib-print-2.5.jar,
+ lib/cdmlib-remote-2.5.jar,
+ lib/cdmlib-services-2.5.jar
 Export-Package: com.google.api,
  com.google.api.detect,
  com.google.api.translate,

diff --git a/taxeditor-cdmlib/build.properties b/taxeditor-cdmlib/build.properties
index 98ebfc18dca7b583b87c0d8aa32908b7ee6a0fc8..7490d77ac25cefbd8248b61ece93dc8323a5ff16 100644 (file)
--- a/taxeditor-cdmlib/build.properties
+++ b/taxeditor-cdmlib/build.properties
@@ -1,5 +1,13 @@
 bin.includes = META-INF/,\\r
-               lib/\r
+               lib/,\\r
+               lib/cdmlib-commons-2.5.jar,\\r
+               lib/cdmlib-ext-2.5.jar,\\r
+               lib/cdmlib-io-2.5.jar,\\r
+               lib/cdmlib-model-2.5.jar,\\r
+               lib/cdmlib-persistence-2.5.jar,\\r
+               lib/cdmlib-print-2.5.jar,\\r
+               lib/cdmlib-remote-2.5.jar,\\r
+               lib/cdmlib-services-2.5.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r