Skip to content

Commit

Permalink
Brute force update of the target platform to latest Orbit versions
Browse files Browse the repository at this point in the history 
eclipse#95
  • Loading branch information
@merks
merks committed Apr 5, 2024
1 parent 1349fb6 commit fe15866
Show file tree
Hide file tree
Showing 25 changed files with 624 additions and 63 deletions.
2 changes: 1 addition & 1 deletion ...s/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product
View file
Expand Up @@ -28,7 +28,7 @@
<plugins>
<plugin id="com.mycorp.examples.osgi.async"/>
<plugin id="com.mycorp.examples.osgi.async.consumer"/>
<plugin id="javax.servlet"/>
<plugin id="jakarta.servlet.jsp-api"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product
View file
Expand Up @@ -28,7 +28,7 @@
<plugins>
<plugin id="com.mycorp.examples.osgi.async"/>
<plugin id="com.mycorp.examples.osgi.async.impl"/>
<plugin id="javax.servlet"/>
<plugin id="jakarta.servlet.jsp-api"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
Expand Down
2 changes: 1 addition & 1 deletion ...rp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product
View file
Expand Up @@ -62,7 +62,7 @@
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.json"/>
<plugin id="json"/>
</plugins>

<configurations>
Expand Down
2 changes: 1 addition & 1 deletion ...examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
View file
Expand Up @@ -30,7 +30,7 @@
<plugins>
<plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/>
<plugin id="javax.servlet"/>
<plugin id="jakarta.servlet.jsp-api"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
Expand Down
2 changes: 1 addition & 1 deletion ...m.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
View file
Expand Up @@ -66,7 +66,7 @@
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.json"/>
<plugin id="json"/>
</plugins>

<configurations>
Expand Down
2 changes: 1 addition & 1 deletion ...ycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
View file
Expand Up @@ -30,7 +30,7 @@
<plugins>
<plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
<plugin id="javax.servlet"/>
<plugin id="jakarta.servlet.jsp-api"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
Expand Down
2 changes: 1 addition & 1 deletion .../bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
View file
Expand Up @@ -65,7 +65,7 @@
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.json"/>
<plugin id="json"/>
</plugins>

<configurations>
Expand Down
4 changes: 2 additions & 2 deletions ...ndles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
View file
Expand Up @@ -36,7 +36,7 @@
<plugins>
<plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.host"/>
<plugin id="javax.servlet"/>
<plugin id="jakarta.servlet.jsp-api"/>
<plugin id="org.apache.commons.commons-codec"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
Expand Down Expand Up @@ -80,7 +80,7 @@
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
<plugin id="org.eclipse.osgi.util"/>
<plugin id="org.json"/>
<plugin id="json"/>
</plugins>

<configurations>
Expand Down
41 changes: 12 additions & 29 deletions ...se.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/start/AccountStart.java
View file
Expand Up @@ -12,10 +12,7 @@
*****************************************************************************/
package org.eclipse.ecf.internal.example.collab.start;

