Removed @service annotation, and the need for it. Now @Inject can be used alone.

Author: lincolnthree

container-api/src/main/java/org/jboss/forge/container/services/Remote.java

@@ -12,16 +12,17 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import javax.inject.Inject;
+
 /**
- * Marker that indicates when a type should be exported to other containers. It may be imported via the corresponding
- * {@link Service} annotation.
+ * Specifies that the target type should be exported to dependent containers, and that it may be imported via
+ * {@link Inject} annotation.
  * 
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
+@Target({ ElementType.TYPE })
 public @interface Remote
 {
-   boolean service() default true;
 }

container-api/src/main/java/org/jboss/forge/container/services/Service.java

@@ -1,17 +1,14 @@
-package org.example.consuming;
+package org.example;
 
 import javax.inject.Inject;
 
-import org.example.published.PublishedService;
 import org.jboss.forge.container.services.Remote;
-import org.jboss.forge.container.services.Service;
 
 @Remote
 public class ConsumingService
 {
    @Inject
-   @Service
-   private PublishedService service;
+   private PublisherService service;
 
    public String getMessage()
    {

container-tests/src/main/java/org/example/consuming/ConsumingService.java renamed to container-tests/src/main/java/org/example/ConsumingService.java

@@ -1,4 +1,4 @@
-package org.example.simple;
+package org.example;
 
 import java.io.IOException;
 
@@ -16,7 +16,7 @@
  */
 @Remote
 @Singleton
-public class SimpleService
+public class LifecycleListenerService
 {
    private boolean startupObserved;
    private boolean postStartupObserved;

container-tests/src/main/java/org/example/simple/SimpleService.java renamed to container-tests/src/main/java/org/example/LifecycleListenerService.java

@@ -0,0 +1,64 @@
+package org.example;
+
+import java.io.IOException;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Singleton;
+
+import org.jboss.forge.container.event.PostStartup;
+import org.jboss.forge.container.event.PreShutdown;
+import org.jboss.forge.container.event.Shutdown;
+import org.jboss.forge.container.event.Startup;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ */
+@Singleton
+public class NonService
+{
+   private boolean startupObserved;
+   private boolean postStartupObserved;
+   private boolean preShutdownObserved;
+   private boolean shutdownObserved;
+
+   public void startup(@Observes Startup event) throws IOException
+   {
+      startupObserved = true;
+   }
+
+   public void postStartup(@Observes PostStartup event) throws IOException
+   {
+      postStartupObserved = true;
+   }
+
+   public void preShutdown(@Observes PreShutdown event)
+   {
+      preShutdownObserved = true;
+   }
+
+   public void shutdown(@Observes Shutdown event) throws IOException
+   {
+      shutdownObserved = true;
+   }
+
+   public boolean isStartupObserved()
+   {
+      return startupObserved;
+   }
+
+   public boolean isPostStartupObserved()
+   {
+      return postStartupObserved;
+   }
+
+   public boolean isPreShutdownObserved()
+   {
+      return preShutdownObserved;
+   }
+
+   public boolean isShutdownObserved()
+   {
+      return shutdownObserved;
+   }
+
+}

container-tests/src/main/java/org/example/NonService.java

@@ -1,4 +1,4 @@
-package org.example.published;
+package org.example;
 
 import javax.inject.Singleton;
 
@@ -9,7 +9,7 @@
  */
 @Remote
 @Singleton
-public class PublishedService
+public class PublisherService
 {
    public String getMessage()
    {