You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by li...@apache.org on 2010/04/30 21:00:26 UTC
svn commit: r939781 -
/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/
Author: linsun
Date: Fri Apr 30 19:00:26 2010
New Revision: 939781
URL: http://svn.apache.org/viewvc?rev=939781&view=rev
Log:
[blueprint annotation] update the blueprint test sample for annotations
Added:
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java (with props)
Modified:
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java
incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java Fri Apr 30 19:00:26 2010
@@ -19,14 +19,14 @@ package org.apache.aries.blueprint.sampl
import java.util.List;
import org.osgi.framework.BundleContext;
-import org.osgi.service.blueprint.annotation.Bean;
-import org.osgi.service.blueprint.annotation.Blueprint;
-import org.osgi.service.blueprint.annotation.Inject;
-import org.osgi.service.blueprint.annotation.Element;
-import org.osgi.service.blueprint.annotation.Element.ElementType;
+import org.apache.aries.blueprint.annotation.Blueprint;
+import org.apache.aries.blueprint.annotation.Bean;
+import org.apache.aries.blueprint.annotation.Inject;
+import org.apache.aries.blueprint.annotation.Element;
+import org.apache.aries.blueprint.annotation.Element.ElementType;
@Blueprint
-@Bean
+@Bean(id="bar")
public class Bar {
@Inject(value="Hello Bar")
@@ -36,7 +36,7 @@ public class Bar {
private BundleContext context;
@Inject
- @org.osgi.service.blueprint.annotation.List ({
+ @org.apache.aries.blueprint.annotation.List ({
@Element(value="a list element"),
@Element(value="5", type=ElementType.INTEGER)
})
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java Fri Apr 30 19:00:26 2010
@@ -18,14 +18,15 @@ package org.apache.aries.blueprint.sampl
import java.util.Map;
import java.util.List;
-import java.io.Serializable;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.blueprint.annotation.Bean;
-import org.osgi.service.blueprint.annotation.Blueprint;
-
+import org.apache.aries.blueprint.annotation.Bean;
+import org.apache.aries.blueprint.annotation.Blueprint;
+import org.apache.aries.blueprint.annotation.Init;
+import org.apache.aries.blueprint.annotation.Bind;
+import org.apache.aries.blueprint.annotation.Unbind;
@Blueprint
-@Bean
+@Bean(id="bindingListener")
public class BindingListener {
private InterfaceA a;
@@ -53,23 +54,28 @@ public class BindingListener {
this.list = list;
}
+ @Init
public void init() {
}
+ @Bind
public void bind(InterfaceA a, Map props) {
this.a = a;
this.props = props;
}
+ @Bind
public void bind(ServiceReference ref) {
this.reference = ref;
}
+ @Unbind
public void unbind(InterfaceA a, Map props) {
this.a = null;
this.props = null;
}
+ @Unbind
public void unbind(ServiceReference ref) {
this.reference = null;
}
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java Fri Apr 30 19:00:26 2010
@@ -18,9 +18,13 @@ package org.apache.aries.blueprint.sampl
import java.util.Currency;
+import org.apache.aries.blueprint.annotation.Bean;
+import org.apache.aries.blueprint.annotation.Blueprint;
import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.blueprint.container.ReifiedType;
+@Blueprint
+@Bean(id="converter2")
public class CurrencyTypeConverter implements Converter {
public boolean canConvert(Object fromValue, ReifiedType toType) {
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java Fri Apr 30 19:00:26 2010
@@ -20,13 +20,19 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.aries.blueprint.annotation.Inject;
+import org.apache.aries.blueprint.annotation.Bean;
+import org.apache.aries.blueprint.annotation.Blueprint;
import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.blueprint.container.ReifiedType;
+@Blueprint
+@Bean(id="converter1")
public class DateTypeConverter implements Converter {
DateFormat dateFormat;
+ @Inject(value="yyyy.MM.dd")
public void setFormat(String format) {
dateFormat = new SimpleDateFormat(format);
}
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java Fri Apr 30 19:00:26 2010
@@ -31,7 +31,7 @@ import org.apache.aries.blueprint.annota
@Blueprint
@Bean(id="foo")
-@Service(autoExport="all-classes", registerationListener = @RegistrationListener(id="fooRegistrationListener"))
+@Service(autoExport="all-classes", registerationListener = @RegistrationListener(id="fooRegistrationListener"), ranking=0)
public class Foo implements Serializable {
@Inject(value="5")
@@ -40,7 +40,7 @@ public class Foo implements Serializable
@Inject(value="${key.b}")
private int b;
- @Inject
+ @Inject(ref="bar")
private Bar bar;
@Inject(value="PLN")
Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java?rev=939781&r1=939780&r2=939781&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java (original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java Fri Apr 30 19:00:26 2010
@@ -16,6 +16,10 @@
*/
package org.apache.aries.blueprint.sample;
+import org.apache.aries.blueprint.annotation.Reference;
+import org.apache.aries.blueprint.annotation.ReferenceListener;
+
+@Reference (referenceListener = {@ReferenceListener(ref="bindingListener")})
public interface InterfaceA {
String hello(String msg);
Added: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java?rev=939781&view=auto
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java (added)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java Fri Apr 30 19:00:26 2010
@@ -0,0 +1,26 @@
+/**
+ * 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.sample;
+
+import org.apache.aries.blueprint.annotation.ReferenceList;
+import org.apache.aries.blueprint.annotation.ReferenceListener;
+
+@ReferenceList (referenceListener = @ReferenceListener(ref="bindingListener"))
+public interface InterfaceB {
+
+ String hello(String msg);
+}
Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/aries/sandbox/linsun/blueprint/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java
------------------------------------------------------------------------------
svn:mime-type = text/plain