Author: gtrasuk
Date: Wed Mar 28 18:49:44 2012
New Revision: 1306534
URL: http://svn.apache.org/viewvc?rev=1306534&view=rev
Log:
Module now successfully loads into the River Container (making this not a bad
example of how to structure a starter-service module for the container). The
container doesn't yet have a security manager subsystem, so the service fails
to join the djinn as yet. Now to work on the container...
Added:
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/Utils.java
Modified:
river/jtsk/skunk/RiverContainerTests/app-root/default.config
river/jtsk/skunk/RiverContainerTests/app-root/start.properties
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/TestRunnerService.java
Modified: river/jtsk/skunk/RiverContainerTests/app-root/default.config
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RiverContainerTests/app-root/default.config?rev=1306534&r1=1306533&r2=1306534&view=diff
==============================================================================
--- river/jtsk/skunk/RiverContainerTests/app-root/default.config (original)
+++ river/jtsk/skunk/RiverContainerTests/app-root/default.config Wed Mar 28
18:49:44 2012
@@ -25,15 +25,13 @@ import net.jini.jeri.tcp.TcpServerEndpoi
import net.jini.core.entry.Entry;
import net.jini.discovery.LookupDiscovery;
import net.jini.lookup.entry.Name;
-
-import com.sun.jini.start.NonActivatableServiceDescriptor;
-import com.sun.jini.start.ServiceDescriptor;
-import com.sun.jini.config.ConfigUtil;
+import net.jini.lookup.JoinManager;
+import org.apache.river.container.tests.Utils;
org.apache.river.container.tests {
service="TestRunner";
- discoveryGroup="Test";
+ discoveryGroup="HOSTED-TEST";
/* If implementing an api with a different name from the service,
override start.apiName
@@ -43,7 +41,7 @@ org.apache.river.container.tests {
serviceClass = service;
joinManager =
- new JoinManager($data, attributes, null, discoveryManager, null);
+ new JoinManager($data, attributes, serviceId, discoveryManager, null,
this);
exporter = new BasicJeriExporter(endpoint, invocationLayerFactory);
@@ -57,6 +55,8 @@ org.apache.river.container.tests {
static nameEntry=new Name(service);
static attributes = new Entry[] { nameEntry };
+
+ static serviceId=Utils.createServiceID();
}
net.jini.lookup.JoinManager {
Modified: river/jtsk/skunk/RiverContainerTests/app-root/start.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RiverContainerTests/app-root/start.properties?rev=1306534&r1=1306533&r2=1306534&view=diff
==============================================================================
--- river/jtsk/skunk/RiverContainerTests/app-root/start.properties (original)
+++ river/jtsk/skunk/RiverContainerTests/app-root/start.properties Wed Mar 28
18:49:44 2012
@@ -16,5 +16,5 @@
# limitations under the License.
#
-startClass=org.apache.river.conatiner.tests.TestRunnerService
+startClass=org.apache.river.container.tests.TestRunnerService
startParameters=default.config
Modified:
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/TestRunnerService.java
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/TestRunnerService.java?rev=1306534&r1=1306533&r2=1306534&view=diff
==============================================================================
---
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/TestRunnerService.java
(original)
+++
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/TestRunnerService.java
Wed Mar 28 18:49:44 2012
@@ -54,7 +54,7 @@ public class TestRunnerService implement
/*
* Get the exporter.
*/
- Exporter ex = (Exporter) config.getEntry(Strings.APP,
Strings.EXPORTER, null);
+ Exporter ex = (Exporter) config.getEntry(Strings.APP,
Strings.EXPORTER, Exporter.class);
/*
* Export the service.
*/
@@ -62,7 +62,7 @@ public class TestRunnerService implement
/*
* Create the joinmanager.
*/
- JoinManager jm = (JoinManager) config.getEntry(Strings.APP,
Strings.JOIN_MANAGER, JoinManager.class, Configuration.NO_DEFAULT, proxy);
+ joinManager = (JoinManager) config.getEntry(Strings.APP,
Strings.JOIN_MANAGER, JoinManager.class, Configuration.NO_DEFAULT, proxy);
System.out.println("Joined registrars " +
Arrays.toString(joinManager.getDiscoveryManager().getRegistrars()) );
}
Added:
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/Utils.java
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/Utils.java?rev=1306534&view=auto
==============================================================================
---
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/Utils.java
(added)
+++
river/jtsk/skunk/RiverContainerTests/src/org/apache/river/container/tests/Utils.java
Wed Mar 28 18:49:44 2012
@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.river.container.tests;
+
+import java.util.UUID;
+import net.jini.core.lookup.ServiceID;
+
+/**
+ *
+ * @author trasukg
+ */
+public class Utils {
+ public static ServiceID createServiceID() {
+ UUID uuid=UUID.randomUUID();
+ ServiceID sid=
+ new ServiceID(uuid.getMostSignificantBits(),
+ uuid.getLeastSignificantBits());
+ return sid;
+ }
+}
