[castor] Update to latest upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Dec 6 16:45:16 UTC 2011
commit cb27515f1a16b696a67c5571b03c4b33177dcd46
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Tue Dec 6 18:44:40 2011 +0200
Update to latest upstream version.
- Most modules disabled hence all old subpackages are obsolete now.
.gitignore | 1 +
castor-build-xml.patch | 11 ----
castor.spec | 145 ++++++++-------------------------------------
disable-modules.patch | 35 +++++++++++
example-servletapi4.patch | 15 -----
example-servletapi5.patch | 28 ---------
sources | 2 +-
7 files changed, 61 insertions(+), 176 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f16fca4..0548d0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
castor-0.9.5-src.tgz
+/castor-1.3.2-src.tgz
diff --git a/castor.spec b/castor.spec
index 8647129..a951bc8 100644
--- a/castor.spec
+++ b/castor.spec
@@ -1,164 +1,67 @@
Summary: An open source data binding framework for Java
Name: castor
-Version: 0.9.5
-Release: 7%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Epoch: 0
-Group: Development/Libraries/Java
+Group: Development/Libraries
License: BSD and MPLv1.1 and W3C
URL: http://castor.codehaus.org
-Source0: http://dist.codehaus.org/castor/0.9.5/castor-0.9.5-src.tgz
-Patch0: example-servletapi4.patch
-Patch1: example-servletapi5.patch
-Patch2: castor-build-xml.patch
+Source0: http://dist.codehaus.org/castor/1.3.2/castor-1.3.2-src.tgz
+Patch0: disable-modules.patch
BuildArch: noarch
-Requires: adaptx
-Requires: jta
-Requires: ldapjdk
-Requires: log4j
-Requires: jakarta-oro
-Requires: regexp
-Requires: xerces-j2
-BuildRequires: adaptx
-BuildRequires: log4j
-BuildRequires: ant
-BuildRequires: jpackage-utils >= 0:1.5.16
-BuildRequires: jta
-BuildRequires: ldapjdk
-BuildRequires: jakarta-oro
-BuildRequires: regexp
-BuildRequires: xerces-j2
-BuildRequires: servlet25
-BuildRequires: junit
+BuildRequires: maven
+BuildRequires: codehaus-parent
+BuildRequires: maven-enforcer-plugin
+Requires: apache-commons-logging
+Requires: apache-commons-lang
+Obsoletes: castor-demo < 0:1.3.2
+Obsoletes: castor-test < 0:1.3.2
+Obsoletes: castor-xml < 0:1.3.2
+Obsoletes: castor-doc < 0:1.3.2
%description
Castor is an open source data binding framework for Java. It's basically
the shortest path between Java objects, XML documents and SQL tables.
Castor provides Java to XML binding, Java to SQL persistence, and more.
-%package demo
-Group: Development/Java
-Summary: Demo for %{name}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: servlet25
-
-%description demo
-Demonstrations and samples for %{name}.
-
-%package test
-Group: Development/Java
-Summary: Tests for %{name}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: junit
-
-%description test
-Tests for %{name}.
-
-%package xml
-Group: Development/Libraries/Java
-Summary: XML support for %{name}.
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description xml
-XML support for Castor
-
%package javadoc
-Group: Development/Documentation
+Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
Javadoc for %{name}.
-%package doc
-Summary: Documentation for %{name}
-Group: Development/Documentation
-
-%description doc
-Documentation for %{name}.
-
%prep
%setup -q
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.class" -exec rm -f {} \;
-perl -p -i -e 's|org.apache.xerces.utils.regex|org.apache.xerces.impl.xpath.regex|g;' \
-src/main/org/exolab/castor/util/XercesRegExpEvaluator.java
-find . -name "*.java" -exec perl -p -i -e 's|assert\(|assertTrue\(|g;' {} \;
-find . -name "*.java" -exec perl -p -i -e 's|_test.name\(\)|_test.getName\(\)|g;' {} \;
-find src/doc -name "*.xml" -exec perl -p -i -e 's|\222|’|g;' {} \;
-%patch0
-%patch1
-%patch2
-
-# Fix for wrong-file-end-of-line-encoding problem
-for i in `find src/doc -iname "*.css"`; do sed -i 's/\r//' $i; done
-for i in `find src/doc -iname "*.xsd"`; do sed -i 's/\r//' $i; done
-for i in `find src/doc -iname "*.dtd"`; do sed -i 's/\r//' $i; done
-for i in `find src/doc -iname "*.pdf"`; do sed -i 's/\r//' $i; done
-for i in `find src/doc -iname "*.htm"`; do sed -i 's/\r//' $i; echo "" >> $i; done
-sed -i 's/\r//' src/etc/README
-sed -i 's/\r//' src/etc/LICENSE
-sed -i 's/\r//' src/etc/CHANGELOG
+%patch0 -b .sav
+
sed -i 's/Class-Path: xerces.jar jdbc-se2.0.jar jndi.jar jta1.0.1.jar//' src/etc/MANIFEST.MF
%build
-export ANT_OPTS=" -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 "
-export CLASSPATH=%(build-classpath adaptx jta junit ldapjdk oro regexp servlet xerces-j2)
-ant -buildfile src/build.xml jar
-ant -buildfile src/build.xml examples
-ant -buildfile src/build.xml CTFjar
-ant -buildfile src/build.xml javadoc
+mvn-rpmbuild -Dgpg.skip=true -Dmaven.test.skip=true install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 dist/%{name}-%{version}-xml.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml.jar
-install -m 644 dist/CTF-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tests.jar
-
-# examples (demo)
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
-cp -pr build/examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
+install -m 644 core/target/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# do this last, since it will delete all build directories
-export CLASSPATH=%(build-classpath log4j adaptx)
-ant -buildfile src/build.xml doc
-
-# like magic
-%jpackage_script org.exolab.castor.builder.SourceGenerator %{nil} %{nil} xerces-j2:%{name} %{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
-%doc src/etc/{CHANGELOG,LICENSE,README}
-%attr(0755,root,root) %{_bindir}/%{name}
%{_javadir}/%{name}.jar
-%dir %{_datadir}/%{name}
-
-%files demo
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/examples
-
-%files test
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-tests.jar
-
-%files xml
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-xml.jar
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%files doc
-%defattr(-,root,root,-)
-%doc build/doc/*
-
%changelog
+* Tue Dec 6 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.2-1
+- Update to latest upstream version.
+- Most modules disabled hence all old subpackages are obsolete now.
+
* Wed Apr 20 2011 Alexander Kurtakov <akurtako at redhat.com> 0:0.9.5-7
- Update to current guidelines.
- Fix oro deps.
diff --git a/disable-modules.patch b/disable-modules.patch
new file mode 100644
index 0000000..b0a7ae4
--- /dev/null
+++ b/disable-modules.patch
@@ -0,0 +1,35 @@
+--- pom.xml.sav 2011-03-29 12:20:29.000000000 +0300
++++ pom.xml 2011-12-06 16:11:38.921384769 +0200
+@@ -14,26 +14,26 @@
+
+ <modules>
+ <module>core</module>
+- <module>xml</module>
++ <!-- module>xml</module>
+ <module>schema</module>
+- <module>codegen</module>
+- <module>ddlgen</module>
++ <module>codegen</module>-->
++ <!-- module>ddlgen</module>
+ <module>anttask</module>
+ <module>cpa</module>
+
+ <module>diff</module>
+ <module>xmlctf-framework</module>
+
+- <module>maven-plugins</module>
++ <module>maven-plugins</module>-->
+
+ <!-- <module>cpa-testcase-archetype</module> -->
+ <!-- <module>codegen-testcase-archetype</module> -->
+
+ <!-- integration test suites -->
+- <module>cpactf</module>
++ <!-- module>cpactf</module>
+ <module>jpa-extensions-it</module>
+
+- <module>xmlctf</module>
++ <module>xmlctf</module>-->
+
+ <!-- re-enable once properly integrated -->
+ <!-- module>fragmentmapper</module> -->
diff --git a/sources b/sources
index 489a484..7813083 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15c42a9f62d2dd82279ddfb3c1f17119 castor-0.9.5-src.tgz
+3c7fd944af8bc4d72b36561e2bdcebc2 castor-1.3.2-src.tgz
More information about the scm-commits
mailing list