ISPN-5900 CDI split up (common, remote and embedded)

infinispan · Apr 28, 2016 · 73bebca · 73bebca
1 parent 04df565
commit 73bebca
Show file tree

Hide file tree

Showing 171 changed files with 353 additions and 360 deletions.
diff --git a/as-modules/client/build.xml b/as-modules/client/build.xml
@@ -38,6 +38,10 @@
             <maven-resource group="org.infinispan" artifact="infinispan-cdi-remote"/>
         </module-def>
 
+        <module-def name="org.infinispan.cdi.common" slot="${infinispan.slot}">
+            <maven-resource group="org.infinispan" artifact="infinispan-cdi-common"/>
+        </module-def>
+
         <module-def name="org.infinispan.protostream" slot="${infinispan.slot}">
             <maven-resource group="org.infinispan.protostream" artifact="protostream" />
         </module-def>

diff --git a/as-modules/client/pom.xml b/as-modules/client/pom.xml
@@ -29,6 +29,11 @@
          <artifactId>infinispan-cdi-remote</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>org.infinispan</groupId>
+         <artifactId>infinispan-cdi-common</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>org.infinispan.protostream</groupId>
          <artifactId>protostream</artifactId>

diff --git a/as-modules/client/src/main/resources/org/infinispan/cdi/common/main/module.xml b/as-modules/client/src/main/resources/org/infinispan/cdi/common/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="org.infinispan.cdi.common" slot="${slot}">
+    <resources>
+        <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api" />
+        <module name="javax.enterprise.api" />
+        <module name="javax.cache.api" slot="${slot}" export="true"/>
+        <module name="org.infinispan.commons" slot="${slot}" export="true"/>
+        <module name="org.jboss.logging" />
+    </dependencies>
+</module>
diff --git a/as-modules/client/src/main/resources/org/infinispan/cdi/remote/main/module.xml b/as-modules/client/src/main/resources/org/infinispan/cdi/remote/main/module.xml
@@ -8,6 +8,7 @@
         <module name="javax.api" />
         <module name="javax.enterprise.api" />
         <module name="javax.cache.api" slot="${slot}" export="true"/>
+        <module name="org.infinispan.cdi.common" slot="${slot}" export="true" services="import"/>
         <module name="org.infinispan.commons" slot="${slot}" export="true"/>
         <module name="org.infinispan.client.hotrod" slot="${slot}" export="true" />
         <module name="org.jboss.logging" />

diff --git a/as-modules/embedded/build.xml b/as-modules/embedded/build.xml
@@ -67,7 +67,8 @@
             <maven-resource group="org.infinispan" artifact="infinispan-cdi-embedded" />
         </module-def>
 
-        <module-def name="org.infinispan.cdi" slot="${infinispan.slot}">
+        <module-def name="org.infinispan.cdi.common" slot="${infinispan.slot}">
+            <maven-resource group="org.infinispan" artifact="infinispan-cdi-common" />
         </module-def>
 
         <module-def name="org.infinispan.client.hotrod" slot="${infinispan.slot}">

diff --git a/as-modules/embedded/pom.xml b/as-modules/embedded/pom.xml
@@ -53,6 +53,11 @@
          <artifactId>infinispan-cdi-embedded</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>org.infinispan</groupId>
+         <artifactId>infinispan-cdi-common</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>org.infinispan</groupId>
          <artifactId>infinispan-jcache</artifactId>

diff --git a/as-modules/embedded/src/main/resources/org/infinispan/cdi/common/main/module.xml b/as-modules/embedded/src/main/resources/org/infinispan/cdi/common/main/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="org.infinispan.cdi.common" slot="${slot}">
+    <resources>
+        <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="javax.api" />
+        <module name="javax.enterprise.api" />
+        <module name="javax.cache.api" slot="${slot}" export="true"/>
+        <module name="org.infinispan.commons" slot="${slot}" export="true"/>
+        <module name="org.jboss.logging" />
+    </dependencies>
+</module>
diff --git a/as-modules/embedded/src/main/resources/org/infinispan/cdi/embedded/main/module.xml b/as-modules/embedded/src/main/resources/org/infinispan/cdi/embedded/main/module.xml
@@ -8,6 +8,7 @@
         <module name="javax.api" />
         <module name="javax.enterprise.api" />
         <module name="javax.cache.api" slot="${slot}" export="true"/>
