[jboss-cvs] Repository SVN: r28543 - in jboss/aop: 2.1.4.GA-brew and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 12 11:04:58 EDT 2009


Author: fnasser at redhat.com
Date: 2009-08-12 11:04:57 -0400 (Wed, 12 Aug 2009)
New Revision: 28543

Added:
   jboss/aop/2.1.4.GA-brew/
   jboss/aop/2.1.4.GA-brew/component-info.xml
   jboss/aop/2.1.4.GA-brew/lib/
   jboss/aop/2.1.4.GA-brew/lib/jboss-aop-aspects.jar
   jboss/aop/2.1.4.GA-brew/lib/jboss-aop-client.jar
   jboss/aop/2.1.4.GA-brew/lib/jboss-aop.jar
   jboss/aop/2.1.4.GA-brew/lib/pluggable-instrumentor.jar
   jboss/aop/2.1.4.GA-brew/src/
   jboss/aop/2.1.4.GA-brew/src/jboss-aop-2.1.4.tar.gz
   jboss/aop/2.1.4.GA-brew/src/jboss-aop-jpp-depmap.xml
   jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-disable-integration.patch
   jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-maven-version.patch
   jboss/aop/2.1.4.GA-brew/src/jboss-aop-settings.xml
   jboss/aop/2.1.4.GA-brew/src/jboss-aop2-SystemOutLoggerPlugin.patch
Log:
JBPAPP-2414 - Upgrade JBoss AOP to 2.1.4.GA in EAP

Added: jboss/aop/2.1.4.GA-brew/component-info.xml
===================================================================
--- jboss/aop/2.1.4.GA-brew/component-info.xml	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/component-info.xml	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="">
+  <component id="jboss/aop"
+             licenseType=""
+             version="2.1.4.GA-brew"
+             tag="jboss-aop2-2_1_4-1_ep5_el4"
+             description=""
+             
+             > 
+              
+    <artifact id="jboss-aop.jar"/>
+    <artifact id="pluggable-instrumentor.jar"/>
+    <artifact id="jboss-aop-client.jar"/>
+    <artifact id="jboss-aop-aspects.jar"/>
+
+
+    <export>
+      <include input="jboss-aop.jar"/>
+      <include input="jboss-aop-aspects.jar"/>
+      <include input="jboss-aop-client.jar"/>
+      <include input="pluggable-instrumentor.jar"/>
+
+    </export>
+  </component>
+</project>

Added: jboss/aop/2.1.4.GA-brew/lib/jboss-aop-aspects.jar
===================================================================
(Binary files differ)


Property changes on: jboss/aop/2.1.4.GA-brew/lib/jboss-aop-aspects.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jboss/aop/2.1.4.GA-brew/lib/jboss-aop-client.jar
===================================================================
(Binary files differ)


Property changes on: jboss/aop/2.1.4.GA-brew/lib/jboss-aop-client.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jboss/aop/2.1.4.GA-brew/lib/jboss-aop.jar
===================================================================
(Binary files differ)


Property changes on: jboss/aop/2.1.4.GA-brew/lib/jboss-aop.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jboss/aop/2.1.4.GA-brew/lib/pluggable-instrumentor.jar
===================================================================
(Binary files differ)


Property changes on: jboss/aop/2.1.4.GA-brew/lib/pluggable-instrumentor.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop-2.1.4.tar.gz
===================================================================
(Binary files differ)


