[jboss-cvs] JBossAS SVN: r71589 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/annotations/support and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 2 06:52:13 EDT 2008
Author: alesj
Date: 2008-04-02 06:52:13 -0400 (Wed, 02 Apr 2008)
New Revision: 71589
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Aliases.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Constructor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Create.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demand.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demands.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Depends.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Destroy.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalInstalls.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalUninstalls.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/FactoryMethod.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/InstallMethod.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/NullValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Start.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Stop.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supplys.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ThisValue.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/UninstallMethod.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ValueFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AfterInstantiateTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/OtherVerifier.java
Log:
Mark IoC annotation with InstanceAnnotation(false).
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Aliases.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Aliases.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Aliases.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* The aliases.
* Equivalent to deployment's alias element.
@@ -35,6 +37,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Cleanup
+ at InstanceAnnotation(false)
public @interface Aliases
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Injecting array value.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface ArrayValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Collection injection.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface CollectionValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Constructor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Constructor.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Constructor.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark the constructor used to instantiate bean.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.CONSTRUCTOR})
+ at InstanceAnnotation(false)
public @interface Constructor
{
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Create.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Create.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Create.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -5,6 +5,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark lifecycle create method.
*
@@ -12,6 +14,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface Create
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demand.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demand.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demand.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -21,10 +21,10 @@
*/
package org.jboss.beans.metadata.api.annotations;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* The demand.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demands.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demands.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Demands.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* The demands.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface Demands
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Depends.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Depends.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Depends.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* The depends values.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface Depends
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Destroy.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Destroy.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Destroy.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -5,6 +5,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark destroy lifecycle method.
*
@@ -12,6 +14,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface Destroy
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalInstalls.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalInstalls.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalInstalls.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Array of external installs.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface ExternalInstalls
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalUninstalls.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalUninstalls.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ExternalUninstalls.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Array of external uninstalls.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface ExternalUninstalls
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Define constructor factory.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface Factory
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/FactoryMethod.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/FactoryMethod.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/FactoryMethod.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark static method as factory method.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface FactoryMethod
{
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -29,6 +29,7 @@
import org.jboss.beans.metadata.api.model.FromContext;
import org.jboss.beans.metadata.api.model.InjectOption;
import org.jboss.beans.metadata.api.model.AutowireType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
/**
* Beans when injected by class type are by default changed to configured
@@ -39,6 +40,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+ at InstanceAnnotation(false)
public @interface Inject
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Install callback.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
+ at InstanceAnnotation(false)
public @interface Install
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/InstallMethod.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/InstallMethod.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/InstallMethod.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Internal installation method.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface InstallMethod
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Java bean value.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface JavaBeanValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* List value injection.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface ListValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Map value injection.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface MapValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/NullValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/NullValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/NullValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Null value.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface NullValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Set value injection.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface SetValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Start.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Start.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Start.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -5,6 +5,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark start lifecycle method.
*
@@ -12,6 +14,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface Start
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Stop.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Stop.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Stop.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -5,6 +5,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark stop lifecycle method.
*
@@ -12,6 +14,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface Stop
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* String value.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface StringValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -21,10 +21,10 @@
*/
package org.jboss.beans.metadata.api.annotations;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* The supplys.
@@ -32,7 +32,7 @@
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
@Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE})
+ at Target({ElementType.ANNOTATION_TYPE})
public @interface Supply
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supplys.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supplys.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supplys.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* The supplys.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+ at InstanceAnnotation(false)
public @interface Supplys
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ThisValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ThisValue.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ThisValue.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* This value.
* Get the underlying target.
@@ -34,6 +36,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER})
+ at InstanceAnnotation(false)
public @interface ThisValue
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Uninstall callback.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
+ at InstanceAnnotation(false)
public @interface Uninstall
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/UninstallMethod.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/UninstallMethod.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/UninstallMethod.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* Mark the uninstall method.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+ at InstanceAnnotation(false)
public @interface UninstallMethod
{
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ValueFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ValueFactory.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ValueFactory.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -26,6 +26,8 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import org.jboss.metadata.spi.annotation.InstanceAnnotation;
+
/**
* The value factory.
*
@@ -33,6 +35,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+ at InstanceAnnotation(false)
public @interface ValueFactory
{
/**
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AfterInstantiateTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AfterInstantiateTester.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AfterInstantiateTester.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -21,34 +21,35 @@
*/
package org.jboss.test.kernel.annotations.support;
+import java.io.PrintStream;
import java.util.Set;
-import java.io.PrintStream;
import org.jboss.beans.metadata.api.annotations.Aliases;
+import org.jboss.beans.metadata.api.annotations.Create;
+import org.jboss.beans.metadata.api.annotations.Demand;
import org.jboss.beans.metadata.api.annotations.Demands;
-import org.jboss.beans.metadata.api.annotations.Demand;
-import org.jboss.beans.metadata.api.annotations.Supply;
import org.jboss.beans.metadata.api.annotations.Depends;
+import org.jboss.beans.metadata.api.annotations.Destroy;
+import org.jboss.beans.metadata.api.annotations.ExternalInstall;
import org.jboss.beans.metadata.api.annotations.ExternalInstalls;
-import org.jboss.beans.metadata.api.annotations.ExternalInstall;
import org.jboss.beans.metadata.api.annotations.ExternalUninstalls;
import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.annotations.Create;
+import org.jboss.beans.metadata.api.annotations.Install;
+import org.jboss.beans.metadata.api.annotations.InstallMethod;
import org.jboss.beans.metadata.api.annotations.Start;
import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.beans.metadata.api.annotations.Destroy;
-import org.jboss.beans.metadata.api.annotations.ValueFactory;
-import org.jboss.beans.metadata.api.annotations.Install;
+import org.jboss.beans.metadata.api.annotations.Supply;
+import org.jboss.beans.metadata.api.annotations.Supplys;
import org.jboss.beans.metadata.api.annotations.Uninstall;
-import org.jboss.beans.metadata.api.annotations.InstallMethod;
import org.jboss.beans.metadata.api.annotations.UninstallMethod;
+import org.jboss.beans.metadata.api.annotations.ValueFactory;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
@Aliases("qwert")
@Demands(@Demand("other"))
- at Supply("qaz")
+ at Supplys({@Supply("qaz")})
@Depends("other")
@ExternalInstalls(@ExternalInstall(bean = "other", method = "touch"))
@ExternalUninstalls(@ExternalInstall(bean = "other", method = "touch"))
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/OtherVerifier.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/OtherVerifier.java 2008-04-02 10:41:02 UTC (rev 71588)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/OtherVerifier.java 2008-04-02 10:52:13 UTC (rev 71589)
@@ -21,28 +21,8 @@
*/
package org.jboss.test.kernel.annotations.support;
-import java.util.Set;
import java.io.PrintStream;
-import org.jboss.beans.metadata.api.annotations.Aliases;
-import org.jboss.beans.metadata.api.annotations.Demands;
-import org.jboss.beans.metadata.api.annotations.Demand;
-import org.jboss.beans.metadata.api.annotations.Supply;
-import org.jboss.beans.metadata.api.annotations.Depends;
-import org.jboss.beans.metadata.api.annotations.ExternalInstalls;
-import org.jboss.beans.metadata.api.annotations.ExternalInstall;
-import org.jboss.beans.metadata.api.annotations.ExternalUninstalls;
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.annotations.Create;
-import org.jboss.beans.metadata.api.annotations.Start;
-import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.beans.metadata.api.annotations.Destroy;
-import org.jboss.beans.metadata.api.annotations.ValueFactory;
-import org.jboss.beans.metadata.api.annotations.Install;
-import org.jboss.beans.metadata.api.annotations.Uninstall;
-import org.jboss.beans.metadata.api.annotations.InstallMethod;
-import org.jboss.beans.metadata.api.annotations.UninstallMethod;
-
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
More information about the jboss-cvs-commits
mailing list