+        <module name="org.infinispan.cdi.common" slot="${slot}" export="true" services="import"/>
         <module name="org.infinispan.commons" slot="${slot}" export="true"/>
         <module name="org.infinispan.core" slot="${slot}" export="true"/>
         <module name="org.infinispan.client.hotrod" slot="${slot}" export="true" />

diff --git a/as-modules/embedded/src/main/resources/org/infinispan/cdi/main/module.xml b/as-modules/embedded/src/main/resources/org/infinispan/cdi/main/module.xml
diff --git a/...java/org/infinispan/cdi/package-info.java → ...g/infinispan/cdi/common/package-info.java b/...java/org/infinispan/cdi/package-info.java → ...g/infinispan/cdi/common/package-info.java
@@ -5,4 +5,4 @@
  *
  * @public
  */
-package org.infinispan.cdi;
+package org.infinispan.cdi.common;
diff --git a/...ispan/cdi/util/AbstractImmutableBean.java → ...di/common/util/AbstractImmutableBean.java b/...ispan/cdi/util/AbstractImmutableBean.java → ...di/common/util/AbstractImmutableBean.java
@@ -1,6 +1,6 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
-import org.infinispan.cdi.util.logging.Log;
+import org.infinispan.cdi.common.util.logging.Log;
 import org.infinispan.commons.logging.LogFactory;
 
 import javax.enterprise.context.Dependent;

diff --git a/...a/org/infinispan/cdi/util/Annotateds.java → ...nfinispan/cdi/common/util/Annotateds.java b/...a/org/infinispan/cdi/util/Annotateds.java → ...nfinispan/cdi/common/util/Annotateds.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedCallable;

diff --git a/...a/org/infinispan/cdi/util/AnyLiteral.java → ...nfinispan/cdi/common/util/AnyLiteral.java b/...a/org/infinispan/cdi/util/AnyLiteral.java → ...nfinispan/cdi/common/util/AnyLiteral.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.util.AnnotationLiteral;

diff --git a/...java/org/infinispan/cdi/util/Arrays2.java → ...g/infinispan/cdi/common/util/Arrays2.java b/...java/org/infinispan/cdi/util/Arrays2.java → ...g/infinispan/cdi/common/util/Arrays2.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/.../org/infinispan/cdi/util/BeanBuilder.java → ...finispan/cdi/common/util/BeanBuilder.java b/.../org/infinispan/cdi/util/BeanBuilder.java → ...finispan/cdi/common/util/BeanBuilder.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Alternative;

diff --git a/...inispan/cdi/util/BeanManagerProvider.java → .../cdi/common/util/BeanManagerProvider.java b/...inispan/cdi/util/BeanManagerProvider.java → .../cdi/common/util/BeanManagerProvider.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;

diff --git a/...n/java/org/infinispan/cdi/util/Beans.java → ...org/infinispan/cdi/common/util/Beans.java b/...n/java/org/infinispan/cdi/util/Beans.java → ...org/infinispan/cdi/common/util/Beans.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Produces;

diff --git a/...va/org/infinispan/cdi/util/CDIHelper.java → ...infinispan/cdi/common/util/CDIHelper.java b/...va/org/infinispan/cdi/util/CDIHelper.java → ...infinispan/cdi/common/util/CDIHelper.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.inject.spi.BeanManager;
 

diff --git a/...inispan/cdi/util/ContextualLifecycle.java → .../cdi/common/util/ContextualLifecycle.java b/...inispan/cdi/util/ContextualLifecycle.java → .../cdi/common/util/ContextualLifecycle.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;

diff --git a/...inispan/cdi/util/ContextualReference.java → .../cdi/common/util/ContextualReference.java b/...inispan/cdi/util/ContextualReference.java → .../cdi/common/util/ContextualReference.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;

