svn commit: r1781323 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/handlers/bean/ main/java/org/apache/aries/blueprint/plugin/model/ main/r
Author: alien11689
Date: Wed Feb 1 22:00:29 2017
New Revision: 1781323
URL: http://svn.apache.org/viewvc?rev=1781323&view=rev
Log:
[ARIES-1676] Handle bean annotation
Added:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BasicBean.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/NamedBean.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/SimpleProducedBean.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
Added:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java?rev=1781323&view=auto
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
(added)
+++
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
Wed Feb 1 22:00:29 2017
@@ -0,0 +1,75 @@
+package org.apache.aries.blueprint.plugin.handlers.bean;
+
+import org.apache.aries.blueprint.annotation.bean.Activation;
+import org.apache.aries.blueprint.annotation.bean.Bean;
+import org.apache.aries.blueprint.annotation.bean.Scope;
+import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.BeanEnricher;
+import org.apache.aries.blueprint.plugin.spi.BeanFinder;
+import org.apache.aries.blueprint.plugin.spi.ContextEnricher;
+import org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder;
+import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler;
+
+import java.lang.reflect.AnnotatedElement;
+
+public class BeanHandler implements
+BeanFinder,
+FactoryMethodFinder,
+NamedLikeHandler,
+BeanAnnotationHandler {
+@Override
+public boolean isSingleton() {
+return true;
+}
+
+@Override
+public Class getAnnotation() {
+return Bean.class;
+}
+
+@Override
+public String getName(Class clazz, AnnotatedElement annotatedElement) {
+Bean bean = annotatedElement.getAnnotation(Bean.class);
+if ("".equals(bean.id())) {
+return null;
+}
+return bean.id();
+}
+
+@Override
+public String getName(Object annotation) {
+Bean bean = Bean.class.cast(annotation);
+if ("".equals(bean.id())) {
+return null;
+}
+return bean.id();
+}
+
+@Override
+public void handleBeanAnnotation(AnnotatedElement annotatedElement, String
id,
+ ContextEnricher contextEnricher,
BeanEnricher beanEnricher) {
+Bean annotation = annotatedElement.getAnnotation(Bean.class);
+if (annotation.activation() != Activation.DEFAULT) {
+beanEnricher.addAttribute("activation",
annotation.activation().name().toLowerCase());
+}
+if (annotation.scope() != Scope.SINGLETON) {
+beanEnricher.addAttribute("scope", "prototype");
+}
+if (annotation.dependsOn().length > 0) {
+StringBuilder dependsOn = new StringBuilder();
+for (int i = 0; i < annotation.dependsOn().length; i++) {
+if (i > 0) {
+dependsOn.append(" ");
+
svn commit: r1781322 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation: ./ src/main/java/org/apache/aries/blueprint/annotation/bean/
Author: alien11689
Date: Wed Feb 1 21:59:39 2017
New Revision: 1781322
URL: http://svn.apache.org/viewvc?rev=1781322&view=rev
Log:
[ARIES-1676] Add bean annotation
Added:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
- copied, changed from r1781298,
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Scope.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1781322&r1=1781321&r2=1781322&view=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed
Feb 1 21:59:39 2017
@@ -41,6 +41,7 @@
+org.apache.aries.blueprint.annotation.bean,
org.apache.aries.blueprint.annotation.config,
org.apache.aries.blueprint.annotation.referencelistener
Copied:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
(from r1781298,
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java&r1=1781298&r2=1781322&rev=1781322&view=diff
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
(original)
+++
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
Wed Feb 1 21:59:39 2017
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.annotation.referencelistener;
+package org.apache.aries.blueprint.annotation.bean;
-public enum Availability {
-MANDATORY,
-OPTIONAL
+public enum Activation {
+LAZY,
+EAGER,
+DEFAULT
}
Added:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java?rev=1781322&view=auto
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
(added)
+++
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
Wed Feb 1 21:59:39 2017
@@ -0,0 +1,65 @@
+/**
+ * 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.bean;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
svn commit: r1781226 - /aries/trunk/blueprint/blueprint-spring/pom.xml
Author: gnodet Date: Wed Feb 1 12:02:25 2017 New Revision: 1781226 URL: http://svn.apache.org/viewvc?rev=1781226&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/blueprint-spring/pom.xml Modified: aries/trunk/blueprint/blueprint-spring/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/pom.xml?rev=1781226&r1=1781225&r2=1781226&view=diff == --- aries/trunk/blueprint/blueprint-spring/pom.xml (original) +++ aries/trunk/blueprint/blueprint-spring/pom.xml Wed Feb 1 12:02:25 2017 @@ -31,16 +31,16 @@ org.apache.aries.blueprint org.apache.aries.blueprint.spring bundle -0.3.0 +1.0.0-SNAPSHOT Apache Aries Blueprint Spring Support This bundle contains Spring support for blueprint. - scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.blueprint.spring-0.3.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.blueprint.spring-0.3.0 - http://svn.apache.org/viewvc/aries/tags/org.apache.aries.blueprint.spring-0.3.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-spring + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-spring + http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring
svn commit: r1781224 - /aries/trunk/blueprint/blueprint-spring/pom.xml
Author: gnodet Date: Wed Feb 1 12:02:20 2017 New Revision: 1781224 URL: http://svn.apache.org/viewvc?rev=1781224&view=rev Log: [maven-release-plugin] prepare release org.apache.aries.blueprint.spring-0.3.0 Modified: aries/trunk/blueprint/blueprint-spring/pom.xml Modified: aries/trunk/blueprint/blueprint-spring/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/pom.xml?rev=1781224&r1=1781223&r2=1781224&view=diff == --- aries/trunk/blueprint/blueprint-spring/pom.xml (original) +++ aries/trunk/blueprint/blueprint-spring/pom.xml Wed Feb 1 12:02:20 2017 @@ -31,16 +31,16 @@ org.apache.aries.blueprint org.apache.aries.blueprint.spring bundle -1.0.0-SNAPSHOT +0.3.0 Apache Aries Blueprint Spring Support This bundle contains Spring support for blueprint. - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-spring - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-spring - http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring + scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.blueprint.spring-0.3.0 + scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.blueprint.spring-0.3.0 + http://svn.apache.org/viewvc/aries/tags/org.apache.aries.blueprint.spring-0.3.0
svn commit: r1781225 - /aries/tags/org.apache.aries.blueprint.spring-0.3.0/
Author: gnodet Date: Wed Feb 1 12:02:23 2017 New Revision: 1781225 URL: http://svn.apache.org/viewvc?rev=1781225&view=rev Log: [maven-release-plugin] copy for tag org.apache.aries.blueprint.spring-0.3.0 Added: aries/tags/org.apache.aries.blueprint.spring-0.3.0/ (props changed) - copied from r1781224, aries/trunk/blueprint/blueprint-spring/ Propchange: aries/tags/org.apache.aries.blueprint.spring-0.3.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Feb 1 12:02:23 2017 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/blueprint-spring:1306564-1337594
