aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alien11...@apache.org
Subject svn commit: r1804234 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-itest/src/it/fail-on-conflict/ blueprint-maven-plugin-itest/src/it/multiple-invocation/ blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ blue...
Date Sun, 06 Aug 2017 14:02:26 GMT
Author: alien11689
Date: Sun Aug  6 14:02:26 2017
New Revision: 1804234

URL: http://svn.apache.org/viewvc?rev=1804234&view=rev
Log:
[ARIES-1736] Generate default availability and timeout based on plugin parameters

Added:
    aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
Modified:
    aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
    aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
    aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
    aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
    aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
Sun Aug  6 14:02:26 2017
@@ -20,5 +20,6 @@
 def file = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml')
 assert !file.exists()
 def log = new File(basedir, 'build.log')
-log.text.contains('Found two beans with id `t1`, but different classes: [p1.T1, p2.T1]')
+log.text.contains('Found two beans with id `t1`, but different classes: [p1.T1, p2.T1]')
||
+        log.text.contains('Found two beans with id `t1`, but different classes: [p2.T1, p1.T1]')
 

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
Sun Aug  6 14:02:26 2017
@@ -52,6 +52,8 @@
                             </scanPaths>
                             <generatedFileName>p1.xml</generatedFileName>
                             <defaultActivation>LAZY</defaultActivation>
+                            <defaultAvailability>MANDATORY</defaultAvailability>
+                            <defaultTimeout>0</defaultTimeout>
                         </configuration>
                     </execution>
                     <execution>
@@ -65,6 +67,8 @@
                             </scanPaths>
                             <generatedFileName>p2.xml</generatedFileName>
                             <defaultActivation>EAGER</defaultActivation>
+                            <defaultAvailability>OPTIONAL</defaultAvailability>
+                            <defaultTimeout>60000</defaultTimeout>
                         </configuration>
                     </execution>
                 </executions>

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
Sun Aug  6 14:02:26 2017
@@ -22,6 +22,8 @@ assert p1.exists()
 def xmlP1 = new groovy.util.XmlSlurper().parse(p1)
 assert xmlP1.name() == 'blueprint'
 assert xmlP1.'@default-activation' == 'lazy'
+assert xmlP1.'@default-availability' == 'mandatory'
+assert xmlP1.'@default-timeout' == '0'
 assert xmlP1.bean.find { it.@class == 'p2.T2' }.size() == 0
 assert xmlP1.bean.@class == 'p1.T1'
 assert xmlP1.bean.@id == 't1'
@@ -31,6 +33,8 @@ assert p2.exists()
 def xmlP2 = new groovy.util.XmlSlurper().parse(p2)
 assert xmlP2.name() == 'blueprint'
 assert xmlP2.'@default-activation' == 'eager'
+assert xmlP2.'@default-availability' == 'optional'
+assert xmlP2.'@default-timeout' == '60000'
 assert xmlP2.bean.find { it.@class == 'p1.T1' }.size() == 0
 assert xmlP2.bean.@class == 'p2.T2'
 assert xmlP2.bean.@id == 't2'
\ No newline at end of file

Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java?rev=1804234&view=auto
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
(added)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
Sun Aug  6 14:02:26 2017
@@ -0,0 +1,32 @@
+/**
+ * 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.spi;
+
+/**
+ * Availability of references and reference-lists
+ */
+public enum Availability {
+    MANDATORY,
+    OPTIONAL;
+
+    @Override
+    public String toString() {
+        return name().toLowerCase();
+    }
+}

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
Sun Aug  6 14:02:26 2017
@@ -36,6 +36,16 @@ public interface BlueprintConfiguration
     Activation getDefaultActivation();
 
     /**
+     * @return value of default availability parameter
+     */
+    Availability getDefaultAvailability();
+
+    /**
+     * @return value of default timeout parameter
+     */
+    Long getDefaultTimeout();
+
+    /**
      * @return custom parameters
      */
     Map<String, String> getCustomParameters();

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
Sun Aug  6 14:02:26 2017
@@ -19,6 +19,7 @@
 package org.apache.aries.blueprint.plugin;
 
 import org.apache.aries.blueprint.plugin.spi.Activation;
+import org.apache.aries.blueprint.plugin.spi.Availability;
 import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration;
 
 import java.util.Arrays;