import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.preferences.InstanceScope;
Expand All @@ -41,8 +38,7 @@ private String normalizeURI(String uri) {

public void removeConnectionDetails(ConnectionDetails cd) {
try {
Preferences preferences = new InstanceScope()
.getNode(ClientPlugin.PLUGIN_ID);
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
Preferences connections = preferences.node(SAVED);
String[] targets = connections.childrenNames();
for (int i = 0; i < targets.length; i++) {
Expand All @@ -55,10 +51,7 @@ public void removeConnectionDetails(ConnectionDetails cd) {
}
connections.flush();
} catch (BackingStoreException e) {
ClientPlugin.getDefault().getLog().log(
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
BACKING_STORE_LOAD_ERROR,
Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
}
}

Expand All @@ -67,13 +60,11 @@ public Collection getConnectionDetails() {
}

public void saveConnectionDetailsToPreferenceStore() {
Preferences preferences = new InstanceScope()
.getNode(ClientPlugin.PLUGIN_ID);
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
Preferences connections = preferences.node(SAVED);
for (Iterator i = connectionDetails.keySet().iterator(); i.hasNext();) {
String target = (String) i.next();
ConnectionDetails details = (ConnectionDetails) connectionDetails
.get(target);
ConnectionDetails details = (ConnectionDetails) connectionDetails.get(target);
Preferences p = connections.node(target);
p.put(ConnectionDetails.CONTAINER_TYPE, details.getContainerType());
p.put(ConnectionDetails.TARGET_URI, details.getTargetURI());
Expand All @@ -83,35 +74,27 @@ public void saveConnectionDetailsToPreferenceStore() {
try {
connections.flush();
} catch (BackingStoreException e) {
ClientPlugin.getDefault().getLog().log(
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
BACKING_STORE_SAVE_ERROR,
Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_SAVE_ERROR, Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
}
}

public void loadConnectionDetailsFromPreferenceStore() {
try {
Preferences preferences = new InstanceScope()
.getNode(ClientPlugin.PLUGIN_ID);
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
Preferences connections = preferences.node(SAVED);
String[] targets = connections.childrenNames();
for (int i = 0; i < targets.length; i++) {
String target = targets[i];
Preferences node = connections.node(target);
if (node != null) {
addConnectionDetails(new ConnectionDetails(node.get(
ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
ConnectionDetails.TARGET_URI, ""), node.get( //$NON-NLS-1$
ConnectionDetails.NICKNAME, ""), node.get( //$NON-NLS-1$
ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
addConnectionDetails(new ConnectionDetails(node.get(ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
ConnectionDetails.TARGET_URI, ""), //$NON-NLS-1$
node.get(ConnectionDetails.NICKNAME, ""), //$NON-NLS-1$
node.get(ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
}
}
} catch (BackingStoreException e) {
ClientPlugin.getDefault().getLog().log(
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
BACKING_STORE_LOAD_ERROR,
Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
}
}
}
4 changes: 2 additions & 2 deletions examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
View file
Expand Up @@ -504,7 +504,7 @@
unpack="false"/>

<plugin
id="javax.servlet.jsp"
id="jakarta.servlet.jsp-api"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down Expand Up @@ -743,7 +743,7 @@
unpack="false"/>

<plugin
id="javax.servlet"
id="jakarta.servlet.jsp-api"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
12 changes: 10 additions & 2 deletions framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath
View file
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/apache/http/impl/client/*"/>
</accessrules>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -73,8 +73,8 @@

<properties>
<tycho-version>2.7.5</tycho-version>
<cbi-version>1.3.2</cbi-version>
<target-platform>2022-03</target-platform>
<cbi-version>1.4.3</cbi-version>
<target-platform>latest-3</target-platform>
<execution-environment>JavaSE-17</execution-environment>
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
Expand Down
6 changes: 3 additions & 3 deletions ....eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
View file
Expand Up @@ -190,10 +190,10 @@ public void connect(ID aTargetID, IConnectContext connectContext)
// fall back to the search path as last resort
if(aTargetID == null || !(aTargetID instanceof DnsSdServiceTypeID)) {
ResolverConfig config = new ResolverConfig();
Name[] searchPaths = config.searchPath();
if(searchPaths != null && searchPaths.length > 0) {
List searchPaths = config.searchPath();
if(!searchPaths.isEmpty()) {
targetID = new DnsSdServiceTypeID();
targetID.setSearchPath(searchPaths);
targetID.setSearchPath((Name[])searchPaths.toArray(new Name[searchPaths.size()]));
} else {
throw new ContainerConnectException(Messages.DnsSdDiscoveryLocator_No_Target_ID);
}
Expand Down
2 changes: 1 addition & 1 deletion ...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier">
<implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier"/>
</scr:component>
2 changes: 1 addition & 1 deletion ...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier">
<implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier"/>
</scr:component>
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.examples/feature.xml
View file
Expand Up @@ -48,7 +48,7 @@
<import plugin="org.eclipse.ecf.examples.remoteservices.common"/>
<import plugin="org.eclipse.ecf.ui"/>
<import plugin="org.eclipse.equinox.common"/>
<import plugin="javax.servlet"/>
<import plugin="jakarta.servlet.jsp-api"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.ecf.remoteservice.ui"/>
<import plugin="org.eclipse.equinox.app"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
View file
Expand Up @@ -28,7 +28,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
<import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
<import plugin="org.json" version="1.0.0" match="compatible"/>
<import plugin="json"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.ecf.releng.repository/category.xml
View file
Expand Up @@ -60,7 +60,7 @@
<feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
<category name="remoteservices"/>
</feature>
<iu id="org.json" version="0.0.0">
<iu id="json" version="0.0.0">
<category name="sdk"/>
</iu>
<iu id="org.objectweb.asm" version="0.0.0">
Expand Down
77 changes: 77 additions & 0 deletions releng/org.eclipse.ecf.releng.target/ecf-latest-1.target
View file
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Generated from ECF" sequenceNumber="10">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.ui" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="bcpg" version="0.0.0"/>
<unit id="biz.aQute.resolve" version="0.0.0"/>
<unit id="com.ibm.icu" version="0.0.0"/>
<unit id="com.jcraft.jsch" version="0.0.0"/>
<unit id="com.sun.jna.platform" version="0.0.0"/>
<unit id="jakarta.annotation-api" version="0.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
<unit id="jakarta.servlet-api" version="0.0.0"/>
<unit id="jakarta.xml.bind-api" version="0.0.0"/>
<unit id="json" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
<unit id="junit-jupiter-params" version="0.0.0"/>
<unit id="junit-platform-runner" version="0.0.0"/>
<unit id="junit-platform-suite-engine" version="0.0.0"/>
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.apache.ant" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.commons.httpclient" version="0.0.0"/>
<unit id="org.apache.commons.jxpath" version="0.0.0"/>
<unit id="org.apache.felix.gogo.runtime" version="0.0.0"/>
<unit id="org.apache.httpcomponents.client5.httpclient5" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
<unit id="org.apache.log4j" version="0.0.0"/>
<unit id="org.apache.lucene.analysis-smartcn" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.bndtools.headless.build.plugin.gradle" version="0.0.0"/>
<unit id="org.bndtools.templates.template" version="0.0.0"/>
<unit id="org.bndtools.templating" version="0.0.0"/>
<unit id="org.osgi.annotation.bundle" version="0.0.0"/>
<unit id="org.osgi.annotation.versioning" version="0.0.0"/>
<unit id="org.osgi.namespace.contract" version="0.0.0"/>
<unit id="org.osgi.namespace.extender" version="0.0.0"/>
<unit id="org.osgi.namespace.service" version="0.0.0"/>
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
<unit id="org.osgi.service.device" version="0.0.0"/>
<unit id="org.osgi.service.event" version="0.0.0"/>
<unit id="org.osgi.service.http.whiteboard" version="0.0.0"/>
<unit id="org.osgi.service.metatype.annotations" version="0.0.0"/>
<unit id="org.osgi.service.prefs" version="0.0.0"/>
<unit id="org.osgi.service.provisioning" version="0.0.0"/>
<unit id="org.osgi.service.upnp" version="0.0.0"/>
<unit id="org.osgi.service.useradmin" version="0.0.0"/>
<unit id="org.osgi.service.wireadmin" version="0.0.0"/>
<unit id="org.osgi.util.position" version="0.0.0"/>
<unit id="org.osgi.util.xml" version="0.0.0"/>
<unit id="org.sat4j.pb" version="0.0.0"/>
<unit id="org.tukaani.xz" version="0.0.0"/>
<unit id="org.xbill.dns" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.sun.syndication" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
</location>
</locations>
</target>

0 comments on commit fe15866

Please sign in to comment.