(no commit message)

diff --git a/cdmlib-plugin/.classpath b/cdmlib-plugin/.classpath
index 74d92a13ae24a85de682258dc88beaa22bdc4d9f..09afec62b0ca891fa342b49a1eb822c61c510051 100644 (file)
--- a/cdmlib-plugin/.classpath
+++ b/cdmlib-plugin/.classpath
@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="avalon-framework-4.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="batik-all-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="commons-io-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="fop.jar"/>
-       <classpathentry exported="true" kind="lib" path="jaxen-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="odfdom-0.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="saxon9he.jar"/>
-       <classpathentry exported="true" kind="lib" path="serializer-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="xalan-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="xercesImpl-2.7.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="xml-apis-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="xml-apis-ext-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="xmlgraphics-commons-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="xsltc.jar"/>
-       <classpathentry exported="true" kind="lib" path="msbase-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="mssqlserver-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="msutil-2000.3.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
@@ -47,7 +30,7 @@
        <classpathentry exported="true" kind="lib" path="hsqldb.jar" sourcepath="eclipse-pluginsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="javassist.jar" sourcepath="eclipse-pluginsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="jaxb-api-2.1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="jaxb-impl-2.1.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="jaxb-impl-2.1.6.jar" sourcepath="jaxb-impl-2.1.6src.zip"/>
        <classpathentry exported="true" kind="lib" path="jdbc-1.2.jar" sourcepath="eclipse-pluginsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="jdbc2_0-stdext.jar" sourcepath="eclipse-pluginsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="joda-time-1.5.jar" sourcepath="joda-time-1.5src.zip"/>
@@ -100,6 +83,7 @@
        <classpathentry exported="true" kind="lib" path="cdmlib-persistence-2.4.jar" sourcepath="cdmlib-persistence-2.4src.zip"/>
        <classpathentry exported="true" kind="lib" path="cdmlib-services-2.4.jar" sourcepath="cdmlib-services-2.4src.zip"/>
        <classpathentry exported="true" kind="lib" path="cdmlib-remote-2.4.jar" sourcepath="cdmlib-remote-2.4src.zip"/>
+       <classpathentry exported="true" kind="lib" path="cdmlib-print-1.0.jar" sourcepath="cdmlib-print-1.0src.zip"/>
        <classpathentry exported="true" kind="lib" path="c3p0-0.9.1.jar" sourcepath="c3p0-0.9.1src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.web-3.0.0.RELEASE.jar" sourcepath="org.springframework.web-3.0.0.RELEASEsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="servlet-api-2.5.jar" sourcepath="servlet-api-2.5src.zip"/>
@@ -110,5 +94,22 @@
        <classpathentry exported="true" kind="lib" path="ezmorph-1.0.4.jar" sourcepath="ezmorph-1.0.4src.zip"/>
        <classpathentry exported="true" kind="lib" path="xom-1.0.jar"/>
        <classpathentry exported="true" kind="lib" path="jdom.jar"/>
+       <classpathentry exported="true" kind="lib" path="msbase-2000.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="mssqlserver-2000.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="msutil-2000.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="avalon-framework-4.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="batik-all-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="commons-io-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="fop.jar"/>
+       <classpathentry exported="true" kind="lib" path="jaxen-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="odfdom-0.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="saxon9he.jar"/>
+       <classpathentry exported="true" kind="lib" path="serializer-2.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="xalan-2.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="xercesImpl-2.7.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="xml-apis-1.3.04.jar"/>
+       <classpathentry exported="true" kind="lib" path="xml-apis-ext-1.3.04.jar"/>
+       <classpathentry exported="true" kind="lib" path="xmlgraphics-commons-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="xsltc.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/cdmlib-plugin/META-INF/MANIFEST.MF b/cdmlib-plugin/META-INF/MANIFEST.MF
index 4045944069e255da211c3c5bec427b42ca03220e..54a5c38aea1dce7cb52d535a4816e548f25a6d65 100644 (file)
--- a/cdmlib-plugin/META-INF/MANIFEST.MF
+++ b/cdmlib-plugin/META-INF/MANIFEST.MF
@@ -82,6 +82,7 @@ Bundle-ClassPath: activation-1.1.jar,
  cdmlib-persistence-2.4.jar,
  cdmlib-services-2.4.jar,
  cdmlib-remote-2.4.jar,
+ cdmlib-print-1.0.jar,
  c3p0-0.9.1.jar,
  org.springframework.web-3.0.0.RELEASE.jar,
  servlet-api-2.5.jar,
