[jboss-svn-commits] JBL Code SVN: r26303 - in labs/jbossesb/workspace/blixen/product/rosetta/aop: resources/META-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2009-04-29 09:20:07 -0400 (Wed, 29 Apr 2009)
New Revision: 26303

Modified:
   labs/jbossesb/workspace/blixen/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/ScoutAspect.java
   labs/jbossesb/workspace/blixen/product/rosetta/aop/resources/META-INF/jboss-aop.xml
Log:
Fix scout performance

Modified: labs/jbossesb/workspace/blixen/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/ScoutAspect.java
===================================================================
--- labs/jbossesb/workspace/blixen/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/ScoutAspect.java	2009-04-29 12:45:20 UTC (rev 26302)
+++ labs/jbossesb/workspace/blixen/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/ScoutAspect.java	2009-04-29 13:20:07 UTC (rev 26303)
@@ -22,9 +22,11 @@
 package org.jboss.internal.soa.esb.services.registry.aspect;
 
 import javax.xml.registry.LifeCycleManager;
+import javax.xml.registry.infomodel.Organization;
 import javax.xml.registry.infomodel.Service;
 
 import org.apache.ws.scout.registry.BusinessQueryManagerImpl;
+import org.apache.ws.scout.registry.infomodel.OrganizationImpl;
 import org.apache.ws.scout.registry.infomodel.ServiceImpl;
 import org.jboss.aop.joinpoint.MethodCalledByMethodInvocation;
 
@@ -32,6 +34,9 @@
  * Aspect used to prevent scout from loading the complete service
  * graph for the registry just to return a binding.
  * 
+ * Updated to intercept calls for the organizational information when
+ * querying a specific service.
+ * 
  * @author <a href='mailto:Kevin.Conner at jboss.com'>Kevin Conner</a>
  */
 public class ScoutAspect
@@ -51,6 +56,13 @@
             service.setKey(lcm.createKey(id));
             return service ;
         }
+        else if (LifeCycleManager.ORGANIZATION.equals(objectType))
+        {
+            final LifeCycleManager lcm = bqmImpl.getRegistryService().getBusinessLifeCycleManager() ;
+            final Organization organization = new OrganizationImpl(lcm) ;
+            organization.setKey(lcm.createKey(id)) ;
+            return organization ;
+        }
         else
         {
             return invocation.invokeNext() ;

Modified: labs/jbossesb/workspace/blixen/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/workspace/blixen/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2009-04-29 12:45:20 UTC (rev 26302)
+++ labs/jbossesb/workspace/blixen/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2009-04-29 13:20:07 UTC (rev 26303)
@@ -11,6 +11,10 @@
       <advice name="getRegistryObject" aspect="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect"/>
    </bind>
 
+   <bind pointcut="withincode(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->getServiceFromBusinessService(..)) AND call(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->getRegistryObject(..))">
+      <advice name="getRegistryObject" aspect="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect"/>
+   </bind>
+
    <bind pointcut="execution(* org.apache.juddi.util.xml.XMLUtils->getText(..))">
       <advice name="getText" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
    </bind>