Author: nomadium-guest
Date: 2010-07-04 22:58:10 +0000 (Sun, 04 Jul 2010)
New Revision: 12726
Added:
trunk/libspring-java/debian/patches/0005_commonj.diff
Removed:
trunk/libspring-java/debian/patches/0005_no_commonj.diff
Modified:
trunk/libspring-java/debian/build-classpath
trunk/libspring-java/debian/control
trunk/libspring-java/debian/patches/series
Log:
* Fix dependencies on castor.
* Enable support for CommonJ API.
Modified: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath 2010-07-04 11:03:50 UTC (rev
12725)
+++ trunk/libspring-java/debian/build-classpath 2010-07-04 22:58:10 UTC (rev
12726)
@@ -15,7 +15,6 @@
/usr/share/java/backport-util-concurrent.jar
/usr/share/java/bsh.jar
/usr/share/java/c3p0.jar
-# FIX #581862
/usr/share/java/castor-core.jar
/usr/share/java/castor-xml.jar
/usr/share/java/catalina.jar
Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control 2010-07-04 11:03:50 UTC (rev 12725)
+++ trunk/libspring-java/debian/control 2010-07-04 22:58:10 UTC (rev 12726)
@@ -208,7 +208,7 @@
Package: libspring-oxm-java
Architecture: all
Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}),
libspring-beans-java (= ${source:Version}), libspring-context-java (=
${source:Version})
-Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-java
+Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java,
libcastor-xml-java
Description: modular Java/J2EE application framework - Object/XML Mapping
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
@@ -220,7 +220,7 @@
Package: libspring-instrument-java
Architecture: all
Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}),
libspring-beans-java (= ${source:Version}), libspring-context-java (=
${source:Version})
-Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-java
+Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java,
libcastor-xml-java
Description: modular Java/J2EE application framework - Instrumentation
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
Copied: trunk/libspring-java/debian/patches/0005_commonj.diff (from rev 12725,
trunk/libspring-java/debian/patches/0005_no_commonj.diff)
===================================================================
--- trunk/libspring-java/debian/patches/0005_commonj.diff
(rev 0)
+++ trunk/libspring-java/debian/patches/0005_commonj.diff 2010-07-04
22:58:10 UTC (rev 12726)
@@ -0,0 +1,52 @@
+Description: Compatibility with CommonJ API provided by Geronimo project
+ The references to the Work related exceptions are disabled because the
+ build fails and the compiler emit messages like this:
+ "Unreachable catch block for WorkException. This exception is never thrown
+ from the try statement body".
+Author: Miguel Landaeta <[email protected]>
+Last-Update: 2010-07-04
+Forwarded: no
+
+---
libspring-java-3.0.3.RELEASE.orig/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
++++
libspring-java-3.0.3.RELEASE/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+@@ -146,20 +146,22 @@ public class WorkManagerTaskExecutor ext
+ public void execute(Runnable task) {
+ Assert.state(this.workManager != null, "No WorkManager
specified");
+ Work work = new DelegatingWork(task);
+- try {
++ //try {
+ if (this.workListener != null) {
+ this.workManager.schedule(work,
this.workListener);
+ }
+ else {
+ this.workManager.schedule(work);
+ }
+- }
++ //}
++ /*
+ catch (WorkRejectedException ex) {
+ throw new TaskRejectedException("CommonJ WorkManager
did not accept task: " + task, ex);
+ }
+ catch (WorkException ex) {
+ throw new SchedulingException("Could not schedule task
on CommonJ WorkManager", ex);
+ }
++ */
+ }
+
+ public void execute(Runnable task, long startTimeout) {
+@@ -191,13 +193,13 @@ public class WorkManagerTaskExecutor ext
+
//-------------------------------------------------------------------------
+
+ public WorkItem schedule(Work work)
+- throws WorkException, IllegalArgumentException {
++ throws IllegalArgumentException {
+
+ return this.workManager.schedule(work);
+ }
+
+ public WorkItem schedule(Work work, WorkListener workListener)
+- throws WorkException, IllegalArgumentException {
++ throws IllegalArgumentException {
+
+ return this.workManager.schedule(work, workListener);
+ }
Deleted: trunk/libspring-java/debian/patches/0005_no_commonj.diff
===================================================================
--- trunk/libspring-java/debian/patches/0005_no_commonj.diff 2010-07-04
11:03:50 UTC (rev 12725)
+++ trunk/libspring-java/debian/patches/0005_no_commonj.diff 2010-07-04
22:58:10 UTC (rev 12726)
@@ -1,22 +0,0 @@
-Description: BEA CommonJ is non-free (remove it)
-Author: Damien Raude-Morvan <[email protected]>
-Last-Update: 2010-06-20
-Forwarded: not-needed
---- a/projects/org.springframework.context.support/build.xml
-+++ b/projects/org.springframework.context.support/build.xml
-@@ -4,4 +4,15 @@
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
- <import file="${basedir}/../spring-build/standard/default.xml"/>
-+
-+ <macrodef name="pre-compile">
-+ <attribute name="classpath.id"/>
-+ <attribute name="input.dir"/>
-+ <attribute name="output.dir"/>
-+ <attribute name="resources.dir"/>
-+ <sequential>
-+ <delete
dir="${basedir}/src/main/java/org/springframework/scheduling/commonj"/>
-+ </sequential>
-+ </macrodef>
-+
- </project>
Modified: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series 2010-07-04 11:03:50 UTC (rev
12725)
+++ trunk/libspring-java/debian/patches/series 2010-07-04 22:58:10 UTC (rev
12726)
@@ -2,7 +2,7 @@
0002_ivy_dependencies.diff
0003_no_ibm_websphere.diff
0004_no_derby_db.diff
-0005_no_commonj.diff
+0005_commonj.diff
0006_aspectj_classpath.diff
0007_no_jruby.diff
0008_jpa_20_api.diff
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