@@ -219,7 +220,12 @@ Export-Package: eu.etaxonomy.cdm,
    org.springframework.jdbc.datasource,
    eu.etaxonomy.cdm.model.common",
  eu.etaxonomy.cdm.database.types;uses:="eu.etaxonomy.cdm.database",
- eu.etaxonomy.cdm.ext;uses:="eu.etaxonomy.cdm.model.taxon,org.apache.log4j,eu.etaxonomy.cdm.model.description",
+ eu.etaxonomy.cdm.ext.bci,
+ eu.etaxonomy.cdm.ext.common,
+ eu.etaxonomy.cdm.ext.dc,
+ eu.etaxonomy.cdm.ext.geo,
+ eu.etaxonomy.cdm.ext.ipni,
+ eu.etaxonomy.cdm.ext.sru,
  eu.etaxonomy.cdm.hibernate;uses:="org.hibernate.search.bridge",
  eu.etaxonomy.cdm.io.berlinModel;
   uses:="eu.etaxonomy.cdm.io.common.mapping,
@@ -493,6 +499,12 @@ Export-Package: eu.etaxonomy.cdm,
    org.hibernate.event,
    eu.etaxonomy.cdm.model.common",
  eu.etaxonomy.cdm.persistence.query;uses:="org.hibernate,org.hibernate.envers.query,org.hibernate.criterion",
+ eu.etaxonomy.cdm.print,
+ eu.etaxonomy.cdm.print.out,
+ eu.etaxonomy.cdm.print.out.odf,
+ eu.etaxonomy.cdm.print.out.pdf,
+ eu.etaxonomy.cdm.print.out.taxpub,
+ eu.etaxonomy.cdm.print.out.xml,
  eu.etaxonomy.cdm.remote.controller;
   uses:="org.apache.commons.logging,
    eu.etaxonomy.cdm.api.facade,

diff --git a/cdmlib-plugin/_makeSources.bat b/cdmlib-plugin/_makeSources.bat
index 958439cdd6311c3a62ba7eb6f46528e241cad685..3653de606bb5a0dd075243686c497bfcb323cb65 100644 (file)
--- a/cdmlib-plugin/_makeSources.bat
+++ b/cdmlib-plugin/_makeSources.bat
@@ -20,23 +20,30 @@ del cdmlib-remote-2.4.jar
 del cdmlib-ext-2.4src.zip\r
 del cdmlib-ext-2.4.jar\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-commons\2.4\cdmlib-commons-2.4.jar" "cdmlib-commons-2.4.jar"\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-commons\2.4\cdmlib-commons-2.4-sources.jar" "cdmlib-commons-2.4src.zip"\r
+del cdmlib-print-1.0src.zip\r
+del cdmlib-print-1.0.jar\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-model\2.4\cdmlib-model-2.4.jar" cdmlib-model-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-model\2.4\cdmlib-model-2.4-sources.jar" cdmlib-model-2.4src.zip\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-commons\2.4\cdmlib-commons-2.4.jar" "cdmlib-commons-2.4.jar"\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-commons\2.4\cdmlib-commons-2.4-sources.jar" "cdmlib-commons-2.4src.zip"\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-persistence\2.4\cdmlib-persistence-2.4.jar" cdmlib-persistence-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-persistence\2.4\cdmlib-persistence-2.4-sources.jar" cdmlib-persistence-2.4src.zip\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-model\2.4\cdmlib-model-2.4.jar" cdmlib-model-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-model\2.4\cdmlib-model-2.4-sources.jar" cdmlib-model-2.4src.zip\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-services\2.4\cdmlib-services-2.4.jar" cdmlib-services-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-services\2.4\cdmlib-services-2.4-sources.jar" cdmlib-services-2.4src.zip\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-persistence\2.4\cdmlib-persistence-2.4.jar" cdmlib-persistence-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-persistence\2.4\cdmlib-persistence-2.4-sources.jar" cdmlib-persistence-2.4src.zip\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-io\2.4\cdmlib-io-2.4.jar" cdmlib-io-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-io\2.4\cdmlib-io-2.4-sources.jar" cdmlib-io-2.4src.zip\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-services\2.4\cdmlib-services-2.4.jar" cdmlib-services-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-services\2.4\cdmlib-services-2.4-sources.jar" cdmlib-services-2.4src.zip\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-remote\2.4\cdmlib-remote-2.4.jar" cdmlib-remote-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-remote\2.4\cdmlib-remote-2.4-sources.jar" cdmlib-remote-2.4src.zip\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-io\2.4\cdmlib-io-2.4.jar" cdmlib-io-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-io\2.4\cdmlib-io-2.4-sources.jar" cdmlib-io-2.4src.zip\r
+\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-remote\2.4\cdmlib-remote-2.4.jar" cdmlib-remote-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-remote\2.4\cdmlib-remote-2.4-sources.jar" cdmlib-remote-2.4src.zip\r
+\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-ext\2.4\cdmlib-ext-2.4.jar" cdmlib-ext-2.4.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-ext\2.4\cdmlib-ext-2.4-sources.jar" cdmlib-ext-2.4src.zip\r
+\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-print\1.0\cdmlib-print-1.0.jar" cdmlib-print-1.0.jar\r
+copy %HOMEPATH% + "\.m2\repository\eu\etaxonomy\cdmlib-print\1.0\cdmlib-print-1.0-sources.jar" cdmlib-print-1.0src.zip\r
 \r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-ext\2.4\cdmlib-ext-2.4.jar" cdmlib-ext-2.4.jar\r
