[jboss-cvs] JBossAS SVN: r84101 - in projects/aop/branches/Branch_2_0/aop: src/main/org/jboss/aop and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 11 14:51:25 EST 2009
Author: stalep
Date: 2009-02-11 14:51:25 -0500 (Wed, 11 Feb 2009)
New Revision: 84101
Added:
projects/aop/branches/Branch_2_0/aop/src/resources/test/standalone/
projects/aop/branches/Branch_2_0/aop/src/resources/test/standalone/jboss-aop.xml
projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/
projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/POJO.java
projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageInterceptor.java
projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageTestCase.java
Modified:
projects/aop/branches/Branch_2_0/aop/base-tests.xml
projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/AspectManager.java
projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/standalone/Package.java
Log:
[JBAOP-697]
AM.getAdvisors() now check all subdomains for advisors.
Make sure Package is using AM.getTopLevelAspectManager().
Modified: projects/aop/branches/Branch_2_0/aop/base-tests.xml
===================================================================
--- projects/aop/branches/Branch_2_0/aop/base-tests.xml 2009-02-11 18:50:41 UTC (rev 84100)
+++ projects/aop/branches/Branch_2_0/aop/base-tests.xml 2009-02-11 19:51:25 UTC (rev 84101)
@@ -103,6 +103,9 @@
<antcall target="${test-target}" inheritRefs="true">
<param name="test" value="dynamicinvoke"/>
</antcall>
+ <antcall target="${test-target}" inheritRefs="true">
+ <param name="test" value="standalone"/>
+ </antcall>
<!-- Tests with special requirements for parameters -->
<antcall target="${test-target}" inheritRefs="true">
Modified: projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/AspectManager.java 2009-02-11 18:50:41 UTC (rev 84100)
+++ projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/AspectManager.java 2009-02-11 19:51:25 UTC (rev 84101)
@@ -531,7 +531,27 @@
public Map<Class<?>, WeakReference<Advisor>> getAdvisors()
{
- return advisors;
+ WeakHashMap<Class<?>, WeakReference<Advisor>> tmpAdvisors = new WeakHashMap<Class<?>, WeakReference<Advisor>>(advisors);
+ if(getSubDomainsPerClass().size() > 0)
+ {
+ Map<Class<?>, WeakReference<Domain>> domainsMap = getSubDomainsPerClass();
+ Set<Class<?>> keys = domainsMap.keySet();
+ Domain subDomain = null;
+ for(Class<?> clazz : keys)
+ {
+ WeakReference<Domain> ref = getSubDomainsPerClass().get(clazz);
+ if (ref != null)
+ {
+ subDomain = ref.get();
+ if(subDomain != null)
+ {
+ WeakReference<Advisor> advisorRef = advisors.get(clazz);
+ tmpAdvisors.put(clazz, advisorRef);
+ }
+ }
+ }
+ }
+ return tmpAdvisors;
}
public Advisor getAdvisor(String name)
Modified: projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/standalone/Package.java
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/standalone/Package.java 2009-02-11 18:50:41 UTC (rev 84100)
+++ projects/aop/branches/Branch_2_0/aop/src/main/org/jboss/aop/standalone/Package.java 2009-02-11 19:51:25 UTC (rev 84101)
@@ -48,9 +48,9 @@
this.name = name;
}
- static void parse(Class<?> clazz, Package root)
+ static void parse(AspectManager manager, Class<?> clazz, Package root)
{
- Advisor advisor = AspectManager.instance().findAdvisor(clazz);
+ Advisor advisor = manager.findAdvisor(clazz);
StringTokenizer tokenizer = new StringTokenizer(clazz.getName(), ".");
while (tokenizer.hasMoreTokens())
{
@@ -74,13 +74,18 @@
public static Package aopClassMap()
{
- Map<Class<?>, WeakReference<Advisor>> advisors = AspectManager.instance().getAdvisors();
+ return aopClassMap(AspectManager.getTopLevelAspectManager());
+ }
+
+ public static Package aopClassMap(AspectManager manager)
+ {
+ Map<Class<?>, WeakReference<Advisor>> advisors = manager.getAdvisors();
Iterator<Class<?>> it = advisors.keySet().iterator();
Package root = new Package("classes");
while (it.hasNext())
{
Class<?> clazz = it.next();
- parse(clazz, root);
+ parse(manager, clazz, root);
}
return root;
}
Added: projects/aop/branches/Branch_2_0/aop/src/resources/test/standalone/jboss-aop.xml
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/resources/test/standalone/jboss-aop.xml (rev 0)
+++ projects/aop/branches/Branch_2_0/aop/src/resources/test/standalone/jboss-aop.xml 2009-02-11 19:51:25 UTC (rev 84101)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+ <bind pointcut="execution(* org.jboss.test.aop.standalone.POJO->foo())">
+ <interceptor class="org.jboss.test.aop.standalone.PackageInterceptor"/>
+ </bind>
+</aop>
Added: projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/POJO.java
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/POJO.java (rev 0)
+++ projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/POJO.java 2009-02-11 19:51:25 UTC (rev 84101)
@@ -0,0 +1,38 @@
+/*
+ * 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.standalone;
+
+/**
+ * A POJO.
+ *
+ * @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision: 1.1 $
+ */
+public class POJO
+{
+
+ public void foo()
+ {
+
+ }
+
+}
Added: projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageInterceptor.java
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageInterceptor.java (rev 0)
+++ projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageInterceptor.java 2009-02-11 19:51:25 UTC (rev 84101)
@@ -0,0 +1,48 @@
+/*
+ * 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.standalone;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ * A PackageInterceptor.
+ *
+ * @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision: 1.1 $
+ */
+public class PackageInterceptor implements Interceptor
+{
+ public static boolean invoked = false;
+
+ public String getName()
+ {
+ return "PackageInterceptor";
+ }
+
+ public Object invoke(Invocation invocation) throws Throwable
+ {
+ invoked = true;
+ return invocation.invokeNext();
+ }
+
+}
Added: projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageTestCase.java
===================================================================
--- projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageTestCase.java (rev 0)
+++ projects/aop/branches/Branch_2_0/aop/src/test/org/jboss/test/aop/standalone/PackageTestCase.java 2009-02-11 19:51:25 UTC (rev 84101)
@@ -0,0 +1,77 @@
+/*
+ * 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.standalone;
+
+import java.lang.ref.WeakReference;
+import java.util.Map;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.Domain;
+import org.jboss.test.aop.AOPTestWithSetup;
+
+/**
+ * A PackageTestCase.
+ *
+ * @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision: 1.1 $
+ */
+public class PackageTestCase extends AOPTestWithSetup
+{
+
+ public PackageTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("PackageTestCase");
+ suite.addTestSuite(PackageTestCase.class);
+ return suite;
+ }
+
+ public void testPackage()
+ {
+ POJO pojo = new POJO();
+ pojo.foo();
+ assertTrue(PackageInterceptor.invoked);
+
+ org.jboss.aop.standalone.Package pkg = org.jboss.aop.standalone.Package.aopClassMap();
+ System.out.println("Package size: "+pkg.packages.size());
+ assertEquals(1,pkg.packages.size());
+
+// System.out.println("Number of advisors: "+AspectManager.getTopLevelAspectManager().getAdvisors().size());
+// System.out.println("Number of advisors: "+AspectManager.instance().getAdvisors().size());
+// System.out.println("Number of advisors: "+AspectManager.instance().getSubDomainsPerClass2().size());
+//
+// Map<Class<?>, WeakReference<Domain>> domains = AspectManager.instance().getSubDomainsPerClass2();
+//
+// System.out.println("domains: "+domains.toString());
+
+
+ System.out.println("Number of aspects: "+AspectManager.instance().getAspectDefinitions().size());
+
+ }
+}
More information about the jboss-cvs-commits
mailing list