Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.artifact-repository into 380765-shared-ivycache
Conflicts:
build.versions
diff --git a/build.versions b/build.versions
index fe3ce10..53c3467 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
-org.eclipse.virgo.util=3.6.0.D-20120717181632
org.aspectj=1.6.12.RELEASE
org.slf4j=1.6.1
org.slf4j.api=1.6.4.v20120130-2120
org.apache.commons.httpclient=3.1.0
-org.eclipse.virgo.medic=3.6.0.D-20120717201225
org.eclipse.osgi=3.8.0.v20120508-2119
+org.eclipse.virgo.medic=3.6.0.D-20120813141556
+org.eclipse.virgo.util=3.6.0.D-20120813140754
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.test=3.6.0.D-20120717182335
+org.eclipse.virgo.test=3.6.0.D-20120813141236
diff --git a/org.eclipse.virgo.repository/.classpath b/org.eclipse.virgo.repository/.classpath
index f0dfd62..a959cd8 100644
--- a/org.eclipse.virgo.repository/.classpath
+++ b/org.eclipse.virgo.repository/.classpath
@@ -23,20 +23,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-sources-3.6.0.D-20120717181632.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-3.6.0.D-20120717181632.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-sources-3.6.0.D-20120717181632.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-3.6.0.D-20120717181632.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120813140754/org.eclipse.virgo.util.io-3.6.0.D-20120813140754.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120813140754/org.eclipse.virgo.util.io-sources-3.6.0.D-20120813140754.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120813140754/org.eclipse.virgo.util.common-3.6.0.D-20120813140754.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120813140754/org.eclipse.virgo.util.common-sources-3.6.0.D-20120813140754.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120813140754/org.eclipse.virgo.util.osgi-3.6.0.D-20120813140754.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120813140754/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120813140754.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.codec/1.3.0/com.springsource.org.apache.commons.codec-1.3.0.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120717181632/org.eclipse.virgo.util.math-3.6.0.D-20120717181632.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120717181632/org.eclipse.virgo.util.math-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120813140754/org.eclipse.virgo.util.math-3.6.0.D-20120813140754.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120813140754/org.eclipse.virgo.util.math-sources-3.6.0.D-20120813140754.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-sources-3.6.0.D-20120717201225.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120813141556/org.eclipse.virgo.medic-3.6.0.D-20120813141556.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120813141556/org.eclipse.virgo.medic-sources-3.6.0.D-20120813141556.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-3.6.0.D-20120717201225.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-sources-3.6.0.D-20120717201225.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120813141556/org.eclipse.virgo.medic.test-3.6.0.D-20120813141556.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120813141556/org.eclipse.virgo.medic.test-sources-3.6.0.D-20120813141556.jar"/>
<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.BUILD-20090909/com.springsource.org.aspectj.runtime-sources-1.6.6.BUILD-20090909.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120813141236/org.eclipse.virgo.test.stubs-3.6.0.D-20120813141236.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120813140754/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120813140754.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/RepositoryBundleActivatorTests.java b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/RepositoryBundleActivatorTests.java
index 7b962df..87b38a5 100644
--- a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/RepositoryBundleActivatorTests.java
+++ b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/RepositoryBundleActivatorTests.java
@@ -18,9 +18,9 @@
import org.eclipse.virgo.medic.eventlog.EventLogger;
import org.eclipse.virgo.repository.RepositoryFactory;
import org.eclipse.virgo.repository.internal.RepositoryBundleActivator;
-import org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.support.ObjectClassFilter;
+import org.eclipse.virgo.test.stubs.framework.OSGiAssert;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.support.ObjectClassFilter;
public class RepositoryBundleActivatorTests {
diff --git a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/StandardRepositoryFactoryTests.java b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/StandardRepositoryFactoryTests.java
index b956063..56d9e6f 100644
--- a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/StandardRepositoryFactoryTests.java
+++ b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/StandardRepositoryFactoryTests.java
@@ -38,7 +38,7 @@
import org.eclipse.virgo.repository.internal.external.ExternalStorageRepository;
import org.eclipse.virgo.repository.internal.remote.RemoteRepository;
import org.eclipse.virgo.repository.internal.watched.WatchedStorageRepository;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
public class StandardRepositoryFactoryTests {
diff --git a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/eventlog/DynamicDelegationEventLoggerTests.java b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/eventlog/DynamicDelegationEventLoggerTests.java
index d417a5a..cd8f581 100644
--- a/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/eventlog/DynamicDelegationEventLoggerTests.java
+++ b/org.eclipse.virgo.repository/src/test/java/org/eclipse/virgo/repository/internal/eventlog/DynamicDelegationEventLoggerTests.java
@@ -22,8 +22,8 @@
import org.eclipse.virgo.medic.eventlog.LogEvent;
import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
import org.eclipse.virgo.repository.internal.eventlog.DynamicDelegationEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.support.ObjectClassFilter;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.support.ObjectClassFilter;
/**
