diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.async/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.async/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml index c5e4fef8e8..6851540a29 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + com.mycorp.examples.timeservice.async - 2.1.101-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.classpath b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/META-INF/MANIFEST.MF index 007398dd15..c528ffc21e 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.generic.auth/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TimeService Example Consumer Generic with Authentication Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.ds.generic.auth -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: com.mycorp.examples.timeservice.consumer.ds.generic.auth.Activator Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity;version="3.2.0", org.eclipse.ecf.core.security;version="3.1.0", diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.classpath b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF index 432d227fc8..d5007aa5f6 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Consumer DS Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.ds Automatic-Module-Name: com.mycorp.examples.timeservice.consumer.ds -Bundle-Version: 1.0.401.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.mycorp.examples.timeservice;version="[2.0.0,3.0.0)", org.osgi.service.component.annotations;resolution:=optional Service-Component: OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/.classpath b/examples/bundles/com.mycorp.examples.timeservice.consumer/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.jdt.core.prefs index 94d2b1d5d6..9d373aa5aa 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/.settings/org.eclipse.jdt.core.prefs @@ -10,11 +10,12 @@ org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF index 805df9b774..5f24d5415e 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Consumer Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer Automatic-Module-Name: com.mycorp.examples.timeservice.consumer -Bundle-Version: 1.1.201.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Activator: com.mycorp.examples.timeservice.consumer.Activator Import-Package: com.mycorp.examples.timeservice;version="[1.0.0,3.0.0)", diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml index 8fc0ac4f33..2d54d369ea 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml @@ -8,8 +8,7 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf com.mycorp.examples.timeservice.consumer - 1.1.201-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.classpath b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF index c9c049d490..fe920a4d76 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF Remote Service Example Host using Authentication Bundle-SymbolicName: com.mycorp.examples.timeservice.host.generic.auth Automatic-Module-Name: com.mycorp.examples.timeservice.host.generic.auth -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.mycorp.examples.timeservice;version="1.0.0", org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity;version="3.2.0", diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/src/com/mycorp/examples/timeservice/host/generic/auth/TimeServiceImpl.java b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/src/com/mycorp/examples/timeservice/host/generic/auth/TimeServiceImpl.java index 47576da99f..e1b0ccc5f4 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/src/com/mycorp/examples/timeservice/host/generic/auth/TimeServiceImpl.java +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/src/com/mycorp/examples/timeservice/host/generic/auth/TimeServiceImpl.java @@ -24,7 +24,7 @@ public Long getCurrentTime() { // Eventually, this should (e.g.) contact NIST time server and return more // accurate time. For the time being, we will return the System time for // this host. - return new Long(System.currentTimeMillis()); + return Long.valueOf(System.currentTimeMillis()); } } diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/.classpath b/examples/bundles/com.mycorp.examples.timeservice.host/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.host/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.host/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.host/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF index 218aad7e97..1cc25b72a1 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Host Bundle-SymbolicName: com.mycorp.examples.timeservice.host Automatic-Module-Name: com.mycorp.examples.timeservice.host -Bundle-Version: 1.1.400.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: com.mycorp.examples.timeservice;version="1.0.0", org.osgi.framework, diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml index 96274a0591..63d0a72140 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + com.mycorp.examples.timeservice.host - 1.1.400-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.classpath b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF index 396c028795..b1f748b10b 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice REST Provider Consumer Bundle-SymbolicName: com.mycorp.examples.timeservice.provider.rest.consumer Automatic-Module-Name: com.mycorp.examples.timeservice.provider.rest.consumer -Bundle-Version: 1.1.101.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: com.mycorp.examples.timeservice;version="1.0.0", org.eclipse.ecf.remoteservice, diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml index f0a827cfec..aaf1efb638 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + com.mycorp.examples.timeservice.provider.rest.consumer - 1.1.101-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.classpath b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF index 75a3f8bca6..ff0d369e14 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example TimeService REST Provider Host Bundle-SymbolicName: com.mycorp.examples.timeservice.provider.rest.host Automatic-Module-Name: com.mycorp.examples.timeservice.provider.rest.host -Bundle-Version: 1.1.101.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)" Import-Package: com.mycorp.examples.timeservice;version="1.0.0", diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml index 23e491c94e..85014f60de 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + com.mycorp.examples.timeservice.provider.rest.host - 1.1.101-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice/.classpath b/examples/bundles/com.mycorp.examples.timeservice/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/com.mycorp.examples.timeservice/.classpath +++ b/examples/bundles/com.mycorp.examples.timeservice/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.core.resources.prefs b/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.jdt.core.prefs index 94d2b1d5d6..9d373aa5aa 100644 --- a/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/com.mycorp.examples.timeservice/.settings/org.eclipse.jdt.core.prefs @@ -10,11 +10,12 @@ org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF index f2624c2c6f..26c0473a83 100644 --- a/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice API Bundle-SymbolicName: com.mycorp.examples.timeservice Automatic-Module-Name: com.mycorp.examples.timeservice -Bundle-Version: 1.1.201.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.mycorp.examples.timeservice;version="1.0.0" diff --git a/examples/bundles/org.eclipse.ecf.examples.datashare.app/.classpath b/examples/bundles/org.eclipse.ecf.examples.datashare.app/.classpath index 2fbb7a23e1..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.datashare.app/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.datashare.app/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.datashare.app/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.datashare.app/.settings/org.eclipse.jdt.core.prefs index ab32df471c..80291457cf 100644 --- a/examples/bundles/org.eclipse.ecf.examples.datashare.app/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.datashare.app/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Fri Oct 16 13:12:21 PDT 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -67,4 +66,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa 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 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.datashare.app/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.datashare.app/META-INF/MANIFEST.MF index 6990739b9f..6986ddbdab 100644 --- a/examples/bundles/org.eclipse.ecf.examples.datashare.app/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.datashare.app/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.datashare.app;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.datashare.app -Bundle-Version: 1.0.101.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.datashare.app.Activator Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.provider.datashare, org.eclipse.ecf.provider.generic, org.osgi.framework;version="1.3.0", diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.classpath b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs index dfa45ff519..9f6ece88bd 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ -#Mon Jul 04 13:23:29 PDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF index a8982f775e..59012e83f8 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.examples.provider.remoteservice;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.provider.remoteservice -Bundle-Version: 1.1.100.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Version: 1.2.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.events, org.eclipse.ecf.core.identity, diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.classpath b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.classpath index 6f3b481acd..eca7bdba8f 100755 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.jdt.core.prefs index be224d8dee..0869a9baf8 100755 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Sun Apr 06 12:10:24 PDT 2008 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.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF index 3791165427..9a3ebb2395 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF @@ -3,15 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.examples.provider.trivial;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.provider.trivial -Bundle-Version: 1.0.300.provider +Bundle-Version: 1.1.0.provider Bundle-Activator: org.eclipse.ecf.internal.examples.provider.trivial.Activator Bundle-Vendor: %bundle.provider Require-Bundle: org.eclipse.ecf, org.eclipse.equinox.common;bundle-version="3.6.200" Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ecf.examples.provider.trivial;version="1.0.0", org.eclipse.ecf.examples.provider.trivial.identity;version="1.0.0", org.eclipse.ecf.internal.examples.provider.trivial;x-internal:=true, diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/META-INF/MANIFEST.MF index 1e1a3df699..f3208cf7ac 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RemoteServices Hello Example Endpoint Description Extender Format Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.consumer.edef Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.consumer.edef -Bundle-Version: 1.1.101.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Remote-Service: generic_hello.xml diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml index 36c4a88e25..884304330f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.edef/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.examples.remoteservices.hello.consumer.edef - 1.1.101-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.classpath index 6f3b481acd..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.jdt.core.prefs index 08fd2e5bd7..0869a9baf8 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Wed Jun 24 16:48:20 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.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF index 0d9c82b35e..c15d06f6ae 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF @@ -2,12 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.consumer.rs -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.consumer.rs.Activator Bundle-Vendor: %bundleProvider Require-Bundle: org.eclipse.equinox.common -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: bundle Import-Package: org.eclipse.ecf.core, diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.jdt.core.prefs index 5f3b687436..f53634e910 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -67,4 +67,4 @@ 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.release=disabled -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF index 45bedbf175..7014623980 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.consumer;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.consumer -Bundle-Version: 3.0.300.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.consumer.Activator Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity;version="3.0.0", org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0", diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml index 6a3e7b3ca6..8f2a227d35 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.examples.remoteservices.hello.consumer - 3.0.300-SNAPSHOT + 3.1.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.settings/org.eclipse.jdt.core.prefs index af0f20f97a..9f6ece88bd 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/META-INF/MANIFEST.MF index 0bc02681fc..61120e73a5 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.consumer2 -Bundle-Version: 1.0.1.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.ecf.examples.internal.remoteservices.hello.consumer2.Activator Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0", org.eclipse.ecf.osgi.services.distribution;version="2.0.0", org.eclipse.ecf.remoteservice;version="6.0.0", diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.jdt.core.prefs index 1caaaf5cb2..8db9a8573d 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -70,4 +70,4 @@ 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.release=disabled -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF index 99d9a01e57..93119e6602 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.ds.consumer;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.ds.consumer -Bundle-Version: 2.0.101.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0", org.eclipse.ecf.remoteservice, org.eclipse.ecf.remoteservice.events, diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml index 1cf4abaadc..8cbc663940 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.examples.remoteservices.hello.ds.consumer - 2.0.101-SNAPSHOT + 2.1.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.jdt.core.prefs index 3e3d184dae..b1234b396f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Sat Apr 24 11:48:38 PDT 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -70,4 +69,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa 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.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF index f2c684cf42..8411f3e299 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF @@ -2,11 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.ds.host;singleton:=true -Bundle-Version: 3.1.1.qualifier +Bundle-Version: 3.2.0.qualifier Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - J2SE-1.4, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0", org.eclipse.equinox.app;version="1.1.0" Service-Component: OSGI-INF/hello.xml diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.classpath index 6f3b481acd..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.settings/org.eclipse.jdt.core.prefs index 95fa6edd59..0869a9baf8 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Wed Jun 24 16:51:45 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.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/META-INF/MANIFEST.MF index a8a8bb293b..3897c2400c 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/META-INF/MANIFEST.MF @@ -4,11 +4,10 @@ Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.host.rs Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.host.rs Bundle-Vendor: %bundleProvider -Bundle-Version: 1.0.101.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.host.rs.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity;version="3.0.0", org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0", diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.settings/org.eclipse.jdt.core.prefs index a2a16456bb..f53634e910 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -66,4 +66,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa 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.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF index 9868e87a83..3d5efe8c9f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF @@ -3,11 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.host;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello.host -Bundle-Version: 3.1.103.qualifier +Bundle-Version: 3.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.host.Activator Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity;version="3.0.0", org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0", diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml index 22534548ec..38b6424ba7 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.examples.remoteservices.hello.host - 3.1.103-SNAPSHOT + 3.2.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.classpath b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.core.resources.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.jdt.core.prefs index 871397d441..2d8e3f3860 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -71,4 +71,4 @@ 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.release=disabled -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF index 10f9d9d4f5..58b15bd4d9 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.hello -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0", org.eclipse.ecf.examples.remoteservices.hello.impl;version="3.0.0" Bundle-Localization: bundle diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml index 7790df3446..a7bd0e5420 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/pom.xml @@ -8,8 +8,7 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf org.eclipse.ecf.examples.remoteservices.hello - 4.0.200-SNAPSHOT + 4.1.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.datashare/.classpath b/framework/bundles/org.eclipse.ecf.datashare/.classpath index 2fbb7a23e1..eca7bdba8f 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/.classpath +++ b/framework/bundles/org.eclipse.ecf.datashare/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs index 8a762c3d91..39370f8cac 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs @@ -8,16 +8,16 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled 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.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 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.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=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 @@ -27,7 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +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=warning @@ -95,7 +95,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF index f2da3baf40..33323142a1 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true Automatic-Module-Name: org.eclipse.ecf.datashare -Bundle-Version: 3.0.301.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Export-Package: org.eclipse.ecf.datashare;version="3.1.0", org.eclipse.ecf.datashare.events;version="3.1.0", org.eclipse.ecf.datashare.mergeable;version="3.1.0", org.eclipse.ecf.datashare.service;version="3.1.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)", org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)" Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)" diff --git a/framework/bundles/org.eclipse.ecf.datashare/pom.xml b/framework/bundles/org.eclipse.ecf.datashare/pom.xml index 6786ab4f6a..aaea629b1e 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/pom.xml +++ b/framework/bundles/org.eclipse.ecf.datashare/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.datashare - 3.0.301-SNAPSHOT + 3.1.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.discovery/.classpath b/framework/bundles/org.eclipse.ecf.discovery/.classpath index 2fbb7a23e1..eca7bdba8f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/.classpath +++ b/framework/bundles/org.eclipse.ecf.discovery/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs index 64b78fc711..918a10f183 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= 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.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -30,7 +30,7 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=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 @@ -40,7 +40,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +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=enabled @@ -125,6 +125,6 @@ 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.release=disabled -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF index 59bb7d8112..b8455db991 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.eclipse.ecf.discovery;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery -Bundle-Version: 5.2.0.qualifier +Bundle-Version: 5.3.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.discovery.DiscoveryPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.discovery/pom.xml b/framework/bundles/org.eclipse.ecf.discovery/pom.xml index a8f4a0930f..0b7264a9f0 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.discovery - 5.2.0-SNAPSHOT + 5.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.presence/.classpath b/framework/bundles/org.eclipse.ecf.presence/.classpath index 2fbb7a23e1..eca7bdba8f 100644 --- a/framework/bundles/org.eclipse.ecf.presence/.classpath +++ b/framework/bundles/org.eclipse.ecf.presence/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.core.resources.prefs b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs index d2a42b8611..e5a9977e2d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -99,23 +99,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab 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 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -185,11 +190,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -219,6 +225,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -242,12 +250,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -293,6 +305,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -328,8 +342,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -352,6 +369,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF index 79f565d535..deee94ac9c 100644 --- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.presence;singleton:=true Automatic-Module-Name: org.eclipse.ecf.presence -Bundle-Version: 2.1.201.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.presence.PresencePlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -17,7 +17,7 @@ Export-Package: org.eclipse.ecf.internal.presence;x-internal:=true, org.eclipse.ecf.presence.search.message;version="2.1.0", org.eclipse.ecf.presence.service;version="2.1.0" Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf Import-Package: org.eclipse.core.runtime.jobs, diff --git a/framework/bundles/org.eclipse.ecf.presence/pom.xml b/framework/bundles/org.eclipse.ecf.presence/pom.xml index 92eec3999b..0350e8ec51 100644 --- a/framework/bundles/org.eclipse.ecf.presence/pom.xml +++ b/framework/bundles/org.eclipse.ecf.presence/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.presence - 2.1.201-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.classpath b/framework/bundles/org.eclipse.ecf.remoteservice/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/.classpath +++ b/framework/bundles/org.eclipse.ecf.remoteservice/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters deleted file mode 100644 index 75c3674e9b..0000000000 --- a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.core.resources.prefs b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs index 3f08382452..843f33b2ef 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -128,23 +128,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -214,11 +219,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -248,6 +254,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -271,12 +279,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -322,6 +334,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -357,8 +371,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -381,6 +398,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF index 4c6b85fda7..117b788eac 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice Automatic-Module-Name: org.eclipse.ecf.remoteservice -Bundle-Version: 8.14.0.qualifier +Bundle-Version: 8.15.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -15,7 +15,7 @@ Export-Package: org.eclipse.ecf.internal.remoteservice;x-internal:=true, org.eclipse.ecf.remoteservice.provider;version="1.1.0", org.eclipse.ecf.remoteservice.util;version="8.3.0", org.eclipse.ecf.remoteservice.util.tracker;version="6.0.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.ecf;bundle-version="[3.9.0,4.0.0)" Import-Package: org.eclipse.ecf.core.util.reflection;version="[2.2.100,3.0.0)", diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml index 35a8f5213e..fffd8224ba 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.remoteservice - 8.14.0-SNAPSHOT + 8.15.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java index f3a10f2c30..721afb93aa 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java @@ -377,7 +377,7 @@ protected Object invokeObject(Object proxy, final Method method, final Object[] if (args == null || args.length == 0) return Boolean.FALSE; try { - return new Boolean(Proxy.getInvocationHandler(args[0]).equals(this)); + return Boolean.valueOf(Proxy.getInvocationHandler(args[0]).equals(this)); } catch (IllegalArgumentException e) { return Boolean.FALSE; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java index f2c723d94a..c5fcf8386c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java @@ -26,7 +26,7 @@ public interface IRemoteCall { * property not set, the default is set to 30000ms (30s). * @since 4.0 */ - public static final long DEFAULT_TIMEOUT = new Long(System.getProperty("ecf.remotecall.timeout", "30000")).longValue(); //$NON-NLS-1$ //$NON-NLS-2$ + public static final long DEFAULT_TIMEOUT = Long.valueOf(System.getProperty("ecf.remotecall.timeout", "30000")).longValue(); //$NON-NLS-1$ //$NON-NLS-2$ /** * Get the method name to call on the remote. Must return a non-null and diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java index 410d2a2bb4..bdca6fa879 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java @@ -149,7 +149,7 @@ protected Properties createProperties(Dictionary props) { resultProps.setProperty(RemoteServiceRegistryImpl.REMOTEOBJECTCLASS, clazzes); - resultProps.setProperty(RemoteServiceRegistryImpl.REMOTESERVICE_ID, new Long(getID().getContainerRelativeID())); + resultProps.setProperty(RemoteServiceRegistryImpl.REMOTESERVICE_ID, Long.valueOf(getID().getContainerRelativeID())); final Object ranking = (props == null) ? null : props.get(RemoteServiceRegistryImpl.REMOTESERVICE_RANKING); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java index f7c5103ccd..fd278a5369 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java @@ -221,6 +221,6 @@ public String toString() { * @since 3.0 */ public IRemoteServiceID createRemoteServiceID(long serviceid) { - return (IRemoteServiceID) IDFactory.getDefault().createID(IDFactory.getDefault().getNamespaceByName(RemoteServiceNamespace.NAME), new Object[] {getContainerID(), new Long(serviceid)}); + return (IRemoteServiceID) IDFactory.getDefault().createID(IDFactory.getDefault().getNamespaceByName(RemoteServiceNamespace.NAME), new Object[] {getContainerID(), Long.valueOf(serviceid)}); } } diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.classpath b/framework/bundles/org.eclipse.ecf.sharedobject/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/.classpath +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs index 846e8eb136..21fa1798b3 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs @@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,23 +127,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -213,11 +218,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -247,6 +253,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -270,12 +278,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -321,6 +333,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -356,8 +370,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -380,6 +397,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF index 85dbb388ac..f332176fb9 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.eclipse.ecf.sharedobject;singleton:=true Automatic-Module-Name: org.eclipse.ecf.sharedobject -Bundle-Version: 2.6.200.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.core.sharedobject.Activator Bundle-Localization: plugin Bundle-Vendor: %plugin.provider @@ -16,7 +17,6 @@ Export-Package: org.eclipse.ecf.core.sharedobject;version="2.3", org.eclipse.ecf.core.util.reflection;version="2.2.100", org.eclipse.ecf.internal.core.sharedobject;version="2.2.100";x-internal:=true Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.equinox.registry;bundle-version="[3.0.0,4.0.0)";resolution:=optional, org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)" diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml index 82fc0be9ae..60f6d42b01 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml +++ b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.sharedobject - 2.6.200-SNAPSHOT + 2.7.0-SNAPSHOT eclipse-plugin diff --git a/protocols/bundles/ch.ethz.iks.slp/.classpath b/protocols/bundles/ch.ethz.iks.slp/.classpath index 2054b9f915..a320ad83f8 100644 --- a/protocols/bundles/ch.ethz.iks.slp/.classpath +++ b/protocols/bundles/ch.ethz.iks.slp/.classpath @@ -1,6 +1,6 @@ - + diff --git a/protocols/bundles/ch.ethz.iks.slp/.settings/org.eclipse.jdt.core.prefs b/protocols/bundles/ch.ethz.iks.slp/.settings/org.eclipse.jdt.core.prefs index 59ae0dd82f..dd3b50762c 100644 --- a/protocols/bundles/ch.ethz.iks.slp/.settings/org.eclipse.jdt.core.prefs +++ b/protocols/bundles/ch.ethz.iks.slp/.settings/org.eclipse.jdt.core.prefs @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -120,6 +120,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF index cf5ed7fe06..cc14d68fd1 100644 --- a/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Service Location Protocol (RFC 2608) Implementation Bundle-SymbolicName: ch.ethz.iks.slp Automatic-Module-Name: ch.ethz.iks.slp -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.5.0.qualifier Export-Package: ch.ethz.iks.slp;version="1.0.0" Bundle-Activator: ch.ethz.iks.slp.impl.Activator Bundle-Vendor: Eclipse.org - ECF @@ -11,4 +11,4 @@ Import-Package: org.osgi.framework;version="[1.0.0,2.0.0)", org.osgi.service.log;version="[1.0.0,2.0.0)" Bundle-Description: jSLP, the pure Java Service Location Protocol implementation Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/protocols/bundles/ch.ethz.iks.slp/pom.xml b/protocols/bundles/ch.ethz.iks.slp/pom.xml index 69a45de303..151c7f3583 100644 --- a/protocols/bundles/ch.ethz.iks.slp/pom.xml +++ b/protocols/bundles/ch.ethz.iks.slp/pom.xml @@ -8,8 +8,7 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf ch.ethz.iks.slp - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT eclipse-plugin diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml index a04ff4768e..967ea65229 100644 --- a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml @@ -2,7 +2,7 @@ @@ -26,9 +26,6 @@ + version="0.0.0"/> diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml b/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml index 6f31cc4d70..b9531adc8c 100644 --- a/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.sharedobject.feature - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-feature diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath index 867c88624c..e5f772d84d 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath @@ -1,6 +1,6 @@ - + diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.core.resources.prefs b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs index 742dffaa61..c98b28323a 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= 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.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -111,4 +111,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF index bee292997e..2f36b6b8d3 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.remoteservice.eventadmin Automatic-Module-Name: org.eclipse.ecf.remoteservice.eventadmin -Bundle-Version: 1.3.101.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: bundle Import-Package: org.eclipse.ecf.core.sharedobject, org.eclipse.ecf.core.sharedobject.events, diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml index 979b104a5c..d4437939ed 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.remoteservice.eventadmin - 1.3.101-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-plugin diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.classpath b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.classpath index 6f3b481acd..eca7bdba8f 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.classpath +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.classpath @@ -1,6 +1,6 @@ - + diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.core.resources.prefs b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.jdt.core.prefs b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.jdt.core.prefs index 8b264563da..0869a9baf8 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.jdt.core.prefs +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Mon Feb 04 22:24:25 PST 2008 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.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF index 9a64860389..e51a9b3aef 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF @@ -3,12 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.common Automatic-Module-Name: org.eclipse.ecf.examples.remoteservices.common -Bundle-Version: 1.0.201.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.common.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.osgi.framework Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.examples.remoteservices.common;version="1.0.0", diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.classpath b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.classpath index ad32c83a78..e801ebfb46 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.classpath +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.core.resources.prefs b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..68a0304527 --- /dev/null +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=windows-1252 diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.jdt.core.prefs b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.jdt.core.prefs index c537b63063..a58ebdcad3 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.jdt.core.prefs +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +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.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF index c35a4d2c1e..1f87848b2b 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.pde;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.pde -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.ecf.remoteservices.internal.tooling.pde.Activator Bundle-Vendor: %plugin.provider Require-Bundle: org.eclipse.ui, diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml index 075efbb8cb..36a49df2d0 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml @@ -8,8 +8,8 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf + org.eclipse.ecf.remoteservices.tooling.pde - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT eclipse-plugin