added Context/Scope feature to di #54

Context/Scope is definded and used by the ServiceProvider
ServiceConsumer have no control over the Scope of referneces

di-api/src/main/java/de/unistuttgart/iaas/amyassist/amy/core/di/ServiceLocator.java

@@ -27,16 +27,18 @@
 public interface ServiceLocator {
 
 	/**
-	 * Instantiate the given class and inject dependencies. The object created in
-	 * this way will not be managed by the DI.
+	 * Instantiate the given class and inject dependencies. The object created
+	 * in this way will not be managed by the DI.
 	 * 
 	 * @param serviceClass
 	 * @return
 	 */
 	<T> T create(Class<T> serviceClass);
 
 	/**
-	 * Get a Service instance
+	 * Get the service of the given type. This method can return external
+	 * services and does return a object of the type registered for the service
+	 * type.
 	 * 
 	 * @param serviceType
 	 * @return

di-api/src/main/java/de/unistuttgart/iaas/amyassist/amy/core/di/annotation/Context.java

@@ -0,0 +1,24 @@
+package de.unistuttgart.iaas.amyassist.amy.core.di.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Declare the use of context information
+ * 
+ * @author Leon Kiefer
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target(java.lang.annotation.ElementType.FIELD)
+public @interface Context {
+	/**
+	 * The class of the context provider to use for getting the context
+	 * information
+	 * 
+	 * @return the ContextProvider class
+	 */
+	Class<?> value();
+}

di-api/src/main/java/de/unistuttgart/iaas/amyassist/amy/core/di/annotation/Reference.java

@@ -33,10 +33,5 @@
 @Documented
 @Target(java.lang.annotation.ElementType.FIELD)
 public @interface Reference {
-	/**
-	 * The {@link Scope scope} of this reference.
-	 * 
-	 * @return the scope.
-	 */
-	Scope value() default Scope.GLOBAL;
-}
+
+}

di-api/src/main/java/de/unistuttgart/iaas/amyassist/amy/core/di/context/provider/StaticProvider.java

@@ -0,0 +1,17 @@
+package de.unistuttgart.iaas.amyassist.amy.core.di.context.provider;
+
+/**
+ * A Static Context Provider which provides context information from then
+ * consumer class.
+ * 
+ * @author Leon Kiefer
+ */
+public interface StaticProvider<T> {
+	/**
+	 * 
+	 * @param consumer
+	 *            the class of the consumer
+	 * @return the context information
+	 */
+	T getContext(Class<?> consumer);
+}

di/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>amy-di</artifactId>
@@ -50,5 +51,9 @@
 			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+		</dependency>
 	</dependencies>
 </project>