[jboss-cvs] JBossAS SVN: r60795 - in branches/Branch_4_2/testsuite: src/main/org/jboss/test/jrmp/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 22 11:28:45 EST 2007
Author: tom.elrod at jboss.com
Date: 2007-02-22 11:28:45 -0500 (Thu, 22 Feb 2007)
New Revision: 60795
Added:
branches/Branch_4_2/testsuite/src/resources/jrmp/META-INF/jboss2.xml
Modified:
branches/Branch_4_2/testsuite/imports/sections/jrmp.xml
branches/Branch_4_2/testsuite/src/main/org/jboss/test/jrmp/test/DynLoadingUnitTestCase.java
Log:
JBAS-4018 - changed DynLoadingUnitTestCase to revert back to using jrmp invoker for dynamic, remote classloading.
Modified: branches/Branch_4_2/testsuite/imports/sections/jrmp.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/jrmp.xml 2007-02-22 15:22:03 UTC (rev 60794)
+++ branches/Branch_4_2/testsuite/imports/sections/jrmp.xml 2007-02-22 16:28:45 UTC (rev 60795)
@@ -2,21 +2,21 @@
<!-- jrmp test -->
<target name="_jars-jrmp">
<mkdir dir="${build.lib}"/>
-
+
<!-- build jrmp-comp-client.jar -->
<jar destfile="${build.lib}/jrmp-comp-client.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jrmp/interfaces/**"/>
</fileset>
</jar>
-
+
<!-- build comp-client.jar -->
<jar destfile="${build.lib}/comp-client.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jrmp/ejb/Compression*.class"/>
</fileset>
</jar>
-
+
<!-- build jrmp-comp.jar -->
<jar destfile="${build.lib}/jrmp-comp.sar">
<metainf dir="${build.resources}/jrmp/service-inf"/>
@@ -37,7 +37,7 @@
<include name="jrmp-comp.sar"/>
</fileset>
</jar>
-
+
<!-- build jrmp-dl-client.jar -->
<jar destfile="${build.lib}/jrmp-dl-client.jar">
<fileset dir="${build.classes}">
@@ -48,18 +48,24 @@
<include name="org/jboss/test/JBossTestServices.class"/>
</fileset>
</jar>
-
+
<!-- build jrmp-dl.jar -->
+ <copy overwrite="true" file="${build.resources}/jrmp/META-INF/jboss.xml" tofile="${build.resources}/jrmp/META-INF/bak.xml"/>
+ <copy overwrite="true" file="${build.resources}/jrmp/META-INF/jboss2.xml" tofile="${build.resources}/jrmp/META-INF/jboss.xml"/>
+
<jar destfile="${build.lib}/jrmp-dl.jar">
<metainf dir="${build.resources}/jrmp/META-INF">
- <exclude name="jboss.xml"/>
+ <!--<exclude name="jboss.xml"/>-->
</metainf>
<fileset dir="${build.classes}">
<include name="org/jboss/test/jrmp/interfaces/**"/>
<include name="org/jboss/test/jrmp/ejb/**"/>
</fileset>
</jar>
-
+
+ <copy overwrite="true" file="${build.resources}/jrmp/META-INF/jboss.xml" tofile="${build.resources}/jrmp/META-INF/jboss2.xml"/>
+ <copy overwrite="true" file="${build.resources}/jrmp/META-INF/bak.xml" tofile="${build.resources}/jrmp/META-INF/jboss.xml"/>
+
<!-- build jrmp-dl.sar -->
<jar destfile="${build.lib}/jrmp-dl.sar">
<metainf dir="${build.resources}/jrmp/sar/META-INF"/>
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jrmp/test/DynLoadingUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jrmp/test/DynLoadingUnitTestCase.java 2007-02-22 15:22:03 UTC (rev 60794)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jrmp/test/DynLoadingUnitTestCase.java 2007-02-22 16:28:45 UTC (rev 60795)
@@ -24,6 +24,8 @@
import java.io.File;
import java.net.URL;
import java.security.CodeSource;
+import java.security.Permission;
+import java.rmi.RMISecurityManager;
import javax.naming.InitialContext;
@@ -59,6 +61,17 @@
*/
public void testAccess() throws Exception
{
+ if (System.getSecurityManager() == null)
+ {
+ SecurityManager secmgr = new SecurityManager()
+ {
+ public void checkPermission(Permission p)
+ {
+ }
+ };
+ System.setSecurityManager(secmgr);
+ }
+
InitialContext jndiContext = new InitialContext();
getLog().debug("Lookup StatefulSession");
Object obj = jndiContext.lookup("StatefulSession");
Added: branches/Branch_4_2/testsuite/src/resources/jrmp/META-INF/jboss2.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/jrmp/META-INF/jboss2.xml (rev 0)
+++ branches/Branch_4_2/testsuite/src/resources/jrmp/META-INF/jboss2.xml 2007-02-22 16:28:45 UTC (rev 60795)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<!-- The jboss.xml descriptor for the jrmp-comp.jar ejb unit -->
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulSession</ejb-name>
+ <configuration-name>Standard Stateful SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>dynamic-stateful-invoker</invoker-proxy-binding-name>
+ <jndi-name>StatefulSession</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ </session>
+ </enterprise-beans>
+
+ <invoker-proxy-bindings>
+ <invoker-proxy-binding>
+ <name>dynamic-stateful-invoker</name>
+ <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ </invoker-proxy-bindings>
+</jboss>
More information about the jboss-cvs-commits
mailing list