[jboss-cvs] JBossAS SVN: r84154 - in branches/Branch_4_2/console/src: resources/webconsole.war and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 13 02:23:13 EST 2009
Author: stalep
Date: 2009-02-13 02:23:13 -0500 (Fri, 13 Feb 2009)
New Revision: 84154
Modified:
branches/Branch_4_2/console/src/main/org/jboss/console/plugins/AOPLister.java
branches/Branch_4_2/console/src/resources/webconsole.war/AOPBinding.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPClassMetaData.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorConstructorCallerChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMetaData.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMethodCallerChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPDefaultMetaData.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldMetaData.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPIntroductionPointcut.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodConstructorCallerChain.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMetaData.jsp
branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMethodCallerChain.jsp
Log:
[JBAS-6493]
Change AOPLister and jsp's to use methods that actually work with AOP.
Modified: branches/Branch_4_2/console/src/main/org/jboss/console/plugins/AOPLister.java
===================================================================
--- branches/Branch_4_2/console/src/main/org/jboss/console/plugins/AOPLister.java 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/main/org/jboss/console/plugins/AOPLister.java 2009-02-13 07:23:13 UTC (rev 84154)
@@ -22,10 +22,14 @@
package org.jboss.console.plugins;
import gnu.trove.TLongObjectHashMap;
+import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.CallerConstructorInfo;
import org.jboss.aop.CallerMethodInfo;
+import org.jboss.aop.ConstructorInfo;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.FieldInfo;
+import org.jboss.aop.JoinPointInfo;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.advice.AdviceBinding;
import org.jboss.aop.advice.Interceptor;
@@ -201,9 +205,12 @@
return (TreeNode[]) constructors.toArray(new TreeNode[constructors.size()]);
}
- TreeNode getMetaData(String classname) throws Exception
+ //TreeNode getMetaData(String classname) throws Exception
+ TreeNode getMetaData(ClassAdvisor advisor) throws Exception
{
- ClassAdvisor advisor = (ClassAdvisor) AspectManager.instance().getAdvisor(classname);
+ //ClassAdvisor advisor = (ClassAdvisor) AspectManager.instance().getAdvisor(classname);
+ //ClassAdvisor advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().getAdvisor(classname);
+ String classname = advisor.getName();
ArrayList nodes = new ArrayList();
TreeNode[] defaultMetaData = loadDefaultMetaData(advisor, classname);
@@ -339,7 +346,8 @@
populateMethods(advisor, nodes);
populateFields(advisor, nodes);
- TreeNode metadata = getMetaData(advisor.getName());
+ //TreeNode metadata = getMetaData(advisor.getName());
+ TreeNode metadata = getMetaData(advisor);
if (metadata != null) nodes.add(metadata);
return (TreeNode[]) nodes.toArray(new TreeNode[nodes.size()]);
@@ -353,7 +361,8 @@
for (int i = 0; i < advisor.getAdvisedFields().length; i++)
{
Field f = advisor.getAdvisedFields()[i];
- Interceptor[] chain = advisor.getFieldWriteInterceptors()[i];
+ //Interceptor[] chain = advisor.getFieldWriteInterceptors()[i];
+ FieldInfo[] chain = advisor.getFieldWriteInfos();
if (chain != null && chain.length > 0)
{
fieldWriteNodes.add(createTreeNode(
@@ -368,7 +377,8 @@
null // Sub-Resources
));
}
- chain = advisor.getFieldReadInterceptors()[i];
+ //chain = advisor.getFieldReadInterceptors()[i];
+ chain = advisor.getFieldReadInfos();
if (chain != null && chain.length > 0)
{
fieldReadNodes.add(createTreeNode(
@@ -439,7 +449,8 @@
for (int i = 0; i < advisor.getConstructors().length; i++)
{
Constructor con = advisor.getConstructors()[i];
- Interceptor[] chain = advisor.getConstructorInterceptors()[i];
+ //Interceptor[] chain = advisor.getConstructorInterceptors()[i];
+ ConstructorInfo[] chain = advisor.getConstructorInfos();
HashMap methodCallers = advisor.getMethodCalledByConInterceptors()[i];
HashMap conCallers = advisor.getConCalledByConInterceptors()[i];
if ((chain != null && chain.length > 0) || methodCallers != null || conCallers != null)
@@ -716,7 +727,8 @@
public TreeNode[] getUnboundBindings() throws Exception
{
ArrayList unbounded = new ArrayList();
- Iterator it = AspectManager.instance().getBindings().values().iterator();
+ //Iterator it = AspectManager.instance().getBindings().values().iterator();
+ Iterator it = AspectManager.getTopLevelAspectManager().getBindings().values().iterator();
while (it.hasNext())
{
AdviceBinding binding = (AdviceBinding) it.next();
@@ -762,7 +774,9 @@
{
Map.Entry entry = (Map.Entry) it.next();
String classname = (String) entry.getKey();
+ System.out.println("AOPLister found classname: "+classname);
ClassAdvisor advisor = (ClassAdvisor) entry.getValue();
+ System.out.println("AOPLister found advisor: "+advisor);
nodes.add(createTreeNode(
classname, // name
"Class " + classname, // description
@@ -791,6 +805,9 @@
{
try
{
+ System.out.println("-> TCL: " + Thread.currentThread().getContextClassLoader());
+ AspectManager tl = AspectManager.getTopLevelAspectManager();
+
TreeNode[] unbounded = getUnboundBindings();
TreeNode[] children = new TreeNode[2];
children[0] = createTreeNode(
@@ -827,12 +844,13 @@
}
}
- public static String outputChain(Interceptor[] chain)
+ public static String outputChain(JoinPointInfo[] chain)
{
String output = "";
for (int i = 0; i < chain.length; i++)
{
output += "<tr>";
+ /*
if (chain[i] instanceof AbstractAdvice)
{
output +="<td><font size=\"1\">advice</font></td><td><font size=\"1\">" + chain[i].getName() + "</font></td>";
@@ -843,13 +861,27 @@
}
else
{
+ */
output +="<td><font size=\"1\">interceptor</font></td><td><font size=\"1\">" + chain[i].getClass().getName() + "</font></td>";
- }
+ //}
output += "</tr>";
}
return output;
}
+ public static String outputChain(Interceptor[] chain)
+ {
+ String output = "";
+ for (int i = 0; i < chain.length; i++)
+ {
+ output += "<tr>";
+ output +="<td><font size=\"1\">interceptor</font></td><td><font size=\"1\">" + chain[i].getClass().getName() + "</font></td>";
+ output += "</tr>";
+ }
+ return output;
+ }
+
+
// org.jboss.console.plugins.helpers.PluginWrapper overrides -----------------------
/* (non-Javadoc)
@@ -871,7 +903,9 @@
int advisorCount = 0;
while (true)
{
- int count = AspectManager.instance().getAdvisors().size();
+ System.out.println("AOPLISTER CL: "+this.getClass().getClassLoader());
+ //int count = AspectManager.instance().getAdvisors().size();
+ int count = AspectManager.getTopLevelAspectManager().getAdvisors().size();
if (count != advisorCount)
{
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPBinding.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPBinding.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPBinding.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -26,7 +26,7 @@
<!-- header end -->
<%
String name = request.getParameter("binding");
- AdviceBinding binding = (AdviceBinding)AspectManager.instance().getBindings().get(name);
+ AdviceBinding binding = (AdviceBinding)AspectManager.getTopLevelAspectManager().getBindings().get(name);
%>
<hr class="hide"/>
<center>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPClassMetaData.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPClassMetaData.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPClassMetaData.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -26,7 +26,16 @@
<%
String classname = request.getParameter("classname");
String group = request.getParameter("group");
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ Advisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
HashMap groupAttrs = advisor.getClassMetaData().tag(group);
%>
<hr class="hide"/>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -28,9 +28,18 @@
<%
String classname = request.getParameter("classname");
int idx = Integer.parseInt(request.getParameter("constructor"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ Advisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
Constructor constructor = advisor.getConstructors()[idx];
- Interceptor[] interceptors = advisor.getConstructorInterceptors()[idx];
+ ConstructorInfo[] interceptors = advisor.getConstructorInfos();
%>
<hr class="hide"/>
@@ -81,4 +90,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorConstructorCallerChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorConstructorCallerChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorConstructorCallerChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -31,7 +31,17 @@
int idx = Integer.parseInt(request.getParameter("index"));
String calledClassname = request.getParameter("calledclassname");
long hash = Long.parseLong(request.getParameter("hash"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
+ //ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
Constructor constructor = advisor.getConstructors()[idx];
HashMap called = advisor.getConCalledByConInterceptors()[idx];
TLongObjectHashMap map = (TLongObjectHashMap)called.get(calledClassname);
@@ -88,4 +98,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMetaData.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMetaData.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMetaData.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -29,7 +29,16 @@
String classname = request.getParameter("classname");
String group = request.getParameter("group");
String con = request.getParameter("constructor");
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
HashMap groupAttrs = new HashMap();
ConstructorMetaData metaData = advisor.getConstructorMetaData();
Iterator conit = metaData.getConstructors();
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMethodCallerChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMethodCallerChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPConstructorMethodCallerChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -31,7 +31,16 @@
int idx = Integer.parseInt(request.getParameter("index"));
String calledClassname = request.getParameter("calledclassname");
long hash = Long.parseLong(request.getParameter("hash"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
Constructor constructor = advisor.getConstructors()[idx];
HashMap called = advisor.getMethodCalledByConInterceptors()[idx];
TLongObjectHashMap map = (TLongObjectHashMap)called.get(calledClassname);
@@ -88,4 +97,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPDefaultMetaData.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPDefaultMetaData.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPDefaultMetaData.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -26,7 +26,16 @@
<%
String classname = request.getParameter("classname");
String group = request.getParameter("group");
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
HashMap groupAttrs = advisor.getDefaultMetaData().tag(group);
%>
<hr class="hide"/>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -27,10 +27,19 @@
<%
String classname = request.getParameter("classname");
int idx = Integer.parseInt(request.getParameter("field"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
Field field = advisor.getAdvisedFields()[idx];
boolean read = request.getParameter("mode").equals("read");
- Interceptor[] interceptors = read ? advisor.getFieldReadInterceptors()[idx] : advisor.getFieldWriteInterceptors()[idx];
+ FieldInfo[] interceptors = read ? advisor.getFieldReadInfos() : advisor.getFieldWriteInfos();
%>
<hr class="hide"/>
<center>
@@ -81,4 +90,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldMetaData.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldMetaData.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPFieldMetaData.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -27,7 +27,16 @@
String classname = request.getParameter("classname");
String group = request.getParameter("group");
String field = request.getParameter("field");
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
HashMap groupAttrs = advisor.getFieldMetaData().getFieldMetaData(field).tag(group);
%>
<hr class="hide"/>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPIntroductionPointcut.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPIntroductionPointcut.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPIntroductionPointcut.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -26,7 +26,7 @@
<!-- header end -->
<%
String name = request.getParameter("pointcut");
- InterfaceIntroduction introduction = AspectManager.instance().getInterfaceIntroduction(name);
+ InterfaceIntroduction introduction = AspectManager.getTopLevelAspectManager().getInterfaceIntroduction(name);
%>
<hr class="hide"/>
<center> <h4 style="text-align: center"><%=name%></h4>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -28,9 +28,18 @@
<%
String classname = request.getParameter("classname");
long hash = Long.parseLong(request.getParameter("method"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
TLongObjectHashMap methodChains = advisor.getMethodInterceptors();
- MethodInfo info = (MethodInfo)methodChains.get(hash);
+ MethodInfo info = (MethodInfo)methodChains.get(hash);
Interceptor[] interceptors = info.interceptors;
Method method = (Method)advisor.getAdvisedMethods().get(hash);
%>
@@ -83,4 +92,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodConstructorCallerChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodConstructorCallerChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodConstructorCallerChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -32,7 +32,16 @@
String calledClassname = request.getParameter("calledclassname");
long hash = Long.parseLong(request.getParameter("hash"));
long callingHash = Long.parseLong(request.getParameter("callinghash"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
Method method = (Method)advisor.getAdvisedMethods().get(callingHash);
HashMap called = (HashMap)advisor.getConCalledByMethodInterceptors().get(callingHash);
TLongObjectHashMap map = (TLongObjectHashMap)called.get(calledClassname);
@@ -89,4 +98,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMetaData.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMetaData.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMetaData.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -27,7 +27,16 @@
String classname = request.getParameter("classname");
String group = request.getParameter("group");
String method = request.getParameter("method");
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
HashMap groupAttrs = advisor.getMethodMetaData().getMethodMetaData(method).tag(group);
%>
<hr class="hide"/>
Modified: branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMethodCallerChain.jsp
===================================================================
--- branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMethodCallerChain.jsp 2009-02-13 06:57:42 UTC (rev 84153)
+++ branches/Branch_4_2/console/src/resources/webconsole.war/AOPMethodMethodCallerChain.jsp 2009-02-13 07:23:13 UTC (rev 84154)
@@ -32,7 +32,16 @@
String calledClassname = request.getParameter("calledclassname");
long hash = Long.parseLong(request.getParameter("hash"));
long callingHash = Long.parseLong(request.getParameter("callinghash"));
- ClassAdvisor advisor = (ClassAdvisor)AspectManager.instance().getAdvisor(classname);
+ ClassAdvisor advisor = null;
+ Map advisorMap = AspectManager.getTopLevelAspectManager().getAdvisors();
+ for(Iterator it = advisorMap.keySet().iterator(); it.hasNext();)
+ {
+ Class clazz = (Class) it.next();
+ if(clazz.getName().equals(classname))
+ {
+ advisor = (ClassAdvisor) AspectManager.getTopLevelAspectManager().findAdvisor(clazz);
+ }
+ }
Method method = (Method)advisor.getAdvisedMethods().get(callingHash);
HashMap called = (HashMap)advisor.getMethodCalledByMethodInterceptors().get(callingHash);
TLongObjectHashMap map = (TLongObjectHashMap)called.get(calledClassname);
@@ -89,4 +98,4 @@
</div>
<!-- footer end -->
</body>
-</html>
\ No newline at end of file
+</html>
More information about the jboss-cvs-commits
mailing list