Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions as-modules/client/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions as-modules/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 14 additions & 0 deletions as-modules/client/src/main/resources/org/infinispan/cdi/common/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions as-modules/client/src/main/resources/org/infinispan/cdi/remote/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 2 additions & 1 deletion as-modules/embedded/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand Down
5 changes: 5 additions & 0 deletions as-modules/embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 14 additions & 0 deletions as-modules/embedded/src/main/resources/org/infinispan/cdi/common/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions as-modules/embedded/src/main/resources/org/infinispan/cdi/embedded/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 0 additions & 4 deletions as-modules/embedded/src/main/resources/org/infinispan/cdi/main/module.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...java/org/infinispan/cdi/package-info.java → ...g/infinispan/cdi/common/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
*
* @public
*/
package org.infinispan.cdi;
package org.infinispan.cdi.common;
4 changes: 2 additions & 2 deletions ...ispan/cdi/util/AbstractImmutableBean.java → ...di/common/util/AbstractImmutableBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/infinispan/cdi/util/Annotateds.java → ...nfinispan/cdi/common/util/Annotateds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/infinispan/cdi/util/AnyLiteral.java → ...nfinispan/cdi/common/util/AnyLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/infinispan/cdi/util/Arrays2.java → ...g/infinispan/cdi/common/util/Arrays2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import java.util.HashSet;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion .../org/infinispan/cdi/util/BeanBuilder.java → ...finispan/cdi/common/util/BeanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...inispan/cdi/util/BeanManagerProvider.java → .../cdi/common/util/BeanManagerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/infinispan/cdi/util/Beans.java → ...org/infinispan/cdi/common/util/Beans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/infinispan/cdi/util/CDIHelper.java → ...infinispan/cdi/common/util/CDIHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import javax.enterprise.inject.spi.BeanManager;

Expand Down
2 changes: 1 addition & 1 deletion ...inispan/cdi/util/ContextualLifecycle.java → .../cdi/common/util/ContextualLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...inispan/cdi/util/ContextualReference.java → .../cdi/common/util/ContextualReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/infinispan/cdi/util/Contracts.java → ...infinispan/cdi/common/util/Contracts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

/**
* An helper class providing useful assertion methods.
Expand Down
2 changes: 1 addition & 1 deletion ...g/infinispan/cdi/util/DefaultLiteral.java → ...ispan/cdi/common/util/DefaultLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...i/util/DelegatingContextualLifecycle.java → ...n/util/DelegatingContextualLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...nispan/cdi/util/DummyInjectionTarget.java → ...cdi/common/util/DummyInjectionTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion ...g/infinispan/cdi/util/ForwardingBean.java → ...ispan/cdi/common/util/ForwardingBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...an/cdi/util/ForwardingObserverMethod.java → ...common/util/ForwardingObserverMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...finispan/cdi/util/HierarchyDiscovery.java → ...n/cdi/common/util/HierarchyDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/infinispan/cdi/util/ImmutableBean.java → ...nispan/cdi/common/util/ImmutableBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...pan/cdi/util/ImmutableInjectionPoint.java → .../common/util/ImmutableInjectionPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import static java.util.Collections.unmodifiableSet;

Expand Down
2 changes: 1 addition & 1 deletion ...util/ImmutablePassivationCapableBean.java → ...util/ImmutablePassivationCapableBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...infinispan/cdi/util/InjectableMethod.java → ...pan/cdi/common/util/InjectableMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion ...pan/cdi/util/ParameterValueRedefiner.java → .../common/util/ParameterValueRedefiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ispan/cdi/util/ParameterizedTypeImpl.java → ...di/common/util/ParameterizedTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../org/infinispan/cdi/util/Reflections.java → ...finispan/cdi/common/util/Reflections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...i/util/SetAccessiblePriviligedAction.java → ...n/util/SetAccessiblePriviligedAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

import java.lang.reflect.AccessibleObject;
import java.security.PrivilegedAction;
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/infinispan/cdi/util/Synthetic.java → ...infinispan/cdi/common/util/Synthetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/infinispan/cdi/util/Types.java → ...org/infinispan/cdi/common/util/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util;
package org.infinispan.cdi.common.util;

/**
* Utility class for Types
Expand Down
2 changes: 1 addition & 1 deletion ...tedtypebuilder/AnnotatedCallableImpl.java → ...tedtypebuilder/AnnotatedCallableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...typebuilder/AnnotatedConstructorImpl.java → ...typebuilder/AnnotatedConstructorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...otatedtypebuilder/AnnotatedFieldImpl.java → ...otatedtypebuilder/AnnotatedFieldImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...l/annotatedtypebuilder/AnnotatedImpl.java → ...l/annotatedtypebuilder/AnnotatedImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tatedtypebuilder/AnnotatedMemberImpl.java → ...tatedtypebuilder/AnnotatedMemberImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tatedtypebuilder/AnnotatedMethodImpl.java → ...tatedtypebuilder/AnnotatedMethodImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...edtypebuilder/AnnotatedParameterImpl.java → ...edtypebuilder/AnnotatedParameterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...atedtypebuilder/AnnotatedTypeBuilder.java → ...atedtypebuilder/AnnotatedTypeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...notatedtypebuilder/AnnotatedTypeImpl.java → ...notatedtypebuilder/AnnotatedTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...notatedtypebuilder/AnnotationBuilder.java → ...notatedtypebuilder/AnnotationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...annotatedtypebuilder/AnnotationStore.java → ...annotatedtypebuilder/AnnotationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...util/defaultbean/AbstractDefaultBean.java → ...util/defaultbean/AbstractDefaultBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...aultbean/AbstractDefaultProducerBean.java → ...aultbean/AbstractDefaultProducerBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...pan/cdi/util/defaultbean/DefaultBean.java → .../common/util/defaultbean/DefaultBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...til/defaultbean/DefaultBeanExtension.java → ...til/defaultbean/DefaultBeanExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...i/util/defaultbean/DefaultBeanHolder.java → ...n/util/defaultbean/DefaultBeanHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.infinispan.cdi.util.defaultbean;
package org.infinispan.cdi.common.util.defaultbean;

import javax.enterprise.inject.spi.Bean;

Expand Down