[jboss-cvs] JBossAS SVN: r106131 - in projects/aop/branches/Branch_2_1: aop and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 17 13:59:21 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-06-17 13:59:20 -0400 (Thu, 17 Jun 2010)
New Revision: 106131
Modified:
projects/aop/branches/Branch_2_1/aop/pom.xml
projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
projects/aop/branches/Branch_2_1/asintegration-core/pom.xml
projects/aop/branches/Branch_2_1/asintegration-jmx/.classpath
projects/aop/branches/Branch_2_1/asintegration-jmx/pom.xml
projects/aop/branches/Branch_2_1/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
projects/aop/branches/Branch_2_1/asintegration-mc/pom.xml
projects/aop/branches/Branch_2_1/aspects/pom.xml
projects/aop/branches/Branch_2_1/build/pom.xml
projects/aop/branches/Branch_2_1/maven-jbossaop-plugin/pom.xml
projects/aop/branches/Branch_2_1/pom.xml
Log:
[JBAOP-773] Build is broken, and the solution is to update the jboss-test version used.
For that reason, this issue fix is being ported to JBAOP_AOP_2_1_6_GA_CP branch.
Modified: projects/aop/branches/Branch_2_1/aop/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/aop/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/aop/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -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>
@@ -344,7 +352,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/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-06-17 17:59:20 UTC (rev 106131)
@@ -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/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-06-17 17:59:20 UTC (rev 106131)
@@ -1,28 +1,29 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.aop.classloader;
import java.lang.reflect.Method;
import java.net.URL;
+import java.util.ArrayList;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AdviceBinding;
@@ -57,24 +58,32 @@
{
junit.textui.TestRunner.run(UserDefinedCLTestCase.class);
}
-
+
+ @Override
+ @SuppressWarnings("all")
public void setUp() throws Exception
{
super.setUp();
jarURL = getURLRelativeToProjectRoot(SCENARIO_TO_LOAD);
+ // add org.apache.log4j and org.junit to exclude list
+ ArrayList<String> exclude = (ArrayList<String>) AspectManager.instance().getExclude().clone();
+ if (exclude == null)
+ {
+ exclude = new ArrayList<String>();
+ }
+ exclude.add("org.apache.log4j");
+ exclude.add("org.junit");
+ AspectManager.instance().setExclude(exclude);
}
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);
@@ -88,4 +97,13 @@
pojoMethod.invoke(pojoInstance);
assertTrue((Boolean) getStatus.invoke(null));
}
+
+ private ClassLoader createUserDefinedCL()
+ {
+ Thread currentThread = Thread.currentThread();
+ ClassLoader classLoader = new UserDefinedCL(jarURL,
+ currentThread.getContextClassLoader());
+ currentThread.setContextClassLoader(classLoader);
+ return classLoader;
+ }
}
Modified: projects/aop/branches/Branch_2_1/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-core/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/asintegration-core/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -119,7 +119,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/Branch_2_1/asintegration-jmx/.classpath
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-jmx/.classpath 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/asintegration-jmx/.classpath 2010-06-17 17:59:20 UTC (rev 106131)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_1/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-jmx/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/asintegration-jmx/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -132,8 +132,8 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/Branch_2_1/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2010-06-17 17:59:20 UTC (rev 106131)
@@ -109,7 +109,7 @@
{
AbstractTestDelegate delegate = new UclClassPoolTestDelegate(clazz);
String property = System.getProperty("jboss.aop.secure", "true");
- boolean enableSecurity = Boolean.valueOf(property).booleanValue();
+ boolean enableSecurity = false; //Boolean.valueOf(property).booleanValue(); // TODO this value was true
delegate.enableSecurity = enableSecurity;
return delegate;
}
Modified: projects/aop/branches/Branch_2_1/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-mc/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/asintegration-mc/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -159,7 +159,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/branches/Branch_2_1/aspects/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/aspects/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/aspects/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -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/branches/Branch_2_1/build/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/build/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/build/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -30,7 +30,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/branches/Branch_2_1/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/maven-jbossaop-plugin/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/maven-jbossaop-plugin/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -131,7 +131,7 @@
<artifactId>jboss-profiler-jvmti</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
</exclusions>
Modified: projects/aop/branches/Branch_2_1/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_1/pom.xml 2010-06-17 17:41:56 UTC (rev 106130)
+++ projects/aop/branches/Branch_2_1/pom.xml 2010-06-17 17:59:20 UTC (rev 106131)
@@ -20,7 +20,7 @@
</scm>
<properties>
- <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
+ <version.javassist.javassist>3.12.0.GA</version.javassist.javassist>
<version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
@@ -382,14 +382,9 @@
<version>${version.org.jboss.man}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.1.7.CR2</version>
<exclusions>
<exclusion>
<groupId>apache-log4j</groupId>
More information about the jboss-cvs-commits
mailing list