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
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: 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
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,
