[jboss-cvs] JBossAS SVN: r106094 - in projects/aop/branches/JBoss_AOP_2_1_6_GA_CP: aop and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 16:51:02 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-06-16 16:51:00 -0400 (Wed, 16 Jun 2010)
New Revision: 106094
Added:
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/classloader/
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties
Modified:
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/deployers/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/maven-jbossaop-plugin/pom.xml
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/.classpath
projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/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/JBoss_AOP_2_1_6_GA_CP/aop/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,26 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java" including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" including="jboss-aop_1_0.dtd|jboss-aop_2_0.xsd" kind="src" path="docs"/>
- <classpathentry excluding="**/*.java" including="jbossorg-eula.txt" kind="src" path="src/etc"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry excluding="org/jboss/aop/hook/JRockit*" kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="docs"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/etc"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <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/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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>
Added: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties (rev 0)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/resources/test/org/jboss/test/aop/classloader/UserDefinedCLTestCase.properties 2010-06-16 20:51:00 UTC (rev 106094)
@@ -0,0 +1,2 @@
+test.Permission.0=java.lang.RuntimePermission, setContextClassLoader
+test.Permission.1=java.lang.RuntimePermission, accessDeclaredMembers
Modified: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/AOPTestDelegate.java 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/test/java/org/jboss/test/aop/classloader/UserDefinedCLTestCase.java 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/asintegration-core/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,27 +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="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="src" path="/jboss-aop"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="src" path="/pluggable-instrumentor"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,62 +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="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="src" path="/jboss-aop"/>
- <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="src" path="/pluggable-instrumentor"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -48,7 +48,7 @@
<forkMode>always</forkMode>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
@@ -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/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,52 +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="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="src" path="/jboss-aop"/>
- <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="src" path="/pluggable-instrumentor"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/build/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,23 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/code/jarjar/1.0/jarjar-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="src" path="/jboss-aop"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <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/JBoss_AOP_2_1_6_GA_CP/build/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/deployers/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/deployers/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/deployers/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,51 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="src" path="/jboss-aop"/>
- <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
- <classpathentry kind="src" path="/jboss-aop-asintegration-mc"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="src" path="/pluggable-instrumentor"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <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/JBoss_AOP_2_1_6_GA_CP/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/maven-jbossaop-plugin/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/maven-jbossaop-plugin/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/.classpath
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/.classpath 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/.classpath 2010-06-16 20:51:00 UTC (rev 106094)
@@ -1,6 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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"/>
-</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="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/JBoss_AOP_2_1_6_GA_CP/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pom.xml 2010-06-16 17:51:42 UTC (rev 106093)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pom.xml 2010-06-16 20:51:00 UTC (rev 106094)
@@ -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