svn commit: r1746854 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/blueprint/plugin/

[alien11689]

Author: alien11689
Date: Sat Jun  4 22:05:02 2016
New Revision: 1746854

URL: http://svn.apache.org/viewvc?rev=1746854=rev
Log:
[ARIES-1562] Refactor after change

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceRef.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1746854=1746853=1746854=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Jun  4 22:05:02 2016
@@ -43,7 +43,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 public class Bean extends BeanRef {
-public String initMethod;
+public final String initMethod;
 public String destroyMethod;
 public SortedSet properties = new TreeSet<>();
 public List constructorArguments = new ArrayList<>();
@@ -57,45 +57,65 @@ public class Bean extends BeanRef {
 super(clazz, BeanRef.getBeanName(clazz));
 Introspector introspector = new Introspector(clazz);
 
-// Init method
-Method initMethod = introspector.methodWith(PostConstruct.class);
-if (initMethod != null) {
-this.initMethod = initMethod.getName();
-}
+initMethod = findMethodAnnotatedWith(introspector, 
PostConstruct.class);
+destroyMethod = findMethodAnnotatedWith(introspector, 
PreDestroy.class);
 
-// Destroy method
-Method destroyMethod = introspector.methodWith(PreDestroy.class);
-if (destroyMethod != null) {
-this.destroyMethod = destroyMethod.getName();
-}
+interpretTransactionalMethods(clazz);
 
-// Transactional methods
-transactionDefs.addAll(new JavaxTransactionFactory().create(clazz));
-transactionDefs.addAll(new SpringTransactionFactory().create(clazz));
 this.isPrototype = isPrototype(clazz);
-this.persistenceFields = 
introspector.fieldsWith(PersistenceContext.class, PersistenceUnit.class);
+this.persistenceFields = findPersistenceFields(introspector);
+
 setQualifiersFromAnnotations(clazz.getAnnotations());
 
+interpretServiceProvider();
+}
+
+private void interpretServiceProvider() {
 ServiceProvider serviceProvider = ServiceProvider.fromBean(this);
-if(serviceProvider != null){
+if (serviceProvider != null) {
 serviceProviders.add(serviceProvider);
 }
 }
 
+private List findPersistenceFields(Introspector introspector) {
+return introspector.fieldsWith(PersistenceContext.class, 
PersistenceUnit.class);
+}
+
+private void interpretTransactionalMethods(Class clazz) {
+transactionDefs.addAll(new JavaxTransactionFactory().create(clazz));
+transactionDefs.addAll(new SpringTransactionFactory().create(clazz));
+}
+
+private String findMethodAnnotatedWith(Introspector introspector, Class annotation) {
+Method initMethod = introspector.methodWith(annotation);
+if (initMethod == null) {
+return null;
+}
+return initMethod.getName();
+}
+
 private boolean isPrototype(Class clazz) {
 return clazz.getAnnotation(Singleton.class) == null && 
clazz.getAnnotation(Component.class) == null;
 }
 
 public void resolve(Matcher matcher) {
 resolveArguments(matcher);
-for (Field field : new Introspector(clazz).fieldsWith(Value.class, 
Autowired.class, Inject.class)) {
-Property prop = Property.create(matcher, field);
+resolveFiields(matcher);
+resolveMethods(matcher);
+}
+
+private void resolveMethods(Matcher matcher) {
+for (Method method : new Introspector(clazz).methodsWith(Value.class, 
Autowired.class, Inject.class)) {
+Property prop = Property.create(matcher, method);
 if (prop != null) {
 properties.add(prop);
 }
 }
-for (Method method : new Introspector(clazz).methodsWith(Value.class, 
Autowired.class, Inject.class)) {
-Property prop = Property.create(matcher, method);
+}
+
+private void resolveFiields(Matcher matcher) {
+for (Field fiel

svn commit: r1746848 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/blueprint/plugin/ test/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Sat Jun  4 19:46:45 2016
New Revision: 1746848

URL: http://svn.apache.org/viewvc?rev=1746848=rev
Log:
[ARIES-1562] Allow for setter injection

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceRef.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1746848=1746847=1746848=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Jun  4 19:46:45 2016
@@ -94,6 +94,12 @@ public class Bean extends BeanRef {
 properties.add(prop);
 }
 }
+for (Method method : new Introspector(clazz).methodsWith(Value.class, 
Autowired.class, Inject.class)) {
+Property prop = Property.create(matcher, method);
+if (prop != null) {
+properties.add(prop);
+}
+}
 }
 
 protected void resolveArguments(Matcher matcher) {

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java?rev=1746848=1746847=1746848=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
 Sat Jun  4 19:46:45 2016
@@ -6,9 +6,9 @@
  * 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
@@ -24,6 +24,7 @@ import javax.inject.Named;
 import javax.inject.Qualifier;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -50,6 +51,16 @@ public class BeanRef implements Comparab
 setQualifiersFromAnnotations(annotations);
 }
 
+public BeanRef(Method method) {
+this(method.getParameterTypes()[0]);
+Annotation[] annotations = method.getAnnotations();
+setQualifiersFromAnnotations(annotations);
+Named named = method.getAnnotation(Named.class);
+if (named != null) {
+id = named.value();
+}
+}
+
 protected void setQualifiersFromAnnotations(Annotation[] annotations) {
 for (Annotation ann : annotations) {
 if (isQualifier(ann) != null) {
@@ -81,6 +92,9 @@ public class BeanRef implements Comparab
 
 public boolean matches(BeanRef template) {
 boolean assignable = template.clazz.isAssignableFrom(this.clazz);
+if (template.id != null) {
+return template.id.equals(id);
+}
 return assignable && 
qualifiers.values().containsAll(template.qualifiers.values());
 }
 

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java?rev=1746848=1746847=1746848=diff
=

svn commit: r1746761 - in /aries/trunk/blueprint/blueprint-maven-plugin: ./ src/main/java/org/apache/aries/blueprint/plugin/ src/main/java/org/apache/aries/blueprint/plugin/model/ src/main/java/org/ap

[alien11689]

Author: alien11689
Date: Fri Jun  3 20:52:55 2016
New Revision: 1746761

URL: http://svn.apache.org/viewvc?rev=1746761=rev
Log:
[ARIES-1561] Prepare ServiceProvider model and move service provider classes to 
separate package

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProviderWriter.java
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/OsgiServiceProviderWriter.java
Modified:
aries/trunk/blueprint/blueprint-maven-plugin/   (props changed)

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

Propchange: aries/trunk/blueprint/blueprint-maven-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Fri Jun  3 20:52:55 2016
@@ -5,3 +5,4 @@ target
 .project
 velocity.log
 .externalToolBuilders
+.idea

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1746761=1746760=1746761=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Fri Jun  3 20:52:55 2016
@@ -26,6 +26,7 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.model.Property;
 import org.apache.aries.blueprint.plugin.model.PropertyWriter;
 import org.apache.aries.blueprint.plugin.model.TransactionalDef;
+import org.apache.aries.blueprint.plugin.model.service.ServiceProviderWriter;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
@@ -89,7 +90,7 @@ public class Generator implements Proper
 }
 
 new OsgiServiceRefWriter(writer).write(context.getServiceRefs());
-new OsgiServiceProviderWriter(writer).write(context.getBeans());
+new 
ServiceProviderWriter(writer).write(context.getServiceProviders());
 
 writer.writeEndElement();
 writer.writeCharacters("\n");

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1746761=1746760=1746761=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Fri Jun  3 20:52:55 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.model;
 
+import org.apache.aries.blueprint.plugin.model.service.ServiceProvider;
 import org.ops4j.pax.cdi.api.OsgiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -50,6 +51,7 @@ public class Bean extends BeanRef {
 public List persistenceFields;
 public Set transactionDefs = new HashSet<>();
 public boolean isPrototype;
+public List serviceProviders = new ArrayList<>();
 
 public Bean(Class clazz) {
 super(clazz, BeanRef.getBeanName(clazz));
@@ -73,6 +75,11 @@ public class Bean extends BeanRef {
 this.isPrototype = isPrototype(clazz);
 this.persistenceFields = 
introspector.fieldsWith(PersistenceContext.class, PersistenceUnit.class);
 setQualifiersFromAnnotations(clazz.getAnnotations());
+
+ServiceProvider serviceProvider = ServiceProvider.fromBean(this);
+if(serviceProvider != null){
+serviceProviders.add(serviceProvider);
+}
 }
 
 private boolean isPrototype(Class clazz) {

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.ja

svn commit: r1746775 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/model/ main/java/org/apache/aries/blueprint/plugin/model/service/ test/java/org

[alien11689]

Author: alien11689
Date: Fri Jun  3 21:58:39 2016
New Revision: 1746775

URL: http://svn.apache.org/viewvc?rev=1746775=rev
Log:
[ARIES-1561] Allow for exposing service from produced beans

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java?rev=1746775=1746774=1746775=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
 Fri Jun  3 21:58:39 2016
@@ -6,9 +6,9 @@
  * 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
@@ -93,6 +93,10 @@ public class Context implements Matcher
 producedBean.setSingleton();
 }
 reg.add(producedBean);
+ServiceProvider serviceProvider = 
ServiceProvider.fromMethod(producedBean, method);
+if (serviceProvider != null) {
+serviceProviders.add(serviceProvider);
+}
 }
 }
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java?rev=1746775=1746774=1746775=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/ServiceProvider.java
 Fri Jun  3 21:58:39 2016
@@ -1,11 +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.plugin.model.service;
 
 import com.google.common.collect.Lists;
 import org.apache.aries.blueprint.plugin.model.Bean;
+import org.apache.aries.blueprint.plugin.model.BeanRef;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;
 import org.ops4j.pax.cdi.api.Property;
 
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -22,25 +43,43 @@ public class ServiceProvider {
 }
 
 public static ServiceProvider fromBean(Bean bean) {
-OsgiServiceProvider serviceProvider = 
bean.clazz.getAnnotation(OsgiServiceProvider.class);
+return createServiceProvider(bean.clazz, bean.id);
+}
+
+public static ServiceProvider fromMethod(BeanRef beanRef, Method method) {
+return 

svn commit: r1746944 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Sun Jun  5 19:41:46 2016
New Revision: 1746944

URL: http://svn.apache.org/viewvc?rev=1746944=rev
Log:
[ARIES-1563] Add field-injection attribute only if bean needs it

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1746944=1746943=1746944=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Sun Jun  5 19:41:46 2016
@@ -145,7 +145,9 @@ public class Generator implements Proper
 writer.writeStartElement("bean");
 writer.writeAttribute("id", bean.id);
 writer.writeAttribute("class", bean.clazz.getName());
-writer.writeAttribute("ext", NS_EXT, "field-injection", "true");
+if(bean.needFieldInjection()) {
+writer.writeAttribute("ext", NS_EXT, "field-injection", "true");
+}
 if (bean.isPrototype) {
 writer.writeAttribute("scope", "prototype");
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1746944=1746943=1746944=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sun Jun  5 19:41:46 2016
@@ -200,4 +200,12 @@ public class Bean extends BeanRef {
 }
 
 
+public boolean needFieldInjection() {
+for (Property property : properties) {
+if (property.isField) {
+return true;
+}
+}
+return false;
+}
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java?rev=1746944=1746943=1746944=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
 Sun Jun  5 19:41:46 2016
@@ -29,14 +29,16 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 public class Property implements Comparable {
-public String name;
-public String ref;
-public String value;
+public final String name;
+public final String ref;
+public final String value;
+public final boolean isField;
 
-public Property(String name, String ref, String value) {
+public Property(String name, String ref, String value, boolean isField) {
 this.name = name;
 this.ref = ref;
 this.value = value;
+this.isField = isField;
 }
 
 public static Property create(Matcher matcher, Field field) {
@@ -44,9 +46,9 @@ public class Property implements Compara
 if (needsInject(field)) {
 BeanRef matching = matcher.getMatching(new BeanRef(field));
 String ref = (matching == null) ? getRefName(field) : matching.id;
-return new Property(field.getName(), ref, null);
+return new Property(field.getName(), ref, null, true);
 } else if (value != null) {
-return new Property(field.getName(), null, 
cleanValue(value.value()));
+return new Property(field.getName(), null, 
cleanValue(value.value()), true);
 } else {
 // Field is not a property
 return null;
@@ -61,14 +63,14 @@ public class Property implements Compara
 
 Value value = method.getAnnotation(Value.cla

svn commit: r1746945 - /aries/trunk/blueprint/blueprint-bundle/pom.xml

[alien11689]

Author: alien11689
Date: Sun Jun  5 20:21:48 2016
New Revision: 1746945

URL: http://svn.apache.org/viewvc?rev=1746945=rev
Log:
Change bleprint-core dependecy version in blueprint-bundle to available in 
project 1.6.3-SNAPSHOT

Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml

Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1746945=1746944=1746945=diff
==
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Sun Jun  5 20:21:48 2016
@@ -122,7 +122,7 @@
 
 org.apache.aries.blueprint
 org.apache.aries.blueprint.core
-1.6.1-SNAPSHOT
+1.6.3-SNAPSHOT
 provided
 
 

svn commit: r1747127 - /aries/trunk/transaction/transaction-itests/pom.xml

[alien11689]

Author: alien11689
Date: Tue Jun  7 05:32:43 2016
New Revision: 1747127

URL: http://svn.apache.org/viewvc?rev=1747127=rev
Log:
Fix transaction-itest dependency to transaction-jdbc

Modified:
aries/trunk/transaction/transaction-itests/pom.xml

Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1747127=1747126=1747127=diff
==
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Tue Jun  7 05:32:43 2016
@@ -95,7 +95,7 @@
 geronimo-connector
 3.1.1
 
-
+
 
 
 javax.transaction
@@ -139,7 +139,7 @@
 org.apache.aries.transaction
 org.apache.aries.transaction.jdbc
 test
-2.1.2-SNAPSHOT
+2.1.3-SNAPSHOT
 
 
 org.apache.aries.transaction

svn commit: r1747457 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Wed Jun  8 21:35:06 2016
New Revision: 1747457

URL: http://svn.apache.org/viewvc?rev=1747457=rev
Log:
[ARIES-1568] Support @DependsOn annotation

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1747457=1747456=1747457=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Wed Jun  8 21:35:06 2016
@@ -156,6 +156,9 @@ public class Generator implements Proper
 if (bean.activation != null) {
 writer.writeAttribute("activation", bean.activation.toString());
 }
+if (bean.dependsOn != null) {
+writer.writeAttribute("depends-on", bean.dependsOn);
+}
 if (bean instanceof ProducedBean) {
 writeFactory((ProducedBean) bean);
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1747457=1747456=1747457=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Wed Jun  8 21:35:06 2016
@@ -20,9 +20,11 @@ package org.apache.aries.blueprint.plugi
 
 import org.apache.aries.blueprint.plugin.Activation;
 import org.apache.aries.blueprint.plugin.model.service.ServiceProvider;
+import org.apache.commons.lang.StringUtils;
 import org.ops4j.pax.cdi.api.OsgiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
@@ -56,12 +58,15 @@ public class Bean extends BeanRef {
 public boolean isPrototype;
 public List serviceProviders = new ArrayList<>();
 public Activation activation;
+public String dependsOn;
 
 public Bean(Class clazz) {
 super(clazz, BeanRef.getBeanName(clazz));
 Introspector introspector = new Introspector(clazz);
 
 activation = getActivation(clazz);
+dependsOn = getDependsOn(clazz);
+
 initMethod = findMethodAnnotatedWith(introspector, 
PostConstruct.class);
 destroyMethod = findMethodAnnotatedWith(introspector, 
PreDestroy.class);
 
@@ -75,6 +80,15 @@ public class Bean extends BeanRef {
 interpretServiceProvider();
 }
 
+protected String getDependsOn(AnnotatedElement annotatedElement) {
+DependsOn annotation = annotatedElement.getAnnotation(DependsOn.class);
+if (annotation == null || annotation.value().length == 0) {
+return null;
+}
+String[] value = annotation.value();
+return StringUtils.join(value, " ");
+}
+
 protected Activation getActivation(AnnotatedElement annotatedElement) {
 Lazy lazy = annotatedElement.getAnnotation(Lazy.class);
 if (lazy == null) {

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.j

svn commit: r1747053 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Mon Jun  6 18:49:10 2016
New Revision: 1747053

URL: http://svn.apache.org/viewvc?rev=1747053=rev
Log:
[ARIES-1566] Support @Lazy annotation

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Activation.java
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java

Added: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Activation.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Activation.java?rev=1747053=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Activation.java
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Activation.java
 Mon Jun  6 18:49:10 2016
@@ -0,0 +1,29 @@
+/**
+ * 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.plugin;
+
+public enum Activation {
+EAGER,
+LAZY;
+
+@Override
+public String toString() {
+return name().toLowerCase();
+}
+}

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1747053=1747052=1747053=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Mon Jun  6 18:49:10 2016
@@ -60,7 +60,7 @@ public class GenerateMojo extends Abstra
  */
 @Parameter
 protected Set namespaces;
-
+
 @Component
 private BuildContext buildContext;
 
@@ -70,6 +70,15 @@ public class GenerateMojo extends Abstra
 @Parameter(defaultValue="autowire.xml")
 protected String generatedFileName;
 
+/**
+ * Specifies the default activation setting that will be defined for 
components.
+ * Default is null, which indicates eager (blueprint default).
+ * If LAZY then default-activation will be set to lazy.
+ * If EAGER then default-activation will be explicitly set to eager.
+ */
+@Parameter
+protected Activation defaultActivation;
+
 public void execute() throws MojoExecutionException, MojoFailureException {
 if (scanPaths.size() == 0 || scanPaths.iterator().next() == null) {
 throw new MojoExecutionException("Configuration scanPaths must be 
set");
@@ -104,7 +113,7 @@ public class GenerateMojo extends Abstra
 System.out.println("Generating blueprint to " + file);
 
 OutputStream fos = buildContext.newFileOutputStream(file);
-new Generator(context, fos, namespaces).generate();
+new Generator(context, fos, namespaces, defaultActivation).ge

svn commit: r1746090 - /aries/site/trunk/content/community/people.mdtext

[alien11689]

Author: alien11689
Date: Mon May 30 08:01:01 2016
New Revision: 1746090

URL: http://svn.apache.org/viewvc?rev=1746090=rev
Log:
CMS commit to aries by alien11689

Modified:
aries/site/trunk/content/community/people.mdtext

Modified: aries/site/trunk/content/community/people.mdtext
URL: 
http://svn.apache.org/viewvc/aries/site/trunk/content/community/people.mdtext?rev=1746090=1746089=1746090=diff
==
--- aries/site/trunk/content/community/people.mdtext (original)
+++ aries/site/trunk/content/community/people.mdtext Mon May 30 08:01:01 2016
@@ -21,6 +21,7 @@ their roles.
 David JencksIBM  
 Davanum Srinivas (Dims)IBM
 Dimo StoilovSAP  
+Dominik PrzybyszTouK 
 Emily JiangIBM 
 Eoghan Glynn  
 Felix MeschbergerAdobe 

svn commit: r1746190 - /aries/trunk/blueprint/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Mon May 30 20:20:56 2016
New Revision: 1746190

URL: http://svn.apache.org/viewvc?rev=1746190=rev
Log:
[ARIES-1555] Add maven-plugin-plugin executions

Modified:
aries/trunk/blueprint/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/pom.xml?rev=1746190=1746189=1746190=diff
==
--- aries/trunk/blueprint/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/pom.xml Mon May 30 20:20:56 
2016
@@ -60,6 +60,22 @@
 
 maven-plugin-plugin
 3.4
+
+
+default-descriptor
+
+descriptor
+
+process-classes
+
+
+help-descriptor
+
+helpmojo
+
+process-classes
+
+
 
 
 

svn commit: r1750823 [2/2] - in /aries/trunk/blueprint/blueprint-maven-plugin: ./ src/main/java/org/apache/aries/blueprint/plugin/ src/main/java/org/apache/aries/blueprint/plugin/javax/ src/main/java/

[alien11689]

Added: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder?rev=1750823=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
 Thu Jun 30 16:18:59 2016
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+org.apache.aries.blueprint.plugin.spring.ComponentBeanFinder
+org.apache.aries.blueprint.plugin.javax.SingletonBeanFinder
+org.apache.aries.blueprint.plugin.javax.NamedBeanFinder
\ No newline at end of file

Added: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler?rev=1750823=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
 Thu Jun 30 16:18:59 2016
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+org.apache.aries.blueprint.plugin.spring.AutowiredAsInject
+org.apache.aries.blueprint.plugin.javax.InjectHandler
\ No newline at end of file

Added: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler?rev=1750823=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
 Thu Jun 30 16:18:59 2016
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+

svn commit: r1781322 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation: ./ src/main/java/org/apache/aries/blueprint/annotation/bean/

[alien11689]

Author: alien11689
Date: Wed Feb  1 21:59:39 2017
New Revision: 1781322

URL: http://svn.apache.org/viewvc?rev=1781322=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=1781321=1781322=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=aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java=1781298=1781322=1781322=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=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.annotatio

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

[alien11689]

Author: alien11689
Date: Wed Feb  1 22:00:29 2017
New Revision: 1781323

URL: http://svn.apache.org/viewvc?rev=1781323=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=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++) {
+  

svn commit: r1781787 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/blueprint/plugin/ test/java/org/apache

[alien11689]

Author: alien11689
Date: Sun Feb  5 18:29:53 2017
New Revision: 1781787

URL: http://svn.apache.org/viewvc?rev=1781787=rev
Log:
[REFACTOR] Separate bean and bean ref

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java
  - copied, changed from r1781786, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Registry.java
Removed:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Registry.java
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java

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/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1781787=1781786=1781787=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sun Feb  5 18:29:53 2017
@@ -26,6 +26,7 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.XmlWriter;
 
 import javax.xml.stream.XMLStreamException;
@@ -56,14 +57,12 @@ class Bean extends BeanRef implements Be
 protected final ContextEnricher contextEnricher;
 
 Bean(Class clazz, ContextEnricher contextEnricher) {
-super(clazz, BeanRef.getBeanName(clazz));
+super(clazz, getBeanName(clazz), clazz.getAnnotations());
 this.contextEnricher = contextEnricher;
 Introspector introspector = new Introspector(clazz);
 
 setScope(clazz);
 
-setQualifiersFromAnnotations(clazz.getAnnotations());
-
 handleCustomBeanAnnotations();
 
 handleFieldsAnnotation(introspector);
@@ -75,7 +74,7 @@ class Bean extends BeanRef implements Be
 attributes.put("scope", findSingleton(clazz) ? "singleton" : 
"prototype");
 }
 
-void resolve(BlueprintRegistry blueprintRegistry) {
+void resolveDependency(BlueprintRegistry blueprintRegistry) {
 resolveArguments(blueprintRegistry);
 resolveFields(blueprintRegistry);
 resolveMethods(blueprintRegistry);
@@ -173,8 +172,7 @@ class Bean extends BeanRef implements Be
 }
 
 if (ref == null && value == null) {
-BeanRef template = new BeanRef(parameterTypes[i]);
-template.setQualifiersFromAnnotations(annotations);
+BeanRef template = new BeanRef(parameterTypes[i], annotations);
 BeanRef bean = blueprintRegistry.getMatching(template);
 if (bean != null) {
 ref = bean.id;
@@ -262,4 +260,29 @@ class Bean extends BeanRef implements Be
 }
 writeAttributes(writer);
 }
+
+BeanRef toBeanRef() {
+return this;
+}
+
+static String getBeanName(Class clazz) {
+return getBeanName(clazz, clazz);
+}
+
+private static String getBeanName(Class clazz, AnnotatedElement 
annotatedElement) {
+for (NamedLikeHandler namedLikeHandler : Handlers.NAMED_LIKE_HANDLERS) 
{
+if 
(annotatedElement.getAnnotation(namedLikeHandler.getAnnotation()) != null) {
+String name = namedLikeHandler.getName(clazz, 
annotatedElement);
+if (name != null) {
+return name;
+}
+}
+}
+String name = clazz.getSimpleName();
+return getBeanNameFromSimpleName(name);
+}
+
+private static String getBeanNameFromSimpleName(String name) {
+return name.substring(0, 1).toLowerCase() + name.substring(1, 
name.length

svn commit: r1781955 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/

[alien11689]

Author: alien11689
Date: Mon Feb  6 21:18:56 2017
New Revision: 1781955

URL: http://svn.apache.org/viewvc?rev=1781955=rev
Log:
[REFACTOR] Refactor bean name generation

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/NamingHelper.java
  - copied, changed from r1781793, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java

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/java/org/apache/aries/blueprint/plugin/model/Introspector.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java?rev=1781955=1781954=1781955=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
 Mon Feb  6 21:18:56 2017
@@ -85,4 +85,13 @@ class AnnotationHelper {
 }
 return false;
 }
+
+static boolean findSingleton(Class clazz) {
+for (Class singletonAnnotation : Handlers.SINGLETONS) {
+if (clazz.getAnnotation(singletonAnnotation) != null) {
+return true;
+}
+}
+return false;
+}
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java?rev=1781955=1781954=1781955=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
 Mon Feb  6 21:18:56 2017
@@ -18,18 +18,53 @@
  */
 package org.apache.aries.blueprint.plugin.model;
 
+import org.apache.aries.blueprint.plugin.handlers.Handlers;
+import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.XmlWriter;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import java.lang.annotation.Annotation;
+
+import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName;
+import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue;
+import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName;
 
 class Argument implements XmlWriter{
 private final String ref;
 private final String value;
 
-Argument(String ref, String value) {
-this.ref = ref;
+Argument(BlueprintRegistry blueprintRegistry, Class argumentClass, 
Annotation[] annotations) {
+String value = findValue(annotations);
+String ref = findName(annotations);
+
+for (CustomDependencyAnnotationHandler 
customDependencyAnnotationHandler : 
Handlers.CUSTOM_DEPENDENCY_ANNOTATION_HANDLERS) {
+Annotation annotation = (Annotation) 
AnnotationHelper.findAnnotation(annotations, 
customDependencyAnnotationHandler.getAnnotation());
+if (annotation != null) {
+String generatedRef = 
customDependencyAnnotationHandler.handleDependencyAnnotation(argumentClass, 
annotation, ref, blueprintRegistry);
+if (generatedRef != null) {
+ref = generatedRef;
+break;
+}
+}
+}
+
+if (ref == null && value == null) {
+BeanTemplate template = new BeanTemplate(argumentClass, 
annotations);
+BeanRef bean = blueprintRegistry.getMatching(

svn commit: r1781669 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model: Bean.java Blueprint.java

[alien11689]

Author: alien11689
Date: Sat Feb  4 13:46:01 2017
New Revision: 1781669

URL: http://svn.apache.org/viewvc?rev=1781669=rev
Log:
[ARIES-1680] Write ext namespace only when bean needs field injection

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1781669=1781668=1781669=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Feb  4 13:46:01 2017
@@ -47,7 +47,7 @@ import static org.apache.aries.blueprint
 
 class Bean extends BeanRef implements BeanEnricher, XmlWriter {
 
-static final String NS_EXT = 
"http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;;
+private static final String NS_EXT = 
"http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;;
 
 SortedSet properties = new TreeSet<>();
 List constructorArguments = new ArrayList<>();
@@ -257,6 +257,7 @@ class Bean extends BeanRef implements Be
 writer.writeAttribute("id", id);
 writer.writeAttribute("class", clazz.getName());
 if (needFieldInjection()) {
+writer.writeNamespace("ext", NS_EXT);
 writer.writeAttribute("ext", NS_EXT, "field-injection", "true");
 }
 writeAttributes(writer);

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java?rev=1781669=1781668=1781669=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
 Sat Feb  4 13:46:01 2017
@@ -35,8 +35,6 @@ import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import static org.apache.aries.blueprint.plugin.model.Bean.NS_EXT;
-
 public class Blueprint implements BlueprintRegistry, ContextEnricher, 
XmlWriter {
 private static final String NS_BLUEPRINT = 
"http://www.osgi.org/xmlns/blueprint/v1.0.0;;
 
@@ -167,7 +165,6 @@ public class Blueprint implements Bluepr
 private void writeBlueprint(XMLStreamWriter writer) throws 
XMLStreamException {
 writer.writeStartElement("blueprint");
 writer.writeDefaultNamespace(NS_BLUEPRINT);
-writer.writeNamespace("ext", NS_EXT);
 if (blueprintConfiguration.getDefaultActivation() != null) {
 writer.writeAttribute("default-activation", 
blueprintConfiguration.getDefaultActivation().name().toLowerCase());
 }

svn commit: r1781668 - 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/ test/j

[alien11689]

Author: alien11689
Date: Sat Feb  4 13:30:43 2017
New Revision: 1781668

URL: http://svn.apache.org/viewvc?rev=1781668=rev
Log:
[MAINTENANCE] Simplify bean model in BMP

Modified:

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/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java

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/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java

Modified: 
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=1781668=1781667=1781668=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java
 Sat Feb  4 13:30:43 2017
@@ -19,7 +19,7 @@ public class BeanHandler implements
 BeanAnnotationHandler {
 @Override
 public boolean isSingleton() {
-return true;
+return false;
 }
 
 @Override
@@ -52,9 +52,7 @@ public class BeanHandler implements
 if (annotation.activation() != Activation.DEFAULT) {
 beanEnricher.addAttribute("activation", 
annotation.activation().name().toLowerCase());
 }
-if (annotation.scope() != Scope.SINGLETON) {
-beanEnricher.addAttribute("scope", "prototype");
-}
+beanEnricher.addAttribute("scope", annotation.scope() == 
Scope.SINGLETON ? "singleton" : "prototype");
 if (annotation.dependsOn().length > 0) {
 StringBuilder dependsOn = new StringBuilder();
 for (int i = 0; i < annotation.dependsOn().length; i++) {
@@ -65,10 +63,10 @@ public class BeanHandler implements
 }
 beanEnricher.addAttribute("depends-on", dependsOn.toString());
 }
-if(!annotation.initMethod().isEmpty()){
+if (!annotation.initMethod().isEmpty()) {
 beanEnricher.addAttribute("init-method", annotation.initMethod());
 }
-if(!annotation.destroyMethod().isEmpty()){
+if (!annotation.destroyMethod().isEmpty()) {
 beanEnricher.addAttribute("destroy-method", 
annotation.destroyMethod());
 }
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1781668=1781667=1781668=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Feb  4 13:30:43 2017
@@ -45,11 +45,13 @@ import java.util.TreeSet;
 import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName;
 import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue;
 
-class Bean extends BeanRef implements BeanEnricher {
-public SortedSet properties = new TreeSet<>();
+class Bean extends BeanRef implements BeanEnricher, XmlWriter {
+
+static final String NS_EXT = 
"http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;;
+
+SortedSet properties = new TreeSet<>();
 List constructorArguments = new ArrayList<>();
-public boolean isPrototype;
-public final Map<String, String> attributes = new HashMap<>();
+final Map<String, String> attributes = new HashMap<>();
 final Map<String, XmlWriter> beanContentWriters = new HashMap<>();
 protected final ContextEnricher contextEnricher;
 
@@ -58,7 +60,7 @@ class Bean extends BeanRef implements Be
   

svn commit: r1781654 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/handlers/pax/ main/java/org/apache/aries/blueprint/plugin/model/ test/ja

[alien11689]

Author: alien11689
Date: Sat Feb  4 11:02:53 2017
New Revision: 1781654

URL: http://svn.apache.org/viewvc?rev=1781654=rev
Log:
[ARIES-1677] Create typed service properties via annotations

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/ServiceProperty.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithTypedParameters.java
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

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/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceHandler.java?rev=1781654=1781653=1781654=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/pax/OsgiServiceHandler.java
 Sat Feb  4 11:02:53 2017
@@ -42,20 +42,7 @@ public class OsgiServiceHandler implemen
 final Class clazz = getClass(annotatedElement);
 
 contextEnricher.addBean(id, getClass(annotatedElement));
-contextEnricher.addBlueprintContentWriter("osgiService/" + 
clazz.getName() + "/" + id, new XmlWriter() {
-@Override
-public void write(XMLStreamWriter writer) throws 
XMLStreamException {
-writer.writeEmptyElement("reference");
-writer.writeAttribute("id", id);
-writer.writeAttribute("interface", clazz.getName());
-if (serviceFilter.filter != null && 
!"".equals(serviceFilter.filter)) {
-writer.writeAttribute("filter", serviceFilter.filter);
-}
-if (serviceFilter.compName != null && 
!"".equals(serviceFilter.compName)) {
-writer.writeAttribute("component-name", 
serviceFilter.compName);
-}
-}
-});
+contextEnricher.addBlueprintContentWriter(getWriterId(id, clazz), 
getXmlWriter(id, clazz, serviceFilter));
 return id;
 }
 
@@ -65,7 +52,12 @@ public class OsgiServiceHandler implemen
 final String id = name != null ? name : generateReferenceId(clazz, 
serviceFilter);
 
 contextEnricher.addBean(id, clazz);
-contextEnricher.addBlueprintContentWriter("osgiService/" + 
clazz.getName() + "/" + id, new XmlWriter() {
+contextEnricher.addBlueprintContentWriter(getWriterId(id, clazz), 
getXmlWriter(id, clazz, serviceFilter));
+return id;
+}
+
+private XmlWriter getXmlWriter(final String id, final Class clazz, 
final ServiceFilter serviceFilter) {
+return new XmlWriter() {
 @Override
 public void write(XMLStreamWriter writer) throws 
XMLStreamException {
 writer.writeEmptyElement("reference");
@@ -78,8 +70,11 @@ public class OsgiServiceHandler implemen
 writer.writeAttribute("component-name", 
serviceFilter.compName);
 }
 }
-});
-return id;
+};
+}
+
+private String getWriterId(String id, Class clazz) {
+return "osgiService/" + clazz.getName() + "/" + id;
 }
 
 private Class getClass(AnnotatedElement annotatedElement) {
@@ -111,7 +106,7 @@ public class OsgiServiceHandler implemen
 return prefix + suffix;
 }
 
-protected static String getBeanNameFromSimpleName(String name) {
+private static String getBeanNameFromSimpleName(String name) {
 return name.substring(0, 1).toLowerCase() + name.substring(1, 
name.length());
 }
 
@@ -137,10 +132,10 @@ public class OsgiServiceHandler implemen
 }
 
 private static class ServiceFilter {
-final public String filter;
-final public String compName;
+final String filter;
+

svn commit: r1779837 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/referencelistener/ test/jav

[alien11689]

Author: alien11689
Date: Sun Jan 22 17:00:17 2017
New Revision: 1779837

URL: http://svn.apache.org/viewvc?rev=1779837=rev
Log:
[TEST] test validate generated xml against xsd

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/blueprint.xsd
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java?rev=1779837=1779836=1779837=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
 Sun Jan 22 17:00:17 2017
@@ -62,11 +62,11 @@ class PackageFinder {
 return packages;
 }
 
-static class SearchFile {
+private static class SearchFile {
 String prefix;
 File f;
 
-public SearchFile(String prefix, File f) {
+SearchFile(String prefix, File f) {
 this.prefix = prefix;
 this.f = f;
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java?rev=1779837=1779836=1779837=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java
 Sun Jan 22 17:00:17 2017
@@ -103,10 +103,10 @@ public class ReferenceListenerHandler im
 xmlStreamWriter.writeStartElement("reference-listener");
 xmlStreamWriter.writeAttribute("ref", referenceListenerDefinition.ref);
 if (referenceListenerDefinition.bind != null) {
-xmlStreamWriter.writeAttribute("bind", 
referenceListenerDefinition.bind);
+xmlStreamWriter.writeAttribute("bind-method", 
referenceListenerDefinition.bind);
 }
 if (referenceListenerDefinition.unbind != null) {
-xmlStreamWriter.writeAttribute("unbind", 
referenceListenerDefinition.unbind);
+xmlStreamWriter.writeAttribute("unbind-method", 
referenceListenerDefinition.unbind);
 }
 xmlStreamWriter.writeEndElement();
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java?rev=1779837=1779836=1779837=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
 Sun Jan 22 17:00:17 2017
@@ -36,9 +36,16 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
@@ -49,6 +56,7 @@ import java.io.Inpu

svn commit: r1780272 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Wed Jan 25 21:50:08 2017
New Revision: 1780272

URL: http://svn.apache.org/viewvc?rev=1780272=rev
Log:
Extract xsd to test dir

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1780272=1780271=1780272=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Jan 25 
21:50:08 2017
@@ -94,7 +94,7 @@
 
 

 **/aries/**/*.xsd
-
${project.build.directory}/classes/schema
+
${project.build.directory}/test-classes/schema
 
true
 
 

svn commit: r1780839 [1/2] - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/config/ main/java/org

[alien11689]

Author: alien11689
Date: Sun Jan 29 18:48:15 2017
New Revision: 1780839

URL: http://svn.apache.org/viewvc?rev=1780839=rev
Log:
[MAINTENANCE] Refactor packages of blueprint maven plugin

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigAnnotationHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigPropertiesHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertyInjectionHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigPropertyInjectionHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/InjectHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/InjectHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/NamedBeanFinder.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/NamedHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PostConstructHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java
  - copied, changed from r1780838, 
aries/trunk/blueprint/plugin/blueprint-maven

svn commit: r1780839 [2/2] - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/config/ main/java/org

[alien11689]

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1780839=1780838=1780839=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sun Jan 29 18:48:15 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.model;
 
-import org.apache.aries.blueprint.plugin.Extensions;
+import org.apache.aries.blueprint.plugin.handlers.Handlers;
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.BeanEnricher;
 import org.apache.aries.blueprint.plugin.spi.ContextEnricher;
@@ -28,6 +28,8 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.XmlWriter;
 
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
@@ -77,7 +79,7 @@ public class Bean extends BeanRef implem
 }
 
 private void handleMethodsAnnotation(Introspector introspector) {
-for (MethodAnnotationHandler methodAnnotationHandler : 
Extensions.methodAnnotationHandlers) {
+for (MethodAnnotationHandler methodAnnotationHandler : 
Handlers.methodAnnotationHandlers) {
 List methods = 
introspector.methodsWith(methodAnnotationHandler.getAnnotation());
 if (methods.size() > 0) {
 methodAnnotationHandler.handleMethodAnnotation(clazz, methods, 
contextEnricher, this);
@@ -86,7 +88,7 @@ public class Bean extends BeanRef implem
 }
 
 private void handleFieldsAnnotation(Introspector introspector) {
-for (FieldAnnotationHandler fieldAnnotationHandler : 
Extensions.fieldAnnotationHandlers) {
+for (FieldAnnotationHandler fieldAnnotationHandler : 
Handlers.fieldAnnotationHandlers) {
 List fields = 
introspector.fieldsWith(fieldAnnotationHandler.getAnnotation());
 if (fields.size() > 0) {
 fieldAnnotationHandler.handleFieldAnnotation(clazz, fields, 
contextEnricher, this);
@@ -95,7 +97,7 @@ public class Bean extends BeanRef implem
 }
 
 private void handleCustomBeanAnnotations() {
-for (BeanAnnotationHandler beanAnnotationHandler : 
Extensions.BEAN_ANNOTATION_HANDLERs) {
+for (BeanAnnotationHandler beanAnnotationHandler : 
Handlers.BEAN_ANNOTATION_HANDLERs) {
 Object annotation = 
AnnotationHelper.findAnnotation(clazz.getAnnotations(), 
beanAnnotationHandler.getAnnotation());
 if (annotation != null) {
 beanAnnotationHandler.handleBeanAnnotation(clazz, id, 
contextEnricher, this);
@@ -108,7 +110,7 @@ public class Bean extends BeanRef implem
 }
 
 private boolean findSingleton(Class clazz) {
-for (Class singletonAnnotation : Extensions.singletons) {
+for (Class singletonAnnotation : Handlers.singletons) {
 if (clazz.getAnnotation(singletonAnnotation) != null) {
 return true;
 }
@@ -146,7 +148,7 @@ public class Bean extends BeanRef implem
 }
 
 private boolean shouldInject(AnnotatedElement annotatedElement) {
-for (InjectLikeHandler injectLikeHandler : 
Extensions.beanInjectLikeHandlers) {
+for (InjectLikeHandler injectLikeHandler : 
Handlers.beanInjectLikeHandlers) {
 if 
(annotatedElement.getAnnotation(injectLikeHandler.getAnnotation()) != null) {
 return true;
 }
@@ -160,7 +162,7 @@ public class Bean extends BeanRef implem
 String value = findValue(annotations);
 String ref = findName(annotations);
 
-for (CustomDependencyAnnotationHandler 
customDependencyAnnotationHandler : 
Extensions.customDependencyAnnotationHandlers) {
+for (CustomDependencyAnnotationHandler 
customDependencyAnnotationHandler : 
Handlers.customDependencyAnnotationHandlers) {
 Annotation annotation = (Annotation) 
AnnotationHelper.findAnnotation(annotations, 
customDependencyAnnotationHandler.getAnnotation());
 if (annotation != null) {
 String generatedRef = 
customDependencyAnnotationHandler.handleDependencyAnnotation(parameterTypes[i], 
annotation, ref, blueprintRegister);
@@ -196,15 +198,15 @@ public class Bean extends BeanRef implem
 return clazz.getName();
 }
 
-public void writeProperties(PropertyWriter writer) {
+public void 

svn commit: r1779795 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java

[alien11689]

Author: alien11689
Date: Sun Jan 22 12:13:16 2017
New Revision: 1779795

URL: http://svn.apache.org/viewvc?rev=1779795=rev
Log:
[DOCUMENTATION] Add javadoc for @ConfigProperties

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java?rev=1779795=1779794=1779795=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
 Sun Jan 22 12:13:16 2017
@@ -23,10 +23,21 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * Annotating any parameter with this will create a
+ * cm:cm-properties element in blueprint and inject such
+ * properties into annotated place
+ */
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ConfigProperties {
+/**
+ * @return persistent id of configuration
+ */
 String pid();
 
+/**
+ * @return should update on each properties change
+ */
 boolean update() default false;
 }

svn commit: r1779797 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/ blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ blu

[alien11689]

Author: alien11689
Date: Sun Jan 22 12:23:22 2017
New Revision: 1779797

URL: http://svn.apache.org/viewvc?rev=1779797=rev
Log:
[ARIES-1669] Genreate reference listener via annotations

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/

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/referencelistener/Bind.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Cardinality.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ReferenceListener.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Unbind.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/packageinfo
  - copied, changed from r1779380, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/packageinfo

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerDefinition.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/referencelistener/ReferenceListenerHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

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/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

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=1779797=1779796=1779797=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Sun 
Jan 22 12:23:22 2017
@@ -22,7 +22,8 @@
 
 
 
-org.apache.aries.blueprint.annotation.config
+org.apache.aries.blueprint.annotation.config,
+org.apache.aries.blueprint.annotation.referencelistener
 
 
 

Added: 
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/referencelistener/Availability.java?rev=1779797=auto
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
 (added)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
 Sun Jan 22 12:23:22 2017
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license

svn commit: r1783901 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Tue Feb 21 15:33:56 2017
New Revision: 1783901

URL: http://svn.apache.org/viewvc?rev=1783901=rev
Log:
Temporary set blueprint-maven-plugin-annotations version to SNAPSHOT in 
blueprint-maven-plugin

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783901=1783900=1783901=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Tue Feb 21 
15:33:56 2017
@@ -185,7 +185,7 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
-1.1.0
+1.1.1-SNAPSHOT
 
 
 org.apache.maven

svn commit: r1783630 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:43:20 2017
New Revision: 1783630

URL: http://svn.apache.org/viewvc?rev=1783630=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-1.6.0

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783630=1783629=1783630=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Feb 19 
11:43:20 2017
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.5.1-SNAPSHOT
+1.6.0
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -43,12 +43,12 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
 
 
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
 
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0
 
 
 

svn commit: r1783631 - /aries/tags/blueprint-maven-plugin-1.6.0/

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:43:24 2017
New Revision: 1783631

URL: http://svn.apache.org/viewvc?rev=1783631=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-1.6.0

Added:
aries/tags/blueprint-maven-plugin-1.6.0/   (props changed)
  - copied from r1783630, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/

Propchange: aries/tags/blueprint-maven-plugin-1.6.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 19 11:43:24 2017
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin:1306564-1337594

svn commit: r1783632 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:43:27 2017
New Revision: 1783632

URL: http://svn.apache.org/viewvc?rev=1783632=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783632=1783631=1783632=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Feb 19 
11:43:27 2017
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.6.0
+1.6.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -43,12 +43,12 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
 

svn commit: r1783633 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 12:06:46 2017
New Revision: 1783633

URL: http://svn.apache.org/viewvc?rev=1783633=rev
Log:
[RELEASE] Bump plugin version in blueprint plugin itests

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml?rev=1783633=1783632=1783633=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml Sun Feb 
19 12:06:46 2017
@@ -35,7 +35,7 @@
 Apache Aries Blueprint Maven Plugin iTest
 
 
-
1.5.1-SNAPSHOT
+
1.6.1-SNAPSHOT
 
 
 

svn commit: r1783629 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:41:19 2017
New Revision: 1783629

URL: http://svn.apache.org/viewvc?rev=1783629=rev
Log:
[RELEASE] Bump annotation version in blueprint maven plugin

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783629=1783628=1783629=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Feb 19 
11:41:19 2017
@@ -185,7 +185,7 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
-1.1.0-SNAPSHOT
+1.1.0
 
 
 org.apache.maven

svn commit: r1783627 - /aries/tags/blueprint-maven-plugin-annotation-1.1.0/

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:38:28 2017
New Revision: 1783627

URL: http://svn.apache.org/viewvc?rev=1783627=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-annotation-1.1.0

Added:
aries/tags/blueprint-maven-plugin-annotation-1.1.0/   (props changed)
  - copied from r1783626, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/

Propchange: aries/tags/blueprint-maven-plugin-annotation-1.1.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 19 11:38:28 2017
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-annotation:1306564-1337594

svn commit: r1783628 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:38:31 2017
New Revision: 1783628

URL: http://svn.apache.org/viewvc?rev=1783628=rev
Log:
[maven-release-plugin] prepare for next development iteration

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=1783628=1783627=1783628=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Sun 
Feb 19 11:38:31 2017
@@ -28,14 +28,14 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
-1.1.0
+1.1.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin Annotations
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
 
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.1.0
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
 
 
 

svn commit: r1783626 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Sun Feb 19 11:38:23 2017
New Revision: 1783626

URL: http://svn.apache.org/viewvc?rev=1783626=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-annotation-1.1.0

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=1783626=1783625=1783626=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Sun 
Feb 19 11:38:23 2017
@@ -28,14 +28,14 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
-1.1.0-SNAPSHOT
+1.1.0
 Apache Aries Blueprint Maven Plugin Annotations
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
 
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.1.0
 
 
 

svn commit: r1783450 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

[alien11689]

Author: alien11689
Date: Fri Feb 17 18:50:43 2017
New Revision: 1783450

URL: http://svn.apache.org/viewvc?rev=1783450=rev
Log:
[ARIES-1687] Fix recognizing sources change in BMP

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1783450=1783449=1783450=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Fri Feb 17 18:50:43 2017
@@ -124,7 +124,7 @@ public class GenerateMojo extends Abstra
 }
 
 private boolean sourcesChanged() {
-return !buildContext.hasDelta(new 
File(project.getCompileSourceRoots().iterator().next()));
+return buildContext.hasDelta(new 
File(project.getCompileSourceRoots().iterator().next()));
 }
 
 private void writeBlueprint(Blueprint blueprint) throws Exception {

svn commit: r1783474 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/ blueprint-maven-plugin/ blueprint-maven-plugin/src/

[alien11689]

Author: alien11689
Date: Fri Feb 17 22:08:50 2017
New Revision: 1783474

URL: http://svn.apache.org/viewvc?rev=1783474=rev
Log:
[ARIES-1685] Add integration tests for BMP

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/packageinfo
  - copied unchanged from r1781298, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/packageinfo
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/  
 (with props)

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/p1/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/p1/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/verify.groovy

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/ 
  (with props)

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p1/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p1/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p2/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p2/T2.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/verify.groovy

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/   
(with props)

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p1/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p1/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/T2.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/inner/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/verify.groovy
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/  
 (with props)

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/T2.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/verify.groovy
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java

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/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithTypedParameters.java

svn commit: r1783449 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

[alien11689]

Author: alien11689
Date: Fri Feb 17 18:47:43 2017
New Revision: 1783449

URL: http://svn.apache.org/viewvc?rev=1783449=rev
Log:
[ARIES-1686] Revert blueprint maven plugin goal

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1783449=1783448=1783449=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Fri Feb 17 18:47:43 2017
@@ -47,7 +47,7 @@ import java.util.Set;
 /**
  * Generates blueprint from CDI annotations
  */
-@Mojo(name = "blueprint-write", requiresDependencyResolution = 
ResolutionScope.COMPILE,
+@Mojo(name = "blueprint-generate", requiresDependencyResolution = 
ResolutionScope.COMPILE,
 defaultPhase = LifecyclePhase.PROCESS_CLASSES, inheritByDefault = 
false)
 public class GenerateMojo extends AbstractMojo {
 

svn commit: r1783442 - /aries/tags/blueprint-maven-plugin-annotation-1.1.0/

[alien11689]

Author: alien11689
Date: Fri Feb 17 18:20:30 2017
New Revision: 1783442

URL: http://svn.apache.org/viewvc?rev=1783442=rev
Log:
Rollback release

Removed:
aries/tags/blueprint-maven-plugin-annotation-1.1.0/

svn commit: r1783443 - /aries/tags/blueprint-maven-plugin-1.6.0/

[alien11689]

Author: alien11689
Date: Fri Feb 17 18:20:49 2017
New Revision: 1783443

URL: http://svn.apache.org/viewvc?rev=1783443=rev
Log:
Rollback release

Removed:
aries/tags/blueprint-maven-plugin-1.6.0/

svn commit: r1784358 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

[alien11689]

Author: alien11689
Date: Sat Feb 25 08:38:05 2017
New Revision: 1784358

URL: http://svn.apache.org/viewvc?rev=1784358=rev
Log:
[MAINTENANCE] Move blueprint plugin integration tests to separate profile 
because of OOM on CI

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml?rev=1784358=1784357=1784358=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml Sat Feb 
25 08:38:05 2017
@@ -56,26 +56,36 @@
 1.7
 
 
-
-org.apache.maven.plugins
-maven-invoker-plugin
-1.10
-
-src/it
-
-**/pom.xml
-
-verify
-
${project.build.directory}/it
-
-
-
-
-run
-
-
-
-
 
 
+
+
+
+integration-test
+
+
+
+org.apache.maven.plugins
+maven-invoker-plugin
+1.10
+
+src/it
+
+**/pom.xml
+
+verify
+
${project.build.directory}/it
+
+
+
+
+run
+
+
+
+
+
+
+
+
 

svn commit: r1783446 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/pom.xml blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Fri Feb 17 18:29:03 2017
New Revision: 1783446

URL: http://svn.apache.org/viewvc?rev=1783446=rev
Log:
[REVERT] Revert blueprint plugin annotations and blueprint plugin release

I have found errors and incompatible changes

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/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=1783446=1783445=1783446=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Fri 
Feb 17 18:29:03 2017
@@ -28,7 +28,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
-1.1.1-SNAPSHOT
+1.1.0-SNAPSHOT
 Apache Aries Blueprint Maven Plugin Annotations
 
 

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783446=1783445=1783446=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 
18:29:03 2017
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.6.1-SNAPSHOT
+1.5.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -184,7 +184,7 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
-1.1.0
+1.1.0-SNAPSHOT
 
 
 org.apache.maven

svn commit: r1783576 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model: Bean.java Blueprint.java

[alien11689]

Author: alien11689
Date: Sat Feb 18 18:03:04 2017
New Revision: 1783576

URL: http://svn.apache.org/viewvc?rev=1783576=rev
Log:
[ARIES-1688] Generate beans and custom writers in alphabetical order

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1783576=1783575=1783576=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Feb 18 18:03:04 2017
@@ -35,6 +35,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +45,7 @@ import java.util.TreeSet;
 import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findSingleton;
 import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName;
 
-class Bean implements BeanEnricher, XmlWriter {
+class Bean implements BeanEnricher, XmlWriter, Comparable{
 
 private static final String NS_EXT = 
"http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;;
 
@@ -181,8 +182,10 @@ class Bean implements BeanEnricher, XmlW
 }
 
 private void writeCustomContent(XMLStreamWriter writer) throws 
XMLStreamException {
-for (XmlWriter xmlWriter : beanContentWriters.values()) {
-xmlWriter.write(writer);
+List customWriterKeys = new 
ArrayList<>(beanContentWriters.keySet());
+Collections.sort(customWriterKeys);
+for (String customWriterKey : customWriterKeys) {
+beanContentWriters.get(customWriterKey).write(writer);
 }
 }
 
@@ -218,4 +221,9 @@ class Bean implements BeanEnricher, XmlW
 BeanRef toBeanRef() {
 return new BeanRef(clazz, id, clazz.getAnnotations());
 }
+
+@Override
+public int compareTo(Bean o) {
+return id.compareTo(o.id);
+}
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java?rev=1783576=1783575=1783576=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
 Sat Feb 18 18:03:04 2017
@@ -31,6 +31,8 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -133,16 +135,24 @@ public class Blueprint implements Bluepr
 
 public void write(XMLStreamWriter writer) throws XMLStreamException {
 writeBlueprint(writer);
+writeBeans(writer);
+writeCustomWriters(writer);
+writer.writeEndElement();
+}
 
-for (Bean beanWriter : generatedBeans) {
-beanWriter.write(writer);
+private void writeCustomWriters(XMLStreamWriter writer) throws 
XMLStreamException {
+List customWriterKeys = new 
ArrayList<>(customWriters.keySet());
+Collections.sort(customWriterKeys);
+for (String customWriterKey : customWriterKeys) {
+customWriters.get(customWriterKey).write(writer);
 }
+}
 
-for (XmlWriter bw : customWriters.values()) {
-bw.write(writer);
+private void writeBeans(XMLStreamWriter writer) throws XMLStreamException {
+Collections.sort(generatedBeans);
+for (Bean beanWriter : generatedBeans) {
+beanWriter.write(writer);
 }
-
-writer.writeEndElement();
 }
 
 private void writeBlueprint(XMLStreamWriter writer) throws 
XMLStreamException {

svn commit: r1783431 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Fri Feb 17 17:23:36 2017
New Revision: 1783431

URL: http://svn.apache.org/viewvc?rev=1783431=rev
Log:
[maven-release-plugin] prepare for next development iteration

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=1783431=1783430=1783431=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Fri 
Feb 17 17:23:36 2017
@@ -28,14 +28,14 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
-1.1.0
+1.1.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin Annotations
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
 
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.1.0
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
 
 
 

svn commit: r1783433 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Fri Feb 17 17:32:16 2017
New Revision: 1783433

URL: http://svn.apache.org/viewvc?rev=1783433=rev
Log:
[RELEASE] Bump blueprint annotation version in BMP

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783433=1783432=1783433=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 
17:32:16 2017
@@ -185,7 +185,7 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
-1.0.1-SNAPSHOT
+1.1.0
 
 
 org.apache.maven

svn commit: r1783437 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Fri Feb 17 17:33:18 2017
New Revision: 1783437

URL: http://svn.apache.org/viewvc?rev=1783437=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783437=1783436=1783437=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 
17:33:18 2017
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.6.0
+1.6.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -43,12 +43,12 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
 

svn commit: r1783436 - /aries/tags/blueprint-maven-plugin-1.6.0/

[alien11689]

Author: alien11689
Date: Fri Feb 17 17:33:15 2017
New Revision: 1783436

URL: http://svn.apache.org/viewvc?rev=1783436=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-1.6.0

Added:
aries/tags/blueprint-maven-plugin-1.6.0/   (props changed)
  - copied from r1783435, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/

Propchange: aries/tags/blueprint-maven-plugin-1.6.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 17 17:33:15 2017
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin:1306564-1337594

svn commit: r1783435 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Fri Feb 17 17:33:10 2017
New Revision: 1783435

URL: http://svn.apache.org/viewvc?rev=1783435=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-1.6.0

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783435=1783434=1783435=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 
17:33:10 2017
@@ -17,8 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 
 4.0.0
 
@@ -26,13 +25,13 @@
 org.apache.aries
 parent
 2.0.1
-
+
 
 
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.5.1-SNAPSHOT
+1.6.0
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -44,12 +43,12 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
 
 
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0
 
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0
 
 
 
@@ -128,7 +127,7 @@
 
 
 
-
+
 
 
 

svn commit: r1782663 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/handlers/config/ test/java/org/apache/aries/blueprint/plugin/ test/java/

[alien11689]

Author: alien11689
Date: Sun Feb 12 12:11:20 2017
New Revision: 1782663

URL: http://svn.apache.org/viewvc?rev=1782663=rev
Log:
[ARIES-1683] Fix placeholder-prefix and placeholder-suffix generation from 
Config annotation

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfig.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java?rev=1782663=1782662=1782663=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigAnnotationHandler.java
 Sun Feb 12 12:11:20 2017
@@ -37,10 +37,7 @@ public class ConfigAnnotationHandler imp
 public void handleBeanAnnotation(AnnotatedElement annotatedElement, String 
id,
  ContextEnricher contextEnricher, 
BeanEnricher beanEnricher) {
 Config config = annotatedElement.getAnnotation(Config.class);
-XmlWriter writer = new ConfigWriter(config);
-contextEnricher.addBlueprintContentWriter("config", writer);
-
contextEnricher.getBlueprintConfiguration().getNamespaces().add(ConfigWriter.CONFIG_NS);
-
+contextEnricher.addBlueprintContentWriter("cm/property-placeholder", 
new ConfigWriter(config));
 }
 
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java?rev=1782663=1782662=1782663=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigPropertiesHandler.java
 Sun Feb 12 12:11:20 2017
@@ -73,16 +73,4 @@ public class ConfigPropertiesHandler imp
 return ConfigProperties.class;
 }
 
-private Class getClass(AnnotatedElement annotatedElement) {
-if (annotatedElement instanceof Class) {
-return (Class) annotatedElement;
-}
-if (annotatedElement instanceof Method) {
-return ((Method) annotatedElement).getParameterTypes()[0];
-}
-if (annotatedElement instanceof Field) {
-return ((Field) annotatedElement).getType();
-}
-throw new RuntimeException("Unknown annotated element");
-}
 }

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java?rev=1782663=1782662=1782663=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/config/ConfigWriter.java
 Sun Feb 12 12:11:20 2017
@@ -6,9 +6,9 @@
  * 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
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is dist

svn commit: r1782620 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model: Argument.java Bean.java Property.java

[alien11689]

Author: alien11689
Date: Sat Feb 11 16:41:52 2017
New Revision: 1782620

URL: http://svn.apache.org/viewvc?rev=1782620=rev
Log:
[REFACTOR] Clean code duplication in BMP

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java?rev=1782620=1782619=1782620=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
 Sat Feb 11 16:41:52 2017
@@ -30,12 +30,20 @@ import static org.apache.aries.blueprint
 import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue;
 import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName;
 
-class Argument implements XmlWriter{
+class Argument implements XmlWriter {
 private final String ref;
 private final String value;
 
 Argument(BlueprintRegistry blueprintRegistry, Class argumentClass, 
Annotation[] annotations) {
-String value = findValue(annotations);
+this.value = findValue(annotations);
+if (value != null) {
+ref = null;
+return;
+}
+this.ref = findRef(blueprintRegistry, argumentClass, annotations);
+}
+
+private String findRef(BlueprintRegistry blueprintRegistry, Class 
argumentClass, Annotation[] annotations) {
 String ref = findName(annotations);
 
 for (CustomDependencyAnnotationHandler 
customDependencyAnnotationHandler : 
Handlers.CUSTOM_DEPENDENCY_ANNOTATION_HANDLERS) {
@@ -49,22 +57,16 @@ class Argument implements XmlWriter{
 }
 }
 
-if (ref == null && value == null) {
+if (ref == null) {
 BeanTemplate template = new BeanTemplate(argumentClass, 
annotations);
 BeanRef bean = blueprintRegistry.getMatching(template);
 if (bean != null) {
 ref = bean.id;
 } else {
-String name = findName(annotations);
-if (name != null) {
-ref = name;
-} else {
-ref = getBeanName(argumentClass);
-}
+ref = getBeanName(argumentClass);
 }
 }
-this.value = value;
-this.ref = ref;
+return ref;
 }
 
 String getRef() {

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1782620=1782619=1782620=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
 Sat Feb 11 16:41:52 2017
@@ -22,7 +22,6 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.BeanEnricher;
 import org.apache.aries.blueprint.plugin.spi.ContextEnricher;
-import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
@@ -42,9 +41,7 @@ import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName;
 import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findSingleton;
-import static 
org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue;
 import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName;
 
 class Bean implements BeanEnricher, XmlWriter {

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-pl

svn commit: r1782629 - /aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext

[alien11689]

Author: alien11689
Date: Sat Feb 11 17:47:27 2017
New Revision: 1782629

URL: http://svn.apache.org/viewvc?rev=1782629=rev
Log:
Add missing spring dependency and add note about optional annotations

Modified:
aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext

Modified: aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext
URL: 
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext?rev=1782629=1782628=1782629=diff
==
--- aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext (original)
+++ aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext Sat Feb 11 
17:47:27 2017
@@ -138,7 +138,16 @@ Creates blueprint xml from annotations i
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 1.0.0
+true
 
+
+org.apache.servicemix.bundles
+org.apache.servicemix.bundles.spring-beans
+3.2.11.RELEASE_1
+true
+
+
+Note that the annotations are needed only during build run, so you can exclude 
them or mark optional in Import-Package header of your bundle.
 
 ## SPI ##
 Whole plugin is written using 'plugin architecture', so your own annotations 
could be configured for bleuprint generation. All you need to do, is to 
implement one of interfaces from blueprint-maven-plugin-spi:

svn commit: r1006560 - /websites/production/aries/content/

[alien11689]

Author: alien11689
Date: Sat Feb 11 17:51:07 2017
New Revision: 1006560

Log:
Add missing spring dependency and add note about optional annotations

Added:
websites/production/aries/content/
  - copied from r1006559, websites/staging/aries/trunk/content/

svn commit: r1779953 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin: pom.xml src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java src/test/resources/schema/ src/test/resources

[alien11689]

Author: alien11689
Date: Mon Jan 23 16:52:24 2017
New Revision: 1779953

URL: http://svn.apache.org/viewvc?rev=1779953=rev
Log:
[TEST] Use aries xsd to validate BMP generated xml

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/example.xsd
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1779953=1779952=1779953=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Mon Jan 23 
16:52:24 2017
@@ -17,7 +17,8 @@
  specific language governing permissions and limitations
  under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 
 4.0.0
 
@@ -43,8 +44,11 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
+
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
@@ -77,6 +81,25 @@
 
 
 
+
+org.apache.maven.plugins
+maven-dependency-plugin
+
+
+resource-dependencies
+process-test-resources
+
+unpack-dependencies
+
+
+

+**/aries/**/*.xsd
+
${project.build.directory}/classes/schema
+
true
+
+
+
+
 
 
 
@@ -105,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -154,15 +177,15 @@
 0.8.0
 
 
-   org.osgi
-   osgi.cmpn
-   6.0.0
+org.osgi
+osgi.cmpn
+6.0.0
 
 
 
-   org.apache.aries.blueprint
-   blueprint-maven-plugin-annotation
-   1.0.1-SNAPSHOT
+org.apache.aries.blueprint
+blueprint-maven-plugin-annotation
+1.0.1-SNAPSHOT
 
 
 org.apache.maven
@@ -274,6 +297,37 @@
 test
 
 
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.api
+1.0.1
+test
+
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.core
+1.7.1
+test
+
+
+org.apache.aries.transaction
+org.apache.aries.transaction.blueprint
+1.1.1
+test
+
+
+org.apache.aries.jpa
+org.apache.aries.jpa.blueprint.aries
+1.0.2
+test
+
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.cm
+1.0.9
+test
+
+
 
 
 

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java?rev=1779953=1779952=1779953=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
 (origina

svn commit: r1779058 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin: pom.xml src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java src/main/java/org/apache/aries/blueprint/plugi

[alien11689]

Author: alien11689
Date: Mon Jan 16 16:08:10 2017
New Revision: 1779058

URL: http://svn.apache.org/viewvc?rev=1779058=rev
Log:
[MAINTENANCE] Format blueprint using only java api

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1779058=1779057=1779058=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Mon Jan 16 
16:08:10 2017
@@ -274,11 +274,6 @@
 test
 
 
-
-org.glassfish.jaxb
-txw2
-2.2.11
-
 
 
 

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1779058=1779057=1779058=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Mon Jan 16 16:08:10 2017
@@ -121,7 +121,7 @@ public class GenerateMojo extends Abstra
 
 Set<Class> classes = FilteredClassFinder.findClasses(finder, 
toScan);
 
-BlueprintConfiguration blueprintConfiguration = new 
BlueprintConfigurationImpl(namespaces, defaultActivation, customParameters);
+BlueprintConfigurationImpl blueprintConfiguration = new 
BlueprintConfigurationImpl(namespaces, defaultActivation, customParameters);
 
 Context context = new Context(blueprintConfiguration, classes);
 context.resolve();
@@ -133,7 +133,7 @@ public class GenerateMojo extends Abstra
 }
 }
 
-private void writeBlueprint(Context context, BlueprintConfiguration 
blueprintConfiguration) throws Exception {
+private void writeBlueprint(Context context, BlueprintConfigurationImpl 
blueprintConfiguration) throws Exception {
 String buildDir = project.getBuild().getDirectory();
 String generatedBaseDir = buildDir + "/generated-sources/blueprint";
 Resource resource = new Resource();

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1779058=1779057=1779058=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Mon Jan 16 16:08:10 2017
@@ -18,7 +18,6 @@
  */
 package org.apache.aries.blueprint.plugin;
 
-import com.sun.xml.txw2.output.IndentingXMLStreamWriter;
 import org.apache.aries.blueprint.plugin.model.Argument;
 import org.apache.aries.blueprint.plugin.model.ArgumentWriter;
 import org.apache.aries.blueprint.plugin.model.Bean;
@@ -32,6 +31,14 @@ import org.apache.aries.blueprint.plugin
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.Map;
 
@@ -43,18 +50,22 @@ public class Generator implements Proper
 private final Context context;
 private final BlueprintConfiguration blueprintConfiguration;
 private final XMLStreamWriter writer;
+private final OutputStream os;
+private final ByteArrayOutputStream temp = new ByteArrayOutputStream();
 
-public Generator(Context context, OutputStream os, BlueprintConfiguration 
blueprintConfiguration) throws XMLStreamException {
+public Generator(Context context, OutputStream os, 
BlueprintConfigurationImpl blueprintConfiguration) throws XM

svn commit: r1759156 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/main: java/org/apache/aries/blueprint/plugin/ java/org/apache/aries/blueprint/plugin/javax/ java/org/apache/aries/blueprint/

[alien11689]

Author: alien11689
Date: Sun Sep  4 09:03:08 2016
New Revision: 1759156

URL: http://svn.apache.org/viewvc?rev=1759156=rev
Log:
[ARIES-1602] Use @javax.inject.Qualifier via spi handler

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/QualifierHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder
  - copied, changed from r1758919, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java?rev=1759156=1759155=1759156=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 Sun Sep  4 09:03:08 2016
@@ -27,6 +27,7 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler;
+import org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder;
 import org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler;
 
 import java.lang.annotation.Annotation;
@@ -46,6 +47,7 @@ public class Extensions {
 public static final List<MethodAnnotationHandler> 
methodAnnotationHandlers = new ArrayList<>();
 public static final List<FieldAnnotationHandler> 
fieldAnnotationHandlers = new ArrayList<>();
 public static final List<Class> 
factoryMethodAnnotationClasses = new ArrayList<>();
+public static final List<Class> 
qualifingAnnotationClasses = new ArrayList<>();
 
 static {
 for (BeanFinder beanFinder : ServiceLoader.load(BeanFinder.class)) {
@@ -90,5 +92,9 @@ public class Extensions {
 for (FactoryMethodFinder factoryMethodFinder : 
ServiceLoader.load(FactoryMethodFinder.class)) {
 factoryMethodAnnotationClasses.add((Class) 
factoryMethodFinder.factoryMethodAnnotation());
 }
+
+for (QualifingAnnotationFinder 
qualifingAnnotationFinder : 
ServiceLoader.load(QualifingAnnotationFinder.class)) {
+qualifingAnnotationClasses.add((Class) 
qualifingAnnotationFinder.getAnnotation());
+}
 }
 }

Added: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/QualifierHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/QualifierHandler.java?rev=1759156=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/QualifierHandler.java
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/QualifierHandler.java
 Sun Sep  4 09:03:08 2016
@@ -0,0 +1,30 @@
+/**
+ * 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.plugin.javax;
+
+import org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder;
+
+import javax.inject.Qualifier;
+
+public class QualifierHandler implements QualifingAnnotationFinder {
+@Override
+public Class getAnnotat

svn commit: r1758293 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/javax/ main/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Mon Aug 29 19:19:20 2016
New Revision: 1758293

URL: http://svn.apache.org/viewvc?rev=1758293=rev
Log:
[ARIES-1602] Use @PersistenceContext and @PersistenceUnit annotations via spi 
handlers

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java
  - copied, changed from r1758278, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler
  - copied, changed from r1758278, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java?rev=1758293=1758292=1758293=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 Mon Aug 29 19:19:20 2016
@@ -7,10 +7,9 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.apache.aries.blueprint.plugin.Generator.NS_JPA2;
-
 public class BlueprintConfigurationImpl implements BlueprintConfiguration {
 public static final String NS_TX2 = 
"http://aries.apache.org/xmlns/transactions/v2.0.0;;
+public static final String NS_JPA2 = 
"http://aries.apache.org/xmlns/jpa/v2.0.0;;
 
 private final Set namespaces;
 private final Activation defaultActivation;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java?rev=1758293=1758292=1758293=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 Mon Aug 29 19:19:20 2016
@@ -22,6 +22,7 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler;
 import 
org.apache.aries.blueprint.plugin.spi.CustomFactoryMethodAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler;
@@ -42,6 +43,7 @@ public class Extensions {
 public static final List<CustomFactoryMethodAnnotationHandler> customFactoryMethodAnnotationHandlers = new ArrayList<>();
 public static final List<CustomDependencyAnnotationHandler> customDependencyAnnotationHandlers = new ArrayList<>();
 public static 

svn commit: r1758300 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin: ./ javax/ pax/ spring/

[alien11689]

Author: alien11689
Date: Mon Aug 29 21:04:36 2016
New Revision: 1758300

URL: http://svn.apache.org/viewvc?rev=1758300=rev
Log:
[ARIES-1602] Fis namespaces generation

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1758300=1758299=1758300=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Mon Aug 29 21:04:36 2016
@@ -66,6 +66,7 @@ public class Generator implements Proper
 
 for (XmlWriter bw : context.getBlueprintWriters().values()) {
 bw.write(writer);
+writer.writeCharacters("\n");
 }
 
 writer.writeEndElement();
@@ -108,7 +109,9 @@ public class Generator implements Proper
 writer.writeCharacters("\n");
 
 for (XmlWriter xmlWriter : bean.beanContentWriters.values()) {
+writer.writeCharacters("");
 xmlWriter.write(writer);
+writer.writeCharacters("\n");
 }
 }
 

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java?rev=1758300=1758299=1758300=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
 Mon Aug 29 21:04:36 2016
@@ -57,10 +57,10 @@ public class JavaxTransactionFactory imp
 
beanEnricher.addBeanContentWriter("javax.transactional.method/" + 
clazz.getName() + "/" + name + "/" + transactionTypeName, new XmlWriter() {
 @Override
 public void write(XMLStreamWriter writer) throws 
XMLStreamException {
-writer.writeEmptyElement("tx", "transaction", NS_TX);
+writer.writeEmptyElement("transaction");
+writer.writeDefaultNamespace(NS_TX);
 writer.writeAttribute("method", name);
 writer.writeAttribute("value", transactionTypeName);
-writer.writeCharacters("\n");
 }
 });
 }
@@ -74,7 +74,8 @@ public class JavaxTransactionFactory imp
 
contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new 
XmlWriter() {
 @Override
 public void write(XMLStreamWriter writer) throws 
XMLStreamException {
-writer.writeEmptyElement(NS_TX, "enable-annotations");
+writer.writeEmptyElement("enable-annotations");
+writer.writeDefaultNamespace(NS_TX);
 }
 });
 }
@@ -88,10 +89,10 @@ public class JavaxTransactionFactory imp
 beanEnricher.addBeanContentWriter("javax.transactional.method/" + 
annotatedElement + "/*/" + transactionTypeName, new XmlWriter() {
 @Override
 public void write(XMLStreamWriter writer) throws 
XMLStreamException {
-writer.writeEmptyElement("tx", "transaction", NS_TX);
+writer.writeEmptyElement(&quo

svn commit: r1758328 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/javax/ main/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Tue Aug 30 06:08:20 2016
New Revision: 1758328

URL: http://svn.apache.org/viewvc?rev=1758328=rev
Log:
[ARIES-1602] Use @Produces via spi handler

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ProducesHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
  - copied, changed from r1758278, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegister.java
  - copied, changed from r1758278, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprinRegister.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprinRegister.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java?rev=1758328=1758327=1758328=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 Tue Aug 30 06:08:20 2016
@@ -18,10 +18,11 @@
  */
 package org.apache.aries.blueprint.plugin;
 
-import org.apache.aries.blueprint.plugin.spi.BeanFinder;
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.BeanFinder;
 import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler;
 import 
org.apache.aries.blueprint.plugin.spi.CustomFactoryMethodAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder;
 import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler;
 import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler;
@@ -44,6 +45,7 @@ public class Extensions {
 public static final List<CustomDependencyAnnotationHandler> customDependencyAnnotationHandlers = new ArrayList<>();
 public static final List<MethodAnnotationHandler> 
methodAnnotationHandlers = new ArrayList<>();
 public static final List<FieldAnnotationHandler> 
fieldAnnotationHandlers = new ArrayList<>();
+public static final List<Class> 
factoryMethodAnnotationClasses = new ArrayList<>();
 
 static {
 for (BeanFinder beanFinder : ServiceLoader.load(BeanFinder.class)) {
@@ -84,5 +86,9 @@ public class Extensions {
 for (FieldAnnotationHandler 
fieldAnnotationHandler : ServiceLoader.load(FieldAnnotationHandler.class)) {
 fieldAnnotationHandlers.add(fieldAnnotationHandler);
 }
+
+for (FactoryMethodFinder factoryMethodFinder : 
ServiceLoader.load(FactoryMethodFinder.class)) {
+factoryMethodAnnotationClasses.add((Class) 
factoryMethodFinder.factoryMethodAnnotation());
+}
 }
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/

svn commit: r1760199 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/javax/ main/java/org/apache/aries/blueprint/plugin/spring/ test/java/org/apache

[alien11689]

Author: alien11689
Date: Sat Sep 10 18:21:23 2016
New Revision: 1760199

URL: http://svn.apache.org/viewvc?rev=1760199=rev
Log:
[ARIES-1610] Check namespace patterns instead of conrete namespace in BMP

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java?rev=1760199=1760198=1760199=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
 Sat Sep 10 18:21:23 2016
@@ -32,9 +32,11 @@ import java.lang.reflect.AnnotatedElemen
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static 
org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_TX1;
+import static 
org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_TX2;
+import static 
org.apache.aries.blueprint.plugin.javax.Namespaces.getNamespaceByPattern;
+
 public class JavaxTransactionFactory implements 
BeanAnnotationHandler, MethodAnnotationHandler {
-public static final String NS_TX = 
"http://aries.apache.org/xmlns/transactions/v1.2.0;;
-public static final String NS_TX2 = 
"http://aries.apache.org/xmlns/transactions/v2.0.0;;
 
 private String getTransactionTypeName(Transactional transactional) {
 return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, 
transactional.value().name());
@@ -47,9 +49,9 @@ public class JavaxTransactionFactory imp
 
 @Override
 public void handleMethodAnnotation(Class clazz, List methods, 
ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
-
-if 
(contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX)) {
-enableAnnotations(contextEnricher);
+final String nsTx1 = 
getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
 PATTERN_NS_TX1);
+if (nsTx1 != null) {
+enableAnnotations(contextEnricher, nsTx1);
 for (final Method method : methods) {
 final Transactional transactional = 
method.getAnnotation(Transactional.class);
 final String transactionTypeName = 
getTransactionTypeName(transactional);
@@ -58,55 +60,58 @@ public class JavaxTransactionFactory imp
 @Override
 public void write(XMLStreamWriter writer) throws 
XMLStreamException {
 writer.writeEmptyElement("transaction");
-writer.writeDefaultNamespace(NS_TX);
+writer.writeDefaultNamespace(nsTx1);
 writer.writeAttribute("method", name);
 writer.writeAttribute("value", transactionTypeName);
 }
 });
 }
 }
-if 
(contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX2)) {
-enableTransactionsTx2(contextEnricher);
+final String nsTx2 = 
getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
 PATTERN_NS_TX2);
+if (nsTx2 != null) {
+enableTransactionsTx2(contextEnricher, nsTx2);
 }
 }
 
-private void enableAnnotations(ContextEnricher contextEnricher) {
+private void enableAnnotations(ContextEnricher contextEnricher, final 
String namespace) {
 
contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new 
XmlWriter() {
 @Override
 public void write(

svn commit: r1760210 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Sat Sep 10 20:34:50 2016
New Revision: 1760210

URL: http://svn.apache.org/viewvc?rev=1760210=rev
Log:
[ARIES-1605] Add missing license headers in BMP

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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.plugin;
 
 import org.apache.aries.blueprint.plugin.spi.Activation;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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.plugin.model;
 
 import org.apache.aries.blueprint.plugin.spi.ContextEnricher;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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
+

svn commit: r1761857 - /aries/trunk/blueprint/pom.xml

[alien11689]

Author: alien11689
Date: Thu Sep 22 06:10:08 2016
New Revision: 1761857

URL: http://svn.apache.org/viewvc?rev=1761857=rev
Log:
[ARIES-1606] blueprint maven plugin spi to blueprint parent pom

Modified:
aries/trunk/blueprint/pom.xml

Modified: aries/trunk/blueprint/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1761857=1761856=1761857=diff
==
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Thu Sep 22 06:10:08 2016
@@ -45,6 +45,7 @@
 blueprint-bundle
 blueprint-compatibility
 blueprint-core-compatibility
+blueprint-maven-plugin-spi
 blueprint-maven-plugin
 blueprint-noosgi
 blueprint-web

svn commit: r1761855 - in /aries/trunk/blueprint: blueprint-maven-plugin-spi/ blueprint-maven-plugin-spi/src/ blueprint-maven-plugin-spi/src/main/ blueprint-maven-plugin-spi/src/main/java/ blueprint-m

[alien11689]

Author: alien11689
Date: Thu Sep 22 06:08:38 2016
New Revision: 1761855

URL: http://svn.apache.org/viewvc?rev=1761855=rev
Log:
[ARIES-1606] Extract SPI from blueprint maven plugin to external project; This 
closes #54

Added:
aries/trunk/blueprint/blueprint-maven-plugin-spi/
aries/trunk/blueprint/blueprint-maven-plugin-spi/pom.xml
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomFactoryMethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/
Modified:
aries/trunk/blueprint/blueprint-maven-plugin/pom.xml

Added: aries/trunk/blueprint/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi/pom.xml?rev=1761855=auto
==
--- aries/trunk/blueprint/blueprint-maven-plugin-spi/pom.xml (added)
+++ aries/trunk/blueprint/blueprint-maven-plugin-spi/pom.xml Thu Sep 22 
06:08:38 2016
@@ -0,0 +1,36 @@
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+org.apache.aries
+parent
+2.0.1
+../../parent/pom.xml
+
+
+org.apache.aries.blueprint
+blueprint-maven-plugin-spi
+1.0.0-SNAPSHOT
+
+
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
+
+
+
+
+maven-compiler-plugin
+
+1.7
+1.7
+
+
+
+
+
+
\ No newline at end of file

Added: 
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.ja

svn commit: r1761039 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/main: java/org/apache/aries/blueprint/plugin/cdi/ java/org/apache/aries/blueprint/plugin/javax/cdi/ resources/META-INF/servi

[alien11689]

Author: alien11689
Date: Fri Sep 16 14:19:29 2016
New Revision: 1761039

URL: http://svn.apache.org/viewvc?rev=1761039=rev
Log:
Move cdi package to javax

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/
  - copied from r1761038, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/cdi/
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/cdi/
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java?rev=1761039=1761038=1761039=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java
 Fri Sep 16 14:19:29 2016
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.cdi;
+package org.apache.aries.blueprint.plugin.javax.cdi;
 
 import com.google.common.base.CaseFormat;
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler?rev=1761039=1761038=1761039=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
 Fri Sep 16 14:19:29 2016
@@ -20,4 +20,4 @@ org.apache.aries.blueprint.plugin.spring
 org.apache.aries.blueprint.plugin.spring.DependsOnAttributeResolver
 org.apache.aries.blueprint.plugin.spring.SpringTransactionalFactory
 org.apache.aries.blueprint.plugin.javax.JavaxTransactionFactory
-org.apache.aries.blueprint.plugin.cdi.CdiTransactionFactory
\ No newline at end of file
+org.apache.aries.blueprint.plugin.javax.cdi.CdiTransactionFactory
\ No newline at end of file

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler?rev=1761039=1761038=1761039=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
 Fri Sep 16 14:19:29 2016
@@ -19,4 +19,4 @@ org.apache.aries.blueprint.plugin.javax.
 org.apache.aries.blueprint.plugin.javax.PreDestroyHandler
 org.apache.aries.blueprint.plugin.spring.SpringTransactionalFactory
 org.apache.aries.blueprint.plugin.javax.JavaxTransactionFactory
-org.apache.aries.blueprint.plugin.cdi.CdiTransactionFactory
\ No newline at end of file
+org.apache.aries.blueprint.plugin.javax.cdi.CdiTransactionFactory
\ No newline at end of file

svn commit: r1758251 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/javax/ main/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Mon Aug 29 15:46:17 2016
New Revision: 1758251

URL: http://svn.apache.org/viewvc?rev=1758251=rev
Log:
[ARIES-1602] Use @PostConstruct and @PreDestroy annotations via spi handlers

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PostConstructHandler.java
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/InjectHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PreDestroyHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java
  - copied, changed from r1758211, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomBeanAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java
  - copied, changed from r1758211, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAttributesResolver.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
  - copied, changed from r1758211, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomBeanAnnotationHandler

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAttributesResolver
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAttributesResolver.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomBeanAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAttributesResolver

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomBeanAnnotationHandler
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/DependsOnAttributeResolver.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/LazyAttributeResolver.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java?rev=1758251=1758250=1758251=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 Mon Aug 29 15:46:17 2016
@@ -20,12 +20,12 @@ package org.apache.aries.blueprint.plugi
 
 import org.apache.aries.blueprint.plugin.model.AbstractTransactionalFactory;
 import org.apache.aries.blueprint.plugin.model.ExtensionTransactionFactory;
-import org.apache.aries.blueprint.plugin.spi.BeanAttributesResolver;
 import org.apache.aries.blueprint.plugin.spi.BeanFinder;
-import org.apache.aries.blueprint.plugin.spi.CustomBeanAnnotationHandler;
+import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler;
 import

svn commit: r1758212 - /aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/PropertyTest.java

[alien11689]

Author: alien11689
Date: Mon Aug 29 12:18:45 2016
New Revision: 1758212

URL: http://svn.apache.org/viewvc?rev=1758212=rev
Log:
[ARIES-1602] Replace pax annotations with spi handlers - remove property test

Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/PropertyTest.java

svn commit: r1758211 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ main/java/org/apache/aries/

[alien11689]

Author: alien11689
Date: Mon Aug 29 12:18:13 2016
New Revision: 1758211

URL: http://svn.apache.org/viewvc?rev=1758211=rev
Log:
[ARIES-1602] Replace pax annotations with spi handlers

Added:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprinRegister.java
  - copied, changed from r1757990, 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Matcher.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintWriter.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomBeanAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomFactoryMethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomBeanAnnotationHandler

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomFactoryMethodAnnotationHandler
Removed:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/OsgiServiceRefWriter.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Matcher.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceRef.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/service/
Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java

aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java?rev=1758211=1758210=1758211=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java
 Mon Aug 29 12:18:13 2016
@@ -6,9 +6,9 @@
  * 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
- *
+ * 
+ * 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
@@ -22,6 +22,9 @@ import org.apache.aries.blueprint.plugin
 import org.apache.aries.blueprint.plugin.model.ExtensionTransactionFactory;
 import org.apache.aries.blueprint.plugin.spi.BeanAttributesResolver;
 import org.apache.aries.blueprint.plugin.spi

svn commit: r1765491 - in /aries/trunk/blueprint: blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin

[alien11689]

Author: alien11689
Date: Tue Oct 18 18:28:24 2016
New Revision: 1765491

URL: http://svn.apache.org/viewvc?rev=1765491=rev
Log:
[ARIES-1619] Add javadoc in blueprint maven plugin spi

Added:

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java
Removed:

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomFactoryMethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomFactoryMethodAnnotationHandler
Modified:

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java

aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Extensions.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigPropertyInjectionHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/NamedBeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ProducesHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/SingletonBeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/ComponentBeanFinder.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/ValueInjectionHandler.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java?rev=1765491=1765490=1765491=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin-spi/src/main/java/org/apache

svn commit: r1778595 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ blueprint-maven-plugin/ blueprint-maven-plugin/sr

[alien11689]

Author: alien11689
Date: Fri Jan 13 14:27:54 2017
New Revision: 1778595

URL: http://svn.apache.org/viewvc?rev=1778595=rev
Log:
[ARIES-1661] Generate cm-properties and inject it via annotations in BMP

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigPropertiesHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfigurationProperties.java
  - copied, changed from r1776017, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/DefaultProperty.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/packageinfo
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithConfig.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java?rev=1778595=1778594=1778595=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
 Fri Jan 13 14:27:54 2017
@@ -1,3 +1,21 @@
+/**
+ * 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.config;
 
 import java.lang.annotation.ElementType;
@@ -13,8 +31,12 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Config {
 String pid();
-String updatePolicy() default "reload"; 
+
+String updatePolicy() default "reload";
+
 String placeholderPrefix() default "${";
+
 String placeholderSuffix() default "}";
+
 DefaultProperty[] defaults() default {};
 }

Added: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java?rev=1778595=auto
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
 (added)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
 Fri Jan 13 14:27:54 2017
@@ -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 owners

svn commit: r1778928 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin: ./ src/main/java/org/apache/aries/blueprint/plugin/ src/main/java/org/apache/aries/blueprint/plugin/config/ src/main/jav

[alien11689]

Author: alien11689
Date: Sun Jan 15 14:46:54 2017
New Revision: 1778928

URL: http://svn.apache.org/viewvc?rev=1778928=rev
Log:
[ARIES-1664] Format generated blueprint XML

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java
  - copied unchanged from r1778754, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1778928=1778927=1778928=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Jan 15 
14:46:54 2017
@@ -273,6 +273,12 @@
 junit
 test
 
+
+
+org.glassfish.jaxb
+txw2
+2.2.11
+
 
 
 

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1778928=1778927=1778928=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
 Sun Jan 15 14:46:54 2017
@@ -18,11 +18,12 @@
  */
 package org.apache.aries.blueprint.plugin;
 
+import com.sun.xml.txw2.output.IndentingXMLStreamWriter;
 import org.apache.aries.blueprint.plugin.model.Argument;
 import org.apache.aries.blueprint.plugin.model.ArgumentWriter;
 import org.apache.aries.blueprint.plugin.model.Bean;
-import org.apache.aries.blueprint.plugin.model.Context;
 import org.apache.aries.blueprint.plugin.model.BeanFromFactory;
+import org.apache.aries.blueprint.plugin.model.Context;
 import org.apache.aries.blueprint.plugin.model.Property;
 import org.apache.aries.blueprint.plugin.model.PropertyWriter;
 import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration;
@@ -34,6 +35,7 @@ import javax.xml.stream.XMLStreamWriter;
 import java.io.OutputStream;
 import java.util.Map;
 
+
 public class Generator implements PropertyWriter, ArgumentWriter {
 private static final String NS_BLUEPRINT = 
"http://www.osgi.org/xmlns/blueprint/v1.0.0;;
 private static final String NS_EXT = 
"http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;;
@@ -45,34 +47,31 @@ public class Generator implements Proper
 public Generator(Context context, OutputStream os, BlueprintConfiguration 
blueprintConfiguration) throws XMLStreamException {
 this.context = context;
 this.blueprintConfiguration = blueprintConfiguration;
-XMLOutputFactory factory = XMLOutputFactory.newInstance();
-writer = factory.createXMLStreamWriter(os);
+writer = createWriter(os);
+}
+
+private XMLStreamWriter createWriter(OutputStream os) throws 
XMLStreamException {
+return new 
IndentingXMLStreamWriter(XMLOutputFactory.newInstance().createXMLStreamWriter(os));
 }
 
 public void generate() {
 try {
 writer.writeStartDocument();
-writer.writeCharacters("\n");
 writeBlueprint();
-writer.writeCharacters("\n");
 
 for (Bean bean : context.getBeans()) {
 writeBeanStart(bean);
 bean.writeArguments(this);
 bean.writeProperties(this);
 writer.writeEndElement();
-writer.writeCharacters("\n");
 }
 
 for (XmlWriter bw : context.getBlueprintWriters().values()) {
 bw.write(writer);
-writer.writeCharacters("\n");
 }
 
 writer.writeEndElement();
-writer.writeCharacters("\n");
 writer.writeEndDocument();
-writer.writeCharacters("\n");
 writer.close();
 } catch (XMLStreamException e) {
 throw new RuntimeException(e.getMessag

svn commit: r1778900 - in /aries/trunk/blueprint/plugin: ./ blueprint-maven-plugin-annotation/ blueprint-maven-plugin-spi/ blueprint-maven-plugin/ blueprint-maven-plugin/src/main/java/org/apache/aries

[alien11689]

Author: alien11689
Date: Sun Jan 15 10:30:15 2017
New Revision: 1778900

URL: http://svn.apache.org/viewvc?rev=1778900=rev
Log:
[ARIES-1663] Generate reference id without dash when filter is not provided

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java
  - copied, changed from r1778754, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
aries/trunk/blueprint/plugin/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=1778900=1778899=1778900=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Sun 
Jan 15 10:30:15 2017
@@ -5,13 +5,13 @@
 org.apache.aries
 parent
 2.0.1
-../../../parent/pom.xml
+
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
 1.0.1-SNAPSHOT
-Apache Aries Blueprint Plugin Annotations
+Apache Aries Blueprint Maven Plugin Annotations
 
 
 
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1778900=1778899=1778900=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Sun Jan 15 
10:30:15 2017
@@ -6,7 +6,7 @@
 org.apache.aries
 parent
 2.0.1
-../../../parent/pom.xml
+
 
 
 org.apache.aries.blueprint
@@ -31,5 +31,5 @@
 
 
 
-Apache Aries Blueprint Plugin Spi
+Apache Aries Blueprint Maven Plugin SPI
 

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1778900=1778899=1778900=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Jan 15 
10:30:15 2017
@@ -25,7 +25,7 @@
 org.apache.aries
 parent
 2.0.1
-../../../parent/pom.xml
+
 
 
 org.apache.aries.blueprint

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java?rev=1778900=1778899=1778900=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceHandler.java
 Sun Jan 15 10:30:15 2017
@@ -141,7 +141,7 @@ public class OsgiServiceHandler implemen
 final public String compName;
 
 public ServiceFilter(String filterValue) {
-if (filterValue == null) {
+if (filterValue == null || filterValue.isEmpty()) {
 filter = null;
 compName = null;
 } else if (filterValue.contains("(")) {

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java?rev=1778900=1778899=1778900=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries

svn commit: r1772024 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/

[alien11689]

Author: alien11689
Date: Wed Nov 30 12:37:23 2016
New Revision: 1772024

URL: http://svn.apache.org/viewvc?rev=1772024=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-spi-1.0.0

Added:
aries/tags/blueprint-maven-plugin-spi-1.0.0/   (props changed)
  - copied from r1772023, aries/trunk/blueprint/blueprint-maven-plugin-spi/

Propchange: aries/tags/blueprint-maven-plugin-spi-1.0.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 30 12:37:23 2016
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/blueprint-maven-plugin-spi:1306564-1337594

svn commit: r1772023 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 12:37:20 2016
New Revision: 1772023

URL: http://svn.apache.org/viewvc?rev=1772023=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-spi-1.0.0

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772023=1772022=1772023=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 
12:37:20 2016
@@ -1,7 +1,5 @@
 
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
 
 
@@ -13,12 +11,12 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.0-SNAPSHOT
+1.0.0
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
 
 
 

svn commit: r1772025 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 12:37:26 2016
New Revision: 1772025

URL: http://svn.apache.org/viewvc?rev=1772025=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772025=1772024=1772025=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 
12:37:26 2016
@@ -11,12 +11,12 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.0
+1.0.1-SNAPSHOT
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi
 
 
 

svn commit: r1772030 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:07:06 2016
New Revision: 1772030

URL: http://svn.apache.org/viewvc?rev=1772030=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-spi-1.0.0

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772030=1772029=1772030=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 
13:07:06 2016
@@ -11,12 +11,12 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.0-SNAPSHOT
+1.0.0
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
 
 
 

svn commit: r1772031 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:07:10 2016
New Revision: 1772031

URL: http://svn.apache.org/viewvc?rev=1772031=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-spi-1.0.0

Added:
aries/tags/blueprint-maven-plugin-spi-1.0.0/   (props changed)
  - copied from r1772030, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/

Propchange: aries/tags/blueprint-maven-plugin-spi-1.0.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 30 13:07:10 2016
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-spi:1306564-1337594

svn commit: r1772029 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/pom.xml blueprint-maven-plugin-spi/pom.xml blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:06:09 2016
New Revision: 1772029

URL: http://svn.apache.org/viewvc?rev=1772029=rev
Log:
Update blueprint plugin scm

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/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=1772029=1772028=1772029=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Nov 30 13:06:09 2016
@@ -6,8 +6,14 @@
 2.0.1
 ../../../parent/pom.xml
 
-  org.apache.aries.blueprint  
+  org.apache.aries.blueprint
   blueprint-maven-plugin-annotation
   1.0.0-SNAPSHOT
   Apache Aries Blueprint Plugin Annotations
-
\ No newline at end of file
+
+  
+  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
+

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772029=1772028=1772029=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 
13:06:09 2016
@@ -11,12 +11,12 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.1-SNAPSHOT
+1.0.0-SNAPSHOT
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin-spi
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-spi
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
 
 
 
@@ -32,4 +32,4 @@
 
 
 Apache Aries Blueprint Plugin Spi
-
\ No newline at end of file
+

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772029=1772028=1772029=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 
13:06:09 2016
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-maven-plugin
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
 
@@ -80,7 +80,7 @@
 
 
 
-
 
 org.eclipse.m2e

svn commit: r1772034 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation: pom.xml src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:13:20 2016
New Revision: 1772034

URL: http://svn.apache.org/viewvc?rev=1772034=rev
Log:
Fix ConfigProperty javadoc

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java

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=1772034=1772033=1772034=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Nov 30 13:13:20 2016
@@ -8,12 +8,12 @@
 
   org.apache.aries.blueprint
   blueprint-maven-plugin-annotation
-  1.0.0-SNAPSHOT
+  1.0.0
   Apache Aries Blueprint Plugin Annotations
 
   
-  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
   
 

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java?rev=1772034=1772033=1772034=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
 Wed Nov 30 13:13:20 2016
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
 
 /**
  * Annotate fields with this to inject configuration like:
- * @ConfigProperty("${mykey}")
+ * @ConfigProperty("${mykey}")
  */
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)

svn commit: r1772036 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:16:18 2016
New Revision: 1772036

URL: http://svn.apache.org/viewvc?rev=1772036=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-annotation-1.0.0

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=1772036=1772035=1772036=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Nov 30 13:16:18 2016
@@ -8,12 +8,12 @@
 
   org.apache.aries.blueprint
   blueprint-maven-plugin-annotation
-  1.0.0-SNAPSHOT
+  1.0.0
   Apache Aries Blueprint Plugin Annotations
 
   
-  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
   
 

svn commit: r1772037 - /aries/tags/blueprint-maven-plugin-annotation-1.0.0/

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:16:22 2016
New Revision: 1772037

URL: http://svn.apache.org/viewvc?rev=1772037=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-annotation-1.0.0

Added:
aries/tags/blueprint-maven-plugin-annotation-1.0.0/   (props changed)
  - copied from r1772036, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/

Propchange: aries/tags/blueprint-maven-plugin-annotation-1.0.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 30 13:16:22 2016
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-annotation:1306564-1337594

svn commit: r1772042 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:27:11 2016
New Revision: 1772042

URL: http://svn.apache.org/viewvc?rev=1772042=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772042=1772041=1772042=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 
13:27:11 2016
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.5.0
+1.5.1-SNAPSHOT
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.5.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
 
 
 

svn commit: r1772040 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:27:05 2016
New Revision: 1772040

URL: http://svn.apache.org/viewvc?rev=1772040=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-1.5.0

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772040=1772039=1772040=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 
13:27:05 2016
@@ -31,7 +31,7 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin
 maven-plugin
-1.5.0-SNAPSHOT
+1.5.0
 Apache Aries Blueprint Maven Plugin
 
 Maven plugin to create blueprint files from annotations
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.5.0
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.5.0
 
 
 
@@ -105,7 +105,7 @@
 
 
 
-
+
 
 
 

svn commit: r1772041 - /aries/tags/blueprint-maven-plugin-1.5.0/

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:27:08 2016
New Revision: 1772041

URL: http://svn.apache.org/viewvc?rev=1772041=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-1.5.0

Added:
aries/tags/blueprint-maven-plugin-1.5.0/   (props changed)
  - copied from r1772040, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/

Propchange: aries/tags/blueprint-maven-plugin-1.5.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 30 13:27:08 2016
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin:1306564-1337594

svn commit: r1772027 - /aries/tags/blueprint-maven-plugin-spi-1.0.0/

[alien11689]

Author: alien11689
Date: Wed Nov 30 12:56:45 2016
New Revision: 1772027

URL: http://svn.apache.org/viewvc?rev=1772027=rev
Log:
Invalid tag

Removed:
aries/tags/blueprint-maven-plugin-spi-1.0.0/

svn commit: r1772032 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:07:12 2016
New Revision: 1772032

URL: http://svn.apache.org/viewvc?rev=1772032=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1772032=1772031=1772032=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Wed Nov 30 
13:07:12 2016
@@ -11,12 +11,12 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.0
+1.0.1-SNAPSHOT
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-spi-1.0.0
-
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-spi-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi
 
 
 

svn commit: r1772038 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:16:24 2016
New Revision: 1772038

URL: http://svn.apache.org/viewvc?rev=1772038=rev
Log:
[maven-release-plugin] prepare for next development iteration

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=1772038=1772037=1772038=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Nov 30 13:16:24 2016
@@ -8,12 +8,12 @@
 
   org.apache.aries.blueprint
   blueprint-maven-plugin-annotation
-  1.0.0
+  1.0.1-SNAPSHOT
   Apache Aries Blueprint Plugin Annotations
 
   
-  
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
-  
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
-  
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
   
 

svn commit: r1772035 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:15:37 2016
New Revision: 1772035

URL: http://svn.apache.org/viewvc?rev=1772035=rev
Log:
Fix pom

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=1772035=1772034=1772035=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Nov 30 13:15:37 2016
@@ -8,12 +8,12 @@
 
   org.apache.aries.blueprint
   blueprint-maven-plugin-annotation
-  1.0.0
+  1.0.0-SNAPSHOT
   Apache Aries Blueprint Plugin Annotations
 
   
-  
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
-  
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.0.0
-  
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.0.0
+  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
   
 

svn commit: r1772039 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Wed Nov 30 13:25:21 2016
New Revision: 1772039

URL: http://svn.apache.org/viewvc?rev=1772039=rev
Log:
Bump spi and annotation version in blueprint maven plugin

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1772039=1772038=1772039=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Wed Nov 30 
13:25:21 2016
@@ -120,7 +120,7 @@
 
 org.apache.aries.blueprint
 blueprint-maven-plugin-spi
-1.0.0-SNAPSHOT
+1.0.0
 
 
 
@@ -162,7 +162,7 @@
 
org.apache.aries.blueprint
blueprint-maven-plugin-annotation
-   1.0.0-SNAPSHOT
+   1.0.0
 
 
 org.apache.maven

svn commit: r1775333 - /aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext

[alien11689]

Author: alien11689
Date: Tue Dec 20 18:04:08 2016
New Revision: 1775333

URL: http://svn.apache.org/viewvc?rev=1775333=rev
Log:
Update blueprint maven plugin page for version 1.5.0

Modified:
aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext

Modified: aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext
URL: 
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext?rev=1775333=1775332=1775333=diff
==
--- aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext (original)
+++ aries/site/trunk/content/modules/blueprint-maven-plugin.mdtext Tue Dec 20 
18:04:08 2016
@@ -21,16 +21,15 @@ So you would like to do most declaration
 
 ## blueprint-maven-plugin ##
 
-The blueprint-maven-plugin allows to configure blueprint using annotations. It 
scans one or more paths for annotated classes and creates a blueprint.xml in 
target/generated-resources. So at runtime the bundle behaves like a normal 
blueprint bundle.
-The generated blueprint can also be used together with a manually created 
blueprint file. So for example property placeholder configurations
-or cxf services can be created in xml while most of the beans are 
automatically generated.
+The blueprint-maven-plugin allows to configure blueprint using annotations. It 
scans one or more paths for annotated classes and creates a blueprint.xml in 
target/generated-sources/blueprint/OSGI-INF/blueprint. So at runtime the bundle 
behaves like a normal blueprint bundle.
+The generated blueprint can also be used together with a manually created 
blueprint file. So for example cxf services can be created in xml while most of 
the beans are automatically generated.
 
 Usage:
 
 
 org.apache.aries.blueprint
 blueprint-maven-plugin
-1.4.0
+1.5.0
 
 
 org.my.package
@@ -40,6 +39,7 @@ Usage:
 
 
 
+add-resource-dir
 blueprint-generate
 
 
@@ -47,12 +47,32 @@ Usage:
 
 
 
+## Goals ##
+
+### add-resource-dir ###
+
+Creates target/generated-sources/blueprint folder and register it as a maven 
resource directory in generate-resources phase, so IDEs like IntelliJ IDEA 
could find it automatically.
+
+### blueprint-generate ###
+
+Creates blueprint xml from annotations in process-classes phase and put file 
in target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml. 
Destination directory (OSGI-INF/blueprint) and file name (autowire.xml) could 
be change via configuration properties: generatedDir and generatedFileName.
+
 ## Annotations ##
 
 ### javax.inject (JSR 330) ###
   - @Inject Inject a bean by type and optionally further qualifiers
   - @Singleton Mark a class as being a bean
   - @Named("Myname") Names a @Singleton and qualifies an @Inject to limit it 
to matches with the same bean id
+  - @Qualifier Annotation on your own annotation
+
+### javax.enterprise ###
+  - @Produces Create bean using factory method
+
+### javax.transaction ###
+  - @Transactional mark the class as transactional.
+
+### javax.transaction.cdi ###
+  - @Transactional mark the class as transactional.
 
 ### javax.annotation (JSR 250) ###
   - @PostConstruct Marks a method to be called after DI is finished 
(init-method)
@@ -68,8 +88,19 @@ Usage:
   - @PersistenceContext(unitName="tasklist") inject a managed EntityManager 
for the given persistence unit into a field
   - @PersistenceUnit(unitName="tasklist") inject an unmanaged 
EntityManagerFactory for the given persistence unit into a field
 
-### javax.transaction ###
-  - @Transactional mark the class as transactional. Individual methods are not 
yet supported
+### Configuration annotations (org.apache.aries.blueprint.annotation.config)
+  - @ConfigProperty Inject value as property from property-placeholder or 
constant
+  - @Config Creates cm:property-placehoder
+  - @DefaultProperty Configure default values for properties in 
property-placeholder
+
+### Spring (supported in version 1.x, probably dropped in next major versions) 
###
+  - @Autowired Inject a bean by type and optionally further qualifiers
+  - @Component Creates bean witd default or given name
+  - @DependsOn Make bean depending on another bean
+  - @Lazy Make bean lazy
+  - @Qualifier Name injected bean
+  - @Transactional mark the class as transactional
+  - @Value Inject value or constant
 
 ## Dependencies for annotations ##
 
@@ -82,23 +113,63 @@ Usage:
 
 org.ops4j.pax.cdi
 pax-cdi-api
-0.5.0
+0.8.0
 true
 
 
-org.hibernate.javax.persistence
-hibernate-jpa-2.1-api
-1.0.0.Final
+javax.enterprise
+cdi-api
+1.2
+true
+
+
+javax.persistence
+

svn commit: r1003187 - /websites/production/aries/content/

[alien11689]

Author: alien11689
Date: Tue Dec 20 18:06:49 2016
New Revision: 1003187

Log:
Update blueprint maven plugin for version 1.5.0

Added:
websites/production/aries/content/
  - copied from r1003186, websites/staging/aries/trunk/content/

svn commit: r1775383 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Wed Dec 21 10:02:21 2016
New Revision: 1775383

URL: http://svn.apache.org/viewvc?rev=1775383=rev
Log:
[ARIES-1639] Convert blueprint-maven-plugin-annotation from jar to bundle; This 
closes #61

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=1775383=1775382=1775383=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Wed 
Dec 21 10:02:21 2016
@@ -1,19 +1,31 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
 
 org.apache.aries
 parent
 2.0.1
 ../../../parent/pom.xml
 
-  org.apache.aries.blueprint
-  blueprint-maven-plugin-annotation
-  1.0.1-SNAPSHOT
-  Apache Aries Blueprint Plugin Annotations
+org.apache.aries.blueprint
+blueprint-maven-plugin-annotation
+bundle
+1.0.1-SNAPSHOT
+Apache Aries Blueprint Plugin Annotations
 
-  
-  
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-  
+
+
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
+
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
+
+
+
+org.apache.aries.blueprint.annotation.config
+
+
+
+1.0.0
+
 

svn commit: r1775243 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

[alien11689]

Author: alien11689
Date: Tue Dec 20 10:01:10 2016
New Revision: 1775243

URL: http://svn.apache.org/viewvc?rev=1775243=rev
Log:
Use maven logger insted of println in BMP

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1775243=1775242=1775243=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Tue Dec 20 10:01:10 2016
@@ -131,7 +131,7 @@ public class GenerateMojo extends Abstra
 File dir = new File(generatedBaseDir, generatedDir);
 File file = new File(dir, generatedFileName);
 file.getParentFile().mkdirs();
-System.out.println("Generating blueprint to " + file);
+getLog().info("Generating blueprint to " + file);
 
 OutputStream fos = buildContext.newFileOutputStream(file);
 new Generator(context, fos, blueprintConfiguration).generate();

svn commit: r1775287 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java

[alien11689]

Author: alien11689
Date: Tue Dec 20 12:43:22 2016
New Revision: 1775287

URL: http://svn.apache.org/viewvc?rev=1775287=rev
Log:
[ARIES-1641] Add missing file

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java

Added: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java?rev=1775287=auto
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java
 (added)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java
 Tue Dec 20 12:43:22 2016
@@ -0,0 +1,15 @@
+package org.apache.aries.blueprint.plugin.test;
+
+import org.ops4j.pax.cdi.api.OsgiServiceProvider;
+import org.ops4j.pax.cdi.api.Properties;
+import org.ops4j.pax.cdi.api.Property;
+
+import javax.inject.Singleton;
+
+@Singleton
+@OsgiServiceProvider
+@Properties({
+@Property(name = "service.ranking", value = "100")
+})
+public class ServiceWithRanking implements ServiceA {
+}
\ No newline at end of file

svn commit: r1775285 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/pax/ test/java/org/apache/aries/blueprint/plugin/ test/java/org/apache/a

[alien11689]

Author: alien11689
Date: Tue Dec 20 12:41:01 2016
New Revision: 1775285

URL: http://svn.apache.org/viewvc?rev=1775285=rev
Log:
[ARIES-1641] Read service.ranking property as ranking attribute in service 
element, This closes #60

Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java?rev=1775285=1775284=1775285=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java
 Tue Dec 20 12:41:01 2016
@@ -31,11 +31,15 @@ import org.ops4j.pax.cdi.api.Property;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import java.lang.reflect.AnnotatedElement;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class OsgiServiceProviderHandler implements 
BeanAnnotationHandler {
+
+private static final List SPECIAL_PROPERTIES = 
Collections.singletonList("service.ranking");
+
 @Override
 public Class getAnnotation() {
 return OsgiServiceProvider.class;
@@ -83,6 +87,7 @@ public class OsgiServiceProviderHandler
 }
 
 if (!propertiesAsMap.isEmpty()) {
+writeRanking(writer, propertiesAsMap);
 writeProperties(writer, propertiesAsMap);
 }
 
@@ -126,16 +131,29 @@ public class OsgiServiceProviderHandler
 writer.writeCharacters("\n");
 }
 
+private void writeRanking(XMLStreamWriter writer, Map<String, String> 
propertiesAsMap) throws XMLStreamException {
+if (propertiesAsMap.containsKey("service.ranking")) {
+try {
+Integer ranking = 
Integer.parseInt(propertiesAsMap.get("service.ranking"));
+writer.writeAttribute("ranking", ranking.toString());
+} catch (NumberFormatException e) {
+throw new IllegalArgumentException("service.ranking property 
must be an integer!");
+}
+}
+}
+
 private void writeProperties(XMLStreamWriter writer, Map<String, String> 
properties) throws XMLStreamException {
 writer.writeCharacters("");
 writer.writeStartElement("service-properties");
 writer.writeCharacters("\n");
 for (Map.Entry<String, String> property : properties.entrySet()) {
-writer.writeCharacters("");
-writer.writeEmptyElement("entry");
-writer.writeAttribute("key", property.getKey());
-writer.writeAttribute("value", property.getValue());
-writer.writeCharacters("\n");
+if (!SPECIAL_PROPERTIES.contains(property.getKey())) {
+writer.writeCharacters("");
+writer.writeEmptyElement("entry");
+writer.writeAttribute("key", property.getKey());
+writer.writeAttribute("value", property.getValue());
+writer.writeCharacters("\n");
+}
 }
 writer.writeCharacters("");
 writer.writeEndElement();

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java?rev=1775285=1775284=1775285=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
 Tue Dec 20 12:41:01 2016
@@ -191,6 +191,18 @@ public class GeneratorTest {
 }
 
 @Test
+public void testGenerateServiceWithRanking() throws Exception {
+Node serviceWithRanking = g

svn commit: r1776239 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin: GenerateMojo.java PackageFinder.java

[alien11689]

Author: alien11689
Date: Wed Dec 28 08:01:27 2016
New Revision: 1776239

URL: http://svn.apache.org/viewvc?rev=1776239=rev
Log:
[ARIES-1644] Find packages to scan in BMP when scanPaths is missing

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
Modified:

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

Modified: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1776239=1776238=1776239=diff
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 (original)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
 Wed Dec 28 08:01:27 2016
@@ -41,6 +41,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -48,14 +49,14 @@ import java.util.Set;
 /**
  * Generates blueprint from CDI annotations
  */
-@Mojo(name="blueprint-generate", 
requiresDependencyResolution=ResolutionScope.COMPILE,
-defaultPhase=LifecyclePhase.PROCESS_CLASSES, inheritByDefault=false)
+@Mojo(name = "blueprint-generate", requiresDependencyResolution = 
ResolutionScope.COMPILE,
+defaultPhase = LifecyclePhase.PROCESS_CLASSES, inheritByDefault = false)
 public class GenerateMojo extends AbstractMojo {
 
-@Parameter(defaultValue="${project}", required=true)
+@Parameter(defaultValue = "${project}", required = true)
 protected MavenProject project;
 
-@Parameter(required=true)
+@Parameter
 protected List scanPaths;
 
 /**
@@ -70,14 +71,14 @@ public class GenerateMojo extends Abstra
 /**
  * Name of file to generate
  */
-@Parameter(defaultValue="autowire.xml")
+@Parameter(defaultValue = "autowire.xml")
 protected String generatedFileName;
 
 /**
  * Base directory to generate into
  * (relative to ${project.build.directory}/generated-sources/blueprint).
  */
-@Parameter(defaultValue="OSGI-INF/blueprint/")
+@Parameter(defaultValue = "OSGI-INF/blueprint/")
 private String generatedDir;
 
 /**
@@ -97,8 +98,19 @@ public class GenerateMojo extends Abstra
 
 @Override
 public void execute() throws MojoExecutionException, MojoFailureException {
-if (scanPaths.size() == 0 || scanPaths.iterator().next() == null) {
-throw new MojoExecutionException("Configuration scanPaths must be 
set");
+List toScan = scanPaths;
+if (scanPaths == null || scanPaths.size() == 0 || 
scanPaths.iterator().next() == null) {
+getLog().info("Scan paths not specified - searching for packages");
+Set packages = 
PackageFinder.findPackagesInSources(project.getCompileSourceRoots());
+if (packages.contains(null)) {
+throw new MojoExecutionException("Found file without package");
+}
+toScan = new ArrayList<>(packages);
+Collections.sort(toScan);
+
+}
+for (String aPackage : toScan) {
+getLog().info("Package " + aPackage + " will be scan");
 }
 if (!buildContext.hasDelta(new 
File(project.getCompileSourceRoots().iterator().next( {
 return;
@@ -107,7 +119,7 @@ public class GenerateMojo extends Abstra
 try {
 ClassFinder finder = createProjectScopeFinder();
 
-Set<Class> classes = FilteredClassFinder.findClasses(finder, 
scanPaths);
+Set<Class> classes = FilteredClassFinder.findClasses(finder, 
toScan);
 
 BlueprintConfiguration blueprintConfiguration = new 
BlueprintConfigurationImpl(namespaces, defaultActivation, customParameters);
 

Added: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java?rev=1776239=auto
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
 (added)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Packa

svn commit: r1776029 - /aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml

[alien11689]

Author: alien11689
Date: Sun Dec 25 19:36:46 2016
New Revision: 1776029

URL: http://svn.apache.org/viewvc?rev=1776029=rev
Log:
Fix missing bndlib

Modified:
aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml

Modified: aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml?rev=1776029=1776028=1776029=diff
==
--- aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml 
(original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml Sun Dec 
25 19:36:46 2016
@@ -56,6 +56,12 @@
 org.apache.aries.blueprint
 test
 
+
+   
+biz.aQute
+bndlib
+0.0.357
+
 
 
 org.apache.aries.proxy

svn commit: r1776024 - in /aries/trunk: blueprint/blueprint-itests/pom.xml transaction/transaction-itests/pom.xml

[alien11689]

Author: alien11689
Date: Sun Dec 25 17:59:35 2016
New Revision: 1776024

URL: http://svn.apache.org/viewvc?rev=1776024=rev
Log:
Let blueprint and transaction build

Modified:
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/transaction/transaction-itests/pom.xml

Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1776024=1776023=1776024=diff
==
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Sun Dec 25 17:59:35 2016
@@ -62,7 +62,7 @@
 
 org.apache.aries.blueprint
 org.apache.aries.blueprint.core
-1.7.1-SNAPSHOT
+1.7.2-SNAPSHOT
 
 
 org.apache.aries.blueprint

Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1776024=1776023=1776024=diff
==
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Sun Dec 25 17:59:35 2016
@@ -127,7 +127,7 @@
 org.apache.aries.transaction
 org.apache.aries.transaction.manager
 test
-1.3.1-SNAPSHOT
+1.3.3-SNAPSHOT
 
 
 org.apache.aries.transaction

svn commit: r1786902 - /aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java

[alien11689]

Author: alien11689
Date: Tue Mar 14 13:32:09 2017
New Revision: 1786902

URL: http://svn.apache.org/viewvc?rev=1786902=rev
Log:
[FIX] Fix typo in blueprint parser javadoc

This closes #71


Modified:

aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java

Modified: 
aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java?rev=1786902=1786901=1786902=diff
==
--- 
aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BeanProcessor.java
 Tue Mar 14 13:32:09 2017
@@ -24,7 +24,7 @@ import org.osgi.service.blueprint.reflec
  * TODO: javadoc
  *
  * Processors must be advertized as being such.  This can be done by using
- * the custom attribtue defined in the extension schema.
+ * the custom attribute defined in the extension schema.
  * 
  *bp:bean ext:role="processor" ...
  * 

svn commit: r1790559 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-itest/ blueprint-maven-plugin-itest/src/it/transaction-annotation/ blueprint-maven-plugin-itest/src/it/transaction-annot

[alien11689]

Author: alien11689
Date: Fri Apr  7 14:14:11 2017
New Revision: 1790559

URL: http://svn.apache.org/viewvc?rev=1790559=rev
Log:
[ARIES-1710] Add enable-annotations only for transaction schema v1.2.0

Added:

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/T1.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/TxBean.java
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/CdiTransactionFactory.java

aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml?rev=1790559=1790558=1790559=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml Fri Apr  
7 14:14:11 2017
@@ -58,7 +58,7 @@
 
 
 
-
+
 
 
 integration-test

Added: 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml?rev=1790559=auto
==
--- 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
 (added)
+++ 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
 Fri Apr  7 14:14:11 2017
@@ -0,0 +1,107 @@
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.aries.blueprint.plugin.itest
+simple-project
+1.0.0-SNAPSHOT
+jar
+
+
+
+javax.inject
+javax.inject
+1
+
+
+javax.transaction
+javax.transaction-api
+1.2
+
+
+
+
+
+
+org.apache.aries.blueprint
+blueprint-maven-plugin
+@blueprint-maven-plugin.version@
+
+
+p1
+
+blueprint-generate
+
+
+
+p1
+
+p1.xml
+
+
http://aries.apache.org/xmlns/transactions/v1.2.0
+
+
+ 

svn commit: r1805027 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml

[alien11689]

Author: alien11689
Date: Mon Aug 14 18:55:00 2017
New Revision: 1805027

URL: http://svn.apache.org/viewvc?rev=1805027=rev
Log:
[maven-release-plugin] prepare release blueprint-maven-plugin-annotation-1.2.0

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=1805027=1805026=1805027=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml 
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Mon 
Aug 14 18:55:00 2017
@@ -28,14 +28,14 @@
 org.apache.aries.blueprint
 blueprint-maven-plugin-annotation
 bundle
-1.1.1-SNAPSHOT
+1.2.0
 Apache Aries Blueprint Maven Plugin Annotations
 
 
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.2.0
+
scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.2.0
 
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
+
http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.2.0
 
 
 

svn commit: r1805028 - /aries/tags/blueprint-maven-plugin-annotation-1.2.0/

[alien11689]

Author: alien11689
Date: Mon Aug 14 18:55:04 2017
New Revision: 1805028

URL: http://svn.apache.org/viewvc?rev=1805028=rev
Log:
[maven-release-plugin] copy for tag blueprint-maven-plugin-annotation-1.2.0

Added:
aries/tags/blueprint-maven-plugin-annotation-1.2.0/   (props changed)
  - copied from r1805027, 
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/

Propchange: aries/tags/blueprint-maven-plugin-annotation-1.2.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 14 18:55:04 2017
@@ -0,0 +1 @@
+/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin-annotation:1306564-1337594

svn commit: r1805034 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

[alien11689]

Author: alien11689
Date: Mon Aug 14 19:01:53 2017
New Revision: 1805034

URL: http://svn.apache.org/viewvc?rev=1805034=rev
Log:
[RELEASE] Bump spi and annotations version to snapshot after release in BMP

Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1805034=1805033=1805034=diff
==
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Mon Aug 14 
19:01:53 2017
@@ -43,9 +43,9 @@
 3.4
 1.0.0
 
-
1.1.0
+
1.1.1-SNAPSHOT
 
1.0.0
-
1.2.0
+
1.2.1-SNAPSHOT
 
 1
 1.2