[jboss-cvs] JBossAS SVN: r79299 - in projects/ejb3/trunk: core/src/main/java/org/jboss/ejb3/session and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 9 08:27:27 EDT 2008


Author: ALRubinger
Date: 2008-10-09 08:27:27 -0400 (Thu, 09 Oct 2008)
New Revision: 79299

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
   projects/ejb3/trunk/proxy-clustered/pom.xml
   projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateful/StatefulSessionClusteredProxyFactory.java
   projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateless/StatelessSessionClusteredProxyFactory.java
   projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredSessionRegistrarBase.java
   projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatefulSessionRegistrar.java
   projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatelessSessionRegistrar.java
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1523] Resolve compilation errors between proxy-clustered and proxy in trunk

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/core/pom.xml	2008-10-09 12:27:27 UTC (rev 79299)
@@ -371,7 +371,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-clustered</artifactId>
-      <version>0.1.3</version>
+      <version>0.1.4-SNAPSHOT</version>
     </dependency>
    
     <dependency>

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -391,6 +391,7 @@
        */
 
       // Is this a Remote Interface ?
+      boolean isLocal = false;
       String ejb2xRemoteInterface = smd.getRemote();
       if (ejb2xInterface.equals(ejb2xRemoteInterface))
       {
@@ -406,6 +407,7 @@
          if (ejb2xInterface.equals(ejb2xLocalInterface))
          {
             // Mark as found
+            isLocal = true;
             jndiName = smd.getLocalJndiName();
          }
       }
@@ -419,7 +421,7 @@
       }
 
       // Lookup
-      String proxyFactoryKey = this.getJndiRegistrar().getProxyFactoryRegistryKey(jndiName);
+      String proxyFactoryKey = this.getJndiRegistrar().getProxyFactoryRegistryKey(jndiName, smd, isLocal);
       Object factory = Ejb3RegistrarLocator.locateRegistrar().lookup(proxyFactoryKey);
 
       // Cast

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -1164,7 +1164,7 @@
          String jndiName = isLocal ? smd.getLocalJndiName() : smd.getJndiName();
 
          // Find the Proxy Factory Key for this SFSB
-         String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName);
+         String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName, smd, isLocal);
 
          // Lookup the Proxy Factory in the Object Store
          StatefulSessionProxyFactory proxyFactory = Ejb3RegistrarLocator.locateRegistrar().lookup(proxyFactoryKey,
@@ -1263,7 +1263,7 @@
          String jndiName = isLocal ? smd.getLocalJndiName() : smd.getJndiName();
          
          // Find the Proxy Factory Key for this SFSB
-         String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName);
+         String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName, smd, isLocal);
 
          // Lookup the Proxy Factory in the Object Store
          StatefulSessionProxyFactory proxyFactory = Ejb3RegistrarLocator.locateRegistrar().lookup(proxyFactoryKey,
@@ -1448,7 +1448,7 @@
       String jndiName = !isRemote ? smd.getLocalJndiName() : smd.getJndiName();
       
       // Find the Proxy Factory Key for this SFSB
-      String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName);
+      String proxyFactoryKey = sfsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName, smd, !isRemote);
       
       // Lookup the Proxy Factory in the Object Store
       StatefulSessionProxyFactory proxyFactory = Ejb3RegistrarLocator.locateRegistrar().lookup(proxyFactoryKey,

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -609,7 +609,7 @@
          String jndiName = isLocal ? smd.getLocalJndiName() : smd.getJndiName();
 
          // Find the Proxy Factory Key for this SLSB
-         String proxyFactoryKey = slsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName);
+         String proxyFactoryKey = slsbJndiRegistrar.getProxyFactoryRegistryKey(jndiName, smd, isLocal);
 
          // Lookup the Proxy Factory in the Object Store
          StatelessSessionProxyFactoryBase proxyFactory = Ejb3RegistrarLocator.locateRegistrar().lookup(proxyFactoryKey,

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -230,7 +230,7 @@
          String defaultRemoteJndiName = smd.getJndiName();
 
          // Create and register a remote proxy factory
-         String defaultRemoteProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultRemoteJndiName);
+         String defaultRemoteProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultRemoteJndiName, smd, false);
          SessionProxyFactory factory = this.createRemoteProxyFactory(defaultRemoteProxyFactoryKey, containerName,
                containerGuid, smd, cl, defaultClientBindUrl, advisor, null);
          try
@@ -354,7 +354,8 @@
                    */
 
                   // Create and register a remote proxy factory specific to this binding
