[SCM] Castor: open source data binding framework written in Java branch, master, updated. debian/1.3.1-1-3-g258c778
Miguel Landaeta
miguel at miguel.cc
Sat Jan 21 23:06:31 UTC 2012
The following commit has been merged in the master branch:
commit 258c7784b83cd0e0a50388aeb201f3a19423c336
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Sat Jan 21 18:34:26 2012 -0430
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 20b1e1d..d4b73a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+castor (1.3.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+ * Bump Standards-Version to 3.9.2. No changes were required.
+ * Add dependencies on libcommons-lang-java and libcommons-cli-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sat, 21 Jan 2012 18:09:58 -0430
+
castor (1.3.1-1) unstable; urgency=low
* Initial release. (Closes: #581862).
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 0c15031..35286c1 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,10 +1,12 @@
usr/share/java/commons-logging.jar
+usr/share/java/commons-lang.jar
+usr/share/java/commons-cli.jar
usr/share/java/oro.jar
usr/share/java/regexp.jar
usr/share/java/easymock.jar
usr/share/java/junit4.jar
usr/share/java/ant.jar
-usr/share/java/geronimo-jta-1.0.1b-spec.jar
+usr/share/java/geronimo-jta_1.1_spec.jar
usr/share/java/cglib.jar
usr/share/java/log4j-1.2.jar
usr/share/java/glassfish-javaee.jar
diff --git a/debian/control b/debian/control
index df5d24d..f2895ec 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Section: java
Priority: optional
Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant,
libcommons-logging-java, liboro-java, libregexp-java, libeasymock-java, junit,
- junit4, libgeronimo-jta-1.0.1b-spec-java, libcglib-java, liblog4j1.2-java,
- glassfish-javaee, velocity, maven-repo-helper, ant-optional
-Standards-Version: 3.8.4
+ junit4, libgeronimo-jta-1.1-spec-java, libcglib-java, liblog4j1.2-java,
+ glassfish-javaee, velocity, maven-repo-helper, ant-optional,
+ libcommons-lang-java, libcommons-cli-java,
+Standards-Version: 3.9.2
Homepage: http://www.castor.org/
Vcs-Git: git://git.debian.org/pkg-java/castor.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/castor.git
@@ -15,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/castor.git
Package: libcastor-xml-java
Architecture: all
Depends: libcastor-core-java, libcommons-logging-java, ${misc:Depends}
-Recommends: liboro-java, libregexp-java
+Recommends: liboro-java, libregexp-java, libcommons-lang-java
Suggests: libcastor-java-doc (= ${binary:Version})
Description: Data binding framework for Java (XML, Objects, DB) - XML module
Castor is a data binding framework for Java. It's the shortest path between
@@ -137,7 +138,7 @@ Package: libcastor-xml-schema-java
Architecture: all
Depends: libcastor-xml-java, libcastor-core-java, libcommons-logging-java,
${misc:Depends}
-Suggests: libcastor-java-doc (= ${binary:Version})
+Suggests: libcastor-java-doc (= ${binary:Version}), libcommons-cli-java
Description: Data binding framework for Java (XML, Objects, DB) - XML Schema
Castor is a data binding framework for Java. It's the shortest path between
Java objects, XML documents and relational tables.
diff --git a/debian/patches/fix_debian_build.diff b/debian/patches/fix_debian_build.diff
index a57a7d4..943d3bf 100644
--- a/debian/patches/fix_debian_build.diff
+++ b/debian/patches/fix_debian_build.diff
@@ -1,121 +1,301 @@
-Description: allow ant based upstream build system to work in Debian
+Description: Allow ant based upstream build system to work in Debian
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: not-needed
-Last-Update: 2010-06-26
+Forwarded: no
+Last-Update: 2012-01-21
---- castor-1.3.1.orig/core/build.xml
-+++ castor-1.3.1/core/build.xml
-@@ -9,13 +9,13 @@
+diff --git a/anttask/build.xml b/anttask/build.xml
+index d3300aa..2f2263d 100644
+--- a/anttask/build.xml
++++ b/anttask/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Ant task definition for Castor XML code generator" default="compile.anttask" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Ant task definition for Castor XML code generator" default="compile.anttask" basedir=".">
+
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -7,11 +6,13 @@
+ <property name="main.resources" value="${source}/main/resources" />
+ <property name="build" value="${basedir}/build"/>
+ <property name="classes" value="${build}/classes"/>
+- <property name="archive" value="${project}-${version}${release}-anttasks"/>
++ <property name="archive" value="${project}-anttasks-${version}${release}"/>
+
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
+ <path id="build.classpath">
+ <pathelement location="${basedir}/../build/classes"/>
+@@ -19,14 +20,17 @@
+ <pathelement location="${basedir}/../ddlgen/build/classes"/>
+ <pathelement location="${basedir}/../codegen/build/classes"/>
+ <pathelement location="${basedir}/../schema/build/classes"/>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+ </path>
+
+ <target name="derive.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
+
+ <target name="prepare.anttask" depends="derive.libs" unless="prepare.anttask.executed">
+diff --git a/codegen/build.xml b/codegen/build.xml
+index 3cc1442..71652f4 100644
+--- a/codegen/build.xml
++++ b/codegen/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor XML - code generator" default="compile.codegen" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor XML - code generator" default="compile.codegen" basedir=".">
+
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -11,12 +10,14 @@
+ <property name="build" value="${basedir}/build"/>
+ <property name="classes" value="${build}/classes"/>
+ <property name="test.classes" value="${build}/test"/>
+- <property name="archive" value="${project}-${version}${release}-codegen"/>
++ <property name="archive" value="${project}-codegen-${version}${release}"/>
+ <property name="gen.src" value="${build}/generated-sources"/>
+
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
+ <path id="build.compile.classpath">
+ <pathelement location="${basedir}/build/classes"/>
+@@ -24,6 +25,7 @@
+ <pathelement location="${basedir}/../schema/build/classes"/>
+ <pathelement location="${basedir}/../anttask/build/classes"/>
+ <pathelement location="${basedir}/../core/build/classes"/>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+
+ <!-- JARs -->
+ <!--
+@@ -55,10 +57,12 @@
+
+ <target name="derive.codegen.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
+
+ <target name="prepare.codegen" unless="prepare.codegen.executed">
+diff --git a/core/build.xml b/core/build.xml
+index e189839..414e770 100644
+--- a/core/build.xml
++++ b/core/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor core" default="compile.core" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor core" default="compile.core" basedir=".">
+
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -10,15 +9,18 @@
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
<property name="test.classes" value="${build}/test"/>
- <property name="archive" value="${project}-${version}${release}-core"/>
+ <property name="archive" value="${project}-core-${version}${release}"/>
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- </path>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+ <!--
+ <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
+ <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
+@@ -32,10 +34,12 @@
+
+ <target name="derive.core.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
- <path id="test.classpath">
---- castor-1.3.1.orig/ddlgen/build.xml
-+++ castor-1.3.1/ddlgen/build.xml
-@@ -8,11 +8,11 @@
+ <target name="prepare.core" unless="prepare.executed">
+diff --git a/cpa/build.xml b/cpa/build.xml
+index 2b32ea2..11d4f1f 100644
+--- a/cpa/build.xml
++++ b/cpa/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor JDO - persistence framework" default="compile.cpa" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor JDO - persistence framework" default="compile.cpa" basedir=".">
+
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -13,12 +12,14 @@
+ <property name="build" value="${basedir}/build"/>
+ <property name="castor.target" value="${basedir}/target/generated-sources/castor"/>
+ <property name="classes" value="${build}/classes"/>
+- <property name="archive" value="${project}-${version}${release}-jdo"/>
++ <property name="archive" value="${project}-jdo-${version}${release}"/>
+ <property name="gen.src" value="${build}/generated-sources"/>
+
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
+ <path id="build.classpath">
+ <!-- inter-module dependencies -->
+diff --git a/ddlgen/build.xml b/ddlgen/build.xml
+index 4876ce4..2963db7 100644
+--- a/ddlgen/build.xml
++++ b/ddlgen/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor DDL generator" default="compile.ddlgen" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor DDL generator" default="compile.ddlgen" basedir=".">
+
+ <property environment="env"/>
+ <property name="source" value="${basedir}/src"/>
+@@ -9,14 +8,17 @@
<property name="classes" value="${build}/classes"/>
<property name="doc" value="${build}/doc"/>
<property name="javadoc" value="${doc}/javadoc"/>
- <property name="archive" value="${project}-${version}${release}-ddlgen"/>
+ <property name="archive" value="${project}-ddlgen-${version}${release}"/>
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
<path id="build.classpath">
<pathelement location="${basedir}/../build/classes"/>
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar" />
-+ <pathelement location="/usr/share/java/commons-logging.jar" />
- </path>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+
+ <!--
+ <pathelement location="${basedir}/../lib/commons-logging-1.1.jar" />
+@@ -25,10 +27,12 @@
- <target name="prepare.ddlgen" unless="prepare.ddlgen.executed">
---- castor-1.3.1.orig/xml/build.xml
-+++ castor-1.3.1/xml/build.xml
-@@ -44,18 +44,22 @@
- source="1.5" target="1.5">
- <classpath refid="build.classpath"/>
- </javac>
-+ <!--
- <javac srcdir="${main.generated}" destdir="${classes}"
- debug="on" encoding="ISO-8859-1" deprecation="false"
- source="1.5" target="1.5">
- <classpath refid="build.classpath"/>
- </javac>
-+ -->
- <copy todir="${classes}">
- <fileset dir="${main.resources}">
- <include name="**"/>
- </fileset>
-+ <!--
- <fileset dir="${main.generated}">
- <include name="**/*.cdr"/>
- </fileset>
-+ -->
- <filterset begintoken="$$" endtoken="$$">
- <filter token="VERSION" value="${version}"/>
- <filter token="RELEASE" value="${release}"/>
---- castor-1.3.1.orig/cpa/build.xml
-+++ castor-1.3.1/cpa/build.xml
-@@ -7,7 +7,7 @@
- <property name="build" value="${basedir}/build"/>
- <property name="target" value="${basedir}/target/generated-sources/castor"/>
- <property name="classes" value="${build}/classes"/>
-- <property name="archive" value="${project}-${version}${release}-jdo"/>
-+ <property name="archive" value="${project}-jdo-${version}${release}"/>
- <property name="gen.src" value="${build}/generated-sources"/>
+ <target name="derive.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
- <path id="build.classpath">
-@@ -20,12 +20,12 @@
- <pathelement location="${basedir}/../codegen/build/classes"/>
-
- <!-- third-party libs -->
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-- <pathelement location="${basedir}/../lib/jta1.0.1.jar"/>
-- <pathelement location="${basedir}/../lib/cglib-full-2.0.2.jar"/>
-- <pathelement location="${basedir}/../lib/log4j-1.2.13.jar"/>
-- <pathelement location="${basedir}/../lib/persistence-api-1.0.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-jta-1.0.1b-spec.jar"/>
-+ <pathelement location="/usr/share/java/cglib.jar"/>
-+ <pathelement location="/usr/share/java/log4j-1.2.jar"/>
-+ <pathelement location="/usr/share/java/glassfish-javaee.jar"/>
- </path>
+ <target name="prepare.ddlgen" depends="derive.libs" unless="prepare.ddlgen.executed">
+diff --git a/diff/build.xml b/diff/build.xml
+index 5e4a098..1f9bea1 100644
+--- a/diff/build.xml
++++ b/diff/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor XML - XML diff" default="compile.diff" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor XML - XML diff" default="compile.diff" basedir=".">
+
+ <!-- $Id: build.xml 0000 2007-01-19 21:12:08Z ekuns $ -->
- <target name="prepare.cpa" unless="prepare.cpa.executed">
---- castor-1.3.1.orig/diff/build.xml
-+++ castor-1.3.1/diff/build.xml
-@@ -9,14 +9,14 @@
+@@ -10,16 +9,19 @@
<property name="test.resources" value="${source}/test/resources"/>
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
- <property name="archive" value="${project}-${version}${release}-xml-diff"/>
+ <property name="archive" value="${project}-xml-diff-${version}${release}"/>
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
<pathelement location="${basedir}/../core/build/classes"/>
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- </path>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+ <!--
+ <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
+ <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
+@@ -28,10 +30,12 @@
+
+ <target name="derive.diff.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
<target name="prepare.diff" unless="prepare.diff.executed">
---- castor-1.3.1.orig/schema/build.xml
-+++ castor-1.3.1/schema/build.xml
-@@ -10,7 +10,7 @@
+diff --git a/examples/build.xml b/examples/build.xml
+index adfb65d..ea4535d 100644
+--- a/examples/build.xml
++++ b/examples/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor CPA - PTF" default="compile.examples" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor CPA - PTF" default="compile.examples" basedir=".">
+
+ <!-- $Id: build.xml 0000 2007-01-19 21:12:08Z ekuns $ -->
+
+@@ -11,14 +10,16 @@
+ <property name="test.resources" value="${source}/test/resources"/>
+ <property name="build" value="${basedir}/build"/>
+ <property name="classes" value="${build}/classes"/>
+- <property name="archive" value="${project}-${version}${release}-examples"/>
+- <property name="archive-sources" value="${project}-${version}${release}-examples-sources"/>
++ <property name="archive" value="${project}-examples-${version}${release}"/>
++ <property name="archive-sources" value="${project}-examples-sources-${version}${release}"/>
+
+ <property name="exampleexcludes" value="codegen/*,**/dax/**"/>
+
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
+ <path id="build.classpath">
+ <pathelement location="${basedir}/build/classes"/>
+diff --git a/schema/build.xml b/schema/build.xml
+index 7aa2944..dfc379f 100644
+--- a/schema/build.xml
++++ b/schema/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor XML schema" default="compile.schema" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor XML schema" default="compile.schema" basedir=".">
+
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -11,18 +10,21 @@
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
<property name="test.classes" value="${build}/test"/>
@@ -123,46 +303,110 @@ Last-Update: 2010-06-26
+ <property name="archive" value="${project}-xml-schema-${version}${release}"/>
<property name="gen.src" value="${basedir}/target/generated-sources/castor"/>
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
<path id="build.classpath">
-@@ -18,8 +18,8 @@
+ <pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
<pathelement location="${basedir}/../xml/build/classes"/>
<pathelement location="${basedir}/../core/build/classes"/>
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- </path>
++ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
+
+ <!--
+ <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
+@@ -37,10 +39,12 @@
+
+ <target name="derive.libs">
+ <mkdir dir="${basedir}/lib" />
++ <!--
+ <copy todir="${basedir}/lib" verbose="true">
+ <fileset refid="dependency.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
+
+ <target name="prepare.schema" depends="derive.libs" unless="prepare.executed">
+diff --git a/src/build.xml b/src/build.xml
+index 6316674..f2e2258 100644
+--- a/src/build.xml
++++ b/src/build.xml
+@@ -2,8 +2,7 @@
- <path id="test.classpath">
---- castor-1.3.1.orig/src/build.xml
-+++ castor-1.3.1/src/build.xml
-@@ -59,9 +59,7 @@
+ <!-- $Id: build.xml 8787 2011-02-20 08:02:41Z wguttmn $ -->
+
+-<project name="Castor" default="compile" basedir=".."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor" default="compile" basedir="..">
+
+ <!-- ================================================================== -->
+ <!-- Properties -->
+@@ -60,9 +59,12 @@
<pathelement location="${classes}"/>
<pathelement location="tests"/>
<pathelement location="${tests}" />
-- <fileset dir="${lib}">
-- <include name="*.jar"/>
-- </fileset>
++ <!--
+ <fileset dir="${lib}">
+ <include name="*.jar"/>
+ </fileset>
++ -->
+ <fileset dir="/" includesfile="${basedir}/debian/classpath-debian"/>
<pathelement location="${basedir}/ddlgen/build/classes" />
<pathelement location="${basedir}/codegen/build/classes" />
<pathelement location="${basedir}/cpa/build/classes" />
-@@ -83,12 +81,7 @@
+@@ -84,12 +86,17 @@
</path>
<path id="javadoc.classpath">
-- <fileset dir="${lib}">
-- <include name="*.jar"/>
-- </fileset>
-- <fileset dir="${basedir}/bin/lib">
-- <include name="ant-1.6.jar" />
-- </fileset>
++ <!--
+ <fileset dir="${lib}">
+ <include name="*.jar"/>
+ </fileset>
++ -->
+ <fileset dir="/" includesfile="${basedir}/debian/classpath-debian"/>
++ <!--
+ <fileset dir="${basedir}/bin/lib">
+ <include name="ant-1.6.jar" />
+ </fileset>
++ -->
</path>
<!-- ================================================================== -->
-@@ -288,20 +281,24 @@
+@@ -135,16 +142,20 @@
+ org/castor/jdo/**/*.java,
+ org/castor/persist/**/*.java" />
+
++ <!--
+ <artifact:dependencies filesetId="dependency.root.fileset" useScope="test">
+ <artifact:pom id="schema" file="${basedir}/xml/pom.xml" />
+ </artifact:dependencies>
++ -->
+
+ <target name="derive.root.libs">
+ <mkdir dir="newlib" />
++ <!--
+ <copy todir="newlib" verbose="true">
+ <fileset refid="dependency.root.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
++ -->
+ </target>
+
+ <target name="targets" description="Prints static list of available targets">
+@@ -305,7 +316,7 @@
+ includes="${castor.commons.files}">
+ <classpath refid="build.classpath"/>
+ <classpath>
+- <fileset dir="${basedir}/newlib"/>
++ <!--<fileset dir="${basedir}/newlib"/>-->
+ </classpath>
+ </javac>
+ </target>
+@@ -318,11 +329,13 @@
<property name="release" value="${release}"/>
</ant>
<!-- compile artifacts in XML module -->
@@ -176,7 +420,8 @@ Last-Update: 2010-06-26
<javac srcdir="${java}" destdir="${classes}" excludes="${excludes}"
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}"
includes="${castor.xml.files}">
- <classpath refid="build.classpath"/>
+@@ -332,9 +345,11 @@
+ </classpath>
</javac>
<copy todir="${classes}">
+ <!--
@@ -187,7 +432,7 @@ Last-Update: 2010-06-26
<fileset dir="${java}">
<patternset refid="support.files" />
</fileset>
-@@ -311,6 +308,7 @@
+@@ -344,6 +359,7 @@
</copy>
<!-- compile test classes -->
@@ -195,22 +440,23 @@ Last-Update: 2010-06-26
<javac srcdir="${test.java}" destdir="${test.classes}"
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}">
<classpath refid="build.classpath"/>
-@@ -323,12 +321,14 @@
- <patternset refid="support.files" />
- </fileset>
- </copy>
+@@ -351,6 +367,7 @@
+ <fileset dir="${basedir}/newlib"/>
+ </classpath>
+ </javac>
+ -->
-
- <!-- left-overs from Castor JDO code -->
- <javac srcdir="${java}" destdir="${classes}" excludes="${excludes}"
+ <copy todir="${test.classes}">
+ <fileset dir="${test.java}">
+ <patternset refid="support.files" />
+@@ -365,6 +382,7 @@
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}"
includes="${castor.jdo.files}">
<classpath refid="build.classpath"/>
+ <exclude name="**/org/exolab/castor/dsml/mozilla/**"/>
- </javac>
- <copy todir="${classes}">
- <fileset dir="${java}">
-@@ -556,6 +556,7 @@
+ <classpath>
+ <fileset dir="${basedir}/newlib"/>
+ </classpath>
+@@ -599,6 +617,7 @@
<include name="${archive.name}.jar" />
</fileset>
</copy>
@@ -218,7 +464,7 @@ Last-Update: 2010-06-26
<copy todir="target/lib">
<fileset dir="${lib}">
<include name="commons-logging.jar" />
-@@ -565,6 +566,7 @@
+@@ -608,6 +627,7 @@
<include name="derby-10.1.2.1.jar" />
</fileset>
</copy>
@@ -226,16 +472,17 @@ Last-Update: 2010-06-26
<zip zipfile="${dist}/${archive.name}-examples.zip" basedir="target" includes="**"/>
</target>
-@@ -596,7 +598,7 @@
+@@ -639,7 +659,8 @@
<replace file="${classes}/MANIFEST.MF" token="$$RELEASE$$" value="${release}"/>
<!-- create Castor XML Only Jar -->
- <jar jarfile="${dist}/${archive.name}-xml.jar" basedir="${classes}"
++ <!--<jar jarfile="${dist}/${archive.name}-xml.jar" basedir="${classes}"-->
+ <jar jarfile="${dist}/castor-xml-${version}.jar" basedir="${classes}"
manifest="${classes}/MANIFEST.MF"
includes="LICENSE,LICENSE.APACHE2,README,
org/castor/messages.properties,
-@@ -870,9 +872,11 @@
+@@ -917,9 +938,11 @@
<copy todir="${build}/${archive.name}/src">
<fileset dir="${source}" />
</copy>
@@ -247,7 +494,7 @@ Last-Update: 2010-06-26
<copy todir="${build}/${archive.name}/bin">
<fileset dir="./bin" includes="*.sh,*.bat"/>
</copy>
-@@ -1049,9 +1053,11 @@
+@@ -1098,9 +1121,11 @@
<include name="${archive.name}-core.jar"/>
</fileset>
</copy>
@@ -259,68 +506,49 @@ Last-Update: 2010-06-26
<!--
<copy todir="${build}/${archive.name}/schema">
<fileset dir="${schema}" />
---- castor-1.3.1.orig/anttask/build.xml
-+++ castor-1.3.1/anttask/build.xml
-@@ -6,7 +6,7 @@
- <property name="main.resources" value="${source}/main/resources" />
- <property name="build" value="${basedir}/build"/>
- <property name="classes" value="${build}/classes"/>
-- <property name="archive" value="${project}-${version}${release}-anttasks"/>
-+ <property name="archive" value="${project}-anttasks-${version}${release}"/>
+diff --git a/xml/build.xml b/xml/build.xml
+index 5a69343..8cae367 100644
+--- a/xml/build.xml
++++ b/xml/build.xml
+@@ -1,5 +1,4 @@
+-<project name="Castor XML - Core module" default="compile" basedir="."
+- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="Castor XML - Core module" default="compile" basedir=".">
- <path id="build.classpath">
- <pathelement location="${basedir}/../build/classes"/>
---- castor-1.3.1.orig/codegen/build.xml
-+++ castor-1.3.1/codegen/build.xml
-@@ -10,7 +10,7 @@
- <property name="build" value="${basedir}/build"/>
- <property name="classes" value="${build}/classes"/>
- <property name="test.classes" value="${build}/test"/>
-- <property name="archive" value="${project}-${version}${release}-codegen"/>
-+ <property name="archive" value="${project}-codegen-${version}${release}"/>
+ <property environment="env" />
+ <property name="source" value="${basedir}/src"/>
+@@ -14,9 +13,11 @@
+ <property name="archive" value="${project}-${version}${release}"/>
<property name="gen.src" value="${build}/generated-sources"/>
- <path id="build.compile.classpath">
-@@ -21,9 +21,9 @@
- <pathelement location="${basedir}/../core/build/classes"/>
-
- <!-- JARs -->
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-- <pathelement location="${basedir}/../lib/velocity-1.5.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
-+ <pathelement location="/usr/share/java/velocity.jar"/>
- </path>
-
- <path id="build.test-compile.classpath">
---- castor-1.3.1.orig/examples/build.xml
-+++ castor-1.3.1/examples/build.xml
-@@ -10,20 +10,20 @@
- <property name="test.resources" value="${source}/test/resources"/>
- <property name="build" value="${basedir}/build"/>
- <property name="classes" value="${build}/classes"/>
-- <property name="archive" value="${project}-${version}${release}-examples"/>
-- <property name="archive-sources" value="${project}-${version}${release}-examples-sources"/>
-+ <property name="archive" value="${project}-examples-${version}${release}"/>
-+ <property name="archive-sources" value="${project}-examples-sources-${version}${release}"/>
-
-- <property name="exampleexcludes" value="codegen/*,**/dax/**"/>
-+ <property name="exampleexcludes" value="codegen/*,**/dax/**,dsml/**"/>
-
++ <!--
+ <artifact:dependencies filesetId="dependency.fileset" useScope="test">
+ <artifact:pom id="core" file="${basedir}/pom.xml" />
+ </artifact:dependencies>
++ -->
+
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
- <pathelement location="${basedir}/../build/classes"/>
- <pathelement location="${basedir}/../core/build/classes"/>
- <pathelement location="${basedir}/../cpa/build/classes"/>
-- <pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
-- <pathelement location="${basedir}/../lib/ldapjdk_4.1.jar"/>
-- <pathelement location="${basedir}/../lib/log4j-1.2.13.jar"/>
-- <pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <!--<pathelement location="${basedir}/../lib/ldapjdk_4.1.jar"/>-->
-+ <pathelement location="/usr/share/java/log4j-1.2.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- </path>
-
- <target name="prepare.examples" unless="prepare.examples.executed">
+@@ -62,18 +63,22 @@
+ <fileset dir="${basedir}/lib"/>
+ </classpath>
+ </javac>
++ <!--
+ <javac srcdir="${main.generated}" destdir="${classes}"
+ debug="on" encoding="ISO-8859-1" deprecation="false"
+ source="1.5" target="1.5">
+ <classpath refid="build.classpath"/>
+ </javac>
++ -->
+ <copy todir="${classes}">
+ <fileset dir="${main.resources}">
+ <include name="**"/>
+ </fileset>
++ <!--
+ <fileset dir="${main.generated}">
+ <include name="**/*.cdr"/>
+ </fileset>
++ -->
+ <filterset begintoken="$$" endtoken="$$">
+ <filter token="VERSION" value="${version}"/>
+ <filter token="RELEASE" value="${release}"/>
diff --git a/debian/patches/fix_maven_metadata.diff b/debian/patches/fix_maven_metadata.diff
index 412704d..d5ff6f7 100644
--- a/debian/patches/fix_maven_metadata.diff
+++ b/debian/patches/fix_maven_metadata.diff
@@ -13,7 +13,7 @@ index decda0d..5e278e3 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-anttasks</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -25,7 +25,7 @@ index 3253f21..71b58db 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-codegen</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -37,7 +37,7 @@ index e06ca21..f8934ec 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-core</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -49,7 +49,7 @@ index 90364eb..19e2ab5 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-jdo</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -61,7 +61,7 @@ index b19418f..3bc7f27 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-ddlgen</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -73,7 +73,7 @@ index 26c907c..b0be80a 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-xml-schema</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
@@ -85,7 +85,7 @@ index e6c7564..7b0ad6d 100644
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-xml</artifactId>
-+ <version>1.3.1</version>
++ <version>1.3.2</version>
<parent>
<groupId>org.codehaus.castor</groupId>
diff --git a/debian/rules b/debian/rules
index ba2f036..78bb96b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
%:
- dh --with javahelper $@
+ dh $@ --with javahelper
override_dh_auto_build:
cd src && ant release
@@ -22,9 +22,9 @@ override_dh_install:
mh_installjar -plibcastor-core-java -l core/pom.xml \
dist/castor-core-$(VERSION).jar
# JDO module
- mh_installpom -plibcastor-jdo-java --no-parent cpa/pom.xml
- mh_installjar -plibcastor-jdo-java -l cpa/pom.xml \
- dist/castor-jdo-$(VERSION).jar
+# mh_installpom -plibcastor-jdo-java --no-parent cpa/pom.xml
+# mh_installjar -plibcastor-jdo-java -l cpa/pom.xml \
+# dist/castor-jdo-$(VERSION).jar
# Codegen module
mh_installpom -plibcastor-codegen-java --no-parent codegen/pom.xml
mh_installjar -plibcastor-codegen-java -l codegen/pom.xml \
@@ -43,7 +43,7 @@ override_dh_install:
dist/castor-xml-schema-$(VERSION).jar
override_dh_auto_clean:
- cd src && ant distclean
+ -cd src && ant distclean
mh_clean
override_jh_manifest:
--
Castor: open source data binding framework written in Java
More information about the pkg-java-commits
mailing list