onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From as...@apache.org
Subject svn commit: r1610111 - in /onami/trunk: autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ autobind/examples/sr...
Date Sun, 13 Jul 2014 04:28:29 GMT
Author: ash2k
Date: Sun Jul 13 04:28:27 2014
New Revision: 1610111

URL: http://svn.apache.org/r1610111
Log:
ONAMI-111 Prefer JSR-330 classes

Modified:
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/dynamic/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/general/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/lazy/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/named/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/integrations/example/rocoto/ExampleImpl.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/FirstMarker.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/SecondMarker.java
    onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java
    onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/InjectorProvider.java
    onami/trunk/converters/net/src/test/java/org/apache/onami/converters/net/URLConverterTestCase.java
    onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleObject.java
    onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleTestCase.java
    onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject1.java
    onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject2.java
    onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag1.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag2.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag3.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag4.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Flat.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Recorder.java
    onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/RecorderSleepSettings.java
    onami/trunk/logging/testframework/src/main/java/org/apache/onami/logging/testfw/AbstractLoggerInectionTestCase.java
    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/ForApplicationManaged.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/PersistenceUnitModule.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/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/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
    onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
    onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
    onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java
    onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java
    onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java
    onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java
    onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java
    onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java
    onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java
    onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java
    onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java
    onami/trunk/test/src/main/java/org/apache/onami/test/OnamiSuite.java
    onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceInjectableClassHandler.java
    onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/InjectFromSuperClassTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java
    onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWordAnnotated.java
    onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWorld.java
    onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation.java
    onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation2.java
    onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
    onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/general/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ import javax.inject.Named;
 import org.apache.commons.configuration.Configuration;
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/commons/plist/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ import javax.inject.Named;
 import org.apache.commons.configuration.plist.PropertyListConfiguration;
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/dynamic/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/dynamic/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/dynamic/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/dynamic/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -21,7 +21,7 @@ import javax.inject.Named;
 
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/general/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/general/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/general/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/general/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ import java.util.Properties;
 
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/lazy/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/lazy/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/lazy/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/lazy/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ import java.util.Properties;
 
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/named/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/named/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/named/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/configuration/example/map/named/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -21,7 +21,7 @@ import javax.inject.Named;
 
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/integrations/example/rocoto/ExampleImpl.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/integrations/example/rocoto/ExampleImpl.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/integrations/example/rocoto/ExampleImpl.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/integrations/example/rocoto/ExampleImpl.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ import javax.inject.Named;
 
 import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 
 /**

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/FirstMarker.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/FirstMarker.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/FirstMarker.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/FirstMarker.java Sun Jul 13 04:28:27 2014
@@ -20,10 +20,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 
 @Retention(RetentionPolicy.RUNTIME)
-@BindingAnnotation
+@Qualifier
 @Target( { ElementType.TYPE })
 public @interface FirstMarker {
 

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/SecondMarker.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/SecondMarker.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/SecondMarker.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/marker/SecondMarker.java Sun Jul 13 04:28:27 2014
@@ -20,10 +20,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 
 @Retention(RetentionPolicy.RUNTIME)
-@BindingAnnotation
+@Qualifier
 @Target( { ElementType.TYPE })
 public @interface SecondMarker {
 

Modified: onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java (original)
+++ onami/trunk/autobind/examples/src/main/java/org/apache/onami/autobind/scanner/asm/example/autobind/multiple/ExampleContainer.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 public class ExampleContainer {
 	private List<Example> _examples;

Modified: onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/InjectorProvider.java
URL: http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/InjectorProvider.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/InjectorProvider.java (original)
+++ onami/trunk/autobind/integrations/metro/src/main/java/org/apache/onami/autobind/integrations/metro/InjectorProvider.java Sun Jul 13 04:28:27 2014
@@ -16,7 +16,7 @@
 package org.apache.onami.autobind.integrations.metro;
 
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import javax.inject.Provider;
 
 public interface InjectorProvider extends Provider<Injector>{
 

Modified: onami/trunk/converters/net/src/test/java/org/apache/onami/converters/net/URLConverterTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/converters/net/src/test/java/org/apache/onami/converters/net/URLConverterTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/converters/net/src/test/java/org/apache/onami/converters/net/URLConverterTestCase.java (original)
+++ onami/trunk/converters/net/src/test/java/org/apache/onami/converters/net/URLConverterTestCase.java Sun Jul 13 04:28:27 2014
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.name.Named;
 

Modified: onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleObject.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleObject.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleObject.java (original)
+++ onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleObject.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.lifecycle.core;
  * under the License.
  */
 
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 
 @Singleton
 public class MultiLifeCycleObject