-                  String remoteBindingProxyFactoryKey = this.getProxyFactoryRegistryKey(remoteBindingJndiName);
+                  String remoteBindingProxyFactoryKey = this.getProxyFactoryRegistryKey(remoteBindingJndiName, smd,
+                        false);
                   SessionProxyFactory remoteBindingProxyFactory = null;
                   boolean reregister = true;
                   try
@@ -447,7 +448,7 @@
          String defaultLocalJndiName = smd.getLocalJndiName();
 
          // Create and register a local proxy factory
-         String localProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultLocalJndiName);
+         String localProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultLocalJndiName, smd, true);
          SessionProxyFactory factory = this.createLocalProxyFactory(localProxyFactoryKey, containerName, containerGuid,
                smd, cl, advisor);
          try
@@ -595,7 +596,7 @@
          String defaultRemoteJndiName = smd.getJndiName();
 
          // Find and deregister a remote proxy factory
-         String remoteProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultRemoteJndiName);
+         String remoteProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultRemoteJndiName, smd, false);
          this.deregisterProxyFactory(remoteProxyFactoryKey);
 
          // Determine if remote home and business remotes are bound to same JNDI Address
@@ -630,7 +631,8 @@
                   this.unbind(context, remoteBindingJndiName);
 
                   // Find and deregister the remote proxy factory
-                  String remoteBindingProxyFactoryKey = this.getProxyFactoryRegistryKey(remoteBindingJndiName);
+                  String remoteBindingProxyFactoryKey = this.getProxyFactoryRegistryKey(remoteBindingJndiName, smd,
+                        false);
                   this.deregisterProxyFactory(remoteBindingProxyFactoryKey);
                }
             }
@@ -655,7 +657,7 @@
          String defaultLocalJndiName = smd.getLocalJndiName();
 
          // Remove local proxy factory
-         String localProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultLocalJndiName);
+         String localProxyFactoryKey = this.getProxyFactoryRegistryKey(defaultLocalJndiName,smd,true);
          this.deregisterProxyFactory(localProxyFactoryKey);
 
          // Determine if local home and business locals are bound to same JNDI Address
@@ -958,8 +960,10 @@
     * ProxyFactory/(jndiName)
     * 
     * @param jndiName
+    * @param smd
+    * @param isLocal
     */
