From 71418f4f93eea820912e6fcd591d5d7ad763f3aa Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Mon, 15 Nov 2010 15:58:59 +0000
Subject: [PATCH] preparations for cdmlib version 3

---
 .gitignore                            | 16 ++++++++++++++++
 taxeditor-cdmlib/META-INF/MANIFEST.MF | 18 +++++++++---------
 taxeditor-cdmlib/build.properties     | 10 +++++++++-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 173567566..293cc8308 100644
--- 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 b4d480e51..8497bd07c 100644
--- 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 98ebfc18d..7490d77ac 100644
--- a/taxeditor-cdmlib/build.properties
+++ b/taxeditor-cdmlib/build.properties
@@ -1,5 +1,13 @@
 bin.includes = META-INF/,\
-               lib/
+               lib/,\
+               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
 jars.compile.order = cdmLibrary.jar
 src.includes = lib/
 jre.compilation.profile = J2SE-1.6
-- 
2.34.1