aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1778587 - in /aries/trunk/blueprint: blueprint-cm/ blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ blueprint-core/ blueprint-core/src/main/java/org/apache/aries/blueprint/container/ blueprint-core/src/main/java/org/apa...
Date Fri, 13 Jan 2017 13:43:21 GMT
Author: cschneider
Date: Fri Jan 13 13:43:21 2017
New Revision: 1778587

URL: http://svn.apache.org/viewvc?rev=1778587&view=rev
Log:
[ARIES-1660] Make blueprint independent from aries util

Added:
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ServiceUtil.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceUtil.java
Removed:
    aries/trunk/blueprint/examples/blueprint-sample-annotation/pom.xml
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Account.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Activator.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Bar.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/Foo.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/InterfaceB.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/ListBindingListener.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/NewAccount.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/java/org/apache/aries/blueprint/sample/TestXmlConfigBean.java
    aries/trunk/blueprint/examples/blueprint-sample-annotation/src/main/resources/OSGI-INF/blueprint/config.xml
Modified:
    aries/trunk/blueprint/blueprint-cm/pom.xml
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/BaseManagedServiceFactory.java
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmProperties.java
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
    aries/trunk/blueprint/examples/pom.xml
    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/Helper.java

Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Jan 13 13:43:21 2017
@@ -56,7 +56,7 @@
         </aries.osgi.private.pkg>
 
         <blueprint.api.version>1.0.0</blueprint.api.version>
-        <blueprint.core.version>1.7.0-SNAPSHOT</blueprint.core.version>
+        <blueprint.core.version>1.7.1</blueprint.core.version>
         <blueprint.parser.version>1.4.0</blueprint.parser.version>
         <lastReleaseVersion>1.0.8</lastReleaseVersion>
     </properties>
@@ -88,6 +88,12 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
             <version>1.7.0</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.aries</groupId>
+            		<artifactId>org.apache.aries.util</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -105,6 +111,7 @@
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.googlecode.pojosr</groupId>
             <artifactId>de.kalpatec.pojosr.framework</artifactId>
@@ -120,7 +127,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/BaseManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/BaseManagedServiceFactory.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/BaseManagedServiceFactory.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/BaseManagedServiceFactory.java
Fri Jan 13 13:43:21 2017
@@ -34,6 +34,7 @@ import org.osgi.service.cm.ManagedServic
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("rawtypes")
 public abstract class BaseManagedServiceFactory<T> implements ManagedServiceFactory
{
 
     public static final long DEFAULT_TIMEOUT_BEFORE_INTERRUPT = 30000;

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
Fri Jan 13 13:43:21 2017
@@ -40,7 +40,6 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.service.blueprint.container.ReifiedType;
 import org.osgi.service.blueprint.reflect.BeanMetadata;
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
Fri Jan 13 13:43:21 2017
@@ -34,7 +34,6 @@ import org.apache.aries.blueprint.servic
 import org.apache.aries.blueprint.utils.JavaUtils;
 import org.apache.aries.blueprint.utils.ReflectionUtils;
 import org.apache.aries.blueprint.utils.ServiceListener;
-import org.apache.aries.util.AriesFrameworkUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -83,7 +82,7 @@ public class CmManagedServiceFactory ext
     }
 
     public void destroy() {
-        AriesFrameworkUtil.safeUnregisterService(registration);
+        ServiceUtil.safeUnregister(registration);
         super.destroy();
     }
 

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmProperties.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmProperties.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmProperties.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmProperties.java
Fri Jan 13 13:43:21 2017
@@ -23,12 +23,11 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
 import org.apache.aries.blueprint.ServiceProcessor;
+import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
 import org.apache.aries.blueprint.utils.JavaUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
Fri Jan 13 13:43:21 2017
@@ -26,7 +26,6 @@ import org.apache.aries.blueprint.ext.Pr
 import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
Fri Jan 13 13:43:21 2017
@@ -24,9 +24,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.aries.util.AriesFrameworkUtil;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
@@ -69,11 +66,11 @@ public class ManagedObjectManager {
             reg.remove(cm);
             if (reg.isEmpty()) {
                 map.remove(key);
-                AriesFrameworkUtil.safeUnregisterService(reg.getRegistration());
+                ServiceUtil.safeUnregister(reg.getRegistration());
             }
         }
     }