Modified: onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleTestCase.java (original)
+++ onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/MultiLifeCycleTestCase.java Sun Jul 13 04:28:27 2014
@@ -24,7 +24,7 @@ import static java.util.Arrays.asList;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import org.junit.Assert;

Modified: onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject1.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject1.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject1.java (original)
+++ onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject1.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.lifecycle.core;
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 public class StageObject1
 {

Modified: onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject2.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject2.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject2.java (original)
+++ onami/trunk/lifecycle/core/src/test/java/org/apache/onami/lifecycle/core/StageObject2.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.lifecycle.core;
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 public class StageObject2
 {

Modified: onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java (original)
+++ onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java Sun Jul 13 04:28:27 2014
@@ -21,7 +21,7 @@ package org.apache.onami.lifecycle.stand
 
 import com.google.inject.AbstractModule;
 import com.google.inject.ConfigurationException;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
 import org.apache.onami.lifecycle.core.StageHandler;

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag1.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag1.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag1.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag1.java Sun Jul 13 04:28:27 2014
@@ -21,8 +21,8 @@ package org.apachi.onami.lifecycle.warmu
 
 import java.util.concurrent.CountDownLatch;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.apache.onami.lifecycle.warmup.WarmUp;
 
 public class Dag1

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag2.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag2.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag2.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag2.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,8 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.apache.onami.lifecycle.warmup.WarmUp;
 
 public class Dag2

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag3.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag3.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag3.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag3.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,8 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.apache.onami.lifecycle.warmup.WarmUp;
 
 public class Dag3

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag4.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag4.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag4.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Dag4.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,8 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.apache.onami.lifecycle.warmup.WarmUp;
 
 public class Dag4

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Flat.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Flat.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Flat.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Flat.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import org.apache.onami.lifecycle.warmup.WarmUp;
 
 public class Flat

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Recorder.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Recorder.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Recorder.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/Recorder.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,8 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import java.util.ArrayList;
 import java.util.HashSet;

Modified: onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/RecorderSleepSettings.java
URL: http://svn.apache.org/viewvc/onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/RecorderSleepSettings.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/RecorderSleepSettings.java (original)
+++ onami/trunk/lifecycle/warmup/src/test/java/org/apachi/onami/lifecycle/warmup/RecorderSleepSettings.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apachi.onami.lifecycle.warmu
  * under the License.
  */
 
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: onami/trunk/logging/testframework/src/main/java/org/apache/onami/logging/testfw/AbstractLoggerInectionTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/logging/testframework/src/main/java/org/apache/onami/logging/testfw/AbstractLoggerInectionTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/logging/testframework/src/main/java/org/apache/onami/logging/testfw/AbstractLoggerInectionTestCase.java (original)
+++ onami/trunk/logging/testframework/src/main/java/org/apache/onami/logging/testfw/AbstractLoggerInectionTestCase.java Sun Jul 13 04:28:27 2014
@@ -24,7 +24,7 @@ import static com.google.inject.Guice.cr
 import org.apache.onami.logging.core.AbstractLoggingModule;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 /**
  *

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,10 +19,10 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.Singleton;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import com.google.inject.Provider;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,9 +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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;

Modified: onami/trunk/persist/src/main/java/org/apache/onami/persist/ForApplicationManaged.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/ForApplicationManaged.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/persist/src/main/java/org/apache/onami/persist/ForApplicationManaged.java (original)
+++ onami/trunk/persist/src/main/java/org/apache/onami/persist/ForApplicationManaged.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,7 @@ 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;
 import java.lang.annotation.RetentionPolicy;
@@ -31,7 +30,7 @@ import java.lang.annotation.Target;
  */
 @Target( { ElementType.PARAMETER } )
 @Retention( RetentionPolicy.RUNTIME )
-@BindingAnnotation
+@Qualifier
 @interface ForApplicationManaged
 {
 }

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=1610111&r1=1610110&r2=1610111&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 Sun Jul 13 04:28:27 2014
@@ -19,8 +19,7 @@ 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;
 import java.lang.annotation.RetentionPolicy;
@@ -31,7 +30,7 @@ import java.lang.annotation.Target;
  */
 @Target( { ElementType.PARAMETER } )
 @Retention( RetentionPolicy.RUNTIME )
-@BindingAnnotation
+@Qualifier
 @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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +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;

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -21,7 +21,7 @@ package org.apache.onami.persist;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;
-import com.google.inject.Provider;
+import javax.inject.Provider;
 import com.google.inject.TypeLiteral;
 
 import javax.persistence.EntityManagerFactory;

Modified: onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModule.java
URL: http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModule.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModule.java (original)
+++ onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceUnitModule.java Sun Jul 13 04:28:27 2014
@@ -221,7 +221,7 @@ class PersistenceUnitModule
         else if ( config.isEmfProvidedByProvider() )
         {
             bind( EntityManagerFactory.class ).annotatedWith( ForContainerManaged.class ).toProvider(
-                config.getEmfProvider() );
+                Providers.guicify( config.getEmfProvider() ) );
         }
         else if ( config.isEmfProvidedByProviderKey() )
         {
@@ -269,7 +269,7 @@ class PersistenceUnitModule
         }
         else if ( config.isUserTransactionProvidedByProvider() )
         {
-            bind( UserTransaction.class ).toProvider( config.getUtProvider() );
+            bind( UserTransaction.class ).toProvider( Providers.guicify( config.getUtProvider() ) );
         }
         else if ( config.isUserTransactionProvidedByProviderKey() )
         {

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import com.google.inject.Provider;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -21,7 +21,7 @@ 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;

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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 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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import com.google.inject.Singleton;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +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;

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=1610111&r1=1610110&r2=1610111&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 Sun Jul 13 04:28:27 2014
@@ -19,8 +19,7 @@ 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;
 import java.lang.annotation.RetentionPolicy;
@@ -31,7 +30,7 @@ import java.lang.annotation.Target;
  */
 @Target( { ElementType.PARAMETER } )
 @Retention( RetentionPolicy.RUNTIME )
-@BindingAnnotation
+@Qualifier
 @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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,8 +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;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist;
  * under the License.
  */
 
-import com.google.inject.Provider;
+import javax.inject.Provider;
 import org.junit.Before;
 import org.junit.Test;
 

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist;
  */
 
 import com.google.inject.Key;
-import com.google.inject.Provider;
+import javax.inject.Provider;
 import com.google.inject.TypeLiteral;
 import org.junit.Before;
 import org.junit.Test;

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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test;
  */
 
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Sun Jul 13 04:28:27 2014
@@ -1,7 +1,6 @@
 package org.apache.onami.persist.test.multipersistenceunits;
 
-import com.google.inject.BindingAnnotation;
-
+import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -12,7 +11,7 @@ import static java.lang.annotation.Eleme
 
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { FIELD, PARAMETER, METHOD } )
-@BindingAnnotation
+@Qualifier
 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=1610111&r1=1610110&r2=1610111&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 Sun Jul 13 04:28:27 2014
@@ -1,7 +1,6 @@
 package org.apache.onami.persist.test.multipersistenceunits;
 
-import com.google.inject.BindingAnnotation;
-
+import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -12,7 +11,7 @@ import static java.lang.annotation.Eleme
 
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { FIELD, PARAMETER, METHOD } )
-@BindingAnnotation
+@Qualifier
 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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.persist.test.mu
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test.tr
  */
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.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=1610111&r1=1610110&r2=1610111&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 Jul 13 04:28:27 2014
@@ -20,7 +20,7 @@ package org.apache.onami.persist.test.tr
  */
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import org.apache.onami.persist.EntityManagerProvider;
 import org.apache.onami.persist.Transactional;

