From 66dba3be4ad79326508c7a0e9c8d0990609fba2e Mon Sep 17 00:00:00 2001 From: Peter Firmstone Date: Thu, 19 Sep 2019 08:11:46 +1000 Subject: [PATCH 1/2] Changes to Rio, to use the latest release of JGDMS 3.1.0 Jini Platform implementation. --- distribution/pom.xml | 6 ++-- .../src/main/config/poms/reggie-dl-2.2.2.pom | 10 +++---- pom.xml | 28 +++++++++--------- rio-core/rio-api/pom.xml | 17 +++++++---- .../deploy/ServiceProvisionEvent.java | 4 +-- .../rioproject/event/RemoteServiceEvent.java | 2 +- rio-core/rio-lib/pom.xml | 29 ++++++++++++++----- rio-core/rio-proxy/pom.xml | 4 +-- rio-platform/pom.xml | 14 +++++++-- rio-services/cybernode/cybernode-api/pom.xml | 9 +++--- .../cybernode/cybernode-proxy/pom.xml | 5 ++-- .../cybernode/cybernode-service/pom.xml | 4 +-- rio-services/cybernode/cybernode-ui/pom.xml | 8 ++--- .../event-collector-api/pom.xml | 5 ++-- .../event-collector-proxy/pom.xml | 5 ++-- rio-services/monitor/monitor-api/pom.xml | 8 ++--- rio-services/monitor/monitor-proxy/pom.xml | 8 ++--- rio-services/monitor/monitor-service/pom.xml | 9 +++--- .../service/DeploymentVerifierTest.java | 3 +- rio-start/pom.xml | 15 +++++++--- rio-test/pom.xml | 6 ++-- rio-tools/rio-ui/pom.xml | 4 +-- rio-tools/watch-ui/pom.xml | 4 +-- 23 files changed, 122 insertions(+), 85 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 2cb78ea17..d2f0b57ef 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -135,13 +135,13 @@ - org.apache.river - reggie + au.net.zeus.jgdms.reggie + reggie-service true - org.apache.river + au.net.zeus.jgdms.reggie reggie-dl true diff --git a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom index 37a9fe484..701551721 100644 --- a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom +++ b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom @@ -18,9 +18,9 @@ 4.0.0 - org.apache.river + au.net.zeus.jgdms.reggie reggie-dl - 2.2.2 + 3.1 http://river.apache.org River Lookup and Registry service client download jar @@ -38,9 +38,9 @@ - net.jini - jsk-dl - 2.2.2 + au.net.zeus.jgdms + jgdms-lib-dl + 3.1 diff --git a/pom.xml b/pom.xml index 869ebb339..f6c8fa555 100644 --- a/pom.xml +++ b/pom.xml @@ -177,44 +177,44 @@ - org.apache.river - start + au.net.zeus.jgdms + jini-2.1-compat ${river.version} - net.jini - jsk-lib + au.net.zeus.jgdms + jgdms-lib ${river.version} - net.jini - jsk-dl + au.net.zeus.jgdms + jgdms-lib-dl ${river.version} - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform ${river.version} - org.apache.river - reggie + au.net.zeus.jgdms.reggie + reggie-service ${river.version} - org.apache.river + au.net.zeus.jgdms.reggie reggie-dl ${river.version} - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory ${river.version} @@ -436,7 +436,7 @@ 4.12 5.6.6 5.1 - 2.2.2 + 3.1.0 1.6.3.82 ${settings.localRepository}/org/hyperic/sigar-dist ${hyperic.repo.dir}/${hyperic.version}/sigar-dist-${hyperic.version} diff --git a/rio-core/rio-api/pom.xml b/rio-core/rio-api/pom.xml index 999d36a7c..34298c4f0 100644 --- a/rio-core/rio-api/pom.xml +++ b/rio-core/rio-api/pom.xml @@ -22,13 +22,13 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-dl + au.net.zeus.jgdms + jgdms-lib-dl @@ -39,10 +39,15 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided + + + au.net.zeus.jgdms + jini-2.1-compat + org.slf4j diff --git a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java index c592d46ae..2dc12b143 100644 --- a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java +++ b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java @@ -45,7 +45,7 @@ public class ServiceProvisionEvent extends RemoteEvent implements Serializable { * @param source The event source */ public ServiceProvisionEvent(Object source) { - super(source, ID, 0, null); + super(source, ID, 0, (MarshalledObject) null); } /** @@ -58,7 +58,7 @@ public ServiceProvisionEvent(Object source) { public ServiceProvisionEvent(Object source, OperationalStringManager opStringManager, ServiceElement svcElement) { - super(source, ID, 0, null); + super(source, ID, 0, (MarshalledObject) null); this.opStringManager = opStringManager; this.svcElement = svcElement; } diff --git a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java index 1402e373d..65e552f21 100644 --- a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java +++ b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java @@ -52,7 +52,7 @@ public RemoteServiceEvent(Object source) { * source is required by RemoteEvents' superclass, * EventObject, which rejects a null for source. */ - super(source, 0, 0, null); + super(source, 0, 0, (MarshalledObject) null); date = new Date(System.currentTimeMillis()); } diff --git a/rio-core/rio-lib/pom.xml b/rio-core/rio-lib/pom.xml index 4614b7280..592143dd8 100644 --- a/rio-core/rio-lib/pom.xml +++ b/rio-core/rio-lib/pom.xml @@ -55,24 +55,37 @@ - org.apache.river - start + au.net.zeus.jgdms + service-starter + ${river.version} true - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-lib + au.net.zeus.jgdms + jgdms-lib + + + + au.net.zeus.jgdms + jgdms-discovery-providers + ${river.version} + + + + au.net.zeus.jgdms + jgdms-jrmp + ${river.version} - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided diff --git a/rio-core/rio-proxy/pom.xml b/rio-core/rio-proxy/pom.xml index a8d8ed384..bf1765970 100644 --- a/rio-core/rio-proxy/pom.xml +++ b/rio-core/rio-proxy/pom.xml @@ -22,8 +22,8 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided diff --git a/rio-platform/pom.xml b/rio-platform/pom.xml index 83409bd54..6e8572b7d 100644 --- a/rio-platform/pom.xml +++ b/rio-platform/pom.xml @@ -18,8 +18,16 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform + ${river.version} + provided + + + + au.net.zeus.jgdms + jgdms-jeri + ${river.version} provided @@ -62,7 +70,7 @@ ${project.version} ${project.version} ${maven.build.timestamp} - jsk-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar + jgdms-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar diff --git a/rio-services/cybernode/cybernode-api/pom.xml b/rio-services/cybernode/cybernode-api/pom.xml index 31c653f41..84519566b 100644 --- a/rio-services/cybernode/cybernode-api/pom.xml +++ b/rio-services/cybernode/cybernode-api/pom.xml @@ -23,13 +23,14 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform + ${river.version} provided diff --git a/rio-services/cybernode/cybernode-proxy/pom.xml b/rio-services/cybernode/cybernode-proxy/pom.xml index f7720f421..6b0f24367 100644 --- a/rio-services/cybernode/cybernode-proxy/pom.xml +++ b/rio-services/cybernode/cybernode-proxy/pom.xml @@ -29,8 +29,9 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform + ${river.version} provided diff --git a/rio-services/cybernode/cybernode-service/pom.xml b/rio-services/cybernode/cybernode-service/pom.xml index fb701d670..809942d1d 100644 --- a/rio-services/cybernode/cybernode-service/pom.xml +++ b/rio-services/cybernode/cybernode-service/pom.xml @@ -41,8 +41,8 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory diff --git a/rio-services/cybernode/cybernode-ui/pom.xml b/rio-services/cybernode/cybernode-ui/pom.xml index 3582235ca..bfa63fdd2 100644 --- a/rio-services/cybernode/cybernode-ui/pom.xml +++ b/rio-services/cybernode/cybernode-ui/pom.xml @@ -29,13 +29,13 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided diff --git a/rio-services/event-collector/event-collector-api/pom.xml b/rio-services/event-collector/event-collector-api/pom.xml index bd017af35..637c4f851 100644 --- a/rio-services/event-collector/event-collector-api/pom.xml +++ b/rio-services/event-collector/event-collector-api/pom.xml @@ -23,8 +23,9 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform + ${river.version} provided diff --git a/rio-services/event-collector/event-collector-proxy/pom.xml b/rio-services/event-collector/event-collector-proxy/pom.xml index 96b4d8ebb..ac0dd8ad9 100644 --- a/rio-services/event-collector/event-collector-proxy/pom.xml +++ b/rio-services/event-collector/event-collector-proxy/pom.xml @@ -35,8 +35,9 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform + ${river.version} provided diff --git a/rio-services/monitor/monitor-api/pom.xml b/rio-services/monitor/monitor-api/pom.xml index 0faaa6be7..8611f9fd3 100644 --- a/rio-services/monitor/monitor-api/pom.xml +++ b/rio-services/monitor/monitor-api/pom.xml @@ -23,13 +23,13 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided diff --git a/rio-services/monitor/monitor-proxy/pom.xml b/rio-services/monitor/monitor-proxy/pom.xml index 6f7992b77..0ccab27a7 100644 --- a/rio-services/monitor/monitor-proxy/pom.xml +++ b/rio-services/monitor/monitor-proxy/pom.xml @@ -35,13 +35,13 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided diff --git a/rio-services/monitor/monitor-service/pom.xml b/rio-services/monitor/monitor-service/pom.xml index f6c7e698b..56fd3ea75 100644 --- a/rio-services/monitor/monitor-service/pom.xml +++ b/rio-services/monitor/monitor-service/pom.xml @@ -35,8 +35,8 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory @@ -65,9 +65,8 @@ - org.apache.river - reggie - ${river.version} + au.net.zeus.jgdms.reggie + reggie-service test diff --git a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java index 068572ae0..d229eb9c0 100644 --- a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java +++ b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java @@ -187,8 +187,9 @@ private boolean hasGroup(Reggie registrar, String group) throws NoSuchObjectExce private void startLookup(String... groups) throws Exception { DynamicConfiguration configuration = new DynamicConfiguration(); - configuration.setEntry("com.sun.jini.reggie", "initialMemberGroups", String[].class, groups); + configuration.setEntry("org.apache.river.reggie", "initialMemberGroups", String[].class, groups); registrar = new Reggie(configuration, null); + registrar.start(); listener = new DL(); discoveryManagement = new LookupDiscoveryManager(new String[]{"foo"}, null, listener); deploymentVerifier = new DeploymentVerifier(EmptyConfiguration.INSTANCE, discoveryManagement); diff --git a/rio-start/pom.xml b/rio-start/pom.xml index 255a47cdc..005260a13 100644 --- a/rio-start/pom.xml +++ b/rio-start/pom.xml @@ -23,13 +23,20 @@ - org.apache.river - start + au.net.zeus.jgdms + service-starter + 3.1.0 + + + + au.net.zeus.jgdms + jini-2.1-compat + 3.1.0 - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform diff --git a/rio-test/pom.xml b/rio-test/pom.xml index e9ad28fa5..a199a1459 100644 --- a/rio-test/pom.xml +++ b/rio-test/pom.xml @@ -74,15 +74,15 @@ - org.apache.river + au.net.zeus.jgdms.outrigger outrigger-dl ${river.version} test - org.apache.river - outrigger + au.net.zeus.jgdms.outrigger + outrigger-service ${river.version} test diff --git a/rio-tools/rio-ui/pom.xml b/rio-tools/rio-ui/pom.xml index fa20153b9..c5e80d80e 100644 --- a/rio-tools/rio-ui/pom.xml +++ b/rio-tools/rio-ui/pom.xml @@ -57,8 +57,8 @@ - net.jini.lookup - serviceui + au.net.zeus.jgdms + jgdms-ui-factory diff --git a/rio-tools/watch-ui/pom.xml b/rio-tools/watch-ui/pom.xml index 2659671ac..efeff61b7 100644 --- a/rio-tools/watch-ui/pom.xml +++ b/rio-tools/watch-ui/pom.xml @@ -22,8 +22,8 @@ - net.jini - jsk-platform + au.net.zeus.jgdms + jgdms-platform provided From 85276665a018037a6bfbe7d4309a0fc0a401206e Mon Sep 17 00:00:00 2001 From: pfirmstone Date: Sat, 9 May 2026 23:07:25 +1000 Subject: [PATCH 2/2] Revert "Changes to Rio, to use the latest release of JGDMS 3.1.0 Jini Platform implementation." This reverts commit 66dba3be4ad79326508c7a0e9c8d0990609fba2e. --- distribution/pom.xml | 6 ++-- .../src/main/config/poms/reggie-dl-2.2.2.pom | 10 +++---- pom.xml | 28 +++++++++--------- rio-core/rio-api/pom.xml | 17 ++++------- .../deploy/ServiceProvisionEvent.java | 4 +-- .../rioproject/event/RemoteServiceEvent.java | 2 +- rio-core/rio-lib/pom.xml | 29 +++++-------------- rio-core/rio-proxy/pom.xml | 4 +-- rio-platform/pom.xml | 14 ++------- rio-services/cybernode/cybernode-api/pom.xml | 9 +++--- .../cybernode/cybernode-proxy/pom.xml | 5 ++-- .../cybernode/cybernode-service/pom.xml | 4 +-- rio-services/cybernode/cybernode-ui/pom.xml | 8 ++--- .../event-collector-api/pom.xml | 5 ++-- .../event-collector-proxy/pom.xml | 5 ++-- rio-services/monitor/monitor-api/pom.xml | 8 ++--- rio-services/monitor/monitor-proxy/pom.xml | 8 ++--- rio-services/monitor/monitor-service/pom.xml | 9 +++--- .../service/DeploymentVerifierTest.java | 3 +- rio-start/pom.xml | 15 +++------- rio-test/pom.xml | 6 ++-- rio-tools/rio-ui/pom.xml | 4 +-- rio-tools/watch-ui/pom.xml | 4 +-- 23 files changed, 85 insertions(+), 122 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index d2f0b57ef..2cb78ea17 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -135,13 +135,13 @@ - au.net.zeus.jgdms.reggie - reggie-service + org.apache.river + reggie true - au.net.zeus.jgdms.reggie + org.apache.river reggie-dl true diff --git a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom index 701551721..37a9fe484 100644 --- a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom +++ b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom @@ -18,9 +18,9 @@ 4.0.0 - au.net.zeus.jgdms.reggie + org.apache.river reggie-dl - 3.1 + 2.2.2 http://river.apache.org River Lookup and Registry service client download jar @@ -38,9 +38,9 @@ - au.net.zeus.jgdms - jgdms-lib-dl - 3.1 + net.jini + jsk-dl + 2.2.2 diff --git a/pom.xml b/pom.xml index f6c8fa555..869ebb339 100644 --- a/pom.xml +++ b/pom.xml @@ -177,44 +177,44 @@ - au.net.zeus.jgdms - jini-2.1-compat + org.apache.river + start ${river.version} - au.net.zeus.jgdms - jgdms-lib + net.jini + jsk-lib ${river.version} - au.net.zeus.jgdms - jgdms-lib-dl + net.jini + jsk-dl ${river.version} - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform ${river.version} - au.net.zeus.jgdms.reggie - reggie-service + org.apache.river + reggie ${river.version} - au.net.zeus.jgdms.reggie + org.apache.river reggie-dl ${river.version} - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui ${river.version} @@ -436,7 +436,7 @@ 4.12 5.6.6 5.1 - 3.1.0 + 2.2.2 1.6.3.82 ${settings.localRepository}/org/hyperic/sigar-dist ${hyperic.repo.dir}/${hyperic.version}/sigar-dist-${hyperic.version} diff --git a/rio-core/rio-api/pom.xml b/rio-core/rio-api/pom.xml index 34298c4f0..999d36a7c 100644 --- a/rio-core/rio-api/pom.xml +++ b/rio-core/rio-api/pom.xml @@ -22,13 +22,13 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-lib-dl + net.jini + jsk-dl @@ -39,15 +39,10 @@ - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided - - - au.net.zeus.jgdms - jini-2.1-compat - org.slf4j diff --git a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java index 2dc12b143..c592d46ae 100644 --- a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java +++ b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java @@ -45,7 +45,7 @@ public class ServiceProvisionEvent extends RemoteEvent implements Serializable { * @param source The event source */ public ServiceProvisionEvent(Object source) { - super(source, ID, 0, (MarshalledObject) null); + super(source, ID, 0, null); } /** @@ -58,7 +58,7 @@ public ServiceProvisionEvent(Object source) { public ServiceProvisionEvent(Object source, OperationalStringManager opStringManager, ServiceElement svcElement) { - super(source, ID, 0, (MarshalledObject) null); + super(source, ID, 0, null); this.opStringManager = opStringManager; this.svcElement = svcElement; } diff --git a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java index 65e552f21..1402e373d 100644 --- a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java +++ b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java @@ -52,7 +52,7 @@ public RemoteServiceEvent(Object source) { * source is required by RemoteEvents' superclass, * EventObject, which rejects a null for source. */ - super(source, 0, 0, (MarshalledObject) null); + super(source, 0, 0, null); date = new Date(System.currentTimeMillis()); } diff --git a/rio-core/rio-lib/pom.xml b/rio-core/rio-lib/pom.xml index 592143dd8..4614b7280 100644 --- a/rio-core/rio-lib/pom.xml +++ b/rio-core/rio-lib/pom.xml @@ -55,37 +55,24 @@ - au.net.zeus.jgdms - service-starter - ${river.version} + org.apache.river + start true - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-lib - - - - au.net.zeus.jgdms - jgdms-discovery-providers - ${river.version} - - - - au.net.zeus.jgdms - jgdms-jrmp - ${river.version} + net.jini + jsk-lib - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided diff --git a/rio-core/rio-proxy/pom.xml b/rio-core/rio-proxy/pom.xml index bf1765970..a8d8ed384 100644 --- a/rio-core/rio-proxy/pom.xml +++ b/rio-core/rio-proxy/pom.xml @@ -22,8 +22,8 @@ - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided diff --git a/rio-platform/pom.xml b/rio-platform/pom.xml index 6e8572b7d..83409bd54 100644 --- a/rio-platform/pom.xml +++ b/rio-platform/pom.xml @@ -18,16 +18,8 @@ - au.net.zeus.jgdms - jgdms-platform - ${river.version} - provided - - - - au.net.zeus.jgdms - jgdms-jeri - ${river.version} + net.jini + jsk-platform provided @@ -70,7 +62,7 @@ ${project.version} ${project.version} ${maven.build.timestamp} - jgdms-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar + jsk-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar diff --git a/rio-services/cybernode/cybernode-api/pom.xml b/rio-services/cybernode/cybernode-api/pom.xml index 84519566b..31c653f41 100644 --- a/rio-services/cybernode/cybernode-api/pom.xml +++ b/rio-services/cybernode/cybernode-api/pom.xml @@ -23,14 +23,13 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-platform - ${river.version} + net.jini + jsk-platform provided diff --git a/rio-services/cybernode/cybernode-proxy/pom.xml b/rio-services/cybernode/cybernode-proxy/pom.xml index 6b0f24367..f7720f421 100644 --- a/rio-services/cybernode/cybernode-proxy/pom.xml +++ b/rio-services/cybernode/cybernode-proxy/pom.xml @@ -29,9 +29,8 @@ - au.net.zeus.jgdms - jgdms-platform - ${river.version} + net.jini + jsk-platform provided diff --git a/rio-services/cybernode/cybernode-service/pom.xml b/rio-services/cybernode/cybernode-service/pom.xml index 809942d1d..fb701d670 100644 --- a/rio-services/cybernode/cybernode-service/pom.xml +++ b/rio-services/cybernode/cybernode-service/pom.xml @@ -41,8 +41,8 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui diff --git a/rio-services/cybernode/cybernode-ui/pom.xml b/rio-services/cybernode/cybernode-ui/pom.xml index bfa63fdd2..3582235ca 100644 --- a/rio-services/cybernode/cybernode-ui/pom.xml +++ b/rio-services/cybernode/cybernode-ui/pom.xml @@ -29,13 +29,13 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided diff --git a/rio-services/event-collector/event-collector-api/pom.xml b/rio-services/event-collector/event-collector-api/pom.xml index 637c4f851..bd017af35 100644 --- a/rio-services/event-collector/event-collector-api/pom.xml +++ b/rio-services/event-collector/event-collector-api/pom.xml @@ -23,9 +23,8 @@ - au.net.zeus.jgdms - jgdms-platform - ${river.version} + net.jini + jsk-platform provided diff --git a/rio-services/event-collector/event-collector-proxy/pom.xml b/rio-services/event-collector/event-collector-proxy/pom.xml index ac0dd8ad9..96b4d8ebb 100644 --- a/rio-services/event-collector/event-collector-proxy/pom.xml +++ b/rio-services/event-collector/event-collector-proxy/pom.xml @@ -35,9 +35,8 @@ - au.net.zeus.jgdms - jgdms-platform - ${river.version} + net.jini + jsk-platform provided diff --git a/rio-services/monitor/monitor-api/pom.xml b/rio-services/monitor/monitor-api/pom.xml index 8611f9fd3..0faaa6be7 100644 --- a/rio-services/monitor/monitor-api/pom.xml +++ b/rio-services/monitor/monitor-api/pom.xml @@ -23,13 +23,13 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided diff --git a/rio-services/monitor/monitor-proxy/pom.xml b/rio-services/monitor/monitor-proxy/pom.xml index 0ccab27a7..6f7992b77 100644 --- a/rio-services/monitor/monitor-proxy/pom.xml +++ b/rio-services/monitor/monitor-proxy/pom.xml @@ -35,13 +35,13 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided diff --git a/rio-services/monitor/monitor-service/pom.xml b/rio-services/monitor/monitor-service/pom.xml index 56fd3ea75..f6c7e698b 100644 --- a/rio-services/monitor/monitor-service/pom.xml +++ b/rio-services/monitor/monitor-service/pom.xml @@ -35,8 +35,8 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui @@ -65,8 +65,9 @@ - au.net.zeus.jgdms.reggie - reggie-service + org.apache.river + reggie + ${river.version} test diff --git a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java index d229eb9c0..068572ae0 100644 --- a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java +++ b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java @@ -187,9 +187,8 @@ private boolean hasGroup(Reggie registrar, String group) throws NoSuchObjectExce private void startLookup(String... groups) throws Exception { DynamicConfiguration configuration = new DynamicConfiguration(); - configuration.setEntry("org.apache.river.reggie", "initialMemberGroups", String[].class, groups); + configuration.setEntry("com.sun.jini.reggie", "initialMemberGroups", String[].class, groups); registrar = new Reggie(configuration, null); - registrar.start(); listener = new DL(); discoveryManagement = new LookupDiscoveryManager(new String[]{"foo"}, null, listener); deploymentVerifier = new DeploymentVerifier(EmptyConfiguration.INSTANCE, discoveryManagement); diff --git a/rio-start/pom.xml b/rio-start/pom.xml index 005260a13..255a47cdc 100644 --- a/rio-start/pom.xml +++ b/rio-start/pom.xml @@ -23,20 +23,13 @@ - au.net.zeus.jgdms - service-starter - 3.1.0 - - - - au.net.zeus.jgdms - jini-2.1-compat - 3.1.0 + org.apache.river + start - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform diff --git a/rio-test/pom.xml b/rio-test/pom.xml index a199a1459..e9ad28fa5 100644 --- a/rio-test/pom.xml +++ b/rio-test/pom.xml @@ -74,15 +74,15 @@ - au.net.zeus.jgdms.outrigger + org.apache.river outrigger-dl ${river.version} test - au.net.zeus.jgdms.outrigger - outrigger-service + org.apache.river + outrigger ${river.version} test diff --git a/rio-tools/rio-ui/pom.xml b/rio-tools/rio-ui/pom.xml index c5e80d80e..fa20153b9 100644 --- a/rio-tools/rio-ui/pom.xml +++ b/rio-tools/rio-ui/pom.xml @@ -57,8 +57,8 @@ - au.net.zeus.jgdms - jgdms-ui-factory + net.jini.lookup + serviceui diff --git a/rio-tools/watch-ui/pom.xml b/rio-tools/watch-ui/pom.xml index efeff61b7..2659671ac 100644 --- a/rio-tools/watch-ui/pom.xml +++ b/rio-tools/watch-ui/pom.xml @@ -22,8 +22,8 @@ - au.net.zeus.jgdms - jgdms-platform + net.jini + jsk-platform provided