addition of rosgi.ws and rosgi.wss provider test cases

Change-Id: Iee19a952e4fdef449d5ea27087f4dd5e0d3fcd88

11 files changed, 419 insertions, 0 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.classpath b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.classpath
new file mode 100644
index 000000000..098194ca4
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.gitignore b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.gitignore
new file mode 100644
index 000000000..ae3c17260
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.project b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.project
new file mode 100644
index 000000000..2b0e6d5f3
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..8c378ccf0
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,100 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.pde.core.prefs b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..f29e940a0
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..2e39115c5
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ROSGi Websockets Provider tests
+Bundle-SymbolicName: org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse.org - ECF
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: org.osgi.framework;version="1.3.0"
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ecf.osgi.services.distribution;bundle-version="1.0.0",
+ org.junit,
+ org.eclipse.equinox.common,
+ org.eclipse.equinox.concurrent;bundle-version="1.0.0",
+ org.eclipse.ecf.tests.osgi.services.distribution;bundle-version="1.0.0",
+ org.eclipse.ecf;bundle-version="3.1.100",
+ org.eclipse.ecf.tests;bundle-version="2.1.0"
+Export-Package: org.eclipse.ecf.tests.osgi.services.distribution.r_osgi.ws
+
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/build.properties b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/build.properties
new file mode 100644
index 000000000..12b49e321
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = .,\
+               META-INF/
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/slewis.org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws.launch b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/slewis.org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws.launch
new file mode 100644
index 000000000..faa5c9689
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/slewis.org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws.launch
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/slewis.org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-dist-osgi"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx256m&#13;&#10;-Dnet.mdns.port=65354&#13;&#10;-Dnet.mdns.interface=127.0.0.1&#13;&#10;-Dorg.eclipse.ecf.osgi.services.discovery.allowLoopbackReference=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="ch.ethz.iks.r_osgi.remote@default:default,ch.ethz.iks.r_osgi.transport.http@default:default,java_websocket@default:default,org.eclipse.ecf.discovery@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.osgi.services.distribution@default:default,org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy@default:default,org.eclipse.ecf.osgi.services.remoteserviceadmin@default:default,org.eclipse.ecf.provider.jmdns@default:default,org.eclipse.ecf.provider.r_osgi@default:default,org.eclipse.ecf.provider@default:default,org.eclipse.ecf.remoteservice.asyncproxy*1.0.0.qualifier@default:default,org.eclipse.ecf.remoteservice@default:default,org.eclipse.ecf.sharedobject@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws@default:default,org.eclipse.ecf.tests.osgi.services.distribution@default:default,org.eclipse.ecf.tests.remoteservice@default:default,org.eclipse.ecf.tests@default:default,org.eclipse.ecf@default:default,org.eclipse.osgi.services.remoteserviceadmin@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceAccessTest.java
new file mode 100644
index 000000000..147275a3e
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceAccessTest.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+* Copyright (c) 2015 Composent, Inc. and others. 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:
+*   Composent, Inc. - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.tests.osgi.services.distribution.r_osgi.ws;
+
+
+import java.util.Properties;
+
+import org.eclipse.ecf.core.ContainerFactory;
+import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.osgi.services.distribution.IDistributionConstants;
+import org.eclipse.ecf.tests.osgi.services.distribution.AbstractRemoteServiceAccessTest;
+
+
+public class R_OSGiWSRemoteServiceAccessTest extends AbstractRemoteServiceAccessTest {
+
+	private static final String CONTAINER_TYPE_NAME = "ecf.r_osgi.peer.ws";
+	
+	private static final String SERVER_IDENTITY = "r-osgi.ws://localhost";
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+		setClientCount(1);
+		createServerAndClients();
+		setupRemoteServiceAdapters();
+	}
+
+	
+	protected void tearDown() throws Exception {
+		cleanUpServerAndClients();
+		super.tearDown();
+	}
+
+	protected IContainer createClient(int index) throws Exception {
+		return ContainerFactory.getDefault().createContainer(CONTAINER_TYPE_NAME,
+				new Object[] { IDFactory.getDefault().createStringID(
+				"r-osgi.ws://localhost:"+(9279+index)) });
+	}
+	
+	protected IContainer createServer() throws Exception {
+		serverID = IDFactory.getDefault().createID("ecf.namespace.r_osgi.ws",SERVER_IDENTITY);
+		return ContainerFactory.getDefault().createContainer(CONTAINER_TYPE_NAME,serverID);
+	}
+
+	protected String getClientContainerName() {
+		return CONTAINER_TYPE_NAME;
+	}
+
+	protected String getServerIdentity() {
+		return SERVER_IDENTITY;
+	}
+	
+	protected String getServerContainerName() {
+		return CONTAINER_TYPE_NAME;
+	}
+	
+	protected Properties getServiceProperties() {
+		Properties props = super.getServiceProperties();
+		props.put(IDistributionConstants.SERVICE_EXPORTED_CONTAINER_ID, serverID);
+		return props;
+	}
+}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceRegisterTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceRegisterTest.java
new file mode 100644
index 000000000..de14b2408
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSRemoteServiceRegisterTest.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+* Copyright (c) 2009 EclipseSource and others. 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:
+*   EclipseSource - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.tests.osgi.services.distribution.r_osgi.ws;
+
+
+import org.eclipse.ecf.core.ContainerFactory;
+import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.tests.osgi.services.distribution.AbstractRemoteServiceRegisterTest;
+
+
+public class R_OSGiWSRemoteServiceRegisterTest extends AbstractRemoteServiceRegisterTest {
+
+	private static final String CONTAINER_TYPE_NAME = "ecf.r_osgi.peer.ws";
+	
+	private static final String SERVER_IDENTITY = "r-osgi.ws://localhost";
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+		setClientCount(1);
+		createServerAndClients();
+		setupRemoteServiceAdapters();
+	}
+
+	
+	protected void tearDown() throws Exception {
+		cleanUpServerAndClients();
+		super.tearDown();
+	}
+
+	protected IContainer createClient(int index) throws Exception {
+		return ContainerFactory.getDefault().createContainer(CONTAINER_TYPE_NAME,
+				new Object[] { IDFactory.getDefault().createStringID(
+				"r-osgi.ws://localhost:"+(9279+index)) });
+	}
+	
+	protected IContainer createServer() throws Exception {
+		return ContainerFactory.getDefault().createContainer(CONTAINER_TYPE_NAME,SERVER_IDENTITY);
+	}
+
+
+	protected String getClientContainerName() {
+		return CONTAINER_TYPE_NAME;
+	}
+
+	protected String getServerIdentity() {
+		return SERVER_IDENTITY;
+	}
+	
+	protected String getServerContainerTypeName() {
+		return CONTAINER_TYPE_NAME;
+	}
+	
+}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSTwoRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSTwoRemoteServiceAccessTest.java
new file mode 100644
index 000000000..53582e991
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi.ws/src/org/eclipse/ecf/tests/osgi/services/distribution/r_osgi/ws/R_OSGiWSTwoRemoteServiceAccessTest.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+* Copyright (c) 2011 Composent, Inc. and others. 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:
+*   Composent - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.tests.osgi.services.distribution.r_osgi.ws;
+
+import java.util.Properties;
+
+import org.eclipse.ecf.core.ContainerFactory;
+import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.osgi.services.distribution.IDistributionConstants;
+import org.eclipse.ecf.tests.osgi.services.distribution.AbstractTwoRemoteServiceAccessTest;
+
+
+public class R_OSGiWSTwoRemoteServiceAccessTest extends AbstractTwoRemoteServiceAccessTest {
+
+	private static final String CONTAINER_TYPE_NAME = "ecf.r_osgi.peer.ws";
+	
+	private static final String SERVER_IDENTITY = "r-osgi.ws://localhost";
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+		setClientCount(1);
+		createServerAndClients();
+		setupRemoteServiceAdapters();
+	}
+
+	
+	protected void tearDown() throws Exception {
+		cleanUpServerAndClients();
+		super.tearDown();
+	}
+
+	protected IContainer createClient(int index) throws Exception {
+		return ContainerFactory.getDefault().createContainer("ecf.r_osgi.peer.ws",
+				new Object[] { IDFactory.getDefault().createStringID(
+				"r-osgi.ws://localhost:"+(9279+index)) });
+	}
+	
+	protected IContainer createServer() throws Exception {
+		serverID = IDFactory.getDefault().createID("ecf.namespace.r_osgi.ws",SERVER_IDENTITY);
+		return ContainerFactory.getDefault().createContainer(CONTAINER_TYPE_NAME,serverID);
+	}
+
+	protected String getClientContainerName() {
+		return CONTAINER_TYPE_NAME;
+	}
+
+	protected String getServerIdentity() {
+		return SERVER_IDENTITY;
+	}
+	
+	protected String getServerContainerName() {
+		return CONTAINER_TYPE_NAME;
+	}
+	
+	protected Properties getServiceProperties() {
+		Properties props = super.getServiceProperties();
+		props.put(IDistributionConstants.SERVICE_EXPORTED_CONTAINER_ID, serverID);
+		return props;
+	}
+}