Modified: onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java (original)
+++ onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java Sun Jul 13 04:28:27 2014
@@ -34,9 +34,9 @@ import org.quartz.SimpleScheduleBuilder;
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 
 @RunWith( OnamiRunner.class )
 public class GuartzSimpleTriggerTimerTestCase

Modified: onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java (original)
+++ onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java Sun Jul 13 04:28:27 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.quartz.Scheduler;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 
 @RunWith( OnamiRunner.class )

Modified: onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java
URL: http://svn.apache.org/viewvc/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java (original)
+++ onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingleton.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,7 @@ package org.apache.onami.scopes;
  * under the License.
  */
 
-import com.google.inject.ScopeAnnotation;
-
+import javax.inject.Scope;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -36,7 +35,7 @@ import java.lang.annotation.Target;
  */
 @Target( { ElementType.TYPE, ElementType.METHOD } )
 @Retention( RetentionPolicy.RUNTIME )
-@ScopeAnnotation
+@Scope
 public @interface ConcurrentLazySingleton
 {
 }

Modified: onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java
URL: http://svn.apache.org/viewvc/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java (original)
+++ onami/trunk/scopes/src/main/java/org/apache/onami/scopes/LazySingleton.java Sun Jul 13 04:28:27 2014
@@ -19,8 +19,7 @@ package org.apache.onami.scopes;
  * under the License.
  */
 
