aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r941484 - in /incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation: ./ service/
Date Wed, 05 May 2010 20:59:36 GMT
Author: linsun
Date: Wed May  5 20:59:35 2010
New Revision: 941484

URL: http://svn.apache.org/viewvc?rev=941484&view=rev
Log:
[blueprint annotation] add service property annotation and update default values for some
of the annotations

Added:
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ServiceProperty.java
  (with props)
Modified:
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Blueprint.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
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/BlueprintAnnotationScanner.java

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Blueprint.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Blueprint.java?rev=941484&r1=941483&r2=941484&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Blueprint.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/Blueprint.java
Wed May  5 20:59:35 2010
@@ -41,10 +41,10 @@ public @interface Blueprint {
      * are invoked on unsatisfied service references.  If the
      * reference does not change to a satisfied state within the timeout
      * window, an error is raised on the method invocation.  The
-     * default timeout value is 300000 milliseconds and individual
+     * default timeout value is 300 seconds and individual
      * <reference> element can override the specified configuration default.
      */   
-    int defaultTimeout() default 300000;
+    int defaultTimeout() default 300;
     
     /**
      * Specifies the default availability value to be used for

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=941484&r1=941483&r2=941484&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
Wed May  5 20:59:35 2010
@@ -60,5 +60,10 @@ public @interface Reference
      * the default-timeout value is inherited from the encapsulating
      * <code><blueprint></code> definition.
      */
-    int timeout() default 300000;
+    int timeout() default 0;
+    
+    /**
+     * the id for the reference
+     */
+    String id() default "";
 }
\ No newline at end of file

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=941484&r1=941483&r2=941484&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
Wed May  5 20:59:35 2010
@@ -59,4 +59,9 @@ public @interface ReferenceList
      * the value of the memberType property.
      */
     String memberType() default "service-object";
+    
+    /**
+     * the id for the referencelist
+     */
+    String id() default "";
 }
\ No newline at end of file

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=941484&r1=941483&r2=941484&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
Wed May  5 20:59:35 2010
@@ -28,4 +28,6 @@ public @interface ReferenceListener {
      * the component that will receive bind and unbind events.
      */
     String ref() default "";
+    String bind() default "";
+    String unbind() default "";
 }

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=941484&r1=941483&r2=941484&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
Wed May  5 20:59:35 2010
@@ -28,4 +28,6 @@ public @interface RegistrationListener {
      * the component that will receive registration and unregistration events.
      */
     String id() default "";
+    String register() default "";
+    String unregister() default "";
 }

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=941484&r1=941483&r2=941484&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
Wed May  5 20:59:35 2010
@@ -29,7 +29,7 @@ public @interface Service {
      * the registration listeners to be notified when the service is
      * registered and unregistered with the framework.
      */
-    RegistrationListener registerationListener();
+    RegistrationListener[] registerationListener();
     
     /**
      *  the ranking value to use when advertising the service.  If the
@@ -42,7 +42,7 @@ public @interface Service {
      *  the auto-export mode for the service.  
      *  possible values are disabled, interfaces, class_hierarchy, all_classes
      */
-    String autoExport() default "disabled";
+    String autoExport() default "";
     
     /**
      *  the names of the interfaces that the service should be advertised as supporting.
@@ -52,5 +52,5 @@ public @interface Service {
     /**
      * the user declared properties to be advertised with the service.
      */
-    Properties[] serviceProperties();
+    ServiceProperty[] serviceProperties() default {};
 }
\ No newline at end of file

Added: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ServiceProperty.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ServiceProperty.java?rev=941484&view=auto
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ServiceProperty.java
(added)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ServiceProperty.java
Wed May  5 20:59:35 2010
@@ -0,0 +1,36 @@
+/**
+ *  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;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ServiceProperty {
+    /**
+     * the key of the property
+     */
+    String key() default "";
+    
+    /**
+     * the value of the property
+     */
+    String value() default "";
+}

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

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

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

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/BlueprintAnnotationScanner.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/BlueprintAnnotationScanner.java?rev=941484&r1=941483&r2=941484&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/BlueprintAnnotationScanner.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/BlueprintAnnotationScanner.java
Wed May  5 20:59:35 2010
@@ -21,8 +21,7 @@ import java.net.URL;
 import org.osgi.framework.Bundle;
 
 public interface BlueprintAnnotationScanner {
-    public boolean foundBlueprintAnnotation(Bundle bundle);
-    
-    public URL generateBlueprintModel(Bundle bundle);
+
+    public URL createBlueprintModel(Bundle bundle);
     
 }



Mime
View raw message