aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alien11...@apache.org
Subject svn commit: r1792761 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main: java/org/apache/aries/blueprint/plugin/handlers/javax/ java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/ resources/META-INF/services/
Date Wed, 26 Apr 2017 16:24:36 GMT
Author: alien11689
Date: Wed Apr 26 16:24:36 2017
New Revision: 1792761

URL: http://svn.apache.org/viewvc?rev=1792761&view=rev
Log:
[ARIES-1712] Extract common code for javax transaction factories

Added:
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
      - copied, changed from r1792760, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/CdiTransactionFactory.java
Removed:
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/
Modified:
    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/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.InjectLikeHandler
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
    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/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler

Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java?rev=1792761&view=auto
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
(added)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
Wed Apr 26 16:24:36 2017
@@ -0,0 +1,114 @@
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.handlers.javax;
+
+import org.apache.aries.blueprint.plugin.spi.*;
+
+import javax.transaction.Transactional;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public abstract class AbstractTransactionFactory<T extends Annotation> implements BeanAnnotationHandler<T>,
MethodAnnotationHandler<T> {
+    protected abstract String getTransactionTypeName(AnnotatedElement annotatedElement);
+
+    private static final String ENABLE_ANNOTATION = "transaction.enableAnnotation";
+    @Override
+    public void handleMethodAnnotation(Class<?> clazz, List<Method> methods,
ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
+        final String nsTx1 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX1);
+        if (nsTx1 != null) {
+            enableAnnotationTx1(contextEnricher, nsTx1);
+            for (final Method method : methods) {
+                final String transactionTypeName = getTransactionTypeName(method);
+                final String name = method.getName();
+                beanEnricher.addBeanContentWriter("javax.transactional.method/" + clazz.getName()
+ "/" + name + "/" + transactionTypeName, new XmlWriter() {
+                    @Override
+                    public void write(XMLStreamWriter writer) throws XMLStreamException {
+                        writer.writeEmptyElement("transaction");
+                        writer.writeDefaultNamespace(nsTx1);
+                        writer.writeAttribute("method", name);
+                        writer.writeAttribute("value", transactionTypeName);
+                    }
+                });
+            }
+        }
+        final String nsTx2 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX2);
+        if (nsTx2 != null) {
+            insertEnableAnnotationTx2(contextEnricher, nsTx2);
+        }
+    }
+
+    @Override
+    public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher
contextEnricher, BeanEnricher beanEnricher) {
+        final String nsTx1 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX1);
+        if (nsTx1 != null) {
+            enableAnnotationTx1(contextEnricher, nsTx1);
+            final String transactionTypeName = getTransactionTypeName(annotatedElement);
+            beanEnricher.addBeanContentWriter("javax.transactional.method/" + annotatedElement
+ "/*/" + transactionTypeName, new XmlWriter() {
+                @Override
+                public void write(XMLStreamWriter writer) throws XMLStreamException {
+                    writer.writeEmptyElement("transaction");
+                    writer.writeDefaultNamespace(nsTx1);
+                    writer.writeAttribute("method", "*");
+                    writer.writeAttribute("value", transactionTypeName);
+                }
+            });
+        }
+        final String nsTx2 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX2);
+        if (nsTx2 != null) {
+            insertEnableAnnotationTx2(contextEnricher, nsTx2);
+        }
+    }
+
+
+    private void enableAnnotationTx1(ContextEnricher contextEnricher, final String nsTx1)
{
+        // TX1 enable-annotation are valid only in 1.2.0 schema
+        if (Namespaces.isTX12(nsTx1) && getEnableAnnotationConfig(contextEnricher.getBlueprintConfiguration()))
{
+            insertEnableAnnotationTx1(contextEnricher, nsTx1);
+        }
+    }
+
+    private boolean getEnableAnnotationConfig(BlueprintConfiguration blueprintConfig) {
+        String enableAnnotation = blueprintConfig.getCustomParameters().get(ENABLE_ANNOTATION);
+        return enableAnnotation == null || Boolean.parseBoolean(enableAnnotation);
+    }
+
+    private void insertEnableAnnotationTx1(ContextEnricher contextEnricher, final String
namespace) {
+        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
+            @Override
+            public void write(XMLStreamWriter writer) throws XMLStreamException {
+                writer.writeEmptyElement("enable-annotations");
+                writer.writeDefaultNamespace(namespace);
+            }
+        });
+    }
+
+    private void insertEnableAnnotationTx2(ContextEnricher contextEnricher, final String
namespace) {
+        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
+            @Override
+            public void write(XMLStreamWriter writer) throws XMLStreamException {
+                writer.writeEmptyElement("enable");
+                writer.writeDefaultNamespace(namespace);
+            }
+        });
+    }
+}

Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
(from r1792760, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/CdiTransactionFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/CdiTransactionFactory.java&r1=1792760&r2=1792761&rev=1792761&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/cdi/CdiTransactionFactory.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
Wed Apr 26 16:24:36 2017
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.handlers.javax.cdi;
+package org.apache.aries.blueprint.plugin.handlers.javax;
 
 import com.google.common.base.CaseFormat;
 
+import org.apache.aries.blueprint.plugin.handlers.javax.AbstractTransactionFactory;
 import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler;
 import org.apache.aries.blueprint.plugin.spi.BeanEnricher;
 import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration;
@@ -36,13 +37,9 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Set;
 
-public class CdiTransactionFactory implements BeanAnnotationHandler<Transactional>,
MethodAnnotationHandler<Transactional> {
-    private static final String PATTERN_NS_TX1 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v1\\.(.)\\.(.)";
-    private static final String PATTERN_NS_TX2 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v2\\.(.)\\.(.)";
-    private static final String NS_TX_1_2_0 = "http://aries.apache.org/xmlns/transactions/v1.2.0";
-    private static final String ENABLE_ANNOTATION = "transaction.enableAnnotation";
-
-    private String getTransactionTypeName(Transactional transactional) {
+public class CdiTransactionFactory extends AbstractTransactionFactory<Transactional>
{
+    protected String getTransactionTypeName(AnnotatedElement annotatedElement) {
+        final Transactional transactional = annotatedElement.getAnnotation(Transactional.class);
         return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, transactional.value().name());
     }
 
@@ -50,94 +47,4 @@ public class CdiTransactionFactory imple
     public Class<Transactional> getAnnotation() {
         return Transactional.class;
     }
-
-    @Override
-    public void handleMethodAnnotation(Class<?> clazz, List<Method> methods,
ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
-        final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
PATTERN_NS_TX1);
-        if (nsTx1 != null) {
-            enableAnnotationTx1(contextEnricher, nsTx1);
-            for (final Method method : methods) {
-                final Transactional transactional = method.getAnnotation(Transactional.class);
-                final String transactionTypeName = getTransactionTypeName(transactional);
-                final String name = method.getName();
-                beanEnricher.addBeanContentWriter("javax.transactional.method/" + clazz.getName()
+ "/" + name + "/" + transactionTypeName, new XmlWriter() {
-                    @Override
-                    public void write(XMLStreamWriter writer) throws XMLStreamException {
-                        writer.writeEmptyElement("transaction");
-                        writer.writeDefaultNamespace(nsTx1);
-                        writer.writeAttribute("method", name);
-                        writer.writeAttribute("value", transactionTypeName);
-                    }
-                });
-            }
-        }
-        final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
PATTERN_NS_TX2);
-        if ((nsTx2 != null) && getEnableAnnotationConfig(contextEnricher.getBlueprintConfiguration()))
{
-            insertEnableAnnotationTx2(contextEnricher, nsTx2);
-        }
-    }
-
-    @Override
-    public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher
contextEnricher, BeanEnricher beanEnricher) {
-        final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
PATTERN_NS_TX1);
-        if (nsTx1 != null) {
-            enableAnnotationTx1(contextEnricher, nsTx1);
-            final Transactional transactional = annotatedElement.getAnnotation(Transactional.class);
-            final String transactionTypeName = getTransactionTypeName(transactional);
-            beanEnricher.addBeanContentWriter("javax.transactional.method/" + annotatedElement
+ "/*/" + transactionTypeName, new XmlWriter() {
-                @Override
-                public void write(XMLStreamWriter writer) throws XMLStreamException {
-                    writer.writeEmptyElement("transaction");
-                    writer.writeDefaultNamespace(nsTx1);
-                    writer.writeAttribute("method", "*");
-                    writer.writeAttribute("value", transactionTypeName);
-                }
-            });
-        }
-        final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
PATTERN_NS_TX2);
-        if (nsTx2 != null && getEnableAnnotationConfig(contextEnricher.getBlueprintConfiguration()))
{
-            insertEnableAnnotationTx2(contextEnricher, nsTx2);
-        }
-    }
-
-    private String getNamespaceByPattern(Set<String> namespaces, String pattern) {
-        for (String namespace : namespaces) {
-            if (namespace.matches(pattern)) {
-                return namespace;
-            }
-        }
-        return null;
-    }
-    
-    private void enableAnnotationTx1(ContextEnricher contextEnricher, final String nsTx1)
{
-        // TX1 enable-annotation are valid only in 1.2.0 schema
-        if (NS_TX_1_2_0.equals(nsTx1) && getEnableAnnotationConfig(contextEnricher.getBlueprintConfiguration()))
{
-            insertEnableAnnotationTx1(contextEnricher, nsTx1);
-        }
-    }
-
-    private boolean getEnableAnnotationConfig(BlueprintConfiguration blueprintConfig) {
-        String enableAnnotation = blueprintConfig.getCustomParameters().get(ENABLE_ANNOTATION);
-        return enableAnnotation == null || Boolean.parseBoolean(enableAnnotation);
-    }
-
-    private void insertEnableAnnotationTx1(ContextEnricher contextEnricher, final String
namespace) {
-        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
-            @Override
-            public void write(XMLStreamWriter writer) throws XMLStreamException {
-                writer.writeEmptyElement("enable-annotations");
-                writer.writeDefaultNamespace(namespace);
-            }
-        });
-    }
-
-    private void insertEnableAnnotationTx2(ContextEnricher contextEnricher, final String
namespace) {
-        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
-            @Override
-            public void write(XMLStreamWriter writer) throws XMLStreamException {
-                writer.writeEmptyElement("enable");
-                writer.writeDefaultNamespace(namespace);
-            }
-        });
-    }
 }