diff --git a/...va/org/infinispan/cdi/util/Contracts.java → ...infinispan/cdi/common/util/Contracts.java b/...va/org/infinispan/cdi/util/Contracts.java → ...infinispan/cdi/common/util/Contracts.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 /**
  * An helper class providing useful assertion methods.

diff --git a/...g/infinispan/cdi/util/DefaultLiteral.java → ...ispan/cdi/common/util/DefaultLiteral.java b/...g/infinispan/cdi/util/DefaultLiteral.java → ...ispan/cdi/common/util/DefaultLiteral.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.inject.Default;
 import javax.enterprise.util.AnnotationLiteral;

diff --git a/...i/util/DelegatingContextualLifecycle.java → ...n/util/DelegatingContextualLifecycle.java b/...i/util/DelegatingContextualLifecycle.java → ...n/util/DelegatingContextualLifecycle.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;

diff --git a/...nispan/cdi/util/DummyInjectionTarget.java → ...cdi/common/util/DummyInjectionTarget.java b/...nispan/cdi/util/DummyInjectionTarget.java → ...cdi/common/util/DummyInjectionTarget.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.util.Set;
 

diff --git a/...g/infinispan/cdi/util/ForwardingBean.java → ...ispan/cdi/common/util/ForwardingBean.java b/...g/infinispan/cdi/util/ForwardingBean.java → ...ispan/cdi/common/util/ForwardingBean.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;

diff --git a/...an/cdi/util/ForwardingObserverMethod.java → ...common/util/ForwardingObserverMethod.java b/...an/cdi/util/ForwardingObserverMethod.java → ...common/util/ForwardingObserverMethod.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.event.Reception;
 import javax.enterprise.event.TransactionPhase;

diff --git a/...finispan/cdi/util/HierarchyDiscovery.java → ...n/cdi/common/util/HierarchyDiscovery.java b/...finispan/cdi/util/HierarchyDiscovery.java → ...n/cdi/common/util/HierarchyDiscovery.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

diff --git a/...rg/infinispan/cdi/util/ImmutableBean.java → ...nispan/cdi/common/util/ImmutableBean.java b/...rg/infinispan/cdi/util/ImmutableBean.java → ...nispan/cdi/common/util/ImmutableBean.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

diff --git a/...pan/cdi/util/ImmutableInjectionPoint.java → .../common/util/ImmutableInjectionPoint.java b/...pan/cdi/util/ImmutableInjectionPoint.java → .../common/util/ImmutableInjectionPoint.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import static java.util.Collections.unmodifiableSet;
 

diff --git a/...util/ImmutablePassivationCapableBean.java → ...util/ImmutablePassivationCapableBean.java b/...util/ImmutablePassivationCapableBean.java → ...util/ImmutablePassivationCapableBean.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

diff --git a/...infinispan/cdi/util/InjectableMethod.java → ...pan/cdi/common/util/InjectableMethod.java b/...infinispan/cdi/util/InjectableMethod.java → ...pan/cdi/common/util/InjectableMethod.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...pan/cdi/util/ParameterValueRedefiner.java → .../common/util/ParameterValueRedefiner.java b/...pan/cdi/util/ParameterValueRedefiner.java → .../common/util/ParameterValueRedefiner.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.BeanManager;

diff --git a/...ispan/cdi/util/ParameterizedTypeImpl.java → ...di/common/util/ParameterizedTypeImpl.java b/...ispan/cdi/util/ParameterizedTypeImpl.java → ...di/common/util/ParameterizedTypeImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

diff --git a/.../org/infinispan/cdi/util/Reflections.java → ...finispan/cdi/common/util/Reflections.java b/.../org/infinispan/cdi/util/Reflections.java → ...finispan/cdi/common/util/Reflections.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.BeanManager;

diff --git a/...i/util/SetAccessiblePriviligedAction.java → ...n/util/SetAccessiblePriviligedAction.java b/...i/util/SetAccessiblePriviligedAction.java → ...n/util/SetAccessiblePriviligedAction.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.reflect.AccessibleObject;
 import java.security.PrivilegedAction;

diff --git a/...va/org/infinispan/cdi/util/Synthetic.java → ...infinispan/cdi/common/util/Synthetic.java b/...va/org/infinispan/cdi/util/Synthetic.java → ...infinispan/cdi/common/util/Synthetic.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...n/java/org/infinispan/cdi/util/Types.java → ...org/infinispan/cdi/common/util/Types.java b/...n/java/org/infinispan/cdi/util/Types.java → ...org/infinispan/cdi/common/util/Types.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util;
+package org.infinispan.cdi.common.util;
 
 /**
  * Utility class for Types

diff --git a/...tedtypebuilder/AnnotatedCallableImpl.java → ...tedtypebuilder/AnnotatedCallableImpl.java b/...tedtypebuilder/AnnotatedCallableImpl.java → ...tedtypebuilder/AnnotatedCallableImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedCallable;
 import javax.enterprise.inject.spi.AnnotatedParameter;

diff --git a/...typebuilder/AnnotatedConstructorImpl.java → ...typebuilder/AnnotatedConstructorImpl.java b/...typebuilder/AnnotatedConstructorImpl.java → ...typebuilder/AnnotatedConstructorImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import java.lang.reflect.Constructor;

diff --git a/...otatedtypebuilder/AnnotatedFieldImpl.java → ...otatedtypebuilder/AnnotatedFieldImpl.java b/...otatedtypebuilder/AnnotatedFieldImpl.java → ...otatedtypebuilder/AnnotatedFieldImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedType;

diff --git a/...l/annotatedtypebuilder/AnnotatedImpl.java → ...l/annotatedtypebuilder/AnnotatedImpl.java b/...l/annotatedtypebuilder/AnnotatedImpl.java → ...l/annotatedtypebuilder/AnnotatedImpl.java
@@ -1,6 +1,6 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
-import org.infinispan.cdi.util.HierarchyDiscovery;
+import org.infinispan.cdi.common.util.HierarchyDiscovery;
 
 import javax.enterprise.inject.spi.Annotated;
 import java.lang.annotation.Annotation;

diff --git a/...tatedtypebuilder/AnnotatedMemberImpl.java → ...tatedtypebuilder/AnnotatedMemberImpl.java b/...tatedtypebuilder/AnnotatedMemberImpl.java → ...tatedtypebuilder/AnnotatedMemberImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedMember;
 import javax.enterprise.inject.spi.AnnotatedType;

diff --git a/...tatedtypebuilder/AnnotatedMethodImpl.java → ...tatedtypebuilder/AnnotatedMethodImpl.java b/...tatedtypebuilder/AnnotatedMethodImpl.java → ...tatedtypebuilder/AnnotatedMethodImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedType;

diff --git a/...edtypebuilder/AnnotatedParameterImpl.java → ...edtypebuilder/AnnotatedParameterImpl.java b/...edtypebuilder/AnnotatedParameterImpl.java → ...edtypebuilder/AnnotatedParameterImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import javax.enterprise.inject.spi.AnnotatedCallable;
 import javax.enterprise.inject.spi.AnnotatedParameter;

diff --git a/...atedtypebuilder/AnnotatedTypeBuilder.java → ...atedtypebuilder/AnnotatedTypeBuilder.java b/...atedtypebuilder/AnnotatedTypeBuilder.java → ...atedtypebuilder/AnnotatedTypeBuilder.java
@@ -1,7 +1,7 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
-import org.infinispan.cdi.util.Reflections;
-import org.infinispan.cdi.util.logging.Log;
+import org.infinispan.cdi.common.util.logging.Log;
+import org.infinispan.cdi.common.util.Reflections;
 import org.infinispan.commons.logging.LogFactory;
 
 import javax.enterprise.inject.spi.Annotated;

diff --git a/...notatedtypebuilder/AnnotatedTypeImpl.java → ...notatedtypebuilder/AnnotatedTypeImpl.java b/...notatedtypebuilder/AnnotatedTypeImpl.java → ...notatedtypebuilder/AnnotatedTypeImpl.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...notatedtypebuilder/AnnotationBuilder.java → ...notatedtypebuilder/AnnotationBuilder.java b/...notatedtypebuilder/AnnotationBuilder.java → ...notatedtypebuilder/AnnotationBuilder.java
@@ -1,7 +1,7 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
-import org.infinispan.cdi.util.Reflections;
-import org.infinispan.cdi.util.logging.Log;
+import org.infinispan.cdi.common.util.Reflections;
+import org.infinispan.cdi.common.util.logging.Log;
 import org.infinispan.commons.logging.LogFactory;
 
 import java.lang.annotation.Annotation;

diff --git a/...annotatedtypebuilder/AnnotationStore.java → ...annotatedtypebuilder/AnnotationStore.java b/...annotatedtypebuilder/AnnotationStore.java → ...annotatedtypebuilder/AnnotationStore.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.annotatedtypebuilder;
+package org.infinispan.cdi.common.util.annotatedtypebuilder;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;

diff --git a/...util/defaultbean/AbstractDefaultBean.java → ...util/defaultbean/AbstractDefaultBean.java b/...util/defaultbean/AbstractDefaultBean.java → ...util/defaultbean/AbstractDefaultBean.java
@@ -1,6 +1,6 @@
-package org.infinispan.cdi.util.defaultbean;
+package org.infinispan.cdi.common.util.defaultbean;
 
-import org.infinispan.cdi.util.ForwardingBean;
+import org.infinispan.cdi.common.util.ForwardingBean;
 
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;

diff --git a/...aultbean/AbstractDefaultProducerBean.java → ...aultbean/AbstractDefaultProducerBean.java b/...aultbean/AbstractDefaultProducerBean.java → ...aultbean/AbstractDefaultProducerBean.java
@@ -1,6 +1,6 @@
-package org.infinispan.cdi.util.defaultbean;
+package org.infinispan.cdi.common.util.defaultbean;
 
-import org.infinispan.cdi.util.Beans;
+import org.infinispan.cdi.common.util.Beans;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;

diff --git a/...pan/cdi/util/defaultbean/DefaultBean.java → .../common/util/defaultbean/DefaultBean.java b/...pan/cdi/util/defaultbean/DefaultBean.java → .../common/util/defaultbean/DefaultBean.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.defaultbean;
+package org.infinispan.cdi.common.util.defaultbean;
 
 import javax.enterprise.inject.Alternative;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;

diff --git a/...til/defaultbean/DefaultBeanExtension.java → ...til/defaultbean/DefaultBeanExtension.java b/...til/defaultbean/DefaultBeanExtension.java → ...til/defaultbean/DefaultBeanExtension.java
@@ -1,13 +1,13 @@
-package org.infinispan.cdi.util.defaultbean;
+package org.infinispan.cdi.common.util.defaultbean;
 
 
-import org.infinispan.cdi.util.AnyLiteral;
-import org.infinispan.cdi.util.DefaultLiteral;
-import org.infinispan.cdi.util.HierarchyDiscovery;
-import org.infinispan.cdi.util.Reflections;
-import org.infinispan.cdi.util.Synthetic;
-import org.infinispan.cdi.util.annotatedtypebuilder.AnnotatedTypeBuilder;
-import org.infinispan.cdi.util.logging.Log;
+import org.infinispan.cdi.common.util.AnyLiteral;
+import org.infinispan.cdi.common.util.DefaultLiteral;
+import org.infinispan.cdi.common.util.HierarchyDiscovery;
+import org.infinispan.cdi.common.util.Synthetic;
+import org.infinispan.cdi.common.util.annotatedtypebuilder.AnnotatedTypeBuilder;
+import org.infinispan.cdi.common.util.logging.Log;
+import org.infinispan.cdi.common.util.Reflections;
 import org.infinispan.commons.logging.LogFactory;
 
 import javax.enterprise.event.Observes;

diff --git a/...i/util/defaultbean/DefaultBeanHolder.java → ...n/util/defaultbean/DefaultBeanHolder.java b/...i/util/defaultbean/DefaultBeanHolder.java → ...n/util/defaultbean/DefaultBeanHolder.java
@@ -1,4 +1,4 @@
-package org.infinispan.cdi.util.defaultbean;
+package org.infinispan.cdi.common.util.defaultbean;
 
 import javax.enterprise.inject.spi.Bean;