-            
+
     private static class ConfigurationWatcher implements ManagedService {
 
         private ServiceRegistration registration;

Added: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ServiceUtil.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ServiceUtil.java?rev=1778587&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ServiceUtil.java
(added)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ServiceUtil.java
Fri Jan 13 13:43:21 2017
@@ -0,0 +1,20 @@
+package org.apache.aries.blueprint.compendium.cm;
+
+import org.osgi.framework.ServiceRegistration;
+
+public final class ServiceUtil {
+
+    private ServiceUtil() {
+    }
+    
+    public static void safeUnregister(ServiceRegistration<?> sreg) {
+        if (sreg != null) {
+            try {
+                sreg.unregister();
+            } catch (Exception e) {
+                // Ignore
+            }
+        }
+    }
+
+}

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Jan 13 13:43:21 2017
@@ -80,7 +80,8 @@
             org.apache.aries.blueprint.namespace,
             org.apache.aries.blueprint.proxy,
             org.apache.aries.blueprint.services,
-            org.apache.aries.blueprint.utils.*
+            org.apache.aries.blueprint.utils.*,
+            org.apache.aries.util.tracker*
         </aries.osgi.private.pkg>
         <aries.osgi.export.service>
             org.apache.aries.blueprint.services.ParserService
@@ -92,7 +93,7 @@
         <blueprint.annotation.api.version>1.0.0</blueprint.annotation.api.version>
         <blueprint.api.version>1.0.0</blueprint.api.version>
         <blueprint.parser.version>1.4.0</blueprint.parser.version>
-        <proxy.api.version>1.0.0</proxy.api.version>
+        <proxy.api.version>1.1.0-SNAPSHOT</proxy.api.version>
         <proxy.impl.version>1.0.3</proxy.impl.version>
         <quiesce.api.version>1.0.0</quiesce.api.version>
         <util.version>1.0.0</util.version>
@@ -136,6 +137,7 @@
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <version>${util.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

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=1778587&r1=1778586&r2=1778587&view=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
Fri Jan 13 13:43:21 2017
@@ -66,6 +66,7 @@ import org.apache.aries.blueprint.servic
 import org.apache.aries.blueprint.utils.HeaderParser;
 import org.apache.aries.blueprint.utils.HeaderParser.PathElement;
 import org.apache.aries.blueprint.utils.JavaUtils;
+import org.apache.aries.blueprint.utils.ServiceUtil;
 import org.apache.aries.proxy.ProxyManager;
 import org.apache.aries.util.AriesFrameworkUtil;
 import org.osgi.framework.Bundle;
@@ -917,7 +918,7 @@ public class BlueprintContainerImpl
         eventDispatcher.blueprintEvent(new BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(),
getExtenderBundle()));
 
         cancelFutureIfPresent();
-        AriesFrameworkUtil.safeUnregisterService(registration);
+        ServiceUtil.safeUnregisterService(registration);
         if (handlerSet != null) {
             handlerSet.removeListener(this);
             handlerSet.destroy();

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Fri Jan 13 13:43:21 2017
@@ -38,10 +38,10 @@ import org.apache.aries.blueprint.servic
 import org.apache.aries.blueprint.services.ParserService;
 import org.apache.aries.blueprint.utils.HeaderParser;
 import org.apache.aries.blueprint.utils.HeaderParser.PathElement;
+import org.apache.aries.blueprint.utils.ServiceUtil;
 import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper;
 import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper.ScheduledExecutorServiceFactory;
 import org.apache.aries.proxy.ProxyManager;
-import org.apache.aries.util.AriesFrameworkUtil;
 import org.apache.aries.util.tracker.RecursiveBundleTracker;
 import org.apache.aries.util.tracker.SingleServiceTracker;
 import org.apache.aries.util.tracker.SingleServiceTracker.SingleServiceListener;
@@ -170,9 +170,9 @@ public class BlueprintExtender implement
 
         stopping = true;
 
-        AriesFrameworkUtil.safeUnregisterService(parserServiceReg);
-        AriesFrameworkUtil.safeUnregisterService(blueprintServiceReg);
-        AriesFrameworkUtil.safeUnregisterService(quiesceParticipantReg);
+        ServiceUtil.safeUnregisterService(parserServiceReg);
+        ServiceUtil.safeUnregisterService(blueprintServiceReg);
+        ServiceUtil.safeUnregisterService(quiesceParticipantReg);
 
         // Orderly shutdown of containers
         while (!containers.isEmpty()) {

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
Fri Jan 13 13:43:21 2017
@@ -47,8 +47,8 @@ import org.apache.aries.blueprint.proxy.
 import org.apache.aries.blueprint.utils.JavaUtils;
 import org.apache.aries.blueprint.utils.ReflectionUtils;
 import org.apache.aries.blueprint.utils.ServiceListener;
+import org.apache.aries.blueprint.utils.ServiceUtil;
 import org.apache.aries.proxy.InvocationListener;
-import org.apache.aries.util.AriesFrameworkUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
@@ -192,7 +192,7 @@ public class ServiceRecipe extends Abstr
         if (registration.get() == null) {
             ServiceRegistration reg = blueprintContainer.registerService(classArray, new
TriggerServiceFactory(this, metadata), props);
             if (!registration.compareAndSet(null, reg) && registration.get() != reg)
{
-                AriesFrameworkUtil.safeUnregisterService(reg);
+                ServiceUtil.safeUnregisterService(reg);
             }
         }
         initialServiceRegistration = false;
@@ -210,7 +210,7 @@ public class ServiceRecipe extends Abstr
                     listener.unregister(service, registrationProperties);
                 }
             }
-            AriesFrameworkUtil.safeUnregisterService(reg);
+            ServiceUtil.safeUnregisterService(reg);
             
             registration.compareAndSet(reg, null);
         }

Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceUtil.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceUtil.java?rev=1778587&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceUtil.java
(added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceUtil.java
Fri Jan 13 13:43:21 2017
@@ -0,0 +1,36 @@
+/**
+ * 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.utils;
+
+import org.osgi.framework.ServiceRegistration;
+
+public final class ServiceUtil {
+    
+    private ServiceUtil() {
+    }
+    
+    public static void safeUnregisterService(ServiceRegistration<?> reg) 
+    {
+      if(reg != null) {
+        try {
+          reg.unregister();
+        } catch (IllegalStateException e) {
+          //This can be safely ignored
+        }
+      }
+    }
+}

Modified: aries/trunk/blueprint/examples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/examples/pom.xml?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/examples/pom.xml (original)
+++ aries/trunk/blueprint/examples/pom.xml Fri Jan 13 13:43:21 2017
@@ -39,7 +39,6 @@
 
     <modules>
         <module>blueprint-sample</module>
-        <module>blueprint-sample-annotation</module>
         <module>blueprint-sample-fragment</module>
         <module>blueprint-sample-war</module>
     </modules>

Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Fri Jan 13 13:43:21 2017
@@ -86,8 +86,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>1.0.3</version>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>1.0.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -162,12 +162,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-            <scope>test</scope>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>

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=1778587&r1=1778586&r2=1778587&view=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
Fri Jan 13 13:43:21 2017
@@ -71,10 +71,11 @@ public abstract class AbstractBlueprintI
         }
         return composite(
                 junitBundles(),
-                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
                 when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository="
+ localRepo)),
                 mvnBundle("org.ops4j.pax.logging", "pax-logging-api"),
-                mvnBundle("org.ops4j.pax.logging", "pax-logging-service")
+                mvnBundle("org.ops4j.pax.logging", "pax-logging-service"),
+                systemProperty("pax.exam.osgi.unresolved.fail").value("true")
          );
     }
     

Modified: aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1778587&r1=1778586&r2=1778587&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
(original)
+++ aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
Fri Jan 13 13:43:21 2017
@@ -66,9 +66,7 @@ public class Helper {
                 mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
                 mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
                 mvnBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
-                mvnBundle("org.apache.aries", "org.apache.aries.util"),
-                mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
-                mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
+                mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
                 mvnBundle("org.apache.commons", "commons-jexl"),
                 mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
                 mvnBundle("org.apache.xbean", "xbean-asm5-shaded"),



Mime
View raw message