\ No newline at end of file

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java?rev=1792761&r1=1792760&r2=1792761&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
Wed Apr 26 16:24:36 2017
@@ -35,10 +35,10 @@ import java.lang.reflect.AnnotatedElemen
 import java.lang.reflect.Method;
 import java.util.List;
 
-public class JavaxTransactionFactory implements BeanAnnotationHandler<Transactional>,
MethodAnnotationHandler<Transactional> {
-    private static final String ENABLE_ANNOTATION = "transaction.enableAnnotation";
+public class JavaxTransactionFactory extends AbstractTransactionFactory<Transactional>
{
 
-    private String getTransactionTypeName(Transactional transactional) {
+    protected String getTransactionTypeName(AnnotatedElement annotatedElement) {
+        Transactional transactional = annotatedElement.getAnnotation(Transactional.class);
         return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, transactional.value().name());
     }
 
@@ -46,86 +46,4 @@ public class JavaxTransactionFactory imp
     public Class<Transactional> getAnnotation() {
         return Transactional.class;
     }
-
-    @Override
-    public void handleMethodAnnotation(Class<?> clazz, List<Method> methods,
ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
-        final String nsTx1 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX1);
-        if (nsTx1 != null) {
-            enableAnnotationTx1(contextEnricher, nsTx1);
-            for (final Method method : methods) {
-                final Transactional transactional = method.getAnnotation(Transactional.class);
-                final String transactionTypeName = getTransactionTypeName(transactional);
-                final String name = method.getName();
-                beanEnricher.addBeanContentWriter("javax.transactional.method/" + clazz.getName()
+ "/" + name + "/" + transactionTypeName, new XmlWriter() {
-                    @Override
-                    public void write(XMLStreamWriter writer) throws XMLStreamException {
-                        writer.writeEmptyElement("transaction");
-                        writer.writeDefaultNamespace(nsTx1);
-                        writer.writeAttribute("method", name);
-                        writer.writeAttribute("value", transactionTypeName);
-                    }
-                });
-            }
-        }
-        final String nsTx2 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX2);
-        if (nsTx2 != null) {
-            insertEnableAnnotationTx2(contextEnricher, nsTx2);
-        }
-    }
-
-    @Override
-    public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher
contextEnricher, BeanEnricher beanEnricher) {
-        final String nsTx1 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX1);
-        if (nsTx1 != null) {
-            enableAnnotationTx1(contextEnricher, nsTx1);
-            final Transactional transactional = annotatedElement.getAnnotation(Transactional.class);
-            final String transactionTypeName = getTransactionTypeName(transactional);
-            beanEnricher.addBeanContentWriter("javax.transactional.method/" + annotatedElement
+ "/*/" + transactionTypeName, new XmlWriter() {
-                @Override
-                public void write(XMLStreamWriter writer) throws XMLStreamException {
-                    writer.writeEmptyElement("transaction");
-                    writer.writeDefaultNamespace(nsTx1);
-                    writer.writeAttribute("method", "*");
-                    writer.writeAttribute("value", transactionTypeName);
-                }
-            });
-        }
-        final String nsTx2 = Namespaces.getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(),
Namespaces.PATTERN_NS_TX2);
-        if (nsTx2 != null) {
-            insertEnableAnnotationTx2(contextEnricher, nsTx2);
-        }
-    }
-
-   
-    private void enableAnnotationTx1(ContextEnricher contextEnricher, final String nsTx1)
{
-        // TX1 enable-annotation are valid only in 1.2.0 schema
-        if (Namespaces.isTX12(nsTx1) && getEnableAnnotationConfig(contextEnricher.getBlueprintConfiguration()))
{
-            insertEnableAnnotationTx1(contextEnricher, nsTx1);
-        }
-    }
-
-    private boolean getEnableAnnotationConfig(BlueprintConfiguration blueprintConfig) {
-        String enableAnnotation = blueprintConfig.getCustomParameters().get(ENABLE_ANNOTATION);
-        return enableAnnotation == null || Boolean.parseBoolean(enableAnnotation);
-    }
-
-    private void insertEnableAnnotationTx1(ContextEnricher contextEnricher, final String
namespace) {
-        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
-            @Override
-            public void write(XMLStreamWriter writer) throws XMLStreamException {
-                writer.writeEmptyElement("enable-annotations");
-                writer.writeDefaultNamespace(namespace);
-            }
-        });
-    }
-
-    private void insertEnableAnnotationTx2(ContextEnricher contextEnricher, final String
namespace) {
-        contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter()
{
-            @Override
-            public void write(XMLStreamWriter writer) throws XMLStreamException {
-                writer.writeEmptyElement("enable");
-                writer.writeDefaultNamespace(namespace);
-            }
-        });
-    }
 }

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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -16,11 +16,8 @@
 #
 
 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.javax.CdiTransactionFactory
 org.apache.aries.blueprint.plugin.handlers.config.ConfigAnnotationHandler
 org.apache.aries.blueprint.plugin.handlers.referencelistener.ReferenceListenerHandler
 org.apache.aries.blueprint.plugin.handlers.bean.BeanHandler
