[jboss-cvs] JBossAS SVN: r97434 - in branches/JBPAPP_4_2_0_GA_CP_IPV6: ejb3/src/resources/test-configs/localfromremote2/conf and 1 other directories.

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

Author: rachmatowicz at jboss.com
Date: 2009-12-03 18:51:39 -0500 (Thu, 03 Dec 2009)
New Revision: 97434

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/resources/services/binding/sample-bindings.xml
Log:
Miscellaneous errors.

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml	2009-12-03 21:59:06 UTC (rev 97433)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml	2009-12-03 23:51:39 UTC (rev 97434)
@@ -8,7 +8,7 @@
 
    <mbean code="org.jboss.remoting.transport.Connector"
           name="jboss.remoting:type=Connector,name=Ejbthree994Ejb3Connector,handler=ejb3">
-      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3874</attribute>
+      <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3874</attribute>
       <attribute name="Configuration">
          <handlers>
             <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
@@ -18,7 +18,7 @@
    
    <mbean code="org.jboss.remoting.transport.Connector"
           name="jboss.remoting.test:type=Connector,name=Ejbthree994TestEjb3Connector,handler=ejb3">
-      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3875</attribute>
+      <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3875</attribute>
       <attribute name="Configuration">
          <handlers>
             <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties	2009-12-03 21:59:06 UTC (rev 97433)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties	2009-12-03 23:51:39 UTC (rev 97434)
@@ -1,5 +1,5 @@
 # DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
 #
-java.naming.provider.url=localhost:1199
+#java.naming.provider.url=jnp://localhost:1199
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/resources/services/binding/sample-bindings.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/resources/services/binding/sample-bindings.xml	2009-12-03 21:59:06 UTC (rev 97433)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/resources/services/binding/sample-bindings.xml	2009-12-03 23:51:39 UTC (rev 97434)
@@ -42,7 +42,7 @@
       <service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
          delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
         <delegate-config>
-           <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+           <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873</attribute>
         </delegate-config>
          <binding port="3873"/>
       </service-config>
@@ -173,7 +173,7 @@
             <attribute name="Properties"><![CDATA[
                 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
                 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-                java.naming.provider.url=${jboss.bind.address:localhost}:1100
+                java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1100
                 jnp.disableDiscovery=false
                 jnp.partitionName=${jboss.partition.name:DefaultPartition}
                 jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -452,7 +452,7 @@
       <service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
          delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
         <delegate-config>
-           <attribute name="InvokerLocator">socket://${jboss.bind.address}:3973</attribute>
+           <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3973</attribute>
         </delegate-config>
          <binding port="3973"/>
       </service-config>
@@ -584,7 +584,7 @@
             <attribute name="Properties"><![CDATA[
                 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
                 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-                java.naming.provider.url=${jboss.bind.address:localhost}:1200
+                java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1200
                 jnp.disableDiscovery=false
                 jnp.partitionName=${jboss.partition.name:DefaultPartition}
                 jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -865,7 +865,7 @@
       <service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
          delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
         <delegate-config>
-           <attribute name="InvokerLocator">socket://${jboss.bind.address}:4073</attribute>
+           <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:4073</attribute>
         </delegate-config>
          <binding port="4073"/>
       </service-config>
@@ -997,7 +997,7 @@
             <attribute name="Properties"><![CDATA[
                 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
                 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-                java.naming.provider.url=${jboss.bind.address:localhost}:1300
+                java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1300
                 jnp.disableDiscovery=false
                 jnp.partitionName=${jboss.partition.name:DefaultPartition}
                 jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -1279,7 +1279,7 @@
       <service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
          delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
         <delegate-config>
-           <attribute name="InvokerLocator">socket://${jboss.bind.address}:4173</attribute>
+           <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:4173</attribute>
         </delegate-config>
          <binding port="4173"/>
       </service-config>
@@ -1411,7 +1411,7 @@
             <attribute name="Properties"><![CDATA[
                 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
                 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-                java.naming.provider.url=${jboss.bind.address:localhost}:1400
+                java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1400
                 jnp.disableDiscovery=false
                 jnp.partitionName=${jboss.partition.name:DefaultPartition}
                 jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}