aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1072975 - in /aries/trunk: blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ jndi/ jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ util/src/main/java/org/apache/aries/util/ util/src/main/java/org/apache/ar...
Date Mon, 21 Feb 2011 14:18:52 GMT
Author: not
Date: Mon Feb 21 14:18:51 2011
New Revision: 1072975

URL: http://svn.apache.org/viewvc?rev=1072975&view=rev
Log:
ARIES-580 Move SingleServiceTracker back to the org.apache.aries.util package so we don't
break clients with [0.3,1) in their import range, since we are yet ready to do a util 1.0
release.

Added:
    aries/trunk/util/src/main/java/org/apache/aries/util/SingleServiceTracker.java
      - copied, changed from r1072934, aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
Removed:
    aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
    aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java
    aries/trunk/jndi/pom.xml
    aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java

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=1072975&r1=1072974&r2=1072975&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
Mon Feb 21 14:18:51 2011
@@ -40,9 +40,9 @@ import org.apache.aries.blueprint.utils.
 import org.apache.aries.blueprint.utils.HeaderParser.PathElement;
 import org.apache.aries.proxy.ProxyManager;
 import org.apache.aries.util.AriesFrameworkUtil;
+import org.apache.aries.util.SingleServiceTracker;
+import org.apache.aries.util.SingleServiceTracker.SingleServiceListener;
 import org.apache.aries.util.tracker.RecursiveBundleTracker;
-import org.apache.aries.util.tracker.SingleServiceTracker;
-import org.apache.aries.util.tracker.SingleServiceTracker.SingleServiceListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Modified: aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java?rev=1072975&r1=1072974&r2=1072975&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java (original)
+++ aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java Mon Feb
21 14:18:51 2011
@@ -24,8 +24,8 @@ import javax.naming.spi.ObjectFactory;
 
 import org.apache.aries.proxy.ProxyManager;
 import org.apache.aries.util.AriesFrameworkUtil;
-import org.apache.aries.util.tracker.SingleServiceTracker;
-import org.apache.aries.util.tracker.SingleServiceTracker.SingleServiceListener;
+import org.apache.aries.util.SingleServiceTracker;
+import org.apache.aries.util.SingleServiceTracker.SingleServiceListener;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;

Modified: aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/pom.xml?rev=1072975&r1=1072974&r2=1072975&view=diff
==============================================================================
--- aries/trunk/jndi/pom.xml (original)
+++ aries/trunk/jndi/pom.xml Mon Feb 21 14:18:51 2011
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
+        <artifactId>java6-parent</artifactId>
         <version>0.4-SNAPSHOT</version>
         <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
     </parent>  

Copied: aries/trunk/util/src/main/java/org/apache/aries/util/SingleServiceTracker.java (from
r1072934, aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java)
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/SingleServiceTracker.java?p2=aries/trunk/util/src/main/java/org/apache/aries/util/SingleServiceTracker.java&p1=aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java&r1=1072934&r2=1072975&rev=1072975&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java
(original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/SingleServiceTracker.java Mon Feb
21 14:18:51 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.util.tracker;
+package org.apache.aries.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;

Modified: aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java?rev=1072975&r1=1072974&r2=1072975&view=diff
==============================================================================
--- aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java (original)
+++ aries/trunk/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java Mon
Feb 21 14:18:51 2011
@@ -21,8 +21,7 @@ package org.apache.aries.util;
 import org.apache.aries.mocks.BundleContextMock;
 import org.apache.aries.unittest.mocks.MethodCall;
 import org.apache.aries.unittest.mocks.Skeleton;
-import org.apache.aries.util.tracker.SingleServiceTracker;
-import org.apache.aries.util.tracker.SingleServiceTracker.SingleServiceListener;
+import org.apache.aries.util.SingleServiceTracker.SingleServiceListener;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;



Mime
View raw message