-   public String getProxyFactoryRegistryKey(String jndiName)
+   public String getProxyFactoryRegistryKey(String jndiName, JBossSessionBeanMetaData smd, boolean isLocal)
    {
       // Initialize
       String suffix = null;

Modified: projects/ejb3/trunk/proxy-clustered/pom.xml
===================================================================
--- projects/ejb3/trunk/proxy-clustered/pom.xml	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/pom.xml	2008-10-09 12:27:27 UTC (rev 79299)
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy</artifactId>
-      <version>0.1.2</version>
+      <version>0.1.8-SNAPSHOT</version>
     </dependency>
     
     <dependency>

Modified: projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateful/StatefulSessionClusteredProxyFactory.java
===================================================================
--- projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateful/StatefulSessionClusteredProxyFactory.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateful/StatefulSessionClusteredProxyFactory.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -75,16 +75,17 @@
     *       for which this ProxyFactory is to generate Proxies
     * @param url The URL to use for remoting
     * @param advisor The Advisor for proxies created by this factory
+    * @param interceptorStack
     */
-   public StatefulSessionClusteredProxyFactory(final String name, final String containerName, final String containerGuid,
-         final JBossSessionBeanMetaData metadata, final ClassLoader classloader, final String url, final Advisor advisor,
-         ProxyClusteringRegistry registry)
+   public StatefulSessionClusteredProxyFactory(final String name, final String containerName,
+         final String containerGuid, final JBossSessionBeanMetaData metadata, final ClassLoader classloader,
+         final String url, final Advisor advisor, ProxyClusteringRegistry registry, final String interceptorStack)
    {
       // Call Super
-      super(name, containerName, containerGuid, metadata, classloader, url, advisor);
-      
+      super(name, containerName, containerGuid, metadata, classloader, url, advisor, interceptorStack);
+
       assert registry != null : "registry is null";
-      
+
       this.registry = registry;
    }
 

Modified: projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateless/StatelessSessionClusteredProxyFactory.java
===================================================================
--- projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateless/StatelessSessionClusteredProxyFactory.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/factory/session/stateless/StatelessSessionClusteredProxyFactory.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -74,13 +74,14 @@
     *       for which this ProxyFactory is to generate Proxies
     * @param url The URL to use for remoting
     * @param advisor The Advisor for proxies created by this factory
+    * @param interceptorStack
     */
-   public StatelessSessionClusteredProxyFactory(final String name, final String containerName, final String containerGuid,
-         final JBossSessionBeanMetaData metadata, final ClassLoader classloader, final String url, final Advisor advisor, 
-         final ProxyClusteringRegistry registry)
+   public StatelessSessionClusteredProxyFactory(final String name, final String containerName,
+         final String containerGuid, final JBossSessionBeanMetaData metadata, final ClassLoader classloader,
+         final String url, final Advisor advisor, final ProxyClusteringRegistry registry, final String interceptorStack)
    {
       // Call Super
-      super(name, containerName, containerGuid, metadata, classloader, url, advisor);
+      super(name, containerName, containerGuid, metadata, classloader, url, advisor, interceptorStack);
       
       assert registry != null : "registry is null";
       

Modified: projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredSessionRegistrarBase.java
===================================================================
--- projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredSessionRegistrarBase.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredSessionRegistrarBase.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -188,14 +188,14 @@
    // --------------------------------------------------------------------------------||
 
    @Override
-   public String getProxyFactoryRegistryKey(JBossSessionBeanMetaData md, boolean isLocal)
+   public String getProxyFactoryRegistryKey(String jndiName, JBossSessionBeanMetaData smd, boolean isLocal)
    {
-      String key = super.getProxyFactoryRegistryKey(md, isLocal);
+      String key = super.getProxyFactoryRegistryKey(jndiName, smd, isLocal);
       if (!isLocal)
       {
-         ClusterConfigMetaData ccmd = md.getClusterConfig();
+         ClusterConfigMetaData ccmd = smd.getClusterConfig();
          assert ccmd != null : ClusterConfigMetaData.class.getSimpleName() + " not found in metadata";
-         key += "/" + ProxyClusteringRegistry.getPartitionName(md.getClusterConfig());
+         key += "/" + ProxyClusteringRegistry.getPartitionName(smd.getClusterConfig());
       }
       return key;
    }

Modified: projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatefulSessionRegistrar.java
===================================================================
--- projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatefulSessionRegistrar.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatefulSessionRegistrar.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -97,15 +97,16 @@
     * @param cl The ClassLoader for this EJB Container
     * @param url The URL to use for Remoting
     * @param advisor The Advisor for proxies created by this factory
+    * @param interceptorStack
     */
    @Override
    protected SessionProxyFactory createRemoteProxyFactory(final String name, final String containerName,
          final String containerGuid, final JBossSessionBeanMetaData smd, final ClassLoader cl, final String url,
-         final Advisor advisor)
+         final Advisor advisor, final String interceptorStack)
    {
       // Create
-      SessionProxyFactory factory = new StatefulSessionClusteredProxyFactory(name, containerName, containerGuid, smd, cl,
-            url, advisor, getRegistry());
+      SessionProxyFactory factory = new StatefulSessionClusteredProxyFactory(name, containerName, containerGuid, smd,
+            cl, url, advisor, getRegistry(), interceptorStack);
 
       // Register with Remoting
       log.debug("Registering with Remoting Dispatcher under name \"" + factory.getName() + "\": " + factory);

Modified: projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatelessSessionRegistrar.java
===================================================================
--- projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatelessSessionRegistrar.java	2008-10-09 11:13:00 UTC (rev 79298)
+++ projects/ejb3/trunk/proxy-clustered/src/main/java/org/jboss/ejb3/proxy/clustered/jndiregistrar/JndiClusteredStatelessSessionRegistrar.java	2008-10-09 12:27:27 UTC (rev 79299)
@@ -101,11 +101,11 @@
    @Override
    protected SessionProxyFactory createRemoteProxyFactory(final String name, final String containerName,
          final String containerGuid, final JBossSessionBeanMetaData smd, final ClassLoader cl, final String url,
-         final Advisor advisor)
+         final Advisor advisor, final String interceptorStack)
    {
       // Create
-      SessionProxyFactory factory = new StatelessSessionClusteredProxyFactory(name, containerName, containerGuid, smd, cl,
-            url, advisor, getRegistry());
+      SessionProxyFactory factory = new StatelessSessionClusteredProxyFactory(name, containerName, containerGuid, smd,
+            cl, url, advisor, getRegistry(), interceptorStack);
 
       // Register with Remoting
       log.debug("Registering with Remoting Dispatcher under name \"" + factory.getName() + "\": " + factory);




More information about the jboss-cvs-commits mailing list