Author: sclassen
Date: Sun Oct 19 13:05:44 2014
New Revision: 1632905
URL: http://svn.apache.org/r1632905
Log:
use javax.inject.* in preference to com.googe.inject.*
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/AllPersistenceUnits.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/AnnotatedPersistenceUnitBuilder.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProvider.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProvider.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactoryFactory.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceByJndiLookup.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceViaProvider.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProvider.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProviderImpl.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/JndiLookupHelper.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/JtaTransactionFacadeFactory.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceModule.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModuleConfiguration.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/ResourceLocalTransactionFacadeFactory.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/Transactional.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationHelper.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationReader.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/TxnInterceptor.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionFacade.java
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/TransactionalMultiplePuTest.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalTask.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalWorker.java
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/AllPersistenceUnits.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/AllPersistenceUnits.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/AllPersistenceUnits.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/AllPersistenceUnits.java
Sun Oct 19 13:05:44 2014
@@ -19,11 +19,11 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/AnnotatedPersistenceUnitBuilder.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/AnnotatedPersistenceUnitBuilder.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/AnnotatedPersistenceUnitBuilder.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/AnnotatedPersistenceUnitBuilder.java
Sun Oct 19 13:05:44 2014
@@ -20,9 +20,9 @@ package org.apache.onami.persist;
*/
import com.google.inject.Key;
-import com.google.inject.Provider;
import com.google.inject.TypeLiteral;
+import javax.inject.Provider;
import javax.transaction.UserTransaction;
/**
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProvider.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProvider.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProvider.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProvider.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProvider.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProvider.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProvider.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProvider.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactoryFactory.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactoryFactory.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactoryFactory.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactoryFactory.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import java.util.Properties;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceByJndiLookup.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceByJndiLookup.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceByJndiLookup.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceByJndiLookup.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceViaProvider.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceViaProvider.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceViaProvider.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerFactorySourceViaProvider.java
Sun Oct 19 13:05:44 2014
@@ -19,10 +19,9 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
/**
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProvider.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProvider.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProvider.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProvider.java
Sun Oct 19 13:05:44 2014
@@ -19,8 +19,7 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Provider;
-
+import javax.inject.Provider;
import javax.persistence.EntityManager;
/**
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProviderImpl.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProviderImpl.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProviderImpl.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/EntityManagerProviderImpl.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import java.util.Properties;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/JndiLookupHelper.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/JndiLookupHelper.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/JndiLookupHelper.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/JndiLookupHelper.java
Sun Oct 19 13:05:44 2014
@@ -19,8 +19,7 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Singleton;
-
+import javax.inject.Singleton;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/JtaTransactionFacadeFactory.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/JtaTransactionFacadeFactory.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/JtaTransactionFacadeFactory.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/JtaTransactionFacadeFactory.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityManager;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
Sun Oct 19 13:05:44 2014
@@ -19,8 +19,7 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-
+import javax.inject.Inject;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceModule.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceModule.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceModule.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceModule.java
Sun Oct 19 13:05:44 2014
@@ -21,10 +21,10 @@ package org.apache.onami.persist;
import com.google.inject.AbstractModule;
import com.google.inject.Key;
-import com.google.inject.Provider;
import com.google.inject.Scopes;
import com.google.inject.TypeLiteral;
+import javax.inject.Provider;
import javax.persistence.EntityManagerFactory;
import java.util.ArrayList;
import java.util.List;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModuleConfiguration.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModuleConfiguration.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModuleConfiguration.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModuleConfiguration.java
Sun Oct 19 13:05:44 2014
@@ -20,9 +20,9 @@ package org.apache.onami.persist;
*/
import com.google.inject.Key;
-import com.google.inject.Provider;
import com.google.inject.TypeLiteral;
+import javax.inject.Provider;
import javax.persistence.EntityManagerFactory;
import javax.transaction.UserTransaction;
import java.lang.annotation.Annotation;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/ResourceLocalTransactionFacadeFactory.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/ResourceLocalTransactionFacadeFactory.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/ResourceLocalTransactionFacadeFactory.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/ResourceLocalTransactionFacadeFactory.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.persistence.EntityTransaction;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/Transactional.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/Transactional.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/Transactional.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/Transactional.java
Sun Oct 19 13:05:44 2014
@@ -21,8 +21,8 @@ package org.apache.onami.persist;
import com.google.inject.Injector;
import com.google.inject.Key;
-import com.google.inject.Provider;
+import javax.inject.Provider;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationHelper.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationHelper.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationHelper.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationHelper.java
Sun Oct 19 13:05:44 2014
@@ -19,10 +19,10 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
import org.aopalliance.intercept.MethodInvocation;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import java.lang.annotation.Annotation;
import static java.util.Arrays.asList;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationReader.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationReader.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationReader.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/TransactionalAnnotationReader.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,9 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Singleton;
import org.aopalliance.intercept.MethodInvocation;
+import javax.inject.Singleton;
import java.lang.reflect.Method;
/**
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/TxnInterceptor.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/TxnInterceptor.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/TxnInterceptor.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/TxnInterceptor.java
Sun Oct 19 13:05:44 2014
@@ -19,10 +19,11 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Inject;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
+import javax.inject.Inject;
+
/**
* Interceptor for methods and classes annotated with {@link Transactional
@Transactional} annotation.
*/
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionFacade.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionFacade.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionFacade.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionFacade.java
Sun Oct 19 13:05:44 2014
@@ -19,8 +19,7 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Singleton;
-
+import javax.inject.Singleton;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.NotSupportedException;
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java
Sun Oct 19 13:05:44 2014
@@ -19,9 +19,8 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
+import javax.inject.Provider;
+import javax.inject.Singleton;
import javax.transaction.UserTransaction;
import static org.apache.onami.persist.Preconditions.checkNotNull;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java
Sun Oct 19 13:05:44 2014
@@ -19,10 +19,10 @@ package org.apache.onami.persist;
* under the License.
*/
-import com.google.inject.Provider;
import org.junit.Before;
import org.junit.Test;
+import javax.inject.Provider;
import javax.persistence.EntityManagerFactory;
import static org.hamcrest.CoreMatchers.sameInstance;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java
Sun Oct 19 13:05:44 2014
@@ -20,11 +20,11 @@ package org.apache.onami.persist;
*/
import com.google.inject.Key;
-import com.google.inject.Provider;
import com.google.inject.TypeLiteral;
import org.junit.Before;
import org.junit.Test;
+import javax.inject.Provider;
import javax.persistence.EntityManagerFactory;
import javax.transaction.UserTransaction;
import java.lang.annotation.Annotation;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/UnderstandRequestInjectionTest.java
Sun Oct 19 13:05:44 2014
@@ -20,10 +20,10 @@ package org.apache.onami.persist.test;
*/
import com.google.inject.Guice;
-import com.google.inject.Inject;
import com.google.inject.PrivateModule;
import org.junit.Test;
+import javax.inject.Inject;
import java.util.Set;
import static com.google.common.collect.Sets.newHashSet;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/TransactionalMultiplePuTest.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/TransactionalMultiplePuTest.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/TransactionalMultiplePuTest.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/TransactionalMultiplePuTest.java
Sun Oct 19 13:05:44 2014
@@ -19,13 +19,14 @@ package org.apache.onami.persist.test.mu
* under the License.
*/
-import com.google.inject.Inject;
import org.apache.onami.persist.EntityManagerProvider;
import org.apache.onami.persist.Transactional;
import org.apache.onami.persist.test.TestEntity;
import org.junit.Before;
import org.junit.Test;
+import javax.inject.Inject;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalTask.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalTask.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalTask.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalTask.java
Sun Oct 19 13:05:44 2014
@@ -20,12 +20,12 @@ package org.apache.onami.persist.test.tr
*/
import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
import org.apache.onami.persist.EntityManagerProvider;
import org.apache.onami.persist.test.TestEntity;
import
org.apache.onami.persist.test.transaction.testframework.exceptions.RuntimeTestException;
import
org.apache.onami.persist.test.transaction.testframework.exceptions.TestException;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import java.util.ArrayList;
import java.util.List;
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalWorker.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalWorker.java?rev=1632905&r1=1632904&r2=1632905&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalWorker.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/test/transaction/testframework/TransactionalWorker.java
Sun Oct 19 13:05:44 2014
@@ -20,7 +20,6 @@ package org.apache.onami.persist.test.tr
*/
import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
import com.google.inject.Injector;
import org.apache.onami.persist.EntityManagerProvider;
import org.apache.onami.persist.Transactional;
@@ -29,6 +28,7 @@ import org.apache.onami.persist.test.Tes
import
org.apache.onami.persist.test.transaction.testframework.exceptions.RuntimeTestException;
import
org.apache.onami.persist.test.transaction.testframework.exceptions.TestException;
+import javax.inject.Inject;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
