NEW - bug 319269: [RemoteSrvc] Split org.eclipse.ecf.tests.remoteservice into r-osgi and generic bundle

https://bugs.eclipse.org/bugs/show_bug.cgi?id=319269

13 files changed, 298 insertions, 0 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.classpath b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.classpath
new file mode 100755
index 000000000..2fbb7a23e
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.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/J2SE-1.4"/>
+	<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.remoteservice.r-osgi/.cvsignore b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.cvsignore
new file mode 100755
index 000000000..ba077a403
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.project b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.project
new file mode 100755
index 000000000..bf090947a
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ecf.tests.remoteservice.r-osgi</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>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 000000000..fec84d22c
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,69 @@
+#Wed May 06 23:07:13 PDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+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.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+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.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+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.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+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.nullReference=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.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+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.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.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/META-INF/MANIFEST.MF
new file mode 100755
index 000000000..e0bc5b341
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %plugin.name
+Bundle-SymbolicName: org.eclipse.ecf.tests.remoteservice.r-osgi;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %plugin.provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.equinox.common,
+ org.eclipse.ecf,
+ org.eclipse.ecf.tests,
+ org.eclipse.ecf.remoteservice,
+ org.junit,
+ org.eclipse.equinox.app;bundle-version="1.2.0",
+ org.eclipse.ecf.tests.remoteservice;bundle-version="2.0.0"
+Import-Package: org.eclipse.equinox.concurrent.future;version="1.0.0",
+ org.eclipse.osgi.util,
+ org.osgi.framework;version="1.4.0",
+ org.osgi.util.tracker;version="1.3.3"
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/Test R-OSGi Concat Host.launch b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/Test R-OSGi Concat Host.launch
new file mode 100644
index 000000000..5e1d8499f
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/Test R-OSGi Concat Host.launch
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.ecf.tests.remoteservice.ROsgiConcatHost"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/R-OSGi Test Concat Host"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<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"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/about.html b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/about.html
new file mode 100755
index 000000000..4c79781a5
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 25, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/build.properties b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/build.properties
new file mode 100755
index 000000000..1dde0d2c6
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html,\
+               plugin.xml
+src.includes = about.html
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.properties b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.properties
new file mode 100755
index 000000000..21d1dae26
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.properties
@@ -0,0 +1,11 @@
+############################################################################
+# Copyright (c) 2007 Composent Inc., IBM Corp, 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
+#
+############################################################################
+plugin.name=ECF Remoteservice r-OSGi Tests
+plugin.provider=Eclipse.org - ECF
+
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.xml b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.xml
new file mode 100644
index 000000000..1497d57eb
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         id="ROsgiConcatHost"
+         point="org.eclipse.core.runtime.applications">
+      <application
+            cardinality="*"
+            thread="any"
+            visible="true">
+         <run
+               class="org.eclipse.ecf.tests.remoteservice.r_osgi.ROsgiConcatHostApplication">
+         </run>
+      </application>
+   </extension>
+</plugin>
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatConsumerTest.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatConsumerTest.java
new file mode 100644
index 000000000..b8fca03bf
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatConsumerTest.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+* 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.remoteservice.r_osgi;
+
+import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.tests.remoteservice.AbstractConcatConsumerTestCase;
+
+public class ROsgiConcatConsumerTest extends AbstractConcatConsumerTestCase {
+
+	protected void setUp() throws Exception {
+		super.setUp();
+		IContainer container = createContainer("r-osgi://localhost:9279");
+		rsContainer = createRemoteServiceContainer(container);
+		targetID = createID(container, R_OSGi.HOST_CONTAINER_ENDPOINT_ID);
+	}
+
+	protected String getContainerType() {
+		return R_OSGi.CONSUMER_CONTAINER_TYPE;
+	}
+
+}
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatHostApplication.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatHostApplication.java
new file mode 100644
index 000000000..2b218d9a4
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/ROsgiConcatHostApplication.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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.remoteservice.r_osgi;
+
+
+import org.eclipse.ecf.tests.remoteservice.AbstractConcatHostApplication;
+
+public class ROsgiConcatHostApplication extends
+		AbstractConcatHostApplication {
+
+	public String getContainerType() {
+		return R_OSGi.HOST_CONTAINER_TYPE;
+	}
+
+}
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/R_OSGi.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/R_OSGi.java
new file mode 100755
index 000000000..a5fd95310
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.r-osgi/src/org/eclipse/ecf/tests/remoteservice/r_osgi/R_OSGi.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Jan S. Rellermeyer, 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:
+ *     Jan S. Rellermeyer - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.ecf.tests.remoteservice.r_osgi;
+
+/**
+ * Constants for setting up an R-OSGi test environment.
+ * 
+ * @author Jan S. Rellermeyer, ETH Zurich
+ */
+public interface R_OSGi {
+
+	public static final String CONSUMER_CONTAINER_TYPE = "ecf.r_osgi.peer";
+	public static final String HOST_CONTAINER_TYPE = "ecf.r_osgi.peer";
+
+	public static final String HOST_CONTAINER_ENDPOINT_ID = "r-osgi://localhost:9278";
+
+}