onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sclas...@apache.org
Subject svn commit: r1631870 - in /onami/trunk/persist/src: main/java/org/apache/onami/persist/ test/java/org/apache/onami/persist/ test/java/org/apache/onami/persist/test/ test/java/org/apache/onami/persist/test/multipersistenceunits/ test/java/org/apache/ona...
Date Tue, 14 Oct 2014 20:21:10 GMT
Author: sclassen
Date: Tue Oct 14 20:21:09 2014
New Revision: 1631870

URL: http://svn.apache.org/r1631870
Log:
onami-persist: cleanup of imports

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/ForContainerManaged.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/UserTransactionJndiName.java
    onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionProviderByJndiLookup.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/AllPersistenceUnitsTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProviderTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProviderTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerFactorySourceViaProviderTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplThreadingTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/JtaTransactionFacadeProviderTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceUnitModuleConfigurationTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/PreconditionsTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/ResourceLocalTransactionFacadeProviderTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/TxnInterceptorTest.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/UserTransactionFacadeTest.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/FirstPU.java
    onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/SecondPU.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=1631870&r1=1631869&r2=1631870&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 Tue
Oct 14 20:21:09 2014
@@ -19,10 +19,10 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import javax.inject.Singleton;
+import com.google.inject.Singleton;
 
 import java.util.ArrayList;
 import java.util.HashSet;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import javax.inject.Provider;
+import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 
 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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManagerFactory;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManagerFactory;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManagerFactory;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,9 +19,9 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Provider;
+import com.google.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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

Modified: onami/trunk/persist/src/main/java/org/apache/onami/persist/ForContainerManaged.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/ForContainerManaged.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/main/java/org/apache/onami/persist/ForContainerManaged.java (original)
+++ onami/trunk/persist/src/main/java/org/apache/onami/persist/ForContainerManaged.java Tue
Oct 14 20:21:09 2014
@@ -19,6 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
+import com.google.inject.BindingAnnotation;
+
 import javax.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,6 +33,7 @@ import java.lang.annotation.Target;
 @Target( { ElementType.PARAMETER } )
 @Retention( RetentionPolicy.RUNTIME )
 @Qualifier
+@BindingAnnotation
 @interface ForContainerManaged
 {
 }

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=1631870&r1=1631869&r2=1631870&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 Tue Oct
14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Singleton;
+import com.google.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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityManager;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;

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=1631870&r1=1631869&r2=1631870&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 Tue
Oct 14 20:21:09 2014
@@ -21,8 +21,7 @@ package org.apache.onami.persist;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;
-import javax.inject.Provider;
-
+import com.google.inject.Provider;
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import javax.inject.Provider;
+import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 
 import javax.persistence.EntityManagerFactory;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import javax.persistence.EntityTransaction;
 

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=1631870&r1=1631869&r2=1631870&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 Tue Oct
14 20:21:09 2014
@@ -21,7 +21,7 @@ package org.apache.onami.persist;
 
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import javax.inject.Provider;
+import com.google.inject.Provider;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import org.aopalliance.intercept.MethodInvocation;
 
 import java.lang.annotation.Annotation;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Singleton;
+import com.google.inject.Singleton;
 import org.aopalliance.intercept.MethodInvocation;
 
 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=1631870&r1=1631869&r2=1631870&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 Tue Oct
14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Singleton;
+import com.google.inject.Singleton;
 
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;

Modified: onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionJndiName.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionJndiName.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionJndiName.java
(original)
+++ onami/trunk/persist/src/main/java/org/apache/onami/persist/UserTransactionJndiName.java
Tue Oct 14 20:21:09 2014
@@ -19,6 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
+import com.google.inject.BindingAnnotation;
+
 import javax.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,6 +33,7 @@ import java.lang.annotation.Target;
 @Target( { ElementType.PARAMETER } )
 @Retention( RetentionPolicy.RUNTIME )
 @Qualifier
+@BindingAnnotation
 @interface UserTransactionJndiName
 {
 }

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,8 +19,8 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
 
 import javax.transaction.UserTransaction;
 

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/AllPersistenceUnitsTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/AllPersistenceUnitsTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/AllPersistenceUnitsTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/AllPersistenceUnitsTest.java
Tue Oct 14 20:21:09 2014
@@ -29,7 +29,11 @@ import static com.google.inject.name.Nam
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link AllPersistenceUnits}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProviderTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProviderTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProviderTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/ApplicationManagedEntityManagerFactoryProviderTest.java
Tue Oct 14 20:21:09 2014
@@ -27,7 +27,11 @@ import javax.persistence.EntityManagerFa
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link ApplicationManagedEntityManagerFactoryProviderTest}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProviderTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProviderTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProviderTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/ContainerManagedEntityManagerFactoryProviderTest.java
Tue Oct 14 20:21:09 2014
@@ -27,7 +27,11 @@ import javax.persistence.EntityManagerFa
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link ContainerManagedEntityManagerFactoryProvider}.

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import javax.inject.Provider;
+import com.google.inject.Provider;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplTest.java
Tue Oct 14 20:21:09 2014
@@ -30,7 +30,11 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link EntityManagerProviderImpl}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplThreadingTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplThreadingTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplThreadingTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/EntityManagerProviderImplThreadingTest.java
Tue Oct 14 20:21:09 2014
@@ -31,7 +31,11 @@ import java.util.concurrent.CountDownLat
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link org.apache.onami.persist.EntityManagerProviderImpl}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/JtaTransactionFacadeProviderTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/JtaTransactionFacadeProviderTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/JtaTransactionFacadeProviderTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/JtaTransactionFacadeProviderTest.java
Tue Oct 14 20:21:09 2014
@@ -26,7 +26,10 @@ import org.junit.runner.RunWith;
 
 import javax.persistence.EntityManager;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link JtaTransactionFacadeFactory}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
