Merge pull request #7067 from pferraro/master

wildfly · Jan 12, 2015 · 6ff8e10 · 6ff8e10
2 parents b3ac177 + b283d7b
commit 6ff8e10
Show file tree

Hide file tree

Showing 520 changed files with 7,427 additions and 5,379 deletions.
diff --git a/clustering/common/pom.xml b/clustering/common/pom.xml
@@ -38,6 +38,10 @@
     <name>WildFly: Common code for clustering subsystems</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-service</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-naming</artifactId>

diff --git a/...ing/common/src/main/java/org/jboss/as/clustering/concurrent/ComparableRunnableFuture.java b/...ing/common/src/main/java/org/jboss/as/clustering/concurrent/ComparableRunnableFuture.java
diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/naming/BinderServiceBuilder.java b/clustering/common/src/main/java/org/jboss/as/clustering/naming/BinderServiceBuilder.java
@@ -21,6 +21,9 @@
  */
 package org.jboss.as.clustering.naming;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.jboss.as.naming.ManagedReferenceFactory;
 import org.jboss.as.naming.ManagedReferenceInjector;
 import org.jboss.as.naming.ServiceBasedNamingStore;
@@ -30,28 +33,47 @@
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceTarget;
+import org.wildfly.clustering.service.Builder;
 
 /**
- * Encapsulates the common logic for building a JNDI binding for a given service.
+ * Builds a ManagedReferenceFactory JNDI binding.
  * @author Paul Ferraro
  */