Property changes on: jboss/aop/2.1.4.GA-brew/src/jboss-aop-2.1.4.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop-jpp-depmap.xml
===================================================================
--- jboss/aop/2.1.4.GA-brew/src/jboss-aop-jpp-depmap.xml	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/src/jboss-aop-jpp-depmap.xml	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,138 @@
+<dependencies>
+
+ <dependency>
+   <maven>
+     <groupId>slide</groupId>
+     <artifactId>slide-webdavlib</artifactId>
+     <version>2.1</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/slide</groupId>
+     <artifactId>slide-webdavlib</artifactId>
+     <version>2.1</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>jboss</groupId>
+     <artifactId>jboss-test</artifactId>
+     <version>1.0.3.GA</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>jboss-test</artifactId>
+     <version>1.1.1</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>javassist</groupId>
+     <artifactId>javassist</artifactId>
+     <version>3.10.0.GA</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>javassist</artifactId>
+     <version>3.8.0</version>
+   </jpp>
+ </dependency>
+
+
+ <dependency>
+   <maven>
+     <groupId>jboss.profiler.jvmti</groupId>
+     <artifactId>jboss-profiler-jvmti</artifactId>
+     <version>1.0.0.CR5</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/jboss-profiler</groupId>
+     <artifactId>jboss-profiler-jvmti</artifactId>
+     <version>1.0.0</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>trove</groupId>
+     <artifactId>trove</artifactId>
+     <version>2.1.1</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>gnu-trove</artifactId>
+     <version>1.0.2</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>apache-xerces</groupId>
+     <artifactId>xml-apis</artifactId>
+     <version>2.9.1</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
+     <version>1.3.03</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>org.jboss.javaee</groupId>
+     <artifactId>jboss-servlet-api</artifactId>
+     <version>2.5.0.CR2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>servlet_2_5_api</artifactId>
+     <version>2.5</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>org.jboss.javaee</groupId>
+     <artifactId>jboss-jca-api</artifactId>
+     <version>1.5.0.CR2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>j2ee_connector_1_5_api</artifactId>
+     <version>1.5</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>org.beanshell</groupId>
+     <artifactId>bsh</artifactId>
+     <version>1.3.0</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>bsh</artifactId>
+     <version>1.3.0</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>com.google.code</groupId>
+     <artifactId>jarjar</artifactId>
+     <version>1.0</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>jarjar</artifactId>
+     <version>0.9</version>
+   </jpp>
+ </dependency>
+
+
+<!--
+-->
+
+</dependencies>

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-disable-integration.patch
===================================================================
--- jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-disable-integration.patch	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-disable-integration.patch	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,17 @@
+--- pom.xml.sav0	2009-05-08 16:15:25.000000000 +0200
++++ pom.xml	2009-06-11 11:48:07.000000000 +0200
+@@ -81,12 +81,14 @@
+     <module>aop</module>
+     <module>pluggable-instrumentor</module>
+     <module>aspects</module>
++<!--
+     <module>asintegration-core</module>
+     <module>asintegration-jmx</module>
+     <module>asintegration-mc</module>
+     <module>aophelper</module>
+     <module>deployers</module>
+     <module>build</module>
++-->
+   </modules>
+   
+   <dependencyManagement>

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-maven-version.patch
===================================================================
--- jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-maven-version.patch	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/src/jboss-aop-pom-maven-version.patch	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,11 @@
+--- pom.xml.sav0	2009-05-08 16:15:25.000000000 +0200
++++ pom.xml	2009-06-11 11:48:07.000000000 +0200
+@@ -54,7 +54,7 @@
+             <configuration>
+               <rules>
+                 <requireMavenVersion>
+-                  <version>2.0.9</version>
++                  <version>2.0.8</version>
+                 </requireMavenVersion>
+                 <requireJavaVersion>
+                   <version>1.5</version>

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop-settings.xml
===================================================================
--- jboss/aop/2.1.4.GA-brew/src/jboss-aop-settings.xml	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/src/jboss-aop-settings.xml	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,47 @@
+<settings>
+	<profiles>
+		<profile>
+			<id>JPP</id>
+			<repositories>
+				<repository>
+					<id>internal</id>
+					<layout>jpp</layout>
+					<url>__JPP_URL_PLACEHOLDER__</url>
+				</repository>
+				<repository>
+					<id>external</id>
+					<layout>jpp</layout>
+					<url>__JAVADIR_PLACEHOLDER__</url>
+				</repository>
+				<repository>
+					<id>local</id>
+					<layout>jpp</layout>
+					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>plugins-internal</id>
+					<name>plugins-internal</name>
+					<layout>jpp</layout>
+					<url>__JPP_URL_PLACEHOLDER__</url>
+				</pluginRepository>
+				<pluginRepository>
+					<id>plugins-external</id>
+					<name>plugins-external</name>
+					<layout>jpp</layout>
+					<url>__JAVADIR_PLACEHOLDER__</url>
+				</pluginRepository>
+				<pluginRepository>
+					<id>plugins-maven</id>
+					<name>plugins-maven</name>
+					<layout>jpp</layout>
+					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+	<activeProfiles>
+		<activeProfile>JPP</activeProfile>
+	</activeProfiles>
+</settings>

Added: jboss/aop/2.1.4.GA-brew/src/jboss-aop2-SystemOutLoggerPlugin.patch
===================================================================
--- jboss/aop/2.1.4.GA-brew/src/jboss-aop2-SystemOutLoggerPlugin.patch	                        (rev 0)
+++ jboss/aop/2.1.4.GA-brew/src/jboss-aop2-SystemOutLoggerPlugin.patch	2009-08-12 15:04:57 UTC (rev 28543)
@@ -0,0 +1,74 @@
+--- aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java.sav	2009-06-10 15:25:05.000000000 +0200
++++ aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java	2009-06-10 15:30:54.000000000 +0200
+@@ -41,6 +41,11 @@
+       print("[aop-debug]", message, t);
+    }
+ 
++   public void debug(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-debug]", message, t);
++   }
++
+    public void error(Object message)
+    {
+       print("[aop-error]", message, null);
+@@ -51,6 +56,11 @@
+       print("[aop-error]", message, t);
+    }
+ 
++   public void error(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-error]", message, t);
++   }
++
+    public void fatal(Object message)
+    {
+       print("[aop-fatal]", message, null);
+@@ -61,6 +71,11 @@
+       print("[aop-debug]", message, t);
+    }
+ 
++   public void fatal(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-debug]", message, t);
++   }
++
+    public void info(Object message)
+    {
+       print("[aop-info]", message, null);
+@@ -71,6 +86,11 @@
+       print("[aop-info]", message, t);
+    }
+ 
++   public void info(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-info]", message, t);
++   }
++
+    public void init(String name)
+    {
+       this.name = name;
+@@ -101,6 +121,11 @@
+       print("[aop-trace]", message, null);
+    }
+ 
++   public void trace(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-trace]", message, null);
++   }
++
+    public void warn(Object message)
+    {
+       print("[aop-warn]", message, null);
+@@ -111,6 +136,11 @@
+       print("[aop-warn]", message, null);
+    }
+ 
++   public void warn(String loggerFcqn, Object message, Throwable t)
++   {
++      print("[aop-warn]", message, null);
++   }
++
+    private void print(String prefix, Object message, Throwable t)
+    {
+       System.out.println(prefix + " " + name + " " + message);




More information about the jboss-cvs-commits mailing list