[jboss-cvs] JBossAS SVN: r102959 - in projects/aop/trunk: aop and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 25 11:16:13 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-25 11:16:11 -0400 (Thu, 25 Mar 2010)
New Revision: 102959
Added:
projects/aop/trunk/aop/src/resources/test/org/
projects/aop/trunk/aop/src/resources/test/org/jboss/
projects/aop/trunk/aop/src/resources/test/org/jboss/test/
projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/
projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/classloader/
projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties
Modified:
projects/aop/trunk/aop/.classpath
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/build/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-773] Added the super.tearDown call, updated jboss-test to 1.1.6.GA, and configured security policy for UserDefinedCLTestCase.
Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/aop/.classpath 2010-03-25 15:16:11 UTC (rev 102959)
@@ -1,5 +1,6 @@
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/resources/test" output="target/test-classes" including="**/*.properties" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="docs" including="jboss-aop_1_0.dtd|jboss-aop_2_0.xsd" excluding="**/*.java"/>
<classpathentry kind="src" path="src/etc" including="jbossorg-eula.txt" excluding="**/*.java"/>
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/aop/pom.xml 2010-03-25 15:16:11 UTC (rev 102959)
@@ -28,6 +28,14 @@
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources/test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -353,7 +361,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Added: projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties
===================================================================
--- projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties (rev 0)
+++ projects/aop/trunk/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties 2010-03-25 15:16:11 UTC (rev 102959)
@@ -0,0 +1,2 @@
+test.Permission.0=java.lang.RuntimePermission, setContextClassLoader
+test.Permission.1=java.lang.RuntimePermission, accessDeclaredMembers
Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-03-25 15:16:11 UTC (rev 102959)
@@ -63,8 +63,7 @@
*/
public void tearDown() throws Exception
{
- //TODO Figure out cause of security exception when making this call
-// super.tearDown();
+ super.tearDown();
String deployedByClassLoader = (String)systemProps.get(EclipseTestTransformer.CLASSLOADER_DEPLOYED_XML);
if (deployedByClassLoader != null)
{
Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-03-25 15:16:11 UTC (rev 102959)
@@ -23,6 +23,8 @@
import java.lang.reflect.Method;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import org.jboss.aop.AspectManager;
@@ -79,14 +81,11 @@
public void testURLLoadedInterception() throws Exception
{
- Thread currentThread = Thread.currentThread();
- ClassLoader classLoader = new UserDefinedCL(jarURL,
- currentThread.getContextClassLoader());
- currentThread.setContextClassLoader(classLoader);
+ ClassLoader classLoader = createUserDefinedCL();
Class<?> clazz = Class.forName(INTERCEPTOR_CLASS, false, classLoader);
AdviceBinding binding = new AdviceBinding("userdefinedclbinding",
- "execution(* *->*(..))", null);
+ "execution(* org.jboss.test.aop.*->*(..))", null);
binding.addInterceptor(clazz);
AspectManager.instance().addBinding(binding);
@@ -100,4 +99,20 @@
pojoMethod.invoke(pojoInstance);
assertTrue((Boolean) getStatus.invoke(null));
}
+
+ private ClassLoader createUserDefinedCL()
+ {
+ final Thread currentThread = Thread.currentThread();
+ final ClassLoader classLoader = new UserDefinedCL(jarURL,
+ currentThread.getContextClassLoader());
+ AccessController.doPrivileged(new PrivilegedAction<Void>()
+ {
+ public Void run()
+ {
+ currentThread.setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ return classLoader;
+ }
}
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2010-03-25 15:16:11 UTC (rev 102959)
@@ -151,7 +151,7 @@
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>compile</scope>
</dependency>
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/aspects/pom.xml 2010-03-25 15:16:11 UTC (rev 102959)
@@ -66,7 +66,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
Modified: projects/aop/trunk/build/pom.xml
===================================================================
--- projects/aop/trunk/build/pom.xml 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/build/pom.xml 2010-03-25 15:16:11 UTC (rev 102959)
@@ -38,7 +38,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2010-03-25 15:15:13 UTC (rev 102958)
+++ projects/aop/trunk/pom.xml 2010-03-25 15:16:11 UTC (rev 102959)
@@ -298,9 +298,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.1.6.GA</version>
<exclusions>
<exclusion>
<groupId>apache-log4j</groupId>
More information about the jboss-cvs-commits
mailing list