[jboss-cvs] JBossAS SVN: r59138 - in trunk: aspects/src/main/org/jboss/aop/deployment build testsuite/imports/sections testsuite/src/main/org/jboss/test/aop/scoped testsuite/src/main/org/jboss/test/aop/scoped/excluded testsuite/src/main/org/jboss/test/aop/scoped/excluded/included testsuite/src/main/org/jboss/test/aop/test testsuite/src/resources/aop/scoped/sar1/META-INF testsuite/src/resources/aop/scoped/sar2/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 19 06:33:13 EST 2006
Author: kabir.khan at jboss.com
Date: 2006-12-19 06:33:03 -0500 (Tue, 19 Dec 2006)
New Revision: 59138
Added:
trunk/testsuite/src/main/org/jboss/test/aop/scoped/POJO$$Ignored$$123.java
trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/
trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/ExcludedPOJO.java
trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/included/
trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/included/IncludedPOJO.java
trunk/testsuite/src/main/org/jboss/test/aop/test/SetupHook.java
Modified:
trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java
trunk/build/build-thirdparty.xml
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java
trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java
trunk/testsuite/src/main/org/jboss/test/aop/test/AOPClassLoaderHookTestSetup.java
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml
Log:
[JBAOP-331] IgnoreExpressions for a domain should be got from main AspectManager
Modified: trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -64,17 +64,17 @@
extends ServiceMBeanSupport
implements AspectManagerServiceMBean, AspectNotificationHandler
{
-
+
static {
//pre-load necessary classes so that we avoid NoClassDefFoundErrors on JRockit when using the RepositoryClassloader hook
- //When AspectManager.translate() is called the first time, these classes have not been loaded yet, and this is what causes
+ //When AspectManager.translate() is called the first time, these classes have not been loaded yet, and this is what causes
//JRockit to get confused
TransformerCommon common = new TransformerCommon();
SuperClassesFirstWeavingStrategy strategy1 = new SuperClassesFirstWeavingStrategy();
ClassicWeavingStrategy strategy2 = new ClassicWeavingStrategy();
-
+
}
-
+
public static final ObjectName DEFAULT_LOADER_REPOSITORY = ObjectNameFactory.create(ServerConstants.DEFAULT_LOADER_NAME);
// Attributes ---------------------------------------------------
@@ -96,7 +96,7 @@
public AspectManagerService()
{
}
-
+
public AspectManagerService(String baseXml)
{
this.baseXml = baseXml;
@@ -129,7 +129,7 @@
if (tmpClassesDir.exists() == false && tmpClassesDir.mkdirs() == false)
throw new FileNotFoundException("Failed to create tmpClassesDir: " + tmpClassesDir.getAbsolutePath());
AspectManager.setClassPoolFactory(createFactory());
-
+
AspectManager.classLoaderValidator = createClassLoaderValidation();
// Add the tmp classes dir to our UCL classpath
@@ -146,9 +146,9 @@
}
created = true;
AspectManager.notificationHandler = this;
-
+
AspectManager.scopedCLHelper = new JBossScopedClassLoaderHelper();
-
+
baseAop();
}
@@ -170,7 +170,7 @@
catch (Exception e)
{
System.out.println("Error loading " + baseXml + " file" + e);
- }
+ }
}
protected void attachDeprecatedTranslator()
@@ -290,10 +290,13 @@
{
this.exclude = exclude;
ArrayList list = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(exclude, ",");
- while (tokenizer.hasMoreTokens())
+ if (exclude != null)
{
- list.add(tokenizer.nextToken().trim());
+ StringTokenizer tokenizer = new StringTokenizer(exclude, ",");
+ while (tokenizer.hasMoreTokens())
+ {
+ list.add(tokenizer.nextToken().trim());
+ }
}
AspectManager.instance().setExclude(list);
}
@@ -307,10 +310,13 @@
{
this.include = include;
ArrayList list = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(include, ",");
- while (tokenizer.hasMoreTokens())
+ if (include != null)
{
- list.add(tokenizer.nextToken().trim());
+ StringTokenizer tokenizer = new StringTokenizer(include, ",");
+ while (tokenizer.hasMoreTokens())
+ {
+ list.add(tokenizer.nextToken().trim());
+ }
}
AspectManager.instance().setInclude(list);
}
@@ -324,15 +330,18 @@
{
this.ignore = ignore;
ArrayList list = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(ignore, ",");
- while (tokenizer.hasMoreTokens())
+ if (ignore != null)
{
- list.add(tokenizer.nextToken().trim());
+ StringTokenizer tokenizer = new StringTokenizer(ignore, ",");
+ while (tokenizer.hasMoreTokens())
+ {
+ list.add(tokenizer.nextToken().trim());
+ }
}
AspectManager.instance().setIgnore(list);
}
-
+
/**
* The temporary directory to which dyn class files are written
*
@@ -592,12 +601,12 @@
}
this.enableLoadtimeWeaving = enableTransformer;
}
-
+
public String getInstrumentor()
{
return InstrumentorFactory.getInstrumentorName();
}
-
+
public void setInstrumentor(String instrumentor)
{
InstrumentorFactory.initialise(instrumentor);
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/build/build-thirdparty.xml 2006-12-19 11:33:03 UTC (rev 59138)
@@ -84,8 +84,8 @@
<componentref name="jacorb" version="2.2.4jboss.patch1"/>
<componentref name="javassist" version="3.4.GA"/>
<componentref name="jaxen" version="1.1-beta-9"/>
- <componentref name="jboss/aop" version="2.0.0.alpha2"/>
- <componentref name="jboss/aop14" version="2.0.0.alpha2"/>
+ <componentref name="jboss/aop" version="snapshot"/>
+ <componentref name="jboss/aop14" version="snapshot"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/cache" version="2.0.0.ALPHA1"/>
<componentref name="jboss/common-core" version="2.0.3.GA"/>
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/imports/sections/aop.xml 2006-12-19 11:33:03 UTC (rev 59138)
@@ -257,6 +257,7 @@
<jar destfile="${build.lib}/aop-scopedtest1.aop">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/scoped/*.class"/>
+ <include name="org/jboss/test/aop/scoped/excluded/**/*.class"/>
<exclude name="org/jboss/test/aop/scoped/ScopedTester*.class"/>
</fileset>
<fileset dir="${build.resources}/aop/scoped/sar1">
@@ -277,6 +278,7 @@
<jar destfile="${build.lib}/aop-scopedtest2.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/scoped/*.class"/>
+ <include name="org/jboss/test/aop/scoped/excluded/**/*.class"/>
<exclude name="org/jboss/test/aop/scoped/Annotated*.class"/>
</fileset>
<fileset dir="${build.resources}/aop/scoped/sar2/META-INF">
Added: trunk/testsuite/src/main/org/jboss/test/aop/scoped/POJO$$Ignored$$123.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/scoped/POJO$$Ignored$$123.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/scoped/POJO$$Ignored$$123.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.scoped;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class POJO$$Ignored$$123
+{
+
+}
Modified: trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTester.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -21,6 +21,10 @@
*/
package org.jboss.test.aop.scoped;
+import org.jboss.aop.Advised;
+import org.jboss.test.aop.scoped.excluded.ExcludedPOJO;
+import org.jboss.test.aop.scoped.excluded.included.IncludedPOJO;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -201,4 +205,27 @@
}
}
+ public void testInclude()
+ {
+ if (!Advised.class.isAssignableFrom(IncludedPOJO.class))
+ {
+ throw new RuntimeException("IncludedPOJO should be Advised");
+ }
+ }
+
+ public void testExclude()
+ {
+ if (Advised.class.isAssignableFrom(ExcludedPOJO.class))
+ {
+ throw new RuntimeException("ExcludedPOJO should not be Advised");
+ }
+ }
+
+ public void testIgnore()
+ {
+ if (Advised.class.isAssignableFrom(POJO$$Ignored$$123.class))
+ {
+ throw new RuntimeException("POJO$$Ignored$$123 should not be Advised");
+ }
+ }
}
Modified: trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/scoped/ScopedTesterMBean.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -40,4 +40,8 @@
void testIntroduction2();
void testAnnotatedScopedAnnotationsDeployed();
void testAnnotatedScopedAnnotationsNotDeployed();
+
+ void testInclude();
+ void testExclude();
+ void testIgnore();
}
Added: trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/ExcludedPOJO.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/ExcludedPOJO.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/ExcludedPOJO.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.scoped.excluded;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ExcludedPOJO
+{
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/included/IncludedPOJO.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/included/IncludedPOJO.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/scoped/excluded/included/IncludedPOJO.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.scoped.excluded.included;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class IncludedPOJO
+{
+
+}
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/AOPClassLoaderHookTestSetup.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/AOPClassLoaderHookTestSetup.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/AOPClassLoaderHookTestSetup.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -40,22 +40,31 @@
public static String ASPECT_MANAGER_NAME = "jboss.aop:service=AspectManager";
private String[] jars;
-
+ SetupHook hook;
+
// Create an initializer for the test suite
public AOPClassLoaderHookTestSetup(TestSuite suite, String jar) throws Exception
{
super(suite);
this.jars = jar.split(",");
}
-
+
+ public AOPClassLoaderHookTestSetup(TestSuite suite, SetupHook hook, String jar) throws Exception
+ {
+ this(suite, jar);
+ this.hook = hook;
+ }
+
protected void setUp() throws Exception
{
super.setUp();
ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
Attribute enableTransformer = new Attribute("EnableLoadtimeWeaving", Boolean.TRUE);
getServer().setAttribute(aspectManager, enableTransformer);
-// Attribute verbose = new Attribute("Verbose", Boolean.TRUE);
-// getServer().setAttribute(aspectManager, verbose);
+ if (hook != null)
+ {
+ hook.setup(getServer());
+ }
try
{
for (int i = 0 ; i < jars.length ; i++)
@@ -71,8 +80,10 @@
{
enableTransformer = new Attribute("EnableLoadtimeWeaving", Boolean.FALSE);
getServer().setAttribute(aspectManager, enableTransformer);
-// verbose = new Attribute("Verbose", Boolean.TRUE);
-// getServer().setAttribute(aspectManager, verbose);
+ if (hook != null)
+ {
+ hook.teardown(getServer());
+ }
}
catch(Exception ex)
{
@@ -99,6 +110,10 @@
ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
Attribute enableTransformer = new Attribute("EnableLoadtimeWeaving", Boolean.FALSE);
getServer().setAttribute(aspectManager, enableTransformer);
+ if (hook != null)
+ {
+ hook.teardown(getServer());
+ }
if( undeployException != null )
throw undeployException;
super.tearDown();
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -23,6 +23,7 @@
import java.net.URL;
+import javax.management.Attribute;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -126,6 +127,60 @@
server.invoke(testerName, "testIntroduction2", params, sig);
}
+ public void testInclude1() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester1");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testInclude", params, sig);
+ }
+
+ public void testInclude2() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester2");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testInclude", params, sig);
+ }
+
+ public void testExclude1() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester1");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testExclude", params, sig);
+ }
+
+ public void testExclude2() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester2");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testExclude", params, sig);
+ }
+
+ public void testIgnore1() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester1");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testIgnore", params, sig);
+ }
+
+ public void testIgnore2() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName testerName = new ObjectName("jboss.aop:name=ScopedTester2");
+ Object[] params = {};
+ String[] sig = {};
+ server.invoke(testerName, "testIgnore", params, sig);
+ }
+
public void testEar1() throws Exception
{
URL url = new URL(HttpUtils.getBaseURL() + "ear1/srv");
@@ -143,8 +198,37 @@
TestSuite suite = new TestSuite();
suite.addTest(new TestSuite(ScopedUnitTestCase.class));
- setup = new AOPClassLoaderHookTestSetup(suite, "aop-scopedtest1.sar,aop-scopedtest2.sar,aop-scopedear1.ear,aop-scopedear2.ear");
+ setup = new AOPClassLoaderHookTestSetup(suite, new MySetupHook(), "aop-scopedtest1.sar,aop-scopedtest2.sar,aop-scopedear1.ear,aop-scopedear2.ear");
return setup;
}
+ static class MySetupHook implements SetupHook
+ {
+ String originalIgnore;
+ String originalInclude;
+ String originalExclude;
+
+ public void setup(MBeanServerConnection server) throws Exception
+ {
+ ObjectName aspectManager = new ObjectName(AOPClassLoaderHookTestSetup.ASPECT_MANAGER_NAME);
+
+ originalIgnore = (String)server.getAttribute(aspectManager, "Ignore");
+ server.setAttribute(aspectManager, new Attribute("Ignore", "*$$Ignored$$*"));
+
+ originalInclude = (String)server.getAttribute(aspectManager, "Include");
+ server.setAttribute(aspectManager, new Attribute("Include", "org.jboss.test.aop.scoped.excluded.included."));
+
+ originalExclude = (String)server.getAttribute(aspectManager, "Exclude");
+ server.setAttribute(aspectManager, new Attribute("Exclude", "org.jboss.test.aop.scoped.excluded."));
+ }
+
+ public void teardown(MBeanServerConnection server) throws Exception
+ {
+ ObjectName aspectManager = new ObjectName(AOPClassLoaderHookTestSetup.ASPECT_MANAGER_NAME);
+
+ server.setAttribute(aspectManager, new Attribute("Ignore", originalIgnore));
+ server.setAttribute(aspectManager, new Attribute("Include", originalInclude));
+ server.setAttribute(aspectManager, new Attribute("Exclude", originalExclude));
+ }
+ }
}
Added: trunk/testsuite/src/main/org/jboss/test/aop/test/SetupHook.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/SetupHook.java 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/SetupHook.java 2006-12-19 11:33:03 UTC (rev 59138)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.test;
+
+import javax.management.MBeanServerConnection;
+
+import org.jboss.test.JBossTestSetup;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface SetupHook
+{
+ void setup(MBeanServerConnection server) throws Exception;
+ void teardown(MBeanServerConnection server) throws Exception;
+}
Modified: trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml 2006-12-19 11:33:03 UTC (rev 59138)
@@ -46,4 +46,7 @@
<interceptor-ref name="org.jboss.test.aop.scoped.ScopedInterceptor"/>
</bind>
+ <prepare expr="all(org.jboss.test.aop.scoped.excluded.ExcludedPOJO)"/>
+ <prepare expr="all(org.jboss.test.aop.scoped.excluded.included.IncludedPOJO)"/>
+ <prepare expr="all(org.jboss.test.aop.scoped.POJO$$Ignored$$123)"/>
</aop>
Modified: trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml 2006-12-19 11:07:12 UTC (rev 59137)
+++ trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml 2006-12-19 11:33:03 UTC (rev 59138)
@@ -46,4 +46,7 @@
<interceptor-ref name="org.jboss.test.aop.scoped.ScopedInterceptor"/>
</bind>
+ <prepare expr="all(org.jboss.test.aop.scoped.excluded.ExcludedPOJO)"/>
+ <prepare expr="all(org.jboss.test.aop.scoped.excluded.included.IncludedPOJO)"/>
+ <prepare expr="all(org.jboss.test.aop.scoped.POJO$$Ignored$$123)"/>
</aop>
More information about the jboss-cvs-commits
mailing list