-copy "C:\Dokumente und Einstellungen\e.-m.lee\.m2\repository\eu\etaxonomy\cdmlib-ext\2.4\cdmlib-ext-2.4-sources.jar" cdmlib-ext-2.4src.zip\r

diff --git a/cdmlib-plugin/_makeSources.sh b/cdmlib-plugin/_makeSources.sh
index 30c692e8fe711db69e4d136cff6e95f5a04f6f22..c448808e22e7f3dd69a60e865ec81a083f31c0ae 100755 (executable)
--- a/cdmlib-plugin/_makeSources.sh
+++ b/cdmlib-plugin/_makeSources.sh
@@ -4,6 +4,7 @@ rm ./cdmlib-commons-2.4src.zip ./cdmlib-commons-2.4.jar ./cdmlib-model-2.4src.zi
  ./cdmlib-model-2.4.jar ./cdmlib-persistence-2.4src.zip ./cdmlib-persistence-2.4.jar \
  ./cdmlib-services-2.4src.zip ./cdmlib-services-2.4.jar \
  ./cdmlib-io-2.4src.zip ./cdmlib-io-2.4.jar \
+ ./cdmlib-print-1.0src.zip ./cdmlib-print-1.0.jar
  ./cdmlib-remote-2.4src.zip ./cdmlib-remote-2.4.jar ./cdmlib-ext-2.4src.zip ./cdmlib-ext-2.4.jar > /dev/null 2>&1 
 
 
@@ -29,3 +30,6 @@ cp $LIBDIR/cdmlib-remote/2.4/cdmlib-remote-2.4-sources.jar ./cdmlib-remote-2.4sr
 
 cp $LIBDIR/cdmlib-ext/2.4/cdmlib-ext-2.4.jar .
 cp $LIBDIR/cdmlib-ext/2.4/cdmlib-ext-2.4-sources.jar ./cdmlib-ext-2.4src.zip
+
+cp $LIBDIR/cdmlib-print/1.0/cdmlib-print-1.0.jar .
+cp $LIBDIR/cdmlib-print/1.0/cdmlib-print-1.0-sources.jar ./cdmlib-print-1.0src.zip
\ No newline at end of file

diff --git a/cdmlib-plugin/build.properties b/cdmlib-plugin/build.properties
index 9a5d211c6168f5c03d65c2f93c80fdf195a181cb..895ae57600e93ed5be08ac9c9517299e502c5ac1 100644 (file)
--- a/cdmlib-plugin/build.properties
+++ b/cdmlib-plugin/build.properties
@@ -125,7 +125,8 @@ bin.includes = META-INF/,\
                xml-apis-1.3.04.jar,\\r
                xml-apis-ext-1.3.04.jar,\\r
                xmlgraphics-commons-1.3.1.jar,\\r
-               xsltc.jar\r
+               xsltc.jar,\\r
+               cdmlib-print-1.0.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = spring-context-support-2.5src.zip,\\r
                spring-jdbc-2.5src.zip,\\r
@@ -200,5 +201,11 @@ src.includes = spring-context-support-2.5src.zip,\
                org.springframework.orm-3.0.0.RELEASEsrc.zip,\\r
                org.springframework.oxm-3.0.0.RELEASEsrc.zip,\\r
                org.springframework.test-3.0.0.RELEASEsrc.zip,\\r
-               org.springframework.transaction-3.0.0.RELEASEsrc.zip\r
+               org.springframework.transaction-3.0.0.RELEASEsrc.zip,\\r
+               cdmlib-print-1.0src.zip,\\r
+               cdmlib-remote-2.4src.zip,\\r
+               dozer-4.4src.zip,\\r
+               ehcache-1.2.3src.zip,\\r
+               ezmorph-1.0.4src.zip,\\r
+               json-lib-2.2.3-jdk15src.zip\r
 \r