[pkg-java] r14101 - in trunk/libjboss-aop-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Mon Aug 8 19:55:43 UTC 2011
Author: twerner
Date: 2011-08-08 19:55:43 +0000 (Mon, 08 Aug 2011)
New Revision: 14101
Added:
trunk/libjboss-aop-java/debian/patches/0001-add-class-org.jboss.lang.Enum.patch
trunk/libjboss-aop-java/debian/patches/0002-catch-exception-in-class-Condition.patch
trunk/libjboss-aop-java/debian/patches/0003-add-method-createDocletTag-required-by-qdox.patch
Removed:
trunk/libjboss-aop-java/debian/patches/catch_exception.diff
trunk/libjboss-aop-java/debian/patches/enum.diff
trunk/libjboss-aop-java/debian/patches/qdox.diff
Modified:
trunk/libjboss-aop-java/debian/changelog
trunk/libjboss-aop-java/debian/patches/series
trunk/libjboss-aop-java/debian/watch
Log:
* Update debian/watch.
* Reformat patches.
Modified: trunk/libjboss-aop-java/debian/changelog
===================================================================
--- trunk/libjboss-aop-java/debian/changelog 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/changelog 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,3 +1,10 @@
+libjboss-aop-java (2.0.1.GA-2) unstable; urgency=low
+
+ * Update debian/watch.
+ * Reformat patches.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 08 Aug 2011 21:49:17 +0200
+
libjboss-aop-java (2.0.1.GA-1) unstable; urgency=low
* New upstream release
Added: trunk/libjboss-aop-java/debian/patches/0001-add-class-org.jboss.lang.Enum.patch
===================================================================
--- trunk/libjboss-aop-java/debian/patches/0001-add-class-org.jboss.lang.Enum.patch (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/0001-add-class-org.jboss.lang.Enum.patch 2011-08-08 19:55:43 UTC (rev 14101)
@@ -0,0 +1,87 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 8 Aug 2011 21:39:30 +0200
+Subject: [PATCH] add class org.jboss.lang.Enum
+
+---
+ src/aspect-framework/main/org/jboss/lang/Enum.java | 71 ++++++++++++++++++++
+ 1 files changed, 71 insertions(+), 0 deletions(-)
+ create mode 100644 src/aspect-framework/main/org/jboss/lang/Enum.java
+
+diff --git a/src/aspect-framework/main/org/jboss/lang/Enum.java b/src/aspect-framework/main/org/jboss/lang/Enum.java
+new file mode 100644
+index 0000000..0c2cb6b
+--- /dev/null
++++ b/src/aspect-framework/main/org/jboss/lang/Enum.java
+@@ -0,0 +1,71 @@
++/*
++ * JBoss, Home of Professional Open Source
++ * Copyright 2005, JBoss Inc., and individual contributors as indicated
++ * by the @authors tag. See the copyright.txt in the distribution for a
++ * full listing of individual contributors.
++ *
++ * This is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2.1 of
++ * the License, or (at your option) any later version.
++ *
++ * This software is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this software; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
++ */
++package org.jboss.lang;
++
++/**
++ * Base class for JDK 1.4 Enums
++ *
++ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
++ * @version $Revision: 37406 $
++ *
++ **/
++public abstract class Enum implements java.io.Serializable
++{
++ protected final transient String name;
++ protected final int ordinal;
++
++ protected Enum(String name, int ordinal)
++ {
++ this.name = name;
++ this.ordinal = ordinal;
++ }
++ public String toString()
++ {
++ return name;
++ }
++
++ public String name()
++ {
++ return name;
++ }
++
++ public int ordinal()
++ {
++ return ordinal;
++ }
++
++ public boolean equals(Object o)
++ {
++ if (o == this) return true;
++ if (o == null) return false;
++ if (!(o instanceof Enum)) return false;
++ if (!o.getClass().equals(this.getClass())) return false;
++ Enum en = (Enum)o;
++ return en.ordinal == this.ordinal;
++ }
++
++ public int hashCode()
++ {
++ return name.hashCode();
++ }
++
++}
+--
Added: trunk/libjboss-aop-java/debian/patches/0002-catch-exception-in-class-Condition.patch
===================================================================
--- trunk/libjboss-aop-java/debian/patches/0002-catch-exception-in-class-Condition.patch (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/0002-catch-exception-in-class-Condition.patch 2011-08-08 19:55:43 UTC (rev 14101)
@@ -0,0 +1,24 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 8 Aug 2011 21:39:30 +0200
+Subject: [PATCH] catch exception in class Condition
+
+---
+ .../org/jboss/aspects/dbc/condition/Condition.java | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java b/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java
+index 5431585..814b42b 100644
+--- a/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java
++++ b/src/aspects/main/org/jboss/aspects/dbc/condition/Condition.java
+@@ -44,7 +44,9 @@ public abstract class Condition
+ 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/0003-add-method-createDocletTag-required-by-qdox.patch
===================================================================
--- trunk/libjboss-aop-java/debian/patches/0003-add-method-createDocletTag-required-by-qdox.patch (rev 0)
+++ trunk/libjboss-aop-java/debian/patches/0003-add-method-createDocletTag-required-by-qdox.patch 2011-08-08 19:55:43 UTC (rev 14101)
@@ -0,0 +1,31 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 8 Aug 2011 21:39:30 +0200
+Subject: [PATCH] add method createDocletTag() required by qdox
+
+---
+ .../compiler/AnnotationDocletTagFactory.java | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java b/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
+index 982e80f..e875680 100644
+--- a/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
++++ b/src/aspect-framework/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
+@@ -24,6 +24,7 @@ package org.jboss.aop.annotation.compiler;
+ 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 @@ public class AnnotationDocletTagFactory implements DocletTagFactory
+ {
+ return new AnnotationDocletTag(tag, text);
+ }
++
++ public DocletTag createDocletTag(String s1, String s2, AbstractBaseJavaEntity arg2, int arg3)
++ {
++ return new AnnotationDocletTag(s1, s2);
++ }
+ }
+--
Deleted: trunk/libjboss-aop-java/debian/patches/catch_exception.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/catch_exception.diff 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/patches/catch_exception.diff 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,15 +0,0 @@
-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.
Deleted: trunk/libjboss-aop-java/debian/patches/enum.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/enum.diff 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/patches/enum.diff 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,76 +0,0 @@
-Index: libjboss-aop-java-2.0.0.GA/src/aspect-framework/main/org/jboss/lang/Enum.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libjboss-aop-java-2.0.0.GA/src/aspect-framework/main/org/jboss/lang/Enum.java 2007-01-17 18:57:00.000000000 +0100
-@@ -0,0 +1,71 @@
-+/*
-+ * JBoss, Home of Professional Open Source
-+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
-+ * by the @authors tag. See the copyright.txt in the distribution for a
-+ * full listing of individual contributors.
-+ *
-+ * This is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU Lesser General Public License as
-+ * published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this software; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-+ */
-+package org.jboss.lang;
-+
-+/**
-+ * Base class for JDK 1.4 Enums
-+ *
-+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
-+ * @version $Revision: 37406 $
-+ *
-+ **/
-+public abstract class Enum implements java.io.Serializable
-+{
-+ protected final transient String name;
-+ protected final int ordinal;
-+
-+ protected Enum(String name, int ordinal)
-+ {
-+ this.name = name;
-+ this.ordinal = ordinal;
-+ }
-+ public String toString()
-+ {
-+ return name;
-+ }
-+
-+ public String name()
-+ {
-+ return name;
-+ }
-+
-+ public int ordinal()
-+ {
-+ return ordinal;
-+ }
-+
-+ public boolean equals(Object o)
-+ {
-+ if (o == this) return true;
-+ if (o == null) return false;
-+ if (!(o instanceof Enum)) return false;
-+ if (!o.getClass().equals(this.getClass())) return false;
-+ Enum en = (Enum)o;
-+ return en.ordinal == this.ordinal;
-+ }
-+
-+ public int hashCode()
-+ {
-+ return name.hashCode();
-+ }
-+
-+}
Deleted: trunk/libjboss-aop-java/debian/patches/qdox.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/qdox.diff 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/patches/qdox.diff 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,21 +0,0 @@
-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 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/patches/series 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,3 +1,3 @@
-enum.diff
-catch_exception.diff
-qdox.diff
+0001-add-class-org.jboss.lang.Enum.patch
+0002-catch-exception-in-class-Condition.patch
+0003-add-method-createDocletTag-required-by-qdox.patch
Modified: trunk/libjboss-aop-java/debian/watch
===================================================================
--- trunk/libjboss-aop-java/debian/watch 2011-08-08 19:26:13 UTC (rev 14100)
+++ trunk/libjboss-aop-java/debian/watch 2011-08-08 19:55:43 UTC (rev 14101)
@@ -1,4 +1,5 @@
version=3
opts="uversionmangle=s{\.(alpha|beta)}{~$1}" \
- http://labs.jboss.com/jbossaop/ .*jboss-aop-(.*)\.zip debian debian/orig-tar.sh
+ http://www.jboss.org/jbossaop/downloads/jboss-aop-(.*).zip \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list