date:20161018

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

2016-10-18 Thread 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)
+++

svn commit: r1765406 - in /aries/trunk/blueprint: blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/ blueprint-maven-plugin/ blueprint-maven-plugin/src/main/java/or

2016-10-18 Thread cschneider

Author: cschneider
Date: Tue Oct 18 09:32:40 2016
New Revision: 1765406

URL: http://svn.apache.org/viewvc?rev=1765406=rev
Log:
[ARIES-1628] Add support default properties, prefixes and suffixes

Added:

aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Property.java
Modified:

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

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigWriter.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/test/BeanWithConfig.java

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Config.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Config.java?rev=1765406=1765405=1765406=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Config.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Config.java
 Tue Oct 18 09:32:40 2016
@@ -14,4 +14,7 @@ import java.lang.annotation.Target;
 public @interface Config {
 String pid();
 String updatePolicy() default "reload"; 
+String placeholderPrefix() default "${";
+String placeholderSuffix() default "}";
+Property[] defaults() default {};
 }

Added: 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Property.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Property.java?rev=1765406=auto
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Property.java
 (added)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/Property.java
 Tue Oct 18 09:32:40 2016
@@ -0,0 +1,6 @@
+package org.apache.aries.blueprint.api.config;
+
+public @interface Property {
+String key();
+String value();
+}

Modified: aries/trunk/blueprint/blueprint-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/pom.xml?rev=1765406=1765405=1765406=diff
==
--- aries/trunk/blueprint/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/pom.xml Tue Oct 18 09:32:40 
2016
@@ -154,6 +154,12 @@
 0.8.0
 
 
+   org.osgi
+   osgi.cmpn
+   6.0.0
+
+
+
org.apache.aries.blueprint
blueprint-maven-plugin-annotation
1.0.0-SNAPSHOT

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigWriter.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigWriter.java?rev=1765406=1765405=1765406=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigWriter.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/ConfigWriter.java
 Tue Oct 18 09:32:40 2016
@@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamExcepti
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.aries.blueprint.api.config.Config;
+import org.apache.aries.blueprint.api.config.Property;
 import org.apache.aries.blueprint.plugin.spi.XmlWriter;
 
 public class ConfigWriter implements XmlWriter {
@@ -38,8 +39,28 @@ public class ConfigWriter implements Xml
 writer.writeStartElement("property-placeholder");
 writer.writeDefaultNamespace(CONFIG_NS);
 writer.writeAttribute("persistent-id", config.pid());
+if (!"${".equals(config.placeholderPrefix())) {
+writer.writeAttribute("placeholder-prefix", config.updatePolicy());
+}
+if (!"}".equals(config.placeholderSuffix())) {
+writer.writeAttribute("placeholder-suffix", config.updatePolicy());
+}
 writer.writeAttribute("update-strategy", config.updatePolicy());
 writer.writeCharacters("\n");
+

svn commit: r1765405 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin: bad/ test/

2016-10-18 Thread cschneider

Author: cschneider
Date: Tue Oct 18 09:32:29 2016
New Revision: 1765405

URL: http://svn.apache.org/viewvc?rev=1765405=rev
Log:
Ignore unused to get rid of warnings

Modified:

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

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

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

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

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

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

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

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java?rev=1765405=1765404=1765405=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
 Tue Oct 18 09:32:29 2016
@@ -26,6 +26,7 @@ import org.apache.aries.blueprint.plugin
 @Singleton
 public class BadFieldBean1 extends ParentWithField
 {
+@SuppressWarnings("unused")
 @Inject
 private MyBean1 field;
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java?rev=1765405=1765404=1765405=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
 Tue Oct 18 09:32:29 2016
@@ -26,6 +26,7 @@ import org.apache.aries.blueprint.plugin
 @Singleton
 public class BadFieldBean2 extends ParentWithInjectedField
 {
+@SuppressWarnings("unused")
 @Inject
 private MyBean1 field;
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java?rev=1765405=1765404=1765405=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
 Tue Oct 18 09:32:29 2016
@@ -25,5 +25,6 @@ import org.apache.aries.blueprint.plugin
 @Singleton
 public class BadFieldBean3 extends ParentWithInjectedField
 {
+@SuppressWarnings("unused")
 private MyBean1 field;
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java?rev=1765405=1765404=1765405=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
 Tue Oct 18 09:32:29 2016
@@ -25,5 +25,6 @@ import org.apache.aries.blueprint.plugin
 @Singleton
 public class FieldBean4 extends ParentWithField
 {
+@SuppressWarnings("unused")
 private MyBean1 field;
 }

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java?rev=1765405=1765404=1765405=diff
==
---

svn commit: r1765400 - /aries/scripts/verify_staged_release.sh

2016-10-18 Thread gnodet

Author: gnodet
Date: Tue Oct 18 08:37:03 2016
New Revision: 1765400

URL: http://svn.apache.org/viewvc?rev=1765400=rev
Log:
Fix verification script

Modified:
aries/scripts/verify_staged_release.sh

Modified: aries/scripts/verify_staged_release.sh
URL: 
http://svn.apache.org/viewvc/aries/scripts/verify_staged_release.sh?rev=1765400=1765399=1765400=diff
==
--- aries/scripts/verify_staged_release.sh (original)
+++ aries/scripts/verify_staged_release.sh Tue Oct 18 08:37:03 2016
@@ -38,7 +38,7 @@ else
echo "${DOWNLOAD}/${STAGING}"
 fi
 
-for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep -v 
'.md5$|.sha1$|index.html|maven-metadata.xml'`
+for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep -v 
'.asc$|.md5$|.sha1$|index.html|maven-metadata.xml'`
 do 
mymd5=`openssl md5 $i |cut -f 2 -d=`
repomd5=`cat $i.md5`
@@ -48,7 +48,7 @@ do
fi
 done
 
-for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep -v 
'.md5$|.sha1$|index.html|maven-metadata.xml'`
+for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep -v 
'.asc$|.md5$|.sha1$|index.html|maven-metadata.xml'`
 do  
mysha1=`openssl sha1 $i|cut -f 2 -d=`
reposha1=`cat $i.sha1`
@@ -58,7 +58,7 @@ do
fi
 done
 
-for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep '.asc$'`
+for i in `find ${DOWNLOAD}/${STAGING} -type f | egrep '.asc$' | egrep -v 
'.asc.asc$'`
 do 
gpgoutput=`gpg $i`
echo ${gpgoutput/BAD/FAILURE: BAD}

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

svn commit: r1765406 - in /aries/trunk/blueprint: blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/api/config/ blueprint-maven-plugin/ blueprint-maven-plugin/src/main/java/or

svn commit: r1765405 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin: bad/ test/

svn commit: r1765400 - /aries/scripts/verify_staged_release.sh

4 matches

Site Navigation

Mail list logo

Footer information