You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2017/01/29 18:48:16 UTC
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/apache/aries/blueprint/plugin/handlers/ main/java/o...
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&r1=1780838&r2=1780839&view=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<Method> 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<Field> 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 writeProperties(XMLStreamWriter writer) throws XMLStreamException {
for (Property property : properties) {
- writer.writeProperty(property);
+ property.write(writer);
}
}
- public void writeArguments(ArgumentWriter writer) {
+ public void writeArguments(XMLStreamWriter writer) throws XMLStreamException {
for (Argument argument : constructorArguments) {
- writer.writeArgument(argument);
+ argument.write(writer);
}
}
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java Sun Jan 29 18:48:15 2017
@@ -19,7 +19,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.ContextEnricher;
@@ -46,7 +46,7 @@ public class BeanFromFactory extends Bea
}
private void handleCustomBeanAnnotations() {
- for (BeanAnnotationHandler beanAnnotationHandler : Extensions.BEAN_ANNOTATION_HANDLERs) {
+ for (BeanAnnotationHandler beanAnnotationHandler : Handlers.BEAN_ANNOTATION_HANDLERs) {
Object annotation = AnnotationHelper.findAnnotation(producingMethod.getAnnotations(), beanAnnotationHandler.getAnnotation());
if (annotation != null) {
beanAnnotationHandler.handleBeanAnnotation(producingMethod, id, contextEnricher, this);
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.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.NamedLikeHandler;
import java.lang.annotation.Annotation;
@@ -69,7 +69,7 @@ public class BeanRef implements Comparab
}
private Object isQualifier(Annotation ann) {
- for (Class<? extends Annotation> qualifingAnnotationClass : Extensions.qualifingAnnotationClasses) {
+ for (Class<? extends Annotation> qualifingAnnotationClass : Handlers.qualifingAnnotationClasses) {
Object annotation = ann.annotationType().getAnnotation(qualifingAnnotationClass);
if (annotation != null) {
return annotation;
@@ -83,7 +83,7 @@ public class BeanRef implements Comparab
}
public static String getBeanName(Class<?> clazz, AnnotatedElement annotatedElement) {
- for (NamedLikeHandler namedLikeHandler : Extensions.namedLikeHandlers) {
+ for (NamedLikeHandler namedLikeHandler : Handlers.namedLikeHandlers) {
if (annotatedElement.getAnnotation(namedLikeHandler.getAnnotation()) != null) {
String name = namedLikeHandler.getName(clazz, annotatedElement);
if (name != null) {
Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintWriter.java (from r1780838, 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/model/BlueprintWriter.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintWriter.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java&r1=1780838&r2=1780839&rev=1780839&view=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/model/BlueprintWriter.java Sun Jan 29 18:48:15 2017
@@ -16,15 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.plugin;
+package org.apache.aries.blueprint.plugin.model;
-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.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;
import org.apache.aries.blueprint.plugin.spi.XmlWriter;
@@ -42,38 +35,35 @@ import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.util.Map;
-
-public class Generator implements PropertyWriter, ArgumentWriter {
+public class BlueprintWriter {
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";
- 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, BlueprintConfigurationImpl blueprintConfiguration) throws XMLStreamException {
- this.context = context;
+ public BlueprintWriter(OutputStream os, BlueprintConfiguration blueprintConfiguration) throws XMLStreamException {
this.blueprintConfiguration = blueprintConfiguration;
this.writer = XMLOutputFactory.newFactory().createXMLStreamWriter(temp);
this.os = os;
}
- public void generate() {
- generateXml();
+ public void generate(Context context) {
+ generateXml(context);
printFormatted();
}
- private void generateXml() {
+ private void generateXml(Context context) {
try {
writer.writeStartDocument();
writeBlueprint();
for (Bean bean : context.getBeans()) {
writeBeanStart(bean);
- bean.writeArguments(this);
- bean.writeProperties(this);
+ bean.writeArguments(writer);
+ bean.writeProperties(writer);
writer.writeEndElement();
}
@@ -96,8 +86,6 @@ public class Generator implements Proper
Transformer transformer = factory.newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-
-
transformer.transform(
new StreamSource(new ByteArrayInputStream(temp.toByteArray())),
new StreamResult(os));
@@ -115,7 +103,7 @@ public class Generator implements Proper
}
}
- public void writeBeanStart(Bean bean) throws XMLStreamException {
+ private void writeBeanStart(Bean bean) throws XMLStreamException {
writer.writeStartElement("bean");
writer.writeAttribute("id", bean.id);
writer.writeAttribute("class", bean.clazz.getName());
@@ -142,33 +130,4 @@ public class Generator implements Proper
writer.writeAttribute("factory-ref", bean.factoryBean.id);
writer.writeAttribute("factory-method", bean.factoryMethod);
}
-
- @Override
- public void writeProperty(Property property) {
- try {
- writer.writeEmptyElement("property");
- writer.writeAttribute("name", property.name);
- if (property.ref != null) {
- writer.writeAttribute("ref", property.ref);
- } else if (property.value != null) {
- writer.writeAttribute("value", property.value);
- }
- } catch (XMLStreamException e) {
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- @Override
- public void writeArgument(Argument argument) {
- try {
- writer.writeEmptyElement("argument");
- if (argument.getRef() != null) {
- writer.writeAttribute("ref", argument.getRef());
- } else if (argument.getValue() != null) {
- writer.writeAttribute("value", argument.getValue());
- }
- } catch (XMLStreamException e) {
- throw new RuntimeException(e.getMessage(), e);
- }
- }
}
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.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.BlueprintConfiguration;
import org.apache.aries.blueprint.plugin.spi.ContextEnricher;
import org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler;
@@ -47,10 +47,11 @@ public class Context implements Blueprin
this.blueprintConfiguration = blueprintConfiguration;
initContext();
addBeans(beanClasses);
+ resolve();
}
private void initContext() {
- for (ContextInitializationHandler contextInitializationHandler : Extensions.contextInitializationHandlers) {
+ for (ContextInitializationHandler contextInitializationHandler : Handlers.contextInitializationHandlers) {
contextInitializationHandler.initContext(this);
}
}
@@ -90,7 +91,7 @@ public class Context implements Blueprin
private boolean isFactoryMethod(Method method) {
boolean isFactoryMethod = false;
- for (Class<? extends Annotation> factoryMethodAnnotationClass : Extensions.factoryMethodAnnotationClasses) {
+ for (Class<? extends Annotation> factoryMethodAnnotationClass : Handlers.factoryMethodAnnotationClasses) {
Annotation annotation = AnnotationHelper.findAnnotation(method.getAnnotations(), factoryMethodAnnotationClass);
if (annotation != null) {
isFactoryMethod = true;
@@ -100,7 +101,7 @@ public class Context implements Blueprin
return isFactoryMethod;
}
- public void resolve() {
+ private void resolve() {
for (Bean bean : getBeans()) {
bean.resolve(this);
}
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-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java Sun Jan 29 18:48:15 2017
@@ -18,10 +18,13 @@
*/
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.CustomDependencyAnnotationHandler;
import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler;
+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.Field;
@@ -29,7 +32,7 @@ import java.lang.reflect.Method;
import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName;
-public class Property implements Comparable<Property> {
+public class Property implements Comparable<Property>, XmlWriter {
public final String name;
public final String ref;
public final String value;
@@ -49,7 +52,7 @@ public class Property implements Compara
return new Property(field.getName(), null, value, true);
}
String ref = getForcedRefName(field);
- for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Extensions.customDependencyAnnotationHandlers) {
+ for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Handlers.customDependencyAnnotationHandlers) {
Annotation annotation = (Annotation) AnnotationHelper.findAnnotation(field.getAnnotations(), customDependencyAnnotationHandler.getAnnotation());
if (annotation != null) {
String generatedRef = customDependencyAnnotationHandler.handleDependencyAnnotation(field, ref, blueprintRegister);
@@ -87,7 +90,7 @@ public class Property implements Compara
if (ref == null) {
ref = findName(method.getParameterAnnotations()[0]);
}
- for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Extensions.customDependencyAnnotationHandlers) {
+ for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Handlers.customDependencyAnnotationHandlers) {
Annotation annotation = (Annotation) AnnotationHelper.findAnnotation(method.getAnnotations(), customDependencyAnnotationHandler.getAnnotation());
if (annotation != null) {
String generatedRef = customDependencyAnnotationHandler.handleDependencyAnnotation(method, ref, blueprintRegister);
@@ -101,7 +104,7 @@ public class Property implements Compara
return new Property(propertyName, ref, null, false);
}
- for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Extensions.customDependencyAnnotationHandlers) {
+ for (CustomDependencyAnnotationHandler customDependencyAnnotationHandler : Handlers.customDependencyAnnotationHandlers) {
Annotation annotation = (Annotation) AnnotationHelper.findAnnotation(method.getParameterAnnotations()[0], customDependencyAnnotationHandler.getAnnotation());
if (annotation != null) {
String generatedRef = customDependencyAnnotationHandler.handleDependencyAnnotation(method.getParameterTypes()[0], annotation, ref, blueprintRegister);
@@ -143,7 +146,7 @@ public class Property implements Compara
}
private static String getForcedRefName(Field field) {
- for (NamedLikeHandler namedLikeHandler : Extensions.namedLikeHandlers) {
+ for (NamedLikeHandler namedLikeHandler : Handlers.namedLikeHandlers) {
if (field.getAnnotation(namedLikeHandler.getAnnotation()) != null) {
String name = namedLikeHandler.getName(field.getType(), field);
if (name != null) {
@@ -155,7 +158,7 @@ public class Property implements Compara
}
private static String getForcedRefName(Method method) {
- for (NamedLikeHandler namedLikeHandler : Extensions.namedLikeHandlers) {
+ for (NamedLikeHandler namedLikeHandler : Handlers.namedLikeHandlers) {
if (method.getAnnotation(namedLikeHandler.getAnnotation()) != null) {
String name = namedLikeHandler.getName(method.getParameterTypes()[0], method);
if (name != null) {
@@ -183,4 +186,15 @@ public class Property implements Compara
private static String makeFirstLetterLower(String name) {
return name.substring(0, 1).toLowerCase() + name.substring(1, name.length());
}
+
+ @Override
+ public void write(XMLStreamWriter writer) throws XMLStreamException {
+ writer.writeEmptyElement("property");
+ writer.writeAttribute("name", name);
+ if (ref != null) {
+ writer.writeAttribute("ref", ref);
+ } else if (value != null) {
+ writer.writeAttribute("value", value);
+ }
+ }
}
Modified: aries/trunk/blueprint/plugin/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/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler Sun Jan 29 18:48:15 2017
@@ -15,11 +15,11 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.pax.OsgiServiceProviderHandler
-org.apache.aries.blueprint.plugin.spring.LazyAttributeResolver
-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.javax.cdi.CdiTransactionFactory
-org.apache.aries.blueprint.plugin.config.ConfigAnnotationHandler
-org.apache.aries.blueprint.plugin.referencelistener.ReferenceListenerHandler
+org.apache.aries.blueprint.plugin.handlers.pax.OsgiServiceProviderHandler
+org.apache.aries.blueprint.plugin.handlers.spring.LazyAttributeResolver
+org.apache.aries.blueprint.plugin.handlers.spring.DependsOnAttributeResolver
+org.apache.aries.blueprint.plugin.handlers.spring.SpringTransactionalFactory
+org.apache.aries.blueprint.plugin.handlers.javax.JavaxTransactionFactory
+org.apache.aries.blueprint.plugin.handlers.javax.cdi.CdiTransactionFactory
+org.apache.aries.blueprint.plugin.handlers.config.ConfigAnnotationHandler
+org.apache.aries.blueprint.plugin.handlers.referencelistener.ReferenceListenerHandler
Modified: aries/trunk/blueprint/plugin/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/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder Sun Jan 29 18:48:15 2017
@@ -15,6 +15,6 @@
# 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
+org.apache.aries.blueprint.plugin.handlers.spring.ComponentBeanFinder
+org.apache.aries.blueprint.plugin.handlers.javax.SingletonBeanFinder
+org.apache.aries.blueprint.plugin.handlers.javax.NamedBeanFinder
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler Sun Jan 29 18:48:15 2017
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.pax.OsgiServiceHandler
-org.apache.aries.blueprint.plugin.config.ConfigPropertiesHandler
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.pax.OsgiServiceHandler
+org.apache.aries.blueprint.plugin.handlers.config.ConfigPropertiesHandler
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder Sun Jan 29 18:48:15 2017
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.javax.ProducesHandler
+org.apache.aries.blueprint.plugin.handlers.javax.ProducesHandler
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler Sun Jan 29 18:48:15 2017
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.javax.PersistenceContextHandler
-org.apache.aries.blueprint.plugin.javax.PersistenceUnitHandler
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.javax.PersistenceContextHandler
+org.apache.aries.blueprint.plugin.handlers.javax.PersistenceUnitHandler
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/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/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler Sun Jan 29 18:48:15 2017
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.spring.AutowiredAsInject
-org.apache.aries.blueprint.plugin.javax.InjectHandler
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.spring.AutowiredAsInject
+org.apache.aries.blueprint.plugin.handlers.javax.InjectHandler
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/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/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler Sun Jan 29 18:48:15 2017
@@ -15,8 +15,8 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.javax.PostConstructHandler
-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.javax.cdi.CdiTransactionFactory
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.javax.PostConstructHandler
+org.apache.aries.blueprint.plugin.handlers.javax.PreDestroyHandler
+org.apache.aries.blueprint.plugin.handlers.spring.SpringTransactionalFactory
+org.apache.aries.blueprint.plugin.handlers.javax.JavaxTransactionFactory
+org.apache.aries.blueprint.plugin.handlers.javax.cdi.CdiTransactionFactory
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/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/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler Sun Jan 29 18:48:15 2017
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.spring.ComponentAsNamed
-org.apache.aries.blueprint.plugin.spring.QualifierAsNamed
-org.apache.aries.blueprint.plugin.javax.NamedHandler
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.spring.ComponentAsNamed
+org.apache.aries.blueprint.plugin.handlers.spring.QualifierAsNamed
+org.apache.aries.blueprint.plugin.handlers.javax.NamedHandler
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder Sun Jan 29 18:48:15 2017
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.javax.QualifierHandler
\ No newline at end of file
+org.apache.aries.blueprint.plugin.handlers.javax.QualifierHandler
\ No newline at end of file
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler Sun Jan 29 18:48:15 2017
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.aries.blueprint.plugin.spring.ValueInjectionHandler
-org.apache.aries.blueprint.plugin.config.ConfigPropertyInjectionHandler
+org.apache.aries.blueprint.plugin.handlers.spring.ValueInjectionHandler
+org.apache.aries.blueprint.plugin.handlers.config.ConfigPropertyInjectionHandler
Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintWriterTest.java (from r1780838, 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/BlueprintWriterTest.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintWriterTest.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java&r1=1780838&r2=1780839&rev=1780839&view=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/BlueprintWriterTest.java Sun Jan 29 18:48:15 2017
@@ -20,6 +20,7 @@ package org.apache.aries.blueprint.plugi
import com.google.common.collect.Sets;
import org.apache.aries.blueprint.plugin.model.Context;
+import org.apache.aries.blueprint.plugin.model.BlueprintWriter;
import org.apache.aries.blueprint.plugin.model.TransactionalDef;
import org.apache.aries.blueprint.plugin.test.MyBean1;
import org.apache.aries.blueprint.plugin.test.MyProduced;
@@ -63,7 +64,7 @@ import static org.apache.aries.blueprint
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class GeneratorTest {
+public class BlueprintWriterTest {
private static final String NS_JPA = "http://aries.apache.org/xmlns/jpa/v1.1.0";
private static final String NS_TX1 = "http://aries.apache.org/xmlns/transactions/v1.2.0";
@@ -74,7 +75,7 @@ public class GeneratorTest {
@BeforeClass
public static void setUp() throws Exception {
- ClassFinder classFinder = new ClassFinder(GeneratorTest.class.getClassLoader());
+ ClassFinder classFinder = new ClassFinder(BlueprintWriterTest.class.getClassLoader());
Set<Class<?>> beanClasses = findClasses(classFinder, Arrays.asList(
MyBean1.class.getPackage().getName(),
ReferenceListenerToProduceWithoutAnnotation.class.getPackage().getName()
@@ -86,9 +87,8 @@ public class GeneratorTest {
customParameters.put("example.p2", "v2");
BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces, null, customParameters);
Context context = new Context(blueprintConfiguration, beanClasses);
- context.resolve();
ByteArrayOutputStream os = new ByteArrayOutputStream();
- new Generator(context, os, blueprintConfiguration).generate();
+ new BlueprintWriter(os, blueprintConfiguration).generate(context);
System.out.println(os.toString("UTF-8"));
xmlAsBytes = os.toByteArray();
@@ -615,20 +615,20 @@ public class GeneratorTest {
Document document = readToDocument(xmlAsBytes, true);
Source[] schemas = new StreamSource[]{
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/example.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/blueprint.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/transaction/parsing/transactionv12.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/jpa/blueprint/namespace/jpa_110.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.0.0.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.1.0.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd")),
- new StreamSource(GeneratorTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.2.0.xsd"))
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/example.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/blueprint.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/transaction/parsing/transactionv12.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/jpa/blueprint/namespace/jpa_110.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.0.0.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.1.0.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd")),
+ new StreamSource(BlueprintWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.2.0.xsd"))
};
Source xmlFile = new DOMSource(document);
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java Sun Jan 29 18:48:15 2017
@@ -164,22 +164,22 @@ public class BeanTest {
@Test(expected = UnsupportedOperationException.class)
public void testBadFieldBean1() {
- new Context(blueprintConfiguration, BadFieldBean1.class).resolve();
+ new Context(blueprintConfiguration, BadFieldBean1.class);
}
@Test(expected = UnsupportedOperationException.class)
public void testBadFieldBean2() {
- new Context(blueprintConfiguration, BadFieldBean2.class).resolve();
+ new Context(blueprintConfiguration, BadFieldBean2.class);
}
@Test(expected = UnsupportedOperationException.class)
public void testBadFieldBean3() {
- new Context(blueprintConfiguration, BadFieldBean3.class).resolve();
+ new Context(blueprintConfiguration, BadFieldBean3.class);
}
@Test
public void testFieldBean4() {
- new Context(blueprintConfiguration, FieldBean4.class).resolve();
+ new Context(blueprintConfiguration, FieldBean4.class);
}
@Test
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java?rev=1780839&r1=1780838&r2=1780839&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java Sun Jan 29 18:48:15 2017
@@ -53,7 +53,6 @@ public class ContextTest {
@Test
public void testLists2() {
Context context = new Context(blueprintConfiguration, ServiceReferences.class);
- context.resolve();
Assert.assertEquals(1, context.getBeans().size());
Assert.assertEquals(3, getOsgiServices(context).size());
}
@@ -86,7 +85,6 @@ public class ContextTest {
@Test
public void testProduced() throws NoSuchFieldException, SecurityException {
Context context = new Context(blueprintConfiguration, MyFactoryBean.class);
- context.resolve();
BeanFromFactory matching = (BeanFromFactory) context.getMatching(new BeanRef(MyProduced.class));
Assert.assertEquals(MyProduced.class, matching.clazz);
Assert.assertEquals("myFactoryBean", matching.factoryBean.id);