[jboss-svn-commits] JBL Code SVN: r30476 - in labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta: aop/java/org/jboss/internal/soa/esb/services/registry/aspect and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2009-12-04 11:19:12 -0500 (Fri, 04 Dec 2009)
New Revision: 30476

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml
Log:
Fix scout null binding templates: JBESB-3020

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java	2009-12-04 13:16:16 UTC (rev 30475)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java	2009-12-04 16:19:12 UTC (rev 30476)
@@ -21,7 +21,7 @@
  */
 package org.jboss.internal.soa.esb.services.registry.aspect;
 
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.ws.scout.model.uddi.v2.BindingTemplates;
 import org.jboss.aop.joinpoint.ConstructorCalledByMethodInvocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
 
@@ -116,4 +116,11 @@
 
         return address;
     }
+    
+    public Object getBindingTemplates(final ConstructorCalledByMethodInvocation invocation)
+        throws Throwable
+    {
+        final Object result = invocation.invokeNext() ;
+        return (result == null ? new BindingTemplates() : result) ;
+    }
 }

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2009-12-04 13:16:16 UTC (rev 30475)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2009-12-04 16:19:12 UTC (rev 30476)
@@ -35,5 +35,10 @@
    <bind pointcut="execution(* org.apache.ws.scout.util.ScoutJaxrUddiV3Helper->getAddress(..))">
         <advice name="getAddress" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIScoutAspect"/>
    </bind>
+
+   <bind pointcut="withincode(* org.apache.ws.scout.util.ScoutUddiJaxrHelper->getService(org.apache.ws.scout.model.uddi.v2.BusinessService,javax.xml.registry.LifeCycleManager))
+            AND call(* org.apache.ws.scout.model.uddi.v2.BusinessService->getBindingTemplates(..))">
+        <advice name="getBindingTemplates" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIScoutAspect"/>
+   </bind>
 </aop>
 

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml	2009-12-04 13:16:16 UTC (rev 30475)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml	2009-12-04 16:19:12 UTC (rev 30476)
@@ -281,6 +281,7 @@
             <classpath path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
             <src path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
             <include name="org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.class"/>
+            <include name="org/apache/ws/scout/util/ScoutUddiJaxrHelper.class"/>
             <aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
             <aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
         </aopc>