svn commit: r1792762 - in /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax: AbstractTransactionFactory.java CdiTransactionFactory.jav
Author: alien11689
Date: Wed Apr 26 16:30:07 2017
New Revision: 1792762
URL: http://svn.apache.org/viewvc?rev=1792762=rev
Log:
[ARIES-1712] Make abstract transaction factory package private
Modified:
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
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
Modified:
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=1792762=1792761=1792762=diff
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
(original)
+++
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
Wed Apr 26 16:30:07 2017
@@ -28,8 +28,8 @@ import java.lang.reflect.AnnotatedElemen
import java.lang.reflect.Method;
import java.util.List;
-public abstract class AbstractTransactionFactory
implements BeanAnnotationHandler, MethodAnnotationHandler {
-protected abstract String getTransactionTypeName(AnnotatedElement
annotatedElement);
+abstract class AbstractTransactionFactory implements
BeanAnnotationHandler, MethodAnnotationHandler {
+abstract String getTransactionTypeName(AnnotatedElement annotatedElement);
private static final String ENABLE_ANNOTATION =
"transaction.enableAnnotation";
@Override
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/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?rev=1792762=1792761=1792762=diff
==
---
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/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:30:07 2017
@@ -38,7 +38,8 @@ import java.util.List;
import java.util.Set;
public class CdiTransactionFactory extends
AbstractTransactionFactory {
-protected String getTransactionTypeName(AnnotatedElement annotatedElement)
{
+
+String getTransactionTypeName(AnnotatedElement annotatedElement) {
final Transactional transactional =
annotatedElement.getAnnotation(Transactional.class);
return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL,
transactional.value().name());
}
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=1792762=1792761=1792762=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:30:07 2017
@@ -37,7 +37,7 @@ import java.util.List;
public class JavaxTransactionFactory extends
AbstractTransactionFactory {
-protected String getTransactionTypeName(AnnotatedElement annotatedElement)
{
+String getTransactionTypeName(AnnotatedElement annotatedElement) {
Transactional transactional =
annotatedElement.getAnnotation(Transactional.class);
return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL,
transactional.value().name());
}
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/cd
Author: alien11689
Date: Wed Apr 26 16:24:36 2017
New Revision: 1792761
URL: http://svn.apache.org/viewvc?rev=1792761=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=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
+ *
+ * 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.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
implements BeanAnnotationHandler, MethodAnnotationHandler {
+protected abstract String getTransactionTypeName(AnnotatedElement
annotatedElement);
+
+private static final String ENABLE_ANNOTATION =
"transaction.enableAnnotation";
+@Override
+public void handleMethodAnnotation(Class clazz, List 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
svn commit: r1792759 - in /aries/trunk/blueprint/plugin: ./ blueprint-maven-plugin-itest/src/it/spring/ blueprint-maven-plugin-itest/src/it/spring/src/ blueprint-maven-plugin-itest/src/it/spring/src/m
Author: alien11689 Date: Wed Apr 26 15:55:00 2017 New Revision: 1792759 URL: http://svn.apache.org/viewvc?rev=1792759=rev Log: [ARIES-1721] Extract Spring annotation handlers to separate jar Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T2.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentBeanFinder.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ValueInjectionHandler.java aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler Removed: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ Modified:
svn commit: r1792736 - in /aries/trunk/blueprint/itests/blueprint-itests: ./ src/test/java/org/apache/aries/blueprint/itests/
Author: cschneider
Date: Wed Apr 26 11:34:50 2017
New Revision: 1792736
URL: http://svn.apache.org/viewvc?rev=1792736=rev
Log:
Update pax exam and equinox. Remove deprecated CompositeBundle tests
Removed:
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
Modified:
aries/trunk/blueprint/itests/blueprint-itests/pom.xml
Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1792736=1792735=1792736=diff
==
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Wed Apr 26 11:34:50
2017
@@ -28,10 +28,8 @@
../pom.xml
-org.apache.aries.blueprint
org.apache.aries.blueprint.itests
Apache Aries Blueprint iTests
-1.0.2-SNAPSHOT
Integration tests using the standalone blueprint-bundle for the
implementation
and blueprint-sample for the blueprint application to be tested.
@@ -44,15 +42,15 @@
-4.5.0
+4.10.0
2.2.0
-org.eclipse
+org.eclipse.platform
org.eclipse.osgi
-3.8.0.v20120529-1548
+3.11.3
provided
@@ -173,25 +171,25 @@
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundlea
test
-1.1.0-SNAPSHOT
+${project.version}
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundleb
test
-1.0.2-SNAPSHOT
+${project.version}
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundlee
test
-1.0.0-SNAPSHOT
+${project.version}
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundles
test
-1.0.0-SNAPSHOT
+${project.version}
org.apache.aries.blueprint
@@ -326,12 +324,12 @@
-org.ops4j.pax.exam
-maven-paxexam-plugin
+org.apache.servicemix.tooling
+depends-maven-plugin
+1.4.0
-generate-config
-generate-resources
+generate-depends-file
generate-depends-file
svn commit: r1792735 - in /aries/trunk/blueprint/itests: blueprint-itests/pom.xml blueprint-testbundlea/pom.xml blueprint-testbundleb/pom.xml blueprint-testbundlee/pom.xml blueprint-testbundles/pom.xm
Author: cschneider
Date: Wed Apr 26 11:34:42 2017
New Revision: 1792735
URL: http://svn.apache.org/viewvc?rev=1792735=rev
Log:
Use common parent for blueprint itests
Modified:
aries/trunk/blueprint/itests/blueprint-itests/pom.xml
aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml
aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml
aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml
aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml
aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml
aries/trunk/blueprint/itests/pom.xml
Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1792735=1792734=1792735=diff
==
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Wed Apr 26 11:34:42
2017
@@ -22,10 +22,10 @@
4.0.0
-org.apache.aries
-parent
-2.0.1
-../../parent/pom.xml
+org.apache.aries.blueprint
+blueprint-itests-parent
+1.1.0-SNAPSHOT
+../pom.xml
org.apache.aries.blueprint
@@ -56,10 +56,6 @@
provided
-org.osgi
-org.osgi.core
-
-
org.apache.aries.blueprint
org.apache.aries.blueprint.core
1.8.1-SNAPSHOT
Modified: aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml?rev=1792735=1792734=1792735=diff
==
--- aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml Wed Apr 26
11:34:42 2017
@@ -22,25 +22,18 @@
4.0.0
-org.apache.aries
-parent
-2.0.1
-../../parent/pom.xml
+org.apache.aries.blueprint
+blueprint-itests-parent
+1.1.0-SNAPSHOT
+../pom.xml
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundlea
Apache Aries Blueprint Test Bundle A
-1.1.0-SNAPSHOT
bundle
Blueprint Test Bundle A, provides NamespaceHandler,
BeanProcessor etc implementations for Test Bundle B
-
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlea
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlea
-
http://svn.apache.org/viewvc/aries/branches/trunk/blueprint-testbundlea
-
-
org.apache.aries.blueprint.testbundlea.Activator
@@ -49,23 +42,4 @@
${project.artifactId}*
-
-
-org.eclipse
-osgi
-3.5.0.v20090520
-provided
-
-
-org.apache.aries.blueprint
-org.apache.aries.blueprint.api
-1.0.0
-
-
-org.apache.aries.blueprint
-org.apache.aries.blueprint.core
-1.0.0
-
-
-
Modified: aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml?rev=1792735=1792734=1792735=diff
==
--- aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml Wed Apr 26
11:34:42 2017
@@ -22,25 +22,18 @@
4.0.0
-org.apache.aries
-parent
-2.0.1
-../../parent/pom.xml
+org.apache.aries.blueprint
+blueprint-itests-parent
+1.1.0-SNAPSHOT
+../pom.xml
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundleb
Apache Aries Blueprint Test Bundle B
-1.0.2-SNAPSHOT
bundle
Blueprint Test Bundle B, tests namespace handlers, bean
processors etc provided by Test Bundle A
-
-
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundleb
-
scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundleb
-
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundleb
-
-
org.apache.aries.blueprint.testbundleb.Activator
@@ -51,26 +44,10 @@
-org.eclipse
-osgi
-3.5.0.v20090520
-provided
-
-
-org.apache.aries.blueprint
-org.apache.aries.blueprint.api
-1.0.0
-
-
org.apache.aries.blueprint
org.apache.aries.blueprint.testbundlea
1.1.0-SNAPSHOT
-
svn commit: r1792711 - in /aries/trunk/blueprint: blueprint-bundle/ blueprint-core/src/main/java/org/apache/aries/blueprint/container/ itests/blueprint-itests/ itests/blueprint-itests/src/test/java/or
Author: cschneider
Date: Wed Apr 26 08:30:00 2017
New Revision: 1792711
URL: http://svn.apache.org/viewvc?rev=1792711=rev
Log:
Update blueprint dependencies to fix build
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
aries/trunk/blueprint/itests/blueprint-itests/pom.xml
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1792711=1792710=1792711=diff
==
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Wed Apr 26 08:30:00 2017
@@ -122,13 +122,13 @@
org.apache.aries.blueprint
org.apache.aries.blueprint.core
-1.6.3-SNAPSHOT
+1.8.1-SNAPSHOT
provided
org.apache.aries.blueprint
org.apache.aries.blueprint.cm
-1.0.10-SNAPSHOT
+1.1.1-SNAPSHOT
provided
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1792711=1792710=1792711=diff
==
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Wed Apr 26 08:30:00 2017
@@ -896,8 +896,6 @@ public class BlueprintContainerImpl
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(), getExtenderBundle()));
-AriesFrameworkUtil.safeUnregisterService(registration);
-
executors.shutdownNow();
if (handlerSet != null) {
handlerSet.removeListener(this);
@@ -916,6 +914,17 @@ public class BlueprintContainerImpl
LOGGER.debug("Blueprint container {} destroyed",
getBundle().getSymbolicName(), getBundle().getVersion());
}
+public static void safeUnregisterService(ServiceRegistration reg)
+{
+ if(reg != null) {
+try {
+ reg.unregister();
+} catch (IllegalStateException e) {
+ //This can be safely ignored
+}
+ }
+}
+
protected void quiesce() {
destroyed.set(true);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(), getExtenderBundle()));
Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1792711=1792710=1792711=diff
==
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Wed Apr 26 08:30:00
2017
@@ -62,7 +62,7 @@
org.apache.aries.blueprint
org.apache.aries.blueprint.core
-1.7.2-SNAPSHOT
+1.8.1-SNAPSHOT
org.apache.aries.blueprint
@@ -87,7 +87,7 @@
org.apache.aries.proxy
org.apache.aries.proxy
-1.0.7-SNAPSHOT
+1.1.0
org.apache.servicemix.bundles
@@ -139,7 +139,7 @@
org.apache.aries.blueprint
org.apache.aries.blueprint.cm
-1.0.10-SNAPSHOT
+1.1.1-SNAPSHOT
bundle
compile
Modified:
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java?rev=1792711=1792710=1792711=diff
==
---
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
(original)
+++
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
Wed Apr 26 08:30:00 2017
@@ -46,9 +46,8 @@ import
