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 2016/09/10 18:21:23 UTC
svn commit: r1760199 - in /aries/trunk/blueprint/blueprint-maven-plugin/src:
main/java/org/apache/aries/blueprint/plugin/javax/
main/java/org/apache/aries/blueprint/plugin/spring/
test/java/org/apache/aries/blueprint/plugin/ test/java/org/apache/aries/...
Author: alien11689
Date: Sat Sep 10 18:21:23 2016
New Revision: 1760199
URL: http://svn.apache.org/viewvc?rev=1760199&view=rev
Log:
[ARIES-1610] Check namespace patterns instead of conrete namespace in BMP
Added:
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java
Modified:
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/JavaxTransactionFactory.java Sat Sep 10 18:21:23 2016
@@ -32,9 +32,11 @@ import java.lang.reflect.AnnotatedElemen
import java.lang.reflect.Method;
import java.util.List;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_TX1;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_TX2;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.getNamespaceByPattern;
+
public class JavaxTransactionFactory implements BeanAnnotationHandler<Transactional>, MethodAnnotationHandler<Transactional> {
- public static final String NS_TX = "http://aries.apache.org/xmlns/transactions/v1.2.0";
- public static final String NS_TX2 = "http://aries.apache.org/xmlns/transactions/v2.0.0";
private String getTransactionTypeName(Transactional transactional) {
return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, transactional.value().name());
@@ -47,9 +49,9 @@ public class JavaxTransactionFactory imp
@Override
public void handleMethodAnnotation(Class<?> clazz, List<Method> methods, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
-
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX)) {
- enableAnnotations(contextEnricher);
+ final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX1);
+ if (nsTx1 != null) {
+ enableAnnotations(contextEnricher, nsTx1);
for (final Method method : methods) {
final Transactional transactional = method.getAnnotation(Transactional.class);
final String transactionTypeName = getTransactionTypeName(transactional);
@@ -58,55 +60,58 @@ public class JavaxTransactionFactory imp
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("transaction");
- writer.writeDefaultNamespace(NS_TX);
+ writer.writeDefaultNamespace(nsTx1);
writer.writeAttribute("method", name);
writer.writeAttribute("value", transactionTypeName);
}
});
}
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX2)) {
- enableTransactionsTx2(contextEnricher);
+ final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX2);
+ if (nsTx2 != null) {
+ enableTransactionsTx2(contextEnricher, nsTx2);
}
}
- private void enableAnnotations(ContextEnricher contextEnricher) {
+ private void enableAnnotations(ContextEnricher contextEnricher, final String namespace) {
contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter() {
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("enable-annotations");
- writer.writeDefaultNamespace(NS_TX);
+ writer.writeDefaultNamespace(namespace);
}
});
}
@Override
public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX)) {
- enableAnnotations(contextEnricher);
+ final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX1);
+ if (nsTx1 != null) {
+ enableAnnotations(contextEnricher, nsTx1);
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(NS_TX);
+ writer.writeDefaultNamespace(nsTx1);
writer.writeAttribute("method", "*");
writer.writeAttribute("value", transactionTypeName);
}
});
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX2)) {
- enableTransactionsTx2(contextEnricher);
+ final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX2);
+ if (nsTx2 != null) {
+ enableTransactionsTx2(contextEnricher, nsTx2);
}
}
- private void enableTransactionsTx2(ContextEnricher contextEnricher) {
+ private void enableTransactionsTx2(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(NS_TX);
+ writer.writeDefaultNamespace(namespace);
}
});
}
Added: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java?rev=1760199&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java (added)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/Namespaces.java Sat Sep 10 18:21:23 2016
@@ -0,0 +1,37 @@
+/**
+ * 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.javax;
+
+import java.util.Set;
+
+class Namespaces {
+ static final String PATTERN_NS_JPA1 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/jpa\\/v1\\.(.)\\.(.)";
+ static final String PATTERN_NS_JPA2 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/jpa\\/v2\\.(.)\\.(.)";
+ static final String PATTERN_NS_TX1 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v1\\.(.)\\.(.)";
+ static final String PATTERN_NS_TX2 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v2\\.(.)\\.(.)";
+
+ static String getNamespaceByPattern(Set<String> namespaces, String pattern) {
+ for (String namespace : namespaces) {
+ if (namespace.matches(pattern)) {
+ return namespace;
+ }
+ }
+ return null;
+ }
+}
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceContextHandler.java Sat Sep 10 18:21:23 2016
@@ -29,9 +29,11 @@ import javax.xml.stream.XMLStreamWriter;
import java.lang.reflect.Field;
import java.util.List;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_JPA1;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_JPA2;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.getNamespaceByPattern;
+
public class PersistenceContextHandler implements FieldAnnotationHandler<PersistenceContext> {
- public static final String NS_JPA = "http://aries.apache.org/xmlns/jpa/v1.1.0";
- public static final String NS_JPA2 = "http://aries.apache.org/xmlns/jpa/v2.0.0";
@Override
public Class<PersistenceContext> getAnnotation() {
@@ -40,7 +42,8 @@ public class PersistenceContextHandler i
@Override
public void handleMethodAnnotation(Class<?> clazz, List<Field> fields, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_JPA)) {
+ final String nsJpa1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_JPA1);
+ if (nsJpa1 != null) {
for (final Field field : fields) {
final String name = field.getName();
final PersistenceContext persistenceContext = field.getAnnotation(PersistenceContext.class);
@@ -48,19 +51,20 @@ public class PersistenceContextHandler i
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("context");
- writer.writeDefaultNamespace(NS_JPA);
+ writer.writeDefaultNamespace(nsJpa1);
writer.writeAttribute("unitname", persistenceContext.unitName());
writer.writeAttribute("property", name);
}
});
}
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_JPA2)) {
+ final String nsJpa2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_JPA2);
+ if (nsJpa2 != null) {
contextEnricher.addBlueprintContentWriter("javax.persistence.enableJpa2", new XmlWriter() {
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("enable");
- writer.writeDefaultNamespace(NS_JPA2);
+ writer.writeDefaultNamespace(nsJpa2);
}
});
}
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/PersistenceUnitHandler.java Sat Sep 10 18:21:23 2016
@@ -29,9 +29,11 @@ import javax.xml.stream.XMLStreamWriter;
import java.lang.reflect.Field;
import java.util.List;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_JPA1;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.PATTERN_NS_JPA2;
+import static org.apache.aries.blueprint.plugin.javax.Namespaces.getNamespaceByPattern;
+
public class PersistenceUnitHandler implements FieldAnnotationHandler<PersistenceUnit> {
- public static final String NS_JPA = "http://aries.apache.org/xmlns/jpa/v1.1.0";
- public static final String NS_JPA2 = "http://aries.apache.org/xmlns/jpa/v2.0.0";
@Override
public Class<PersistenceUnit> getAnnotation() {
@@ -40,7 +42,8 @@ public class PersistenceUnitHandler impl
@Override
public void handleMethodAnnotation(Class<?> clazz, List<Field> fields, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_JPA)) {
+ final String nsJpa1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_JPA1);
+ if (nsJpa1 != null) {
for (final Field field : fields) {
final String name = field.getName();
final PersistenceUnit persistenceUnit = field.getAnnotation(PersistenceUnit.class);
@@ -48,19 +51,20 @@ public class PersistenceUnitHandler impl
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("unit");
- writer.writeDefaultNamespace(NS_JPA);
+ writer.writeDefaultNamespace(nsJpa1);
writer.writeAttribute("unitname", persistenceUnit.unitName());
writer.writeAttribute("property", name);
}
});
}
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_JPA2)) {
+ final String nsJpa2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_JPA2);
+ if (nsJpa2 != null) {
contextEnricher.addBlueprintContentWriter("javax.persistence.enableJpa2", new XmlWriter() {
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("enable");
- writer.writeDefaultNamespace(NS_JPA2);
+ writer.writeDefaultNamespace(nsJpa2);
}
});
}
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/spring/SpringTransactionalFactory.java Sat Sep 10 18:21:23 2016
@@ -32,10 +32,11 @@ import javax.xml.stream.XMLStreamWriter;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import java.util.List;
+import java.util.Set;
public class SpringTransactionalFactory implements BeanAnnotationHandler<Transactional>, MethodAnnotationHandler<Transactional> {
- public static final String NS_TX = "http://aries.apache.org/xmlns/transactions/v1.2.0";
- public static final String NS_TX2 = "http://aries.apache.org/xmlns/transactions/v2.0.0";
+ private 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 String getTransactionTypeName(Transactional transactional) {
Propagation propagation = transactional.propagation();
@@ -52,8 +53,9 @@ public class SpringTransactionalFactory
@Override
public void handleMethodAnnotation(Class<?> clazz, List<Method> methods, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX)) {
- enableAnnotations(contextEnricher);
+ final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX1);
+ if (nsTx1 != null) {
+ enableAnnotations(contextEnricher, nsTx1);
for (final Method method : methods) {
final Transactional transactional = method.getAnnotation(Transactional.class);
final String transactionTypeName = getTransactionTypeName(transactional);
@@ -62,56 +64,68 @@ public class SpringTransactionalFactory
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("transaction");
- writer.writeDefaultNamespace(NS_TX);
+ writer.writeDefaultNamespace(nsTx1);
writer.writeAttribute("method", name);
writer.writeAttribute("value", transactionTypeName);
}
});
}
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX2)) {
- enableTransactionsTx2(contextEnricher);
+ final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX2);
+ if (nsTx2 != null) {
+ enableTransactionsTx2(contextEnricher, nsTx2);
}
}
- private void enableAnnotations(ContextEnricher contextEnricher) {
+ private void enableAnnotations(ContextEnricher contextEnricher, final String namespace) {
contextEnricher.addBlueprintContentWriter("transaction/ennable-annotation", new XmlWriter() {
@Override
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement("enable-annotations");
- writer.writeDefaultNamespace(NS_TX);
+ writer.writeDefaultNamespace(namespace);
}
});
}
@Override
public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher contextEnricher, BeanEnricher beanEnricher) {
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX)) {
- enableAnnotations(contextEnricher);
+ final String nsTx1 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX1);
+ if (nsTx1 != null) {
+ enableAnnotations(contextEnricher, nsTx1);
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(NS_TX);
+ writer.writeDefaultNamespace(nsTx1);
writer.writeAttribute("method", "*");
writer.writeAttribute("value", transactionTypeName);
}
});
}
- if (contextEnricher.getBlueprintConfiguration().getNamespaces().contains(NS_TX2)) {
- enableTransactionsTx2(contextEnricher);
+ final String nsTx2 = getNamespaceByPattern(contextEnricher.getBlueprintConfiguration().getNamespaces(), PATTERN_NS_TX1);
+ if (nsTx2 != null) {
+ enableTransactionsTx2(contextEnricher, nsTx2);
}
}
- private void enableTransactionsTx2(ContextEnricher contextEnricher) {
+ private void enableTransactionsTx2(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(NS_TX2);
+ writer.writeDefaultNamespace(namespace);
}
});
}
-}
+
+ private String getNamespaceByPattern(Set<String> namespaces, String pattern) {
+ for (String namespace : namespaces) {
+ if (namespace.matches(pattern)) {
+ return namespace;
+ }
+ }
+ return null;
+ }
+}
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java Sat Sep 10 18:21:23 2016
@@ -19,10 +19,8 @@
package org.apache.aries.blueprint.plugin;
import com.google.common.collect.Sets;
-import org.apache.aries.blueprint.plugin.javax.PersistenceContextHandler;
import org.apache.aries.blueprint.plugin.model.Context;
import org.apache.aries.blueprint.plugin.model.TransactionalDef;
-import org.apache.aries.blueprint.plugin.spring.SpringTransactionalFactory;
import org.apache.aries.blueprint.plugin.test.MyBean1;
import org.apache.aries.blueprint.plugin.test.MyProduced;
import org.apache.aries.blueprint.plugin.test.ServiceA;
@@ -56,6 +54,9 @@ import static org.junit.Assert.assertEqu
public class GeneratorTest {
+ 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";
+
private static XPath xpath;
private static Document document;
@@ -64,7 +65,7 @@ public class GeneratorTest {
ClassFinder classFinder = new ClassFinder(GeneratorTest.class.getClassLoader());
String packageName = MyBean1.class.getPackage().getName();
Set<Class<?>> beanClasses = findClasses(classFinder, Collections.singletonList(packageName));
- Set<String> namespaces = new HashSet<String>(Arrays.asList(PersistenceContextHandler.NS_JPA, SpringTransactionalFactory.NS_TX));
+ Set<String> namespaces = new HashSet<String>(Arrays.asList(NS_JPA, NS_TX1));
BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces, null);
Context context = new Context(blueprintConfiguration, beanClasses);
context.resolve();
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java Sat Sep 10 18:21:23 2016
@@ -27,8 +27,6 @@ import org.apache.aries.blueprint.plugin
import org.apache.aries.blueprint.plugin.bad.BadFieldBean2;
import org.apache.aries.blueprint.plugin.bad.BadFieldBean3;
import org.apache.aries.blueprint.plugin.bad.FieldBean4;
-import org.apache.aries.blueprint.plugin.javax.JavaxTransactionFactory;
-import org.apache.aries.blueprint.plugin.javax.PersistenceUnitHandler;
import org.apache.aries.blueprint.plugin.test.MyBean1;
import org.apache.aries.blueprint.plugin.test.MyBean3;
import org.apache.aries.blueprint.plugin.test.MyBean4;
@@ -46,7 +44,10 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
public class BeanTest {
- private final Set<String> namespaces = new HashSet<String>(Arrays.asList(PersistenceUnitHandler.NS_JPA, JavaxTransactionFactory.NS_TX));
+ private static final String NS_JPA1 = "http://aries.apache.org/xmlns/jpa/v1.1.0";
+ private static final String NS_TX1 = "http://aries.apache.org/xmlns/transactions/v1.1.0";
+
+ private final Set<String> namespaces = new HashSet<String>(Arrays.asList(NS_JPA1, NS_TX1));
private final BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces, null);
private final Context context = new Context(blueprintConfiguration);
Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java?rev=1760199&r1=1760198&r2=1760199&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java Sat Sep 10 18:21:23 2016
@@ -19,8 +19,6 @@
package org.apache.aries.blueprint.plugin.model;
import org.apache.aries.blueprint.plugin.BlueprintConfigurationImpl;
-import org.apache.aries.blueprint.plugin.javax.PersistenceUnitHandler;
-import org.apache.aries.blueprint.plugin.spring.SpringTransactionalFactory;
import org.apache.aries.blueprint.plugin.test.MyBean3;
import org.apache.aries.blueprint.plugin.test.MyFactoryBean;
import org.apache.aries.blueprint.plugin.test.MyProduced;
@@ -39,7 +37,10 @@ import java.util.Set;
import static org.junit.Assert.assertEquals;
public class ContextTest {
- private final Set<String> namespaces = new HashSet<String>(Arrays.asList(PersistenceUnitHandler.NS_JPA, SpringTransactionalFactory.NS_TX));
+ private static final String NS_JPA1 = "http://aries.apache.org/xmlns/jpa/v1.0.0";
+ private static final String NS_TX1 = "http://aries.apache.org/xmlns/transactions/v1.0.0";
+
+ private final Set<String> namespaces = new HashSet<String>(Arrays.asList(NS_JPA1, NS_TX1));
private final BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces, null);
@Test