-import com.google.inject.ScopeAnnotation;
-
+import javax.inject.Scope;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -32,7 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target( { ElementType.TYPE, ElementType.METHOD } )
 @Retention( RetentionPolicy.RUNTIME )
-@ScopeAnnotation
+@Scope
 public @interface LazySingleton
 {
 }

Modified: onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java
URL: http://svn.apache.org/viewvc/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java (original)
+++ onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java Sun Jul 13 04:28:27 2014
@@ -34,9 +34,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import javax.inject.Provider;
 
 @RunWith(OnamiRunner.class)
 public class TestConcurrentLazySingleton

Modified: onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java
URL: http://svn.apache.org/viewvc/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java (original)
+++ onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java Sun Jul 13 04:28:27 2014
@@ -30,10 +30,10 @@ import org.junit.runner.RunWith;
 
 import com.google.inject.Binder;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import com.google.inject.Provider;
+import javax.inject.Provider;
 
 @RunWith(OnamiRunner.class)
 public class TestLazySingleton

Modified: onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java (original)
+++ onami/trunk/spi/modules/src/test/java/org/apache/onami/spi/modules/GuiceServiceLoaderTestCase.java Sun Jul 13 04:28:27 2014
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 
 @RunWith( OnamiRunner.class )

Modified: onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java
URL: http://svn.apache.org/viewvc/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java (original)
+++ onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/BarBindingAnnotation.java Sun Jul 13 04:28:27 2014
@@ -26,9 +26,9 @@ import static java.lang.annotation.Reten
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 
-@BindingAnnotation
+@Qualifier
 @Retention( RUNTIME )
 @Target( { FIELD, TYPE } )
 public @interface BarBindingAnnotation

Modified: onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java (original)
+++ onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/FromSystemPropertiesTestCase.java Sun Jul 13 04:28:27 2014
@@ -26,7 +26,7 @@ import org.apache.onami.test.annotation.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 
 @RunWith( OnamiRunner.class )

Modified: onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java (original)
+++ onami/trunk/spi/services/src/test/java/org/apache/onami/spi/services/ServiceLoaderModuleTestCase.java Sun Jul 13 04:28:27 2014
@@ -26,7 +26,7 @@ import org.apache.onami.test.annotation.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.name.Named;
 

Modified: onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java (original)
+++ onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java Sun Jul 13 04:28:27 2014
@@ -46,13 +46,11 @@ import org.apache.onami.test.reflection.
 import org.apache.onami.test.reflection.HandleException;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.Suite;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.matcher.Matchers;
@@ -360,7 +358,7 @@ public class OnamiRunner
             // Setup the handlers
             final GuiceProvidedModuleHandler guiceProvidedModuleHandler = new GuiceProvidedModuleHandler();
             final GuiceModuleHandler guiceModuleHandler = new GuiceModuleHandler();
-            final GuiceInjectableClassHandler<Inject> guiceInjectableClassHandler = new GuiceInjectableClassHandler<Inject>();
+            final GuiceInjectableClassHandler<com.google.inject.Inject> guiceInjectableClassHandler = new GuiceInjectableClassHandler<com.google.inject.Inject>();
             final GuiceInjectableClassHandler<javax.inject.Inject> jsr330InjectableClassHandler = new GuiceInjectableClassHandler<javax.inject.Inject>();
 
             final MockHandler mockHandler = new MockHandler();
@@ -372,7 +370,7 @@ public class OnamiRunner
             .registerHandler( GuiceModules.class, guiceModuleHandler )
             .registerHandler( Mock.class, mockHandler )
             .registerHandler( MockFramework.class, mockFrameworkHandler )
-            .registerHandler( Inject.class, guiceInjectableClassHandler )
+            .registerHandler( com.google.inject.Inject.class, guiceInjectableClassHandler )
             .registerHandler( javax.inject.Inject.class, jsr330InjectableClassHandler )
             .visit( clazz );
 