\ 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.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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-org.apache.aries.blueprint.plugin.handlers.spring.ComponentBeanFinder
 org.apache.aries.blueprint.plugin.handlers.javax.SingletonBeanFinder
 org.apache.aries.blueprint.plugin.handlers.javax.NamedBeanFinder
 org.apache.aries.blueprint.plugin.handlers.bean.BeanHandler
\ 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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -15,5 +15,4 @@
 # limitations under the License.
 #
 
-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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -17,6 +17,5 @@
 
 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
+org.apache.aries.blueprint.plugin.handlers.javax.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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -15,7 +15,5 @@
 # limitations under the License.
 #
 
-org.apache.aries.blueprint.plugin.handlers.spring.ComponentAsNamed
-org.apache.aries.blueprint.plugin.handlers.spring.QualifierAsNamed
 org.apache.aries.blueprint.plugin.handlers.javax.NamedHandler
 org.apache.aries.blueprint.plugin.handlers.bean.BeanHandler
\ 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=1792761&r1=1792760&r2=1792761&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
Wed Apr 26 16:24:36 2017
@@ -15,5 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.aries.blueprint.plugin.handlers.spring.ValueInjectionHandler
 org.apache.aries.blueprint.plugin.handlers.config.ConfigPropertyInjectionHandler



Mime
View raw message