Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.test into 380765-shared-ivycache
Conflicts:
build.versions
org.eclipse.virgo.test.framework/ivy.xml
org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java
org.eclipse.virgo.test.launcher/ivy.xml
org.eclipse.virgo.test.launcher/smoke-test.xml
diff --git a/build.properties b/build.properties
index 6e1fd55..0c66ffe 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,6 @@
version=3.6.0
release.type=integration
-bucket.basename=springsource.com
-#zodiac.springsource.com?
-project.name=SpringSource OSGi Test Framework
+project.name=Virgo Test Framework
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache=ivy-cache
ivy.cache.dir=${user.home}/ivy/ivy-cache
diff --git a/build.versions b/build.versions
index 23cd4f6..79fbb27 100644
--- a/build.versions
+++ b/build.versions
@@ -2,7 +2,7 @@
org.aspectj=1.6.12.RELEASE
org.eclipse.osgi=3.8.0.v20120508-2119
org.eclipse.osgi.services=3.3.0.v20120307-2102
-org.eclipse.virgo.util=3.6.0.D-20120717181632
+org.eclipse.virgo.util=3.6.0.D-20120813140754
# Test
org.junit=4.7.0
@@ -11,4 +11,3 @@
org.apache.commons=1.4.1
org.apache.oro=2.0.8
-
diff --git a/org.eclipse.virgo.test.framework/.classpath b/org.eclipse.virgo.test.framework/.classpath
index de0f51f..b747be9 100644
--- a/org.eclipse.virgo.test.framework/.classpath
+++ b/org.eclipse.virgo.test.framework/.classpath
@@ -5,12 +5,12 @@
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_FRAMEWORK_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="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_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="/TEST_FRAMEWORK_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="TEST_FRAMEWORK_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="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120711092707.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_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="TEST_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="/TEST_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="TEST_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/TEST_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.test.launcher"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.test.stubs"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120813140754/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120813140754.jar" sourcepath="/TEST_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120813140754/org.eclipse.virgo.util.parser.launcher-sources-3.6.0.D-20120813140754.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.test.framework/ivy.xml b/org.eclipse.virgo.test.framework/ivy.xml
index 0c8bcf0..8cc559a 100644
--- a/org.eclipse.virgo.test.framework/ivy.xml
+++ b/org.eclipse.virgo.test.framework/ivy.xml
@@ -19,7 +19,6 @@
<dependencies>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}"/>
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.launcher" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.common" rev="${org.eclipse.virgo.util}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.stubs" rev="latest.integration" conf="test->compile"/>
</dependencies>
diff --git a/org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java b/org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java
index 17be7ff..f63a26d 100644
--- a/org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java
+++ b/org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java
@@ -12,9 +12,8 @@
package org.eclipse.virgo.test.framework;
import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
-//import org.eclipse.virgo.osgi.extensions.equinox.hooks.BundleFileClosingBundleFileWrapperFactoryHook;
-import org.eclipse.virgo.osgi.launcher.FrameworkBuilder;
-import org.eclipse.virgo.osgi.launcher.FrameworkBuilder.FrameworkCustomizer;
+import org.eclipse.virgo.test.launcher.FrameworkBuilder;
+import org.eclipse.virgo.test.launcher.FrameworkBuilder.FrameworkCustomizer;
import org.eclipse.virgo.test.framework.plugin.PluginManager;
import org.eclipse.virgo.util.common.PropertyPlaceholderResolver;
import org.junit.runner.notification.Failure;
@@ -111,6 +110,7 @@
}
}
unregisterVirgoMBeans(notifier);
+ // TODO confirm that this can be removed as nested frameworks are no longer used
//BundleFileClosingBundleFileWrapperFactoryHook.getInstance().cleanup();
}
}
diff --git a/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/DmKernelTestRunnerTests.java b/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/DmKernelTestRunnerTests.java
index 23dd7ab..e615f5f 100644
--- a/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/DmKernelTestRunnerTests.java
+++ b/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/DmKernelTestRunnerTests.java
@@ -23,8 +23,8 @@
import org.junit.runners.model.InitializationError;
import org.osgi.framework.BundleContext;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.support.TrueFilter;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.support.TrueFilter;
import javax.management.MalformedObjectNameException;
diff --git a/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/RegionDependenciesDmKernelRunnerTests.java b/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/RegionDependenciesDmKernelRunnerTests.java
index 1d23ba7..b08caf7 100644
--- a/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/RegionDependenciesDmKernelRunnerTests.java
+++ b/org.eclipse.virgo.test.framework/src/test/java/org/eclipse/virgo/test/framework/dmkernel/RegionDependenciesDmKernelRunnerTests.java
@@ -25,9 +25,9 @@
import java.util.Properties;
import org.eclipse.virgo.test.framework.BundleEntry;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.support.TrueFilter;
+import org.eclipse.virgo.test.stubs.framework.StubBundle;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runners.model.InitializationError;
diff --git a/org.eclipse.virgo.test.launcher/.classpath b/org.eclipse.virgo.test.launcher/.classpath
index 6915375..1958a96 100644
--- a/org.eclipse.virgo.test.launcher/.classpath
+++ b/org.eclipse.virgo.test.launcher/.classpath
@@ -21,7 +21,8 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="OSGI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="OSGI_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/OSGI_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="TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_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="TEST_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120813140754/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120813140754.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.test.launcher/.project b/org.eclipse.virgo.test.launcher/.project
index 6d8d337..bbea233 100644
--- a/org.eclipse.virgo.test.launcher/.project
+++ b/org.eclipse.virgo.test.launcher/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.virgo.osgi.launcher</name>
+ <name>org.eclipse.virgo.test.launcher</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.virgo.test.launcher/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.test.launcher/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.test.launcher/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.test.launcher/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.test.launcher/ivy.xml b/org.eclipse.virgo.test.launcher/ivy.xml
index 57268b3..51695e6 100644
--- a/org.eclipse.virgo.test.launcher/ivy.xml
+++ b/org.eclipse.virgo.test.launcher/ivy.xml
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.launcher" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.launcher" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
</dependencies>
diff --git a/org.eclipse.virgo.test.launcher/smoke-test.xml b/org.eclipse.virgo.test.launcher/smoke-test.xml
index 3602f71..cf802db 100644
--- a/org.eclipse.virgo.test.launcher/smoke-test.xml
+++ b/org.eclipse.virgo.test.launcher/smoke-test.xml
@@ -4,22 +4,20 @@
<property name="console.port" value="2401"/>
<property name="test.bundle" value="src/test/resources/test-bundle"/>
- <target name="smoke-test"
- description="Runs a smoke test on the OSGi Launcher">
+ <target name="smoke-test" description="Runs a smoke test on the OSGi Launcher">
<antcall target="startup"/>
<antcall target="shutdown"/>
</target>
<target name="startup">
<ivy:cachepath resolveId="osgi.classpath" pathid="osgi.classpath" organisation="org.eclipse.virgo.mirrored"
- module="org.eclipse.osgi" revision="${org.eclipse.osgi}"
- conf="runtime" type="jar" inline="true" log="download-only"/>
- <ivy:cachepath resolveId="parser.launcher.classpath" pathid="parser.launcher.classpath" organisation="org.eclipse.virgo.util"
- module="org.eclipse.virgo.util.parser.launcher" revision="${org.eclipse.virgo.util}"
- conf="runtime" type="jar" inline="true" log="download-only"/>
+ module="org.eclipse.osgi" revision="${org.eclipse.osgi}" conf="runtime" type="jar" inline="true"/>
+ <ivy:cachepath resolveId="parser.launcher.classpath" pathid="parser.launcher.classpath" organisation="org.eclipse.virgo.util"
+ module="org.eclipse.virgo.util.parser.launcher" revision="${org.eclipse.virgo.util}" conf="runtime" type="jar" inline="true"/>
+
<echo message="Starting Up OSGi Launcher" />
- <java classname="org.eclipse.virgo.osgi.launcher.Launcher" fork="true" spawn="true">
+ <java classname="org.eclipse.virgo.test.launcher.Launcher" fork="true" spawn="true">
<arg value="-Fosgi.console=${console.port}"/>
<arg value="-Fosgi.console.enable.builtin=true"/>
@@ -28,7 +26,7 @@
<classpath>
<pathelement location="${jar.output.file}"/>
<path refid="osgi.classpath"/>
- <path refid="parser.launcher.classpath"/>
+ <path refid="parser.launcher.classpath"/>
</classpath>
</java>
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkBuilder.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkBuilder.java
index 5b99f65..808794b 100644
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkBuilder.java
+++ b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkBuilder.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import java.io.File;
import java.net.URI;
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocator.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocator.java
index fb5d8e3..cf48ef2 100644
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocator.java
+++ b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import java.util.Set;
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/JavaVersionChecker.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/JavaVersionChecker.java
deleted file mode 100644
index 9f26301..0000000
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/JavaVersionChecker.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.osgi.launcher;
-
-/**
- * JavaVersionChecker is specifically designed to check for the version of Java being used for dm Server 2.0.
- * It is run as part of the startup protocol before the server is launched.
- * <p />
- * If the Java version is correct this call is silent, and returns zero <code>System.exit(0)</code>.<br/>
- * If the version is not set or incorrect, a single line is output (in English) and this process returns -1 <code>System.exit(-1)</code>
- * <p/>
- *
- * <strong>Concurrent Semantics</strong><br />
- * Main thread run synchronously.
- *
- * @see "http://java.sun.com/j2se/versioning_naming.html"
- */
-public class JavaVersionChecker {
-
- /**
- * No parameters are expected; this version check is specific for dm Server 2.0.
- * @param args non expected
- */
- public static void main(String[] args) {
- String javaVersion = System.getProperty("java.version");
- if (javaVersion==null) {
- System.out.println("JavaVersionChecker: no java.version property found.");
- System.exit(-1);
- }
-
- if (!javaVersion.startsWith("1.6.") && !javaVersion.startsWith("1.7.")) {
- System.out.println("JavaVersionChecker: Java version must be at 1.6 (detected version "+javaVersion+").");
- System.exit(-1);
- }
- System.exit(0);
- }
-}
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/Launcher.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/Launcher.java
index a7eed31..3ea61cc 100644
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/Launcher.java
+++ b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/Launcher.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import java.io.File;
import java.io.IOException;
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolver.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolver.java
index 76436f2..6aff419 100644
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolver.java
+++ b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolver.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import java.util.Enumeration;
import java.util.Properties;
diff --git a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/ServiceLoader.java b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/ServiceLoader.java
index c282953..71066de 100644
--- a/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/ServiceLoader.java
+++ b/org.eclipse.virgo.test.launcher/src/main/java/org/eclipse/virgo/test/launcher/ServiceLoader.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkBuilderTests.java b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkBuilderTests.java
index 1247272..fc2d9c9 100644
--- a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkBuilderTests.java
+++ b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkBuilderTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -18,7 +18,7 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-import org.eclipse.virgo.osgi.launcher.FrameworkBuilder;
+import org.eclipse.virgo.test.launcher.FrameworkBuilder;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocatorTests.java b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocatorTests.java
index 38bc9ec..9db0852 100644
--- a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocatorTests.java
+++ b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/FrameworkFactoryLocatorTests.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import static org.junit.Assert.assertNotNull;
-import org.eclipse.virgo.osgi.launcher.FrameworkFactoryLocator;
+import org.eclipse.virgo.test.launcher.FrameworkFactoryLocator;
import org.junit.Test;
import org.osgi.framework.launch.FrameworkFactory;
diff --git a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/LauncherTests.java b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/LauncherTests.java
index 6e49657..5e31037 100644
--- a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/LauncherTests.java
+++ b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/LauncherTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -17,7 +17,7 @@
import java.io.File;
import java.io.IOException;
-import org.eclipse.virgo.osgi.launcher.Launcher;
+import org.eclipse.virgo.test.launcher.Launcher;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolverTests.java b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolverTests.java
index ae1dce7..3cc66a1 100644
--- a/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolverTests.java
+++ b/org.eclipse.virgo.test.launcher/src/test/java/org/eclipse/virgo/test/launcher/PropertyPlaceholderResolverTests.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.osgi.launcher;
+package org.eclipse.virgo.test.launcher;
import static org.junit.Assert.assertEquals;
import java.util.Properties;
-import org.eclipse.virgo.osgi.launcher.PropertyPlaceholderResolver;
+import org.eclipse.virgo.test.launcher.PropertyPlaceholderResolver;
import org.junit.Test;
diff --git a/org.eclipse.virgo.test.stubs/.classpath b/org.eclipse.virgo.test.stubs/.classpath
index b136dd0..a7bd023 100644
--- a/org.eclipse.virgo.test.stubs/.classpath
+++ b/org.eclipse.virgo.test.stubs/.classpath
@@ -21,10 +21,10 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TEST_STUBS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_STUBS_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="TEST_STUBS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_STUBS_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="TEST_STUBS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/TEST_STUBS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="TEST_STUBS_IVY_CACHE"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_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="TEST_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/TEST_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.test.stubs/.project b/org.eclipse.virgo.test.stubs/.project
index 13077b8..963e889 100644
--- a/org.eclipse.virgo.test.stubs/.project
+++ b/org.eclipse.virgo.test.stubs/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.virgo.teststubs.osgi</name>
+ <name>org.eclipse.virgo.test.stubs</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.virgo.test.stubs/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.test.stubs/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/org.eclipse.virgo.test.stubs/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.test.stubs/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/FindEntriesDelegate.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/FindEntriesDelegate.java
index 20b9e27..0f72145 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/FindEntriesDelegate.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/FindEntriesDelegate.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
import java.util.Enumeration;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/OSGiAssert.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/OSGiAssert.java
index 4ebadf3..f71152a 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/OSGiAssert.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/OSGiAssert.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundle.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundle.java
index 957feb9..ca49c39 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundle.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundle.java
@@ -9,10 +9,10 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
-import static org.eclipse.virgo.teststubs.osgi.internal.Duplicator.shallowCopy;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Duplicator.shallowCopy;
import java.io.File;
import java.io.IOException;
@@ -47,7 +47,7 @@
private static final Long DEFAULT_BUNDLE_ID = Long.valueOf(1);
- private static final String DEFAULT_SYMBOLIC_NAME = "org.eclipse.virgo.teststubs.osgi.testbundle";
+ private static final String DEFAULT_SYMBOLIC_NAME = "org.eclipse.virgo.test.stubs.testbundle";
private static final Version DEFAULT_VERSION = Version.emptyVersion;
@@ -124,7 +124,7 @@
/**
* Creates a new {@link StubServiceRegistration} and sets its initial state. This constructor sets
* <code>bundleId</code> to <code>1</code>, <code>symbolicName</code> to
- * <code>org.eclipse.virgo.teststubs.osgi.testbundle</code>, <code>version</code> to <code>0.0.0</code>, and
+ * <code>org.eclipse.virgo.test.stubs.testbundle</code>, <code>version</code> to <code>0.0.0</code>, and
* <code>location</code> to <code>/</code>.
*/
public StubBundle() {
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundleContext.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundleContext.java
index 8dbc1ce..e787494 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundleContext.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubBundleContext.java
@@ -9,10 +9,10 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
-import static org.eclipse.virgo.teststubs.osgi.internal.Duplicator.shallowCopy;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Duplicator.shallowCopy;
import java.io.File;
import java.io.InputStream;
@@ -37,7 +37,7 @@
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
-import org.eclipse.virgo.teststubs.osgi.support.TrueFilter;
+import org.eclipse.virgo.test.stubs.support.TrueFilter;
/**
* A stub testing implementation of {@link BundleContext} as defined in section 6.1.6 of the OSGi Service Platform Core
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubFilter.java
index 4526476..b8f619f 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubFilter.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
import org.osgi.framework.Filter;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceReference.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceReference.java
index 697ceb4..3236008 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceReference.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceReference.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistration.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistration.java
index 3a5847f..7aa1af9 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistration.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistration.java
@@ -9,10 +9,10 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
-import static org.eclipse.virgo.teststubs.osgi.internal.Duplicator.shallowCopy;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Duplicator.shallowCopy;
import java.util.Arrays;
import java.util.Dictionary;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/UpdateDelegate.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/UpdateDelegate.java
index 001e1bf..998a45b 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/UpdateDelegate.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/UpdateDelegate.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
import java.io.InputStream;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/AspectPrecedence.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/AspectPrecedence.aj
index 91aa4f1..9068d74 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/AspectPrecedence.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/AspectPrecedence.aj
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
/**
* An aspect that defines the precendence of the aspects in this project
@@ -22,6 +22,6 @@
*/
public final aspect AspectPrecedence {
- declare precedence: org.eclipse.virgo.teststubs.osgi.framework.aspects.Valid*, *, org.eclipse.virgo.teststubs.osgi.framework.aspects.*Events;
+ declare precedence: org.eclipse.virgo.test.stubs.framework.aspects.Valid*, *, org.eclipse.virgo.test.stubs.framework.aspects.*Events;
}
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleEvents.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleEvents.aj
index 946573c..9ab6428 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleEvents.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleEvents.aj
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
import java.util.List;
@@ -18,8 +18,8 @@
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubBundle;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
/**
* Sends {@link BundleEvent}s to {@link BundleListener}s.
@@ -41,9 +41,9 @@
*/
after(StubBundleContext context, Bundle bundle) :
this(context) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext.installBundle(..)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundleContext.installBundle(..)) &&
target(bundle) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.INSTALLED)) {
sendEvent(context.getBundleListeners(), new BundleEvent(BundleEvent.INSTALLED, bundle));
}
@@ -55,8 +55,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.start(int)) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.start(int)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.STARTING)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.STARTING, bundle));
@@ -79,8 +79,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.start(int)) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.start(int)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.ACTIVE)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.STARTED, bundle));
@@ -93,8 +93,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.stop(int)) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.stop(int)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.STOPPING)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.STOPPING, bundle));
@@ -107,8 +107,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.stop(int)) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.stop(int)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.RESOLVED)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.STOPPED, bundle));
@@ -121,8 +121,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.update(..)) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.update(..)) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.INSTALLED)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.UPDATED, bundle));
@@ -136,8 +136,8 @@
*/
after(StubBundle bundle) :
this(bundle) &&
- withincode(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.uninstall()) &&
- call(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.setState(int)) &&
+ withincode(* org.eclipse.virgo.test.stubs.framework.StubBundle.uninstall()) &&
+ call(* org.eclipse.virgo.test.stubs.framework.StubBundle.setState(int)) &&
if(thisJoinPoint.getArgs()[0].equals(Bundle.UNINSTALLED)) {
StubBundleContext bundleContext = (StubBundleContext) bundle.getBundleContext();
sendEvent(bundleContext.getBundleListeners(), new BundleEvent(BundleEvent.UNINSTALLED, bundle));
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleModifier.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleModifier.aj
index d033d14..ee5922d 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleModifier.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleModifier.aj
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
import java.util.Date;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
+import org.eclipse.virgo.test.stubs.framework.StubBundle;
/**
* Updates the <code>lastModified</code> time on a bundle when it's modified.
@@ -27,9 +27,9 @@
public final aspect BundleModifier {
private pointcut modifyingMethod(StubBundle bundle) : this(bundle) && (
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.uninstall()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.reset()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.update(..))
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.uninstall()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.reset()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.update(..))
);
/**
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleValid.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleValid.aj
index 4c7f00e..f769a68 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleValid.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/BundleValid.aj
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
import org.osgi.framework.Bundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
+import org.eclipse.virgo.test.stubs.framework.StubBundle;
/**
* Ensures that a bundle has not been uninstalled before method execution
@@ -27,18 +27,18 @@
public final aspect BundleValid {
private pointcut ensureNotUninstalledMethod(StubBundle bundle) : this(bundle) && (
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getEntry(String)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getEntryPaths(String)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getRegisteredServices()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getResource(String)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getResources(String)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.getServicesInUse()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.hasPermission(Object)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.loadClass(String)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.start(int)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.stop(int)) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.uninstall()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundle.update(..))
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getEntry(String)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getEntryPaths(String)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getRegisteredServices()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getResource(String)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getResources(String)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.getServicesInUse()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.hasPermission(Object)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.loadClass(String)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.start(int)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.stop(int)) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.uninstall()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundle.update(..))
);
/**
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ServiceEvents.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ServiceEvents.aj
index beeec4d..9fc141a 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ServiceEvents.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ServiceEvents.aj
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
import java.util.List;
@@ -17,8 +17,8 @@
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceRegistration;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubServiceRegistration;
/**
* Sends {@link ServiceEvent}s to {@link ServiceListener}s.
@@ -39,7 +39,7 @@
*/
after(StubServiceRegistration registration) :
this(registration) &&
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration.setProperties(*)) {
+ execution(* org.eclipse.virgo.test.stubs.framework.StubServiceRegistration.setProperties(*)) {
sendEvent(registration.getBundleContext().getServiceListeners(), new ServiceEvent(ServiceEvent.MODIFIED, registration.getReference()));
}
@@ -51,7 +51,7 @@
*/
after(StubBundleContext context) returning (ServiceRegistration<?> registration) :
this(context) &&
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext.registerService(java.lang.String[], java.lang.Object, java.util.Dictionary)) {
+ execution(* org.eclipse.virgo.test.stubs.framework.StubBundleContext.registerService(java.lang.String[], java.lang.Object, java.util.Dictionary)) {
sendEvent(context.getServiceListeners(), new ServiceEvent(ServiceEvent.REGISTERED, registration.getReference()));
}
@@ -63,7 +63,7 @@
*/
before(StubServiceRegistration registration) :
this(registration) &&
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration.unregister()) {
+ execution(* org.eclipse.virgo.test.stubs.framework.StubServiceRegistration.unregister()) {
sendEvent(registration.getBundleContext().getServiceListeners(), new ServiceEvent(ServiceEvent.UNREGISTERING, registration.getReference()));
}
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidBundleContext.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidBundleContext.aj
index a172787..fd73754 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidBundleContext.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidBundleContext.aj
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
import org.osgi.framework.Bundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
/**
* Ensures that a bundle context is in {@link Bundle#STARTING}, {@link Bundle#ACTIVE}, or {@link Bundle#STOPPING} before
@@ -36,7 +36,7 @@
*/
before(StubBundleContext bundleContext) :
this(bundleContext) &&
- within(org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext) &&
+ within(org.eclipse.virgo.test.stubs.framework.StubBundleContext) &&
execution(* org.osgi.framework.BundleContext.*(..)) {
int state = bundleContext.getContextBundle().getState();
if (state != Bundle.STARTING && state != Bundle.ACTIVE && state != Bundle.STOPPING) {
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidServiceRegistration.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidServiceRegistration.aj
index 4c2f4c8..c0f809e 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidServiceRegistration.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/framework/aspects/ValidServiceRegistration.aj
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework.aspects;
+package org.eclipse.virgo.test.stubs.framework.aspects;
-import org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration;
+import org.eclipse.virgo.test.stubs.framework.StubServiceRegistration;
/**
* Ensures that a bundle has not been unregistered before method execution
@@ -25,8 +25,8 @@
public final aspect ValidServiceRegistration {
private pointcut ensureNotUninstalledMethod(StubServiceRegistration registration) : this(registration) && (
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration.getReference()) ||
- execution(* org.eclipse.virgo.teststubs.osgi.framework.StubServiceRegistration.unregister())
+ execution(* org.eclipse.virgo.test.stubs.framework.StubServiceRegistration.getReference()) ||
+ execution(* org.eclipse.virgo.test.stubs.framework.StubServiceRegistration.unregister())
);
/**
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Assert.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Assert.java
index d239fab..a34e1a5 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Assert.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Assert.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.internal;
+package org.eclipse.virgo.test.stubs.internal;
/**
* A set of internal assertions for the OSGi test stubs
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Duplicator.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Duplicator.java
index 7a7ae5e..d095680 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Duplicator.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/internal/Duplicator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.internal;
+package org.eclipse.virgo.test.stubs.internal;
import java.util.ArrayList;
import java.util.Dictionary;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfiguration.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfiguration.java
index 32be54d..6f4bfc4 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfiguration.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfiguration.java
@@ -9,10 +9,10 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.cm;
+package org.eclipse.virgo.test.stubs.service.cm;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
-import static org.eclipse.virgo.teststubs.osgi.internal.Duplicator.shallowCopy;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Duplicator.shallowCopy;
import java.io.IOException;
import java.util.Dictionary;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdmin.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdmin.java
index 8d9258f..f336d75 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdmin.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdmin.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.cm;
+package org.eclipse.virgo.test.stubs.service.cm;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
import java.io.IOException;
import java.util.HashMap;
@@ -24,8 +24,8 @@
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import org.eclipse.virgo.teststubs.osgi.support.PropertiesFilter;
-import org.eclipse.virgo.teststubs.osgi.support.TrueFilter;
+import org.eclipse.virgo.test.stubs.support.PropertiesFilter;
+import org.eclipse.virgo.test.stubs.support.TrueFilter;
/**
* A stub testing implementation of {@link ConfigurationAdmin} as defined in section 104.15.3 of the OSGi Service Platform
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/aspects/DeletedConfiguration.aj b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/aspects/DeletedConfiguration.aj
index 19b4f3a..b1629f9 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/aspects/DeletedConfiguration.aj
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/cm/aspects/DeletedConfiguration.aj
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.cm.aspects;
+package org.eclipse.virgo.test.stubs.service.cm.aspects;
import org.osgi.service.cm.Configuration;
-import org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration;
+import org.eclipse.virgo.test.stubs.service.cm.StubConfiguration;
/**
* Ensures that a configuration has not been deleted before method execution
@@ -35,11 +35,11 @@
*/
before(StubConfiguration configuration) :
this(configuration) &&
- within(org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration) &&
+ within(org.eclipse.virgo.test.stubs.service.cm.StubConfiguration) &&
execution(* org.osgi.service.cm.Configuration.*(..)) &&
- !execution(* org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration.equals(Object)) &&
- !execution(int org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration.hashCode()) &&
- !execution(java.lang.String org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration.toString()) {
+ !execution(* org.eclipse.virgo.test.stubs.service.cm.StubConfiguration.equals(Object)) &&
+ !execution(int org.eclipse.virgo.test.stubs.service.cm.StubConfiguration.hashCode()) &&
+ !execution(java.lang.String org.eclipse.virgo.test.stubs.service.cm.StubConfiguration.toString()) {
if (configuration.getDeleted()) {
throw new IllegalStateException("This configuration has been deleted");
}
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContext.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContext.java
index 5fa70ee..ebb4ecc 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContext.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContext.java
@@ -9,7 +9,7 @@
* SAP AG - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.component;
+package org.eclipse.virgo.test.stubs.service.component;
import java.util.Dictionary;
import java.util.Hashtable;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdmin.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdmin.java
index 470545e..117c220 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdmin.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdmin.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.event;
+package org.eclipse.virgo.test.stubs.service.event;
import java.util.ArrayList;
import java.util.Iterator;
@@ -18,7 +18,7 @@
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
-import org.eclipse.virgo.teststubs.osgi.service.event.internal.EventUtils;
+import org.eclipse.virgo.test.stubs.service.event.internal.EventUtils;
/**
* A stub implementation of {@link EventAdmin}.
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtils.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtils.java
index dcea937..0a0c715 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtils.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtils.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.event.internal;
+package org.eclipse.virgo.test.stubs.service.event.internal;
import java.util.Arrays;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/AbstractFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/AbstractFilter.java
index 086d568..2bb4738 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/AbstractFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/AbstractFilter.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import org.osgi.framework.Filter;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/FalseFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/FalseFilter.java
index 10fdb83..fd293de 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/FalseFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/FalseFilter.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import java.util.Dictionary;
import java.util.Map;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilter.java
index 321f1f2..4588603 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilter.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
import java.util.Dictionary;
import java.util.Map;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/PropertiesFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/PropertiesFilter.java
index d857d8d..a3097e5 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/PropertiesFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/PropertiesFilter.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
-import static org.eclipse.virgo.teststubs.osgi.internal.Assert.assertNotNull;
+import static org.eclipse.virgo.test.stubs.internal.Assert.assertNotNull;
import java.util.Dictionary;
import java.util.Map;
diff --git a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/TrueFilter.java b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/TrueFilter.java
index e5cb68a..6c00d2a 100644
--- a/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/TrueFilter.java
+++ b/org.eclipse.virgo.test.stubs/src/main/java/org/eclipse/virgo/test/stubs/support/TrueFilter.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import java.util.Dictionary;
import java.util.Map;
diff --git a/org.eclipse.virgo.test.stubs/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.test.stubs/src/main/resources/META-INF/MANIFEST.MF
index 706a5bf..91eb2da 100644
--- a/org.eclipse.virgo.test.stubs/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.test.stubs/src/main/resources/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.virgo.teststubs.osgi.framework;version="1.
- 0.0";uses:="org.osgi.framework",org.eclipse.virgo.teststubs.osgi.serv
+Export-Package: org.eclipse.virgo.test.stubs.framework;version="1.
+ 0.0";uses:="org.osgi.framework",org.eclipse.virgo.test.stubs.serv
ice.cm;version="1.0.0";uses:="org.osgi.framework,org.osgi.service.cm"
- ,org.eclipse.virgo.teststubs.osgi.service.event;version="1.0.0";uses:
- ="org.osgi.service.event",org.eclipse.virgo.teststubs.osgi.service.ev
+ ,org.eclipse.virgo.test.stubs.service.event;version="1.0.0";uses:
+ ="org.osgi.service.event",org.eclipse.virgo.test.stubs.service.ev
ent.internal;version="1.0.0";uses:="org.osgi.service.event",org.eclip
se.virgo.teststubs.osgi.support;version="1.0.0";uses:="org.osgi.frame
work"
@@ -19,5 +19,5 @@
ersion="[1.6.3.RELEASE, 2.0.0)",org.junit;version="[4.4.0, 5.0.0)",or
g.osgi.framework;version="0",org.osgi.service.cm;version="[1.2.0, 1.3
.0)",org.osgi.service.event;version="[1.1.0, 1.2.0)"
-Bundle-SymbolicName: org.eclipse.virgo.teststubs.osgi
+Bundle-SymbolicName: org.eclipse.virgo.test.stubs
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/AdditionalAsserts.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/AdditionalAsserts.java
index 9e6cccd..76db35e 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/AdditionalAsserts.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/AdditionalAsserts.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi;
+package org.eclipse.virgo.test.stubs;
import static org.junit.Assert.assertTrue;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/OSGiAssertTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/OSGiAssertTests.java
index 5654878..1baf9e8 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/OSGiAssertTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/OSGiAssertTests.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert.assertBundleListenerCount;
-import static org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert.assertCleanState;
-import static org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert.assertFrameworkListenerCount;
-import static org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert.assertServiceListenerCount;
-import static org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert.assertServiceRegistrationCount;
+import static org.eclipse.virgo.test.stubs.framework.OSGiAssert.assertBundleListenerCount;
+import static org.eclipse.virgo.test.stubs.framework.OSGiAssert.assertCleanState;
+import static org.eclipse.virgo.test.stubs.framework.OSGiAssert.assertFrameworkListenerCount;
+import static org.eclipse.virgo.test.stubs.framework.OSGiAssert.assertServiceListenerCount;
+import static org.eclipse.virgo.test.stubs.framework.OSGiAssert.assertServiceRegistrationCount;
import org.junit.Test;
import org.osgi.framework.BundleEvent;
@@ -25,8 +25,8 @@
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubBundle;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
public class OSGiAssertTests {
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleContextTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleContextTests.java
index 791dd48..24b0e9c 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleContextTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleContextTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -41,7 +41,7 @@
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
-import org.eclipse.virgo.teststubs.osgi.support.AbstractFilter;
+import org.eclipse.virgo.test.stubs.support.AbstractFilter;
public class StubBundleContextTests {
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleTests.java
index 758d9ae..77c353e 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubBundleTests.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.AdditionalAsserts.assertContains;
+import static org.eclipse.virgo.test.stubs.AdditionalAsserts.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -38,7 +38,7 @@
private static final Long DEFAULT_BUNDLE_ID = Long.valueOf(1);
- private static final String DEFAULT_SYMBOLIC_NAME = "org.eclipse.virgo.teststubs.osgi.testbundle";
+ private static final String DEFAULT_SYMBOLIC_NAME = "org.eclipse.virgo.test.stubs.testbundle";
private static final Version DEFAULT_VERSION = Version.emptyVersion;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceReferenceTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceReferenceTests.java
index 454f531..44302be 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceReferenceTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceReferenceTests.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.AdditionalAsserts.assertContains;
+import static org.eclipse.virgo.test.stubs.AdditionalAsserts.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistrationTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistrationTests.java
index e493141..e301eb5 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistrationTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/framework/StubServiceRegistrationTests.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.framework;
+package org.eclipse.virgo.test.stubs.framework;
-import static org.eclipse.virgo.teststubs.osgi.AdditionalAsserts.assertContains;
+import static org.eclipse.virgo.test.stubs.AdditionalAsserts.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/internal/AssertTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/internal/AssertTests.java
index 1f72667..fc2f00b 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/internal/AssertTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/internal/AssertTests.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.internal;
+package org.eclipse.virgo.test.stubs.internal;
import org.junit.Test;
-import org.eclipse.virgo.teststubs.osgi.internal.Assert;
+import org.eclipse.virgo.test.stubs.internal.Assert;
public class AssertTests {
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdminTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdminTests.java
index ea69e37..16290c2 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdminTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationAdminTests.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.cm;
+package org.eclipse.virgo.test.stubs.service.cm;
-import static org.eclipse.virgo.teststubs.osgi.AdditionalAsserts.assertContains;
+import static org.eclipse.virgo.test.stubs.AdditionalAsserts.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationTests.java
index 31cefec..d440aad 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/cm/StubConfigurationTests.java
@@ -9,9 +9,9 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.cm;
+package org.eclipse.virgo.test.stubs.service.cm;
-import static org.eclipse.virgo.teststubs.osgi.AdditionalAsserts.assertContains;
+import static org.eclipse.virgo.test.stubs.AdditionalAsserts.assertContains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContextTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContextTests.java
index fef3313..12394c0 100755
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContextTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/component/StubComponentContextTests.java
@@ -9,7 +9,7 @@
* SAP AG - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.component;
+package org.eclipse.virgo.test.stubs.service.component;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -19,7 +19,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
public class StubComponentContextTests {
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
index 130dbff..9b084fd 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.event;
+package org.eclipse.virgo.test.stubs.service.event;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtilsTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtilsTests.java
index 948cf54..6842a88 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtilsTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/internal/EventUtilsTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.service.event.internal;
+package org.eclipse.virgo.test.stubs.service.event.internal;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/FalseFilterTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/FalseFilterTests.java
index a4b2970..4cde55e 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/FalseFilterTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/FalseFilterTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -20,7 +20,7 @@
import org.junit.Test;
import org.osgi.framework.ServiceReference;
-import org.eclipse.virgo.teststubs.osgi.support.FalseFilter;
+import org.eclipse.virgo.test.stubs.support.FalseFilter;
public class FalseFilterTests {
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilterTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilterTests.java
index 6df0fdb..a8cf37f 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilterTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/ObjectClassFilterTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/PropertiesFilterTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/PropertiesFilterTests.java
index 5e98491..dbe5eca 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/PropertiesFilterTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/PropertiesFilterTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/TrueFilterTests.java b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/TrueFilterTests.java
index 3557e6b..96c8304 100644
--- a/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/TrueFilterTests.java
+++ b/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/support/TrueFilterTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.teststubs.osgi.support;
+package org.eclipse.virgo.test.stubs.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/org.eclipse.virgo.test.stubs/template.mf b/org.eclipse.virgo.test.stubs/template.mf
index b3b60b0..0e5eeb3 100644
--- a/org.eclipse.virgo.test.stubs/template.mf
+++ b/org.eclipse.virgo.test.stubs/template.mf
@@ -17,6 +17,6 @@
org.aspectj.runtime.internal;version="[1.6.3.RELEASE, 2.0.0)",
org.aspectj.runtime.reflect;version="[1.6.3.RELEASE, 2.0.0)"
Excluded-Exports:
- org.eclipse.virgo.teststubs.osgi.framework.aspects,
- org.eclipse.virgo.teststubs.osgi.internal,
- org.eclipse.virgo.teststubs.osgi.service.cm.aspects
+ org.eclipse.virgo.test.stubs.framework.aspects,
+ org.eclipse.virgo.test.stubs.internal,
+ org.eclipse.virgo.test.stubs.service.cm.aspects
diff --git a/org.eclipse.virgo.test.test/.classpath b/org.eclipse.virgo.test.test/.classpath
index 736ea61..35da577 100644
--- a/org.eclipse.virgo.test.test/.classpath
+++ b/org.eclipse.virgo.test.test/.classpath
@@ -5,9 +5,8 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_FRAMEWORK_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="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="var" path="TEST_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_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 combineaccessrules="false" kind="src" path="/org.eclipse.virgo.test.framework"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
