svn commit: r1760210 - in /aries/trunk/blueprint/blueprint-maven-plugin/src: main/java/org/apache/aries/blueprint/plugin/ main/java/org/apache/aries/blueprint/plugin/model/ test/java/org/apache/aries/

2016-09-10 Thread alien11689 
Author: alien11689
Date: Sat Sep 10 20:34:50 2016
New Revision: 1760210

URL: http://svn.apache.org/viewvc?rev=1760210=rev
Log:
[ARIES-1605] Add missing license headers in BMP

Modified:

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java

aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java

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

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * 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;
 
 import org.apache.aries.blueprint.plugin.spi.Activation;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintInitialization.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * 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.model;
 
 import org.apache.aries.blueprint.plugin.spi.ContextEnricher;

Modified: 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java?rev=1760210=1760209=1760210=diff
==
--- 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
 Sat Sep 10 20:34:50 2016
@@ -1,3 +1,21 @@
+/**
+ * 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

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

2016-09-10 Thread alien11689 
Author: alien11689
Date: Sat Sep 10 18:21:23 2016
New Revision: 1760199

URL: http://svn.apache.org/viewvc?rev=1760199=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=1760198=1760199=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, MethodAnnotationHandler {
-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 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 {