[jboss-svn-commits] JBL Code SVN: r38174 - in labs/jbossesb/branches/JBESB_4_4_GA_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: tcunning
Date: 2012-09-12 15:14:22 -0400 (Wed, 12 Sep 2012)
New Revision: 38174

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivysettings.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
Log:
JBESB-3846
Change the use of constructor of InitialContext from in JNDIRegistration.register() from InitialContext(Hashtable) to InitialContext.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivy.xml	2012-09-11 16:43:13 UTC (rev 38173)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivy.xml	2012-09-12 19:14:22 UTC (rev 38174)
@@ -86,5 +86,7 @@
         <dependency org="sun-jaxws" name="jaxws-tools" rev="2.1.1"/>
         <dependency org="sun-jaxws" name="jaxws-rt" rev="2.1.1"/>
         <dependency org="sun-jaxb" name="jaxb-xjc" rev="2.1.4"/>
+        <exclude org="apache-httpclient" module="commons-httpclient"/>
+
     </dependencies>
 </ivy-module>

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivysettings.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivysettings.xml	2012-09-11 16:43:13 UTC (rev 38173)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/ivysettings.xml	2012-09-12 19:14:22 UTC (rev 38174)
@@ -2,9 +2,13 @@
     <settings defaultResolver="chained"/>
     <resolvers>
         <chain name="chained">
-            <url name="jboss" m2compatible="true">
-                <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+            <url name="jboss-nexus" m2compatible="true">
+                <artifact pattern="https://repository.jboss.org/nexus/content/groups/public/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
             </url>
+            <url name="jboss-deprecated" m2compatible="true">
+                <artifact pattern="https://repository.jboss.org/nexus/content/repositories/deprecated/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+            </url>
+
             <ibiblio name="ibiblio" m2compatible="true"/> 
             <url name="milyn" m2compatible="true">
                 <artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>

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	2012-09-11 16:43:13 UTC (rev 38173)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIAspect.java	2012-09-12 19:14:22 UTC (rev 38174)
@@ -22,13 +22,18 @@
 package org.jboss.internal.soa.esb.services.registry.aspect;
 
 import java.sql.Connection;
+import java.util.Hashtable;
 import java.util.Vector;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 import org.apache.juddi.datastore.jdbc.JBossESBDataStore;
 import org.apache.juddi.datastore.jdbc.JDBCDataStore;
 import org.apache.juddi.datatype.binding.BindingTemplate;
 import org.apache.juddi.datatype.binding.TModelInstanceDetails;
 import org.apache.juddi.util.Config;
+import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.MethodCalledByMethodInvocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.w3c.dom.Element;
@@ -120,4 +125,8 @@
             return null ;
         }
     }
+    
+    public InitialContext newContext(final Invocation invocation) throws NamingException {
+    	return new InitialContext();
+    }
 }

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	2012-09-11 16:43:13 UTC (rev 38173)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/aop/resources/META-INF/jboss-aop.xml	2012-09-12 19:14:22 UTC (rev 38174)
@@ -6,6 +6,7 @@
 <aop>
    <aspect class="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect" scope="PER_VM"/>
    <aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIContextAspect" scope="PER_VM"/>
 
    <bind pointcut="withincode(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->findServiceBindings(..)) AND call(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->getRegistryObject(..))">
       <advice name="getRegistryObject" aspect="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect"/>
@@ -30,5 +31,10 @@
    <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>
+
+   <bind pointcut="withincode(* org.apache.juddi.registry.rmi.JNDIRegistration->register()) AND call(javax.naming.InitialContext->new(..))">
+      <advice name="newContext" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
+   </bind>
+
 </aop>