Modified: onami/trunk/test/src/main/java/org/apache/onami/test/OnamiSuite.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiSuite.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/main/java/org/apache/onami/test/OnamiSuite.java (original)
+++ onami/trunk/test/src/main/java/org/apache/onami/test/OnamiSuite.java Sun Jul 13 04:28:27 2014
@@ -52,7 +52,7 @@ import org.junit.runners.model.RunnerBui
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.matcher.Matchers;

Modified: onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceInjectableClassHandler.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceInjectableClassHandler.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceInjectableClassHandler.java (original)
+++ onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceInjectableClassHandler.java Sun Jul 13 04:28:27 2014
@@ -31,7 +31,7 @@ import org.apache.onami.test.reflection.
 import org.apache.onami.test.reflection.HandleException;
 
 /**
- * Handler class to handle all {@link com.google.inject.Inject} annotations.
+ * Handler class to handle all {@link com.google.inject.Inject} and {@link javax.inject.Inject} annotations.
  *
  * @param <A> whatever annotation type
  * @see org.apache.onami.test.reflection.ClassVisitor
@@ -48,7 +48,8 @@ public final class GuiceInjectableClassH
     protected final Set<Class<?>> classes = new HashSet<Class<?>>();
 
     /**
-     * Return all {@link Class} that contains at last one {@link com.google.inject.Inject} annotation.
+     * Return all {@link Class} that contains at last one {@link com.google.inject.Inject} or
+     * {@link javax.inject.Inject} annotation.
      *
      * @return {@link Class} array.
      */

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java Sun Jul 13 04:28:27 2014
@@ -33,7 +33,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
 

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/InjectFromSuperClassTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/InjectFromSuperClassTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/InjectFromSuperClassTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/InjectFromSuperClassTestCase.java Sun Jul 13 04:28:27 2014
@@ -22,7 +22,7 @@ package org.apache.onami.test;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.name.Named;
 
 public class InjectFromSuperClassTestCase

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java Sun Jul 13 04:28:27 2014
@@ -30,7 +30,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 
 @RunWith( OnamiRunner.class )

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java Sun Jul 13 04:28:27 2014
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java Sun Jul 13 04:28:27 2014
@@ -30,7 +30,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Module;
 
 @RunWith( OnamiRunner.class )

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java Sun Jul 13 04:28:27 2014
@@ -28,7 +28,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 @RunWith( OnamiRunner.class )
 public class MockitoFrameworkTestCase

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java Sun Jul 13 04:28:27 2014
@@ -28,7 +28,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 @RunWith( OnamiRunner.class )
 @GuiceModules( SimpleModule.class )

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWordAnnotated.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWordAnnotated.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWordAnnotated.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWordAnnotated.java Sun Jul 13 04:28:27 2014
@@ -19,7 +19,7 @@ package org.apache.onami.test.data;
  * under the License.
  */
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.name.Named;
 
 public class HelloWordAnnotated

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWorld.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWorld.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWorld.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/HelloWorld.java Sun Jul 13 04:28:27 2014
@@ -22,7 +22,8 @@ package org.apache.onami.test.data;
 import java.util.List;
 
 import com.google.inject.Inject;
-import com.google.inject.Singleton;
+
+import javax.inject.Singleton;
 
 @Singleton
 public class HelloWorld

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation.java Sun Jul 13 04:28:27 2014
@@ -22,9 +22,9 @@ package org.apache.onami.test.data;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 
-@BindingAnnotation
+@Qualifier
 @Retention( RetentionPolicy.RUNTIME )
 public @interface TestAnnotation
 {

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation2.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation2.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation2.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/data/TestAnnotation2.java Sun Jul 13 04:28:27 2014
@@ -22,9 +22,9 @@ package org.apache.onami.test.data;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 
-@BindingAnnotation
+@Qualifier
 @Retention( RetentionPolicy.RUNTIME )
 public @interface TestAnnotation2
 {

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java Sun Jul 13 04:28:27 2014
@@ -29,7 +29,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 @RunWith( OnamiRunner.class )
 public class MockAnnotatedWithTestCase

Modified: onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
URL: http://svn.apache.org/viewvc/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java?rev=1610111&r1=1610110&r2=1610111&view=diff
==============================================================================
--- onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java (original)
+++ onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java Sun Jul 13 04:28:27 2014
@@ -32,7 +32,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 @RunWith( OnamiRunner.class )
 @GuiceModules( ServiceModule.class )



Mime
View raw message