[jboss-cvs] JBoss Messaging SVN: r2757 - in trunk: docs/examples/mdb/etc and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-06-04 16:49:46 -0400 (Mon, 04 Jun 2007)
New Revision: 2757

Added:
   trunk/docs/examples/mdb/etc/EAR-META-INF/
   trunk/docs/examples/mdb/etc/EAR-META-INF/application.xml
   trunk/docs/examples/mdb/etc/EAR-META-INF/jboss-app.xml
Modified:
   trunk/docs/examples/mdb/build.xml
   trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-980 - fix

Modified: trunk/docs/examples/mdb/build.xml
===================================================================
--- trunk/docs/examples/mdb/build.xml	2007-06-04 06:33:48 UTC (rev 2756)
+++ trunk/docs/examples/mdb/build.xml	2007-06-04 20:49:46 UTC (rev 2757)
@@ -82,11 +82,19 @@
       </copy>
       <jar destfile="./output/lib/mdb-example.jar"
            basedir="./output/classes"
-           includes="META-INF/**,org/jboss/example/**/MDBExample.class"/>
+           includes="META-INF/**,org/jboss/example/**/MDBExample.class">
+      </jar>
    </target>
 
-   <target name="deploy" depends="jar">
-      <copy file="./output/lib/mdb-example.jar"
+   <target name="ear" depends="jar">
+      <jar destfile="./output/lib/mdb-example.ear">
+         <zipfileset dir="./output/lib" includes="mdb-example.jar"/>
+         <zipfileset dir="./etc/EAR-META-INF" prefix="META-INF"/>
+      </jar>
+   </target>
+
+   <target name="deploy" depends="ear">
+      <copy file="./output/lib/mdb-example.ear"
             todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
       <antcall target="sleep"><param name="sleep.interval" value="5"/></antcall>
    </target>
@@ -110,7 +118,7 @@
    </target>
 
    <target name="undeploy">
-      <delete file="${jboss.home}/server/${jboss.configuration}/deploy/mdb-example.jar" quiet="true"/>
+      <delete file="${jboss.home}/server/${jboss.configuration}/deploy/mdb-example.ear" quiet="true"/>
    </target>
 
    <target name="clean" depends="undeploy">

Added: trunk/docs/examples/mdb/etc/EAR-META-INF/application.xml
===================================================================
--- trunk/docs/examples/mdb/etc/EAR-META-INF/application.xml	                        (rev 0)
+++ trunk/docs/examples/mdb/etc/EAR-META-INF/application.xml	2007-06-04 20:49:46 UTC (rev 2757)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE application PUBLIC
+        "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+        "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+
+  <display-name>MDB Example</display-name>
+  <module>
+    <ejb>mdb-example.jar</ejb>
+  </module>
+
+</application>


Property changes on: trunk/docs/examples/mdb/etc/EAR-META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Added: trunk/docs/examples/mdb/etc/EAR-META-INF/jboss-app.xml
===================================================================
--- trunk/docs/examples/mdb/etc/EAR-META-INF/jboss-app.xml	                        (rev 0)
+++ trunk/docs/examples/mdb/etc/EAR-META-INF/jboss-app.xml	2007-06-04 20:49:46 UTC (rev 2757)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-app
+    PUBLIC "-//JBoss//DTD J2EE Application 4.0//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+
+<jboss-app>
+   <loader-repository>org.jboss.messaging.examples:loader=mdb-example.ear</loader-repository>
+</jboss-app>


Property changes on: trunk/docs/examples/mdb/etc/EAR-META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-06-04 06:33:48 UTC (rev 2756)
+++ trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-06-04 20:49:46 UTC (rev 2757)
@@ -64,11 +64,24 @@
          return;
       }
 
-      byte[] clientAOPStack = delegate.getClientAOPStack();
+      ClassLoader savedLoader = Thread.currentThread().getContextClassLoader();
 
-      new JmsClientAspectXMLLoader().deployXML(clientAOPStack);
+      try
+      {
+         // This was done because of some weird behavior of AOP & classLoading
+         // http://jira.jboss.org/jira/browse/JBMESSAGING-980
+         Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
 
-      loaded = true;
+         byte[] clientAOPStack = delegate.getClientAOPStack();
+
+         new JmsClientAspectXMLLoader().deployXML(clientAOPStack);
+
+         loaded = true;
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(savedLoader);
+      }
    }
 
    // Package protected ----------------------------------------------------------------------------