[pkg-java] r12722 - in trunk/libspring-java/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2010-07-02 03:42:42 +0000 (Fri, 02 Jul 2010)
New Revision: 12722

Added:
   trunk/libspring-java/debian/patches/0007_no_jruby.diff
Modified:
   trunk/libspring-java/debian/build-classpath
   trunk/libspring-java/debian/control
   trunk/libspring-java/debian/patches/series
Log:
Trying to build libspring-java:
* Add Build-Depends on libdom4j.java. It is needed for ORM module.
* Add patch to disable JRuby features in context module.


Modified: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath	2010-07-01 23:18:38 UTC (rev 12721)
+++ trunk/libspring-java/debian/build-classpath	2010-07-02 03:42:42 UTC (rev 12722)
@@ -26,11 +26,11 @@
 /usr/share/java/commons-httpclient.jar
 /usr/share/java/commons-logging.jar
 /usr/share/java/commons-pool.jar
+/usr/share/java/dom4j.jar
 /usr/share/java/eclipselink.jar
 /usr/share/java/ehcache.jar
 /usr/share/java/el-api-2.1.jar
 /usr/share/java/freemarker.jar
-# TODO: package libgeronimo-commonj-spec-java
 /usr/share/java/geronimo-commonj-spec.jar
 /usr/share/java/geronimo-ejb-3.0-spec.jar
 /usr/share/java/geronimo-interceptor-3.0-spec.jar

Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control	2010-07-01 23:18:38 UTC (rev 12721)
+++ trunk/libspring-java/debian/control	2010-07-02 03:42:42 UTC (rev 12722)
@@ -7,9 +7,10 @@
 Build-Depends-Indep: maven-repo-helper, ivy, spring-build-scripts,
  aspectj, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials,
  groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java,
- libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-java, libcglib-java, libcommons-beanutils-java,
- libcommons-collections3-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-logging-java,
- libcommons-pool-java, libecj-java, libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java,
+ libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-core-java, libcastor-xml-java,
+ libcglib-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java,
+ libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java,
+ libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java,
  libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java,
  libgeronimo-jms-1.1-spec-java, libgeronimo-jpa-2.0-spec-java, libgeronimo-validation-1.0-spec-java, libhessian-java,
  libhibernate3-java (>= 3.5), libibatis-java, libitext-java, libjackson-json-java, libjakarta-poi-java,
@@ -184,7 +185,7 @@
 Package: libspring-orm-java
 Architecture: all
 Depends: ${misc:Depends}, libspring-jdbc-java (= ${source:Version})
-Recommends: libspring-web-java (= ${source:Version}), libjdo-api-java (>= 2.2), glassfish-toplink-essentials, libibatis-java, libhibernate3-java (>= 3.5)
+Recommends: libspring-web-java (= ${source:Version}), libjdo-api-java (>= 2.2), glassfish-toplink-essentials, libibatis-java, libhibernate3-java (>= 3.5), libdom4j-java
 Description: modular Java/J2EE application framework - ORM tools
  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

Added: trunk/libspring-java/debian/patches/0007_no_jruby.diff
===================================================================
--- trunk/libspring-java/debian/patches/0007_no_jruby.diff	                        (rev 0)
+++ trunk/libspring-java/debian/patches/0007_no_jruby.diff	2010-07-02 03:42:42 UTC (rev 12722)
@@ -0,0 +1,23 @@
+Description: JRuby is not available in main yet
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: not-needed
+Last-Update: 2010-07-01
+
+--- libspring-java-3.0.3.RELEASE.orig/projects/org.springframework.context/build.xml
++++ libspring-java-3.0.3.RELEASE/projects/org.springframework.context/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/scripting/jruby"/>
++		</sequential>
++	</macrodef>
++
+ </project>

Modified: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series	2010-07-01 23:18:38 UTC (rev 12721)
+++ trunk/libspring-java/debian/patches/series	2010-07-02 03:42:42 UTC (rev 12722)
@@ -4,3 +4,4 @@
 0004_no_derby_db.diff
 #0005_no_commonj.diff
 0006_aspectj_classpath.diff
+0007_no_jruby.diff