[jboss-svn-commits] JBL Code SVN: r32001 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product: rosetta and 2 other directories.

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

Author: kevin.conner at jboss.com
Date: 2010-03-09 05:37:57 -0500 (Tue, 09 Mar 2010)
New Revision: 32001

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/conf/esb.juddi.xml
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIAspect.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/build.xml
Log:
Force juddi JNDI binding to be local: JBESB-3202

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/conf/esb.juddi.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/conf/esb.juddi.xml	2010-03-09 08:26:33 UTC (rev 32000)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/conf/esb.juddi.xml	2010-03-09 10:37:57 UTC (rev 32001)
@@ -82,8 +82,9 @@
   <entry key="juddi.proxy.securityProvider">com.sun.net.ssl.internal.ssl.Provider</entry>
   <entry key="juddi.proxy.protocolHandler">com.sun.net.ssl.internal.www.protocol</entry>
 
-  <!-- JNDI settings (used by RMITransport) -->
+  <!-- JNDI settings (used by RMITransport)
   <entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
   <entry key="java.naming.provider.url">jnp://${jboss.esb.bind.address}:1099</entry>
   <entry key="java.naming.factory.url.pkgs">org.jboss.naming</entry>
+  -->
 </properties>

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIAspect.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIAspect.java	2010-03-09 08:26:33 UTC (rev 32000)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIAspect.java	2010-03-09 10:37:57 UTC (rev 32001)
@@ -23,6 +23,7 @@
 
 import java.util.Vector;
 
+import org.apache.juddi.util.Config;
 import org.jboss.aop.joinpoint.MethodCalledByMethodInvocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.w3c.dom.Element;
@@ -65,4 +66,27 @@
     {
         return new Vector<Object>() ;
     }
+    
+    public Object getStringProperty(final MethodCalledByMethodInvocation invocation)
+        throws Throwable
+    {
+        final Object[] args = invocation.getArguments() ;
+        final String key = (String)args[0] ;
+        return Config.getStringProperty(key) ;
+    }
+    
+    public Object setProperty(final MethodCalledByMethodInvocation invocation)
+        throws Throwable
+    {
+        final Object[] args = invocation.getArguments() ;
+        final Object value = args[1] ;
+        if (value != null)
+        {
+            return invocation.invokeNext() ;
+        }
+        else
+        {
+            return null ;
+        }
+    }
 }

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2010-03-09 08:26:33 UTC (rev 32000)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2010-03-09 10:37:57 UTC (rev 32001)
@@ -13,5 +13,13 @@
    <bind pointcut="withincode(* org.apache.juddi.datastore.jdbc.JDBCDataStore->fetchBusiness(..)) AND call(* org.apache.juddi.datastore.jdbc.JDBCDataStore->fetchServiceByBusinessKey(..))">
       <advice name="fetchServiceByBusinessKey" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
    </bind>
+
+   <bind pointcut="withincode(* org.apache.juddi.registry.rmi.JNDIRegistration->register()) AND call(* org.apache.juddi.util.Config->getStringProperty(..))">
+      <advice name="getStringProperty" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
+   </bind>
+
+   <bind pointcut="withincode(* org.apache.juddi.registry.rmi.JNDIRegistration->register()) AND call(* java.util.Properties->setProperty(..))">
+      <advice name="setProperty" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
+   </bind>
 </aop>
 

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/build.xml	2010-03-09 08:26:33 UTC (rev 32000)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/build.xml	2010-03-09 10:37:57 UTC (rev 32001)
@@ -188,6 +188,7 @@
             <src path="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
             <include name="org/apache/juddi/util/xml/XMLUtils.class"/>
             <include name="org/apache/juddi/datastore/jdbc/JDBCDataStore.class"/>
+            <include name="org/apache/juddi/registry/rmi/JNDIRegistration.class"/>
             <aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
             <aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
         </aopc>