-public class BinderServiceBuilder {
+public class BinderServiceBuilder<T> implements Builder<ManagedReferenceFactory> {
+
+    private final ContextNames.BindInfo binding;
+    private final ServiceName targetServiceName;
+    private final Class<T> targetClass;
+    private final List<ContextNames.BindInfo> aliases = new LinkedList<>();
 
-    private final ServiceTarget target;
+    public BinderServiceBuilder(ContextNames.BindInfo binding, ServiceName targetServiceName, Class<T> targetClass) {
+        this.binding = binding;
+        this.targetServiceName = targetServiceName;
+        this.targetClass = targetClass;
+    }
+
+    public BinderServiceBuilder<T> alias(ContextNames.BindInfo alias) {
+        this.aliases.add(alias);
+        return this;
+    }
 
-    public BinderServiceBuilder(ServiceTarget target) {
-        this.target = target;
+    @Override
+    public ServiceName getServiceName() {
+        return this.binding.getBinderServiceName();
     }
 
-    public <T> ServiceBuilder<ManagedReferenceFactory> build(ContextNames.BindInfo binding, ServiceName targetServiceName, Class<T> targetClass) {
-        String name = binding.getBindName();
+    @Override
+    public ServiceBuilder<ManagedReferenceFactory> build(ServiceTarget target) {
+        String name = this.binding.getBindName();
         BinderService binder = new BinderService(name);
-        ServiceBuilder<ManagedReferenceFactory> builder = this.target.addService(binding.getBinderServiceName(), binder)
+        ServiceBuilder<ManagedReferenceFactory> builder = target.addService(this.getServiceName(), binder)
                 .addAliases(ContextNames.JAVA_CONTEXT_SERVICE_NAME.append(name))
-                .addDependency(targetServiceName, targetClass, new ManagedReferenceInjector<T>(binder.getManagedObjectInjector()))
-                .addDependency(binding.getParentContextServiceName(), ServiceBasedNamingStore.class, binder.getNamingStoreInjector())
-                .setInitialMode(ServiceController.Mode.PASSIVE)
+                .addDependency(this.targetServiceName, this.targetClass, new ManagedReferenceInjector<T>(binder.getManagedObjectInjector()))
+                .addDependency(this.binding.getParentContextServiceName(), ServiceBasedNamingStore.class, binder.getNamingStoreInjector())
         ;
-        return builder;
+        for (ContextNames.BindInfo alias : this.aliases) {
+            builder.addAliases(alias.getBinderServiceName(), ContextNames.JAVA_CONTEXT_SERVICE_NAME.append(alias.getBindName()));
+        }
+        return builder.setInitialMode(ServiceController.Mode.PASSIVE);
     }
 }
diff --git a/clustering/ee/infinispan/pom.xml b/clustering/ee/infinispan/pom.xml
@@ -46,15 +46,14 @@
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.transaction</groupId>
             <artifactId>jboss-transaction-api_1.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...lustering/concurrent/RetryingInvoker.java → ...tering/ee/infinispan/RetryingInvoker.java b/...lustering/concurrent/RetryingInvoker.java → ...tering/ee/infinispan/RetryingInvoker.java
@@ -19,19 +19,22 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.as.clustering.concurrent;
+package org.wildfly.clustering.ee.infinispan;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.as.clustering.logging.ClusteringLogger;
+import org.jboss.logging.Logger;
+import org.wildfly.clustering.ee.Invoker;
 
 /**
  * A invocation strategy that invokes a given task, retrying a configurable number of times on failure using backoff sleep intervals.
  * @author Paul Ferraro
  */
 public class RetryingInvoker implements Invoker {
 
+    private static final Logger LOGGER = Logger.getLogger(RetryingInvoker.class);
+
     private final long[] backOffIntervals;
     private final TimeUnit unit;
 
@@ -67,7 +70,7 @@ public <R> R invoke(Callable<R> task) throws Exception {
             } catch (Exception e) {
                 exception = e;
             }
-            ClusteringLogger.ROOT_LOGGER.debugf(exception, "Attempt #%d failed", i + 1);
+            LOGGER.debugf(exception, "Attempt #%d failed", i + 1);
         }
 
         throw exception;

diff --git a/...oss/as/clustering/concurrent/Invoker.java → ...va/org/wildfly/clustering/ee/Invoker.java b/...oss/as/clustering/concurrent/Invoker.java → ...va/org/wildfly/clustering/ee/Invoker.java
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.as.clustering.concurrent;
+package org.wildfly.clustering.ee;
 
 import java.util.concurrent.Callable;
 

diff --git a/clustering/ejb/infinispan/pom.xml b/clustering/ejb/infinispan/pom.xml
@@ -56,7 +56,11 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-infinispan</artifactId>
+            <artifactId>wildfly-clustering-infinispan-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-server</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
@@ -74,5 +78,10 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...an/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanCacheConfigurationService.java b/...an/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanCacheConfigurationService.java
diff --git a/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanEvictionScheduler.java b/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanEvictionScheduler.java
@@ -25,13 +25,13 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.jboss.as.clustering.infinispan.distribution.Locality;
 import org.wildfly.clustering.dispatcher.CommandDispatcher;
 import org.wildfly.clustering.dispatcher.CommandDispatcherFactory;
 import org.wildfly.clustering.ee.Batcher;
 import org.wildfly.clustering.ee.infinispan.Evictor;
 import org.wildfly.clustering.ee.infinispan.TransactionBatch;
 import org.wildfly.clustering.ejb.infinispan.logging.InfinispanEjbLogger;
+import org.wildfly.clustering.infinispan.spi.distribution.Locality;
 
 /**
  * Schedules a bean for eviction.

diff --git a/...finispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanExpirationScheduler.java b/...finispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanExpirationScheduler.java
@@ -27,12 +27,12 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.as.clustering.infinispan.distribution.Locality;
 import org.wildfly.clustering.ee.Batch;
 import org.wildfly.clustering.ee.Batcher;
 import org.wildfly.clustering.ee.infinispan.TransactionBatch;
 import org.wildfly.clustering.ejb.Time;
 import org.wildfly.clustering.ejb.infinispan.logging.InfinispanEjbLogger;
+import org.wildfly.clustering.infinispan.spi.distribution.Locality;
 
 /**
  * Schedules a bean for expiration.

diff --git a/...ng/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanGroupEntry.java b/...ng/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanGroupEntry.java
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jboss.as.clustering.marshalling.MarshalledValue;
-import org.jboss.as.clustering.marshalling.MarshallingContext;
+import org.wildfly.clustering.marshalling.MarshalledValue;
+import org.wildfly.clustering.marshalling.MarshallingContext;
 
 /**
  * The cache entry for a bean group

diff --git a/...nispan/src/main/java/org/wildfly/clustering/ejb/infinispan/ClientMappingExternalizer.java b/...nispan/src/main/java/org/wildfly/clustering/ejb/infinispan/ClientMappingExternalizer.java
@@ -26,8 +26,8 @@
 import java.io.ObjectOutput;
 import java.net.InetAddress;
 
-import org.jboss.as.clustering.infinispan.io.AbstractSimpleExternalizer;
 import org.jboss.as.network.ClientMapping;
+import org.wildfly.clustering.infinispan.spi.io.AbstractSimpleExternalizer;
 
 /**
  * @author Paul Ferraro

diff --git a/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/InfinispanBeanManager.java b/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/InfinispanBeanManager.java
@@ -42,20 +42,16 @@
 import org.infinispan.notifications.cachelistener.event.CacheEntryPassivatedEvent;
 import org.infinispan.notifications.cachelistener.event.DataRehashedEvent;
 import org.infinispan.remoting.transport.Address;
-import org.jboss.as.clustering.concurrent.Invoker;
-import org.jboss.as.clustering.concurrent.RetryingInvoker;
-import org.jboss.as.clustering.infinispan.affinity.KeyAffinityServiceFactory;
-import org.jboss.as.clustering.infinispan.distribution.ConsistentHashLocality;
-import org.jboss.as.clustering.infinispan.distribution.Locality;
-import org.jboss.as.clustering.infinispan.distribution.SimpleLocality;
 import org.jboss.ejb.client.Affinity;
 import org.jboss.ejb.client.ClusterAffinity;
 import org.jboss.ejb.client.NodeAffinity;
 import org.wildfly.clustering.dispatcher.Command;
 import org.wildfly.clustering.dispatcher.CommandDispatcher;
 import org.wildfly.clustering.dispatcher.CommandDispatcherFactory;
 import org.wildfly.clustering.ee.Batcher;
+import org.wildfly.clustering.ee.Invoker;
 import org.wildfly.clustering.ee.infinispan.InfinispanBatcher;
+import org.wildfly.clustering.ee.infinispan.RetryingInvoker;
 import org.wildfly.clustering.ee.infinispan.TransactionBatch;
 import org.wildfly.clustering.ejb.Bean;
 import org.wildfly.clustering.ejb.BeanManager;
@@ -65,6 +61,10 @@
 import org.wildfly.clustering.ejb.infinispan.logging.InfinispanEjbLogger;
 import org.wildfly.clustering.group.Node;
 import org.wildfly.clustering.group.NodeFactory;
+import org.wildfly.clustering.infinispan.spi.affinity.KeyAffinityServiceFactory;
+import org.wildfly.clustering.infinispan.spi.distribution.ConsistentHashLocality;
+import org.wildfly.clustering.infinispan.spi.distribution.Locality;
+import org.wildfly.clustering.infinispan.spi.distribution.SimpleLocality;
 import org.wildfly.clustering.registry.Registry;
 
 /**