[pkg-java] r4674 - in trunk/libjboss-aop-java/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Fri Nov 9 20:58:31 UTC 2007


Author: varun-guest
Date: 2007-11-09 20:58:30 +0000 (Fri, 09 Nov 2007)
New Revision: 4674

Added:
   trunk/libjboss-aop-java/debian/patches/
   trunk/libjboss-aop-java/debian/patches/catch_exception.diff
   trunk/libjboss-aop-java/debian/patches/series
Modified:
   trunk/libjboss-aop-java/debian/ant.properties
   trunk/libjboss-aop-java/debian/build.xml
   trunk/libjboss-aop-java/debian/control
   trunk/libjboss-aop-java/debian/rules
Log:
* Add Build-Depends
* Builds now.


Modified: trunk/libjboss-aop-java/debian/ant.properties
===================================================================
--- trunk/libjboss-aop-java/debian/ant.properties	2007-11-09 20:57:51 UTC (rev 4673)
+++ trunk/libjboss-aop-java/debian/ant.properties	2007-11-09 20:58:30 UTC (rev 4674)
@@ -2,10 +2,10 @@
 class.dir=classes
 source.dir=src
 
-aspect-deployer.dir=aspect-deployer
 aspect-framework.dir=aspect-framework
 aspects.dir=aspects
+aspect-deployer.dir=aspect-deployer
 
-aspect-deployer.jar=aspect-deployer.jar
-aspect-framework.jar=aspect-framework.jar
-aspects.jar=aspects.jar
+aspect-framework.jar=jboss-aop.jar
+aspects.jar=jboss-aspects.jar
+aspect-deployer.jar=jboss-aspect-deployer.jar

Modified: trunk/libjboss-aop-java/debian/build.xml
===================================================================
--- trunk/libjboss-aop-java/debian/build.xml	2007-11-09 20:57:51 UTC (rev 4673)
+++ trunk/libjboss-aop-java/debian/build.xml	2007-11-09 20:58:30 UTC (rev 4674)
@@ -3,9 +3,9 @@
 <project default="jar" name="${project.name}" basedir="..">
 
   <target name="clean">
-    <delete dir="${aspects.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${aspect-framework.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${aspects-deployer.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${source.dir}/${aspects.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${source.dir}/${aspect-framework.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${source.dir}/${aspects-deployer.dir}/${class.dir}" quiet="true"/>
     <delete file="${aspects.jar}" quiet="true"/>
     <delete file="${aspect-framework.jar}" quiet="true"/>
     <delete file="${aspect-deployer.jar}" quiet="true"/>

Modified: trunk/libjboss-aop-java/debian/control
===================================================================
--- trunk/libjboss-aop-java/debian/control	2007-11-09 20:57:51 UTC (rev 4673)
+++ trunk/libjboss-aop-java/debian/control	2007-11-09 20:58:30 UTC (rev 4674)
@@ -3,8 +3,14 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt
+Build-Depends-Indep: ant, java-gcj-compat-dev, libjavassist-java (>= 3.6), 
+ libtrove-java, libqdox-java, junit, libcommons-logging-java,
+ liblog4j1.2-java, bsh, libservlet2.4-java, libjboss-common-java,
+ libjboss-j2ee-java, libjboss-deployment-java, libjboss-test-java,
+ libjboss-remoting-java, libjboss-microcontainer-java,
+ libjboss-jmx-java, libjboss-system-java, libjboss-transaction-java,
+ libjboss-ejb3x-java
 Standards-Version: 3.7.2
 Homepage: http://labs.jboss.com/jbossaop/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-aop-java

Added: trunk/libjboss-aop-java/debian/patches/catch_exception.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/catch_exception.diff	                        (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/catch_exception.diff	2007-11-09 20:58:30 UTC (rev 4674)
@@ -0,0 +1,15 @@
+Index: libjboss-aop-java-2.0.0.beta2/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java
+===================================================================
+--- libjboss-aop-java-2.0.0.beta2.orig/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java	2007-11-10 01:33:55.000000000 +0530
++++ libjboss-aop-java-2.0.0.beta2/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java	2007-11-10 01:34:16.000000000 +0530
+@@ -44,7 +44,9 @@
+    static
+    {
+       //Make sure that the beanshell can access private fields and variables
+-      Capabilities.setAccessibility(true);      
++       try{
++	   Capabilities.setAccessibility(true);      
++       } catch (Exception e){}
+    }
+ 
+    //Map of valid java identifiers to the original $tgt, $ret, $0, $1, $2 etc. 

Added: trunk/libjboss-aop-java/debian/patches/series
===================================================================
--- trunk/libjboss-aop-java/debian/patches/series	                        (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/series	2007-11-09 20:58:30 UTC (rev 4674)
@@ -0,0 +1 @@
+catch_exception.diff

Modified: trunk/libjboss-aop-java/debian/rules
===================================================================
--- trunk/libjboss-aop-java/debian/rules	2007-11-09 20:57:51 UTC (rev 4673)
+++ trunk/libjboss-aop-java/debian/rules	2007-11-09 20:58:30 UTC (rev 4674)
@@ -2,18 +2,21 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= javassist trove qdox ant junit commons-logging bsh log4j-1.2 servlet-api\
-			   jboss-common jboss-j2ee libjboss-profiler-java concurrent jboss-deployment\
-			   jboss-test jboss-remoting jbossha jboss-microcontainer jboss-jmx\
-			   jboss-system jbosssx-client jboss-transaction jboss-ejb3x jboss-container
+DEB_JARS		:= javassist trove qdox junit commons-logging bsh log4j-1.2 servlet-api\
+			   jboss-common jboss-j2ee concurrent jboss-deployment jboss-test \
+			   jboss-remoting jboss-microcontainer jboss-jmx jboss-system \
+			   jboss-transaction jboss-ejb3x jboss-container
 
 install/libjboss-aop-java::
 	install -m 644 -D jboss-aop.jar $(DEB_DESTDIR)/usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jboss-aop.jar
+	install -m 644 -D jboss-aspects.jar $(DEB_DESTDIR)/usr/share/java/jboss-aspects-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/jboss-aspects-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jboss-aspects.jar
 
 get-orig-source:
 	-uscan --upstream-version 0




More information about the pkg-java-commits mailing list