[jboss-cvs] JBossAS SVN: r108816 - in branches/JBPAPP_5_1: testsuite/imports and 3 other directories.

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

Author: ALRubinger
Date: 2010-10-22 16:17:21 -0400 (Fri, 22 Oct 2010)
New Revision: 108816

Removed:
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb/passivationcl/
   branches/JBPAPP_5_1/testsuite/src/resources/ejb/passivationcl/
Modified:
   branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java
   branches/JBPAPP_5_1/testsuite/imports/sections/ejb.xml
   branches/JBPAPP_5_1/testsuite/imports/test-jars.xml
Log:
[JBPAPP-5167] Revert r108583 leading to testsuite errors

Modified: branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java
===================================================================
--- branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java	2010-10-22 20:16:45 UTC (rev 108815)
+++ branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java	2010-10-22 20:17:21 UTC (rev 108816)
@@ -203,8 +203,6 @@
 
          if (canPassivate(ctx))
          {
-            ClassLoader ccl = SecurityActions.getContextClassLoader();
-            SecurityActions.setContextClassLoader(getContainer().getClassLoader());
             try
             {
                remove(id);
@@ -215,10 +213,6 @@
             {
                log.warn("failed to passivate, id="+id, ignored);
             }
-            finally
-            {
-               SecurityActions.setContextClassLoader(ccl);
-            }
          }
          else
          {

Modified: branches/JBPAPP_5_1/testsuite/imports/sections/ejb.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/ejb.xml	2010-10-22 20:16:45 UTC (rev 108815)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/ejb.xml	2010-10-22 20:17:21 UTC (rev 108816)
@@ -11,31 +11,4 @@
          </fileset>
       </jar>
    </target>
-   <!-- passivationcl test -->
-   <target name="_jars-passivationcl">
-      <mkdir dir="${build.lib}"/>
-      <jar destfile="${build.lib}/passivationcl_entity.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/ejb/passivationcl/entity/**"/>
-         </fileset>
-      </jar>
-      <jar destfile="${build.lib}/passivationcl_stateful.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/ejb/passivationcl/stateful/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/ejb/passivationcl/stateful">
-            <include name="**"/>
-         </fileset>
-      </jar>
-      <jar destfile="${build.lib}/passivationcl.ear">
-        <fileset dir="${build.resources}/ejb/passivationcl/ear">
-           <include name="META-INF/*.*"/>
-        </fileset>
-        <fileset dir="${build.lib}">
-           <include name="passivationcl_entity.jar"/>
-           <include name="passivationcl_stateful.jar"/>
-        </fileset>
-      </jar>
-   </target>
-
 </project>
\ No newline at end of file

Modified: branches/JBPAPP_5_1/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/test-jars.xml	2010-10-22 20:16:45 UTC (rev 108815)
+++ branches/JBPAPP_5_1/testsuite/imports/test-jars.xml	2010-10-22 20:17:21 UTC (rev 108816)
@@ -116,7 +116,6 @@
         _jars-ejbproxy,        
         _jars-entity,
         _jars-entitydepends,
-        _jars-passivationcl,
         _jars-entityexc,
         _jars-excepiiop,
         _jars-exception,