Tue Oct 14 20:21:09 2014
@@ -28,7 +28,10 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link PersistenceFilterImpl}.

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import javax.inject.Provider;
+import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +30,8 @@ import javax.transaction.UserTransaction
 import java.lang.annotation.Annotation;
 import java.util.Properties;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/PreconditionsTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/PreconditionsTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/PreconditionsTest.java (original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/PreconditionsTest.java Tue
Oct 14 20:21:09 2014
@@ -21,7 +21,9 @@ package org.apache.onami.persist;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/ResourceLocalTransactionFacadeProviderTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/ResourceLocalTransactionFacadeProviderTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/ResourceLocalTransactionFacadeProviderTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/ResourceLocalTransactionFacadeProviderTest.java
Tue Oct 14 20:21:09 2014
@@ -27,7 +27,10 @@ import org.junit.runner.RunWith;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link ResourceLocalTransactionFacadeFactory}.

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/TxnInterceptorTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/TxnInterceptorTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/TxnInterceptorTest.java (original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/TxnInterceptorTest.java Tue
Oct 14 20:21:09 2014
@@ -29,7 +29,12 @@ import org.mockito.InOrder;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link TxnInterceptor}

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/UserTransactionFacadeTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/UserTransactionFacadeTest.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/UserTransactionFacadeTest.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/UserTransactionFacadeTest.java
Tue Oct 14 20:21:09 2014
@@ -32,10 +32,23 @@ import javax.transaction.SystemException
 import javax.transaction.UserTransaction;
 
 import static java.lang.System.currentTimeMillis;
-import static javax.transaction.Status.*;
+import static javax.transaction.Status.STATUS_ACTIVE;
+import static javax.transaction.Status.STATUS_COMMITTED;
+import static javax.transaction.Status.STATUS_COMMITTING;
+import static javax.transaction.Status.STATUS_MARKED_ROLLBACK;
+import static javax.transaction.Status.STATUS_NO_TRANSACTION;
+import static javax.transaction.Status.STATUS_PREPARED;
+import static javax.transaction.Status.STATUS_PREPARING;
+import static javax.transaction.Status.STATUS_ROLLEDBACK;
+import static javax.transaction.Status.STATUS_ROLLING_BACK;
+import static javax.transaction.Status.STATUS_UNKNOWN;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test for {@link UserTransactionFacade}.

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test;
  */
 
 import com.google.inject.Guice;
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import com.google.inject.PrivateModule;
 import org.junit.Test;
 

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/FirstPU.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/FirstPU.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/FirstPU.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/FirstPU.java
Tue Oct 14 20:21:09 2014
@@ -17,6 +17,8 @@ package org.apache.onami.persist.test.mu
  * limitations under the License.
  */
 
+import com.google.inject.BindingAnnotation;
+
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -29,6 +31,7 @@ import static java.lang.annotation.Eleme
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { FIELD, PARAMETER, METHOD } )
 @Qualifier
+@BindingAnnotation
 public @interface FirstPU
 {
 }

Modified: onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/SecondPU.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/SecondPU.java?rev=1631870&r1=1631869&r2=1631870&view=diff
==============================================================================
--- onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/SecondPU.java
(original)
+++ onami/trunk/persist/src/test/java/org/apache/onami/persist/test/multipersistenceunits/SecondPU.java
Tue Oct 14 20:21:09 2014
@@ -17,6 +17,8 @@ package org.apache.onami.persist.test.mu
  * limitations under the License.
  */
 
+import com.google.inject.BindingAnnotation;
+
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -29,6 +31,7 @@ import static java.lang.annotation.Eleme
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { FIELD, PARAMETER, METHOD } )
 @Qualifier
+@BindingAnnotation
 public @interface SecondPU
 {
 }

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist.test.mu
  * under the License.
  */
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import org.apache.onami.persist.EntityManagerProvider;
 import org.apache.onami.persist.Transactional;
 import org.apache.onami.persist.test.TestEntity;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test.tr
  */
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.inject.Inject;
+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;

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=1631870&r1=1631869&r2=1631870&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
Tue Oct 14 20:21:09 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test.tr
  */
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import com.google.inject.Injector;
 import org.apache.onami.persist.EntityManagerProvider;
 import org.apache.onami.persist.Transactional;



Mime
View raw message