@@ -34,11 +35,22 @@ public class BlueprintConfigurationImpl
     private final Set<String> namespaces;
     private final Activation defaultActivation;
     private final Map<String, String> customParameters;
+    private final Availability defaultAvailability;
+    private final Long defaultTimeout;
 
-    public BlueprintConfigurationImpl(Set<String> namespaces, Activation defaultActivation,
Map<String, String> customParameters) {
+    public BlueprintConfigurationImpl(Set<String> namespaces, Activation defaultActivation,
Map<String, String> customParameters, Availability defaultAvailability, Long defaultTimeout)
{
         this.namespaces = namespaces != null ? namespaces : new HashSet<>(Arrays.asList(NS_TX2,
NS_JPA2));
         this.defaultActivation = defaultActivation;
-        this.customParameters =  customParameters == null ? new HashMap<String, String>()
: customParameters;
+        this.customParameters = customParameters == null ? new HashMap<String, String>()
: customParameters;
+        this.defaultAvailability = defaultAvailability;
+        this.defaultTimeout = defaultTimeout;
+        validateTimeout();
+    }
+
+    private void validateTimeout() {
+        if (defaultTimeout != null && defaultTimeout < 0L) {
+            throw new NegativeTimeout(defaultTimeout);
+        }
     }
 
     @Override
@@ -52,6 +64,16 @@ public class BlueprintConfigurationImpl
     }
 
     @Override
+    public Availability getDefaultAvailability() {
+        return defaultAvailability;
+    }
+
+    @Override
+    public Long getDefaultTimeout() {
+        return defaultTimeout;
+    }
+
+    @Override
     public Map<String, String> getCustomParameters() {
         return customParameters;
     }

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
Sun Aug  6 14:02:26 2017
@@ -21,6 +21,7 @@ package org.apache.aries.blueprint.plugi
 import org.apache.aries.blueprint.plugin.model.Blueprint;
 import org.apache.aries.blueprint.plugin.model.ConflictDetected;
 import org.apache.aries.blueprint.plugin.spi.Activation;
+import org.apache.aries.blueprint.plugin.spi.Availability;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -96,6 +97,22 @@ public class GenerateMojo extends Abstra
     protected Activation defaultActivation;
 
     /**
+     * Specifies the default availability setting that will be defined for components.
+     * Default is null, which indicates mandatory (blueprint default).
+     * If MANDATORY then default-activation will be set to mandatory.
+     * If OPTIONAL then default-activation will be explicitly set to optional.
+     */
+    @Parameter
+    protected Availability defaultAvailability;
+
+    /**
+     * Specifies the default timout setting that will be defined for components.
+     * Default is null, which indicates 300000 seconds (blueprint default).
+     */
+    @Parameter
+    protected Long defaultTimeout;
+
+    /**
      * Specifies additional parameters which could be used in extensions
      */
     @Parameter
@@ -109,10 +126,9 @@ public class GenerateMojo extends Abstra
             getLog().info("Skipping blueprint generation because source files were not changed");
             return;
         }
