aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r941985 - /incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/
Date Fri, 07 May 2010 02:46:22 GMT
Author: linsun
Date: Fri May  7 02:46:21 2010
New Revision: 941985

URL: http://svn.apache.org/viewvc?rev=941985&view=rev
Log:
[blueprint annotation]add factoryMethod annotation, update interface attribute name in reference
and referencelist annoation

Added:
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
  (with props)
Modified:
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Bean.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Inject.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Reference.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceList.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceListener.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/RegistrationListener.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Service.java

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Bean.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Bean.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Bean.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Bean.java
Fri May  7 02:46:21 2010
@@ -66,9 +66,5 @@ public @interface Bean {
      * factory method for the bean.
      */
     String factoryRef() default "";
-    
-    /**
-     *  the name of the factory method for the bean.
-     */
-    String factoryMethod() default "";
+  
 }

Added: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java?rev=941985&view=auto
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
(added)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
Fri May  7 02:46:21 2010
@@ -0,0 +1,32 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.aries.blueprint.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * used to annotation factory-method in blueprint beans
+ *
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FactoryMethod {
+    String[] values();
+}

Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/FactoryMethod.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Inject.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Inject.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Inject.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Inject.java
Fri May  7 02:46:21 2010
@@ -21,11 +21,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Inject {
     String value() default "";
     String name() default "";
     String description() default "";
     String ref() default "";
+    String[] values() default {};
 }
\ No newline at end of file

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Reference.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Reference.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Reference.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Reference.java
Fri May  7 02:46:21 2010
@@ -31,9 +31,9 @@ public @interface Reference
     String description() default "";
     
     /**
-     * the name of the interface type that a matching service must support.
+     * the interface type that a matching service must support.
      */
-    String publishInterface() default "";
+    Class<?> serviceInterface() default Object.class;
     
     /**
      * the filter expression that a matching service must match.

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceList.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceList.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceList.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceList.java
Fri May  7 02:46:21 2010
@@ -31,9 +31,9 @@ public @interface ReferenceList
     String description() default "";
     
     /**
-     * the name of the interface type that a matching service must support.
+     * the interface type that a matching service must support.
      */
-    String publishInterface() default "";
+    Class<?> serviceInterface() default Object.class;
     
     /**
      * the filter expression that a matching service must match.

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceListener.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceListener.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ReferenceListener.java
Fri May  7 02:46:21 2010
@@ -27,7 +27,7 @@ public @interface ReferenceListener {
     /**
      * the component that will receive bind and unbind events.
      */
-    String ref() default "";
-    String bind() default "";
-    String unbind() default "";
+    String ref();
+    String bind();
+    String unbind();
 }

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/RegistrationListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/RegistrationListener.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/RegistrationListener.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/RegistrationListener.java
Fri May  7 02:46:21 2010
@@ -27,7 +27,7 @@ public @interface RegistrationListener {
     /**
      * the component that will receive registration and unregistration events.
      */
-    String id() default "";
-    String register() default "";
-    String unregister() default "";
+    String id();
+    String register();
+    String unregister();
 }

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Service.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Service.java?rev=941985&r1=941984&r2=941985&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Service.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Service.java
Fri May  7 02:46:21 2010
@@ -45,9 +45,9 @@ public @interface Service {
     String autoExport() default "";
     
     /**
-     *  the names of the interfaces that the service should be advertised as supporting.
+     *  the interfaces that the service should be advertised as supporting.
      */
-    String publishInterface() default "";
+    Class<?>[] interfaces() default {};
     
     /**
      * the user declared properties to be advertised with the service.



Mime
View raw message