[pkg-java] r10472 - in trunk/libjboss-aop-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri Sep 18 11:23:47 UTC 2009
Author: twerner
Date: 2009-09-18 11:23:47 +0000 (Fri, 18 Sep 2009)
New Revision: 10472
Added:
trunk/libjboss-aop-java/debian/ant.properties
trunk/libjboss-aop-java/debian/build.xml
trunk/libjboss-aop-java/debian/patches/catch_exception.diff
trunk/libjboss-aop-java/debian/patches/qdox.diff
Removed:
trunk/libjboss-aop-java/debian/patches/build.diff
Modified:
trunk/libjboss-aop-java/debian/changelog
trunk/libjboss-aop-java/debian/patches/series
trunk/libjboss-aop-java/debian/rules
Log:
go back to version 2.0.*
Added: trunk/libjboss-aop-java/debian/ant.properties
===================================================================
--- trunk/libjboss-aop-java/debian/ant.properties (rev 0)
+++ trunk/libjboss-aop-java/debian/ant.properties 2009-09-18 11:23:47 UTC (rev 10472)
@@ -0,0 +1,11 @@
+project.name=jboss-aop
+class.dir=classes
+source.dir=src
+
+aspect-framework.dir=aspect-framework
+aspects.dir=aspects
+aspect-deployer.dir=aspect-deployer
+
+aspect-framework.jar=jboss-aop.jar
+aspects.jar=jboss-aspects.jar
+aspect-deployer.jar=jboss-aspect-deployer.jar
Added: trunk/libjboss-aop-java/debian/build.xml
===================================================================
--- trunk/libjboss-aop-java/debian/build.xml (rev 0)
+++ trunk/libjboss-aop-java/debian/build.xml 2009-09-18 11:23:47 UTC (rev 10472)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="${project.name}" basedir="..">
+
+ <target name="clean">
+ <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"/>
+ </target>
+
+ <target name="jar">
+ <mkdir dir="${source.dir}/${aspect-framework.dir}/${class.dir}"/>
+ <jjtree target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/pointcut.jjt"
+ javacchome="/usr/share/java/"
+ outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
+ <javacc target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/pointcut.jj"
+ javacchome="/usr/share/java/" static="false" debugparser="true"
+ outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
+ <jjtree target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/typeExpression.jjt"
+ javacchome="/usr/share/java/"
+ outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
+ <javacc target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/typeExpression.jj"
+ javacchome="/usr/share/java/" static="false" debugparser="true"
+ outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
+ <javac srcdir="${source.dir}/${aspect-framework.dir}/main"
+ destdir="${source.dir}/${aspect-framework.dir}/${class.dir}"
+ debug="true" source="1.5" nowarn="true"/>
+
+ <jar jarfile="${aspect-framework.jar}">
+ <fileset dir="${source.dir}/${aspect-framework.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+<!-- <mkdir dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"/> -->
+<!-- <javac srcdir="${source.dir}/${aspect-deployer.dir}/main" destdir="${source.dir}/${aspect-deployer.dir}/${class.dir}" -->
+<!-- debug="true" source="1.5" classpath="${aspect-framework.jar}" /> -->
+
+<!-- <jar jarfile="${aspect-deployer.jar}"> -->
+<!-- <fileset dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"> -->
+<!-- <include name="**"/> -->
+<!-- </fileset> -->
+<!-- </jar> -->
+
+ <mkdir dir="${source.dir}/${aspects.dir}/${class.dir}"/>
+ <javac srcdir="${source.dir}/${aspects.dir}/main" destdir="${source.dir}/${aspects.dir}/${class.dir}"
+ debug="true" source="1.5" classpath="${aspect-framework.jar}"/>
+
+ <jar jarfile="${aspect-framework.jar}">
+ <fileset dir="${source.dir}/${aspect-framework.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="${source.dir}/${aspects.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+ </target>
+</project>
Modified: trunk/libjboss-aop-java/debian/changelog
===================================================================
--- trunk/libjboss-aop-java/debian/changelog 2009-09-18 08:09:42 UTC (rev 10471)
+++ trunk/libjboss-aop-java/debian/changelog 2009-09-18 11:23:47 UTC (rev 10472)
@@ -1,15 +1,14 @@
-libjboss-aop-java (2.1.3.GA-1) unstable; urgency=low
+libjboss-aop-java (2.0.1.GA-1) unstable; urgency=low
- UNRELEASED
- * new upstream version (Closes: #543073)
+ * New upstream release
+ * Disable compiler warnings.
+ * Add patch qdox.diff thanks to Luke Cycon. (Closes: #543073)
* Switch to default-java.
- * Use upstream provided build.xml.
- * Install jboss-aop-client.jar, too.
- * Remove unneeded patch catch-exception.diff.
* Update Standards-Version: 3.8.3.
* Change Section: java.
+ * Improve get-orig-source target in debian/rules.
- -- Torsten Werner <twerner at debian.org> Tue, 08 Sep 2009 21:36:31 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 18 Sep 2009 13:17:03 +0200
libjboss-aop-java (2.0.0.SP1-1) unstable; urgency=low
Deleted: trunk/libjboss-aop-java/debian/patches/build.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/build.diff 2009-09-18 08:09:42 UTC (rev 10471)
+++ trunk/libjboss-aop-java/debian/patches/build.diff 2009-09-18 11:23:47 UTC (rev 10472)
@@ -1,21 +0,0 @@
-TODO: pluggable-instrumentor does not build for unknown reasons
-
-Index: libjboss-aop-java-2.1.3.GA/build.xml
-===================================================================
---- libjboss-aop-java-2.1.3.GA.orig/build.xml 2009-09-08 21:27:11.000000000 +0200
-+++ libjboss-aop-java-2.1.3.GA/build.xml 2009-09-08 21:27:36.000000000 +0200
-@@ -150,14 +150,6 @@
- <fileset file="docs/jboss-aop_1_0.dtd"/>
- <fileset file ="${build.etc}/jbossorg-eula.txt"/>
- </jar>
-- <jar jarfile="${build.lib}/pluggable-instrumentor.jar"
-- manifest="${build.etc}/pluggable-instrumentor.mf">
-- <fileset dir="${build.classes}">
-- <!-- Include everything else -->
-- <include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
-- </fileset>
-- <fileset file ="${build.etc}/jbossorg-eula.txt"/>
-- </jar>
- <!-- Build the jboss-aop-client.jar needed for EJB 3-->
- <jar jarfile="${build.lib}/jboss-aop-client.jar"
- manifest="${build.etc}/default.mf">
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 2009-09-18 11:23:47 UTC (rev 10472)
@@ -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/qdox.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/qdox.diff (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/qdox.diff 2009-09-18 11:23:47 UTC (rev 10472)
@@ -0,0 +1,21 @@
+diff -urNad libjboss-aop-java-2.0.0.SP1.orig/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java libjboss-aop-java-2.0.0.SP1/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
+--- libjboss-aop-java-2.0.0.SP1.orig/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java 2009-08-25 13:23:04.000000000 -0700
++++ libjboss-aop-java-2.0.0.SP1/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java 2009-08-25 13:19:07.000000000 -0700
+@@ -24,6 +24,7 @@
+ import com.thoughtworks.qdox.model.AbstractJavaEntity;
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.DocletTagFactory;
++import com.thoughtworks.qdox.model.AbstractBaseJavaEntity;
+
+ /**
+ * Comment
+@@ -45,4 +46,9 @@
+ {
+ return new AnnotationDocletTag(tag, text);
+ }
++
++ public DocletTag createDocletTag(String s1, String s2, AbstractBaseJavaEntity arg2, int arg3)
++ {
++ return new AnnotationDocletTag(s1, s2);
++ }
+ }
Modified: trunk/libjboss-aop-java/debian/patches/series
===================================================================
--- trunk/libjboss-aop-java/debian/patches/series 2009-09-18 08:09:42 UTC (rev 10471)
+++ trunk/libjboss-aop-java/debian/patches/series 2009-09-18 11:23:47 UTC (rev 10472)
@@ -1,2 +1,3 @@
enum.diff
-build.diff
+catch_exception.diff
+qdox.diff
Modified: trunk/libjboss-aop-java/debian/rules
===================================================================
--- trunk/libjboss-aop-java/debian/rules 2009-09-18 08:09:42 UTC (rev 10471)
+++ trunk/libjboss-aop-java/debian/rules 2009-09-18 11:23:47 UTC (rev 10472)
@@ -5,17 +5,16 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jars15
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := javassist trove qdox junit javacc ant-nodeps bsh log4j-1.2 servlet-api\
jboss-common jboss-j2ee concurrent jboss-deployment jboss-test commons-logging \
jboss-remoting jboss-microcontainer jboss-jmx jboss-system jboss-transaction \
jboss-ejb3x jboss-reflect jboss-metadata
install/libjboss-aop-java::
- install -m 644 -D output/lib/jboss-aop.jar $(DEB_DESTDIR)/usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar
+ 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 output/lib/jboss-aop-client.jar $(DEB_DESTDIR)/usr/share/java/jboss-aop-client-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/jboss-aop-client-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jboss-aop-client.jar
get-orig-source:
- -uscan --upstream-version 0
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
More information about the pkg-java-commits
mailing list