-
-        BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
defaultActivation, customParameters);
-
+        
         try {
+            BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
defaultActivation, customParameters, defaultAvailability, defaultTimeout);
             generateBlueprint(toScan, blueprintConfiguration);
         } catch (ConflictDetected e) {
             throw new MojoExecutionException(e.getMessage(), e);

Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java?rev=1804234&view=auto
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
(added)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
Sun Aug  6 14:02:26 2017
@@ -0,0 +1,25 @@
+/**
+ * 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;
+
+class NegativeTimeout extends RuntimeException {
+    NegativeTimeout(long defaultTimeout) {
+        super("Default timeout cannot be negative " + defaultTimeout);
+    }
+}

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
Sun Aug  6 14:02:26 2017
@@ -163,7 +163,13 @@ public class Blueprint implements Bluepr
         writer.writeStartElement("blueprint");
         writer.writeDefaultNamespace(NS_BLUEPRINT);
         if (blueprintConfiguration.getDefaultActivation() != null) {
-            writer.writeAttribute("default-activation", blueprintConfiguration.getDefaultActivation().name().toLowerCase());
+            writer.writeAttribute("default-activation", blueprintConfiguration.getDefaultActivation().toString());
+        }
+        if (blueprintConfiguration.getDefaultAvailability() != null) {
+            writer.writeAttribute("default-availability", blueprintConfiguration.getDefaultAvailability().toString());
+        }
+        if (blueprintConfiguration.getDefaultTimeout() != null) {
+            writer.writeAttribute("default-timeout", blueprintConfiguration.getDefaultTimeout().toString());
         }
     }
 

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
Sun Aug  6 14:02:26 2017
@@ -89,7 +89,7 @@ public class BlueprintFileWriterTest {
         customParameters.put("ex.t", "1");
         customParameters.put("example.p1", "v1");
         customParameters.put("example.p2", "v2");
-        BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, customParameters);
+        BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, customParameters, null, null);
         Blueprint blueprint = new Blueprint(blueprintConfiguration, beanClasses);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         new BlueprintFileWriter(os).write(blueprint);

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
Sun Aug  6 14:02:26 2017
@@ -18,10 +18,24 @@
  */
 package org.apache.aries.blueprint.plugin;
 
-import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.apache.aries.blueprint.plugin.model.Blueprint;
+import org.apache.aries.blueprint.plugin.test.transactionenable.TxBean;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xbean.finder.ClassFinder;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,24 +46,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.aries.blueprint.plugin.model.Blueprint;
-import org.apache.aries.blueprint.plugin.test.transactionenable.TxBean;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.xbean.finder.ClassFinder;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
+import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class EnableAnnotationTest {
 
@@ -59,7 +58,7 @@ public class EnableAnnotationTest {
     private static final String NS_TX1_2 = "http://aries.apache.org/xmlns/transactions/v1.2.0";
 
     private static Set<Class<?>> beanClasses;
-    
+
     private XPath xpath;
     private Document document;
     private byte[] xmlAsBytes;
@@ -72,11 +71,11 @@ public class EnableAnnotationTest {
     }
 
     private void writeXML(String namespace, String enableAnnotations) throws XMLStreamException,
-        UnsupportedEncodingException, ParserConfigurationException, SAXException, IOException
{
+            UnsupportedEncodingException, ParserConfigurationException, SAXException, IOException
{
         Set<String> namespaces = new HashSet<>(Arrays.asList(NS_JPA, namespace));
         Map<String, String> customParameters = new HashMap<>();
         customParameters.put("transaction.enableAnnotation", enableAnnotations);
-        BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, customParameters);
+        BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, customParameters, null, null);
         Blueprint blueprint = new Blueprint(blueprintConfiguration, beanClasses);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         new BlueprintFileWriter(os).write(blueprint);
@@ -119,8 +118,8 @@ public class EnableAnnotationTest {
     }
 
     private Document readToDocument(byte[] xmlAsBytes, boolean nameSpaceAware)
-        throws ParserConfigurationException,
-        SAXException, IOException {
+            throws ParserConfigurationException,
+            SAXException, IOException {
 
         InputStream is = new ByteArrayInputStream(xmlAsBytes);
         DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -128,7 +127,7 @@ public class EnableAnnotationTest {
         DocumentBuilder builder = builderFactory.newDocumentBuilder();
         return builder.parse(is);
     }
-    
+
     private Node getEnableAnnotationTx1() throws XPathExpressionException {
         return (Node) xpath.evaluate("/blueprint/enable-annotations", document, XPathConstants.NODE);
     }

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=1804234&r1=1804233&r2=1804234&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 Aug  6 14:02:26 2017
@@ -49,7 +49,7 @@ public class BeanTest {
     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, null);
+    private final BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, null, null, null);
     private final Blueprint blueprint = new Blueprint(blueprintConfiguration);
 
     @Test

Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java?rev=1804234&r1=1804233&r2=1804234&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
(original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
Sun Aug  6 14:02:26 2017
@@ -20,8 +20,6 @@ package org.apache.aries.blueprint.plugi
 
 import org.apache.aries.blueprint.plugin.BlueprintConfigurationImpl;
 import org.apache.aries.blueprint.plugin.test.MyBean3;
-import org.apache.aries.blueprint.plugin.test.MyFactoryBean;
-import org.apache.aries.blueprint.plugin.test.MyProduced;
 import org.apache.aries.blueprint.plugin.test.ServiceReferences;
 import org.junit.Assert;
 import org.junit.Test;
@@ -42,7 +40,7 @@ public class BlueprintTest {
     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, null);
+    private final BlueprintConfigurationImpl blueprintConfiguration = new BlueprintConfigurationImpl(namespaces,
null, null, null, null);
 
     @Test
     public void testLists() {



Mime
View raw message