You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/01/27 18:21:40 UTC
svn commit: r500565 - in /incubator/tuscany/java/sca:
runtime/standalone/assembly/src/main/assembly/profiles/admin/
runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/
services/discovery/jxta/src/main/java/org/apache/tus...
Author: meerajk
Date: Sat Jan 27 09:21:37 2007
New Revision: 500565
URL: http://svn.apache.org/viewvc?view=rev&rev=500565
Log:
stable checkin for discovery, not fully working yet
Modified:
incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java
Modified: incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl?view=diff&rev=500565&r1=500564&r2=500565
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl (original)
+++ incubator/tuscany/java/sca/runtime/standalone/assembly/src/main/assembly/profiles/admin/system.scdl Sat Jan 27 09:21:37 2007
@@ -117,6 +117,9 @@
<!-- Java implementation type -->
<include name="org.apache.tuscany.core.JavaImplementation" scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
+ <!-- Include discovery -->
+ <include name="org.apache.tuscany.service.discovery" scdlResource="org/apache/tuscany/service/discovery/discovery.jxta.scdl"/>
+
<!-- service for resolving artifacts using Maven repositories -->
<component name="artifactRepository">
<system:implementation.system class="org.apache.tuscany.services.maven.MavenArtifactRepository"/>
Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java?view=diff&rev=500565&r1=500564&r2=500565
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java Sat Jan 27 09:21:37 2007
@@ -22,6 +22,8 @@
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Map;
import java.util.Properties;
@@ -134,6 +136,9 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new TuscanyServerException(ex);
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ throw new TuscanyServerException(ex);
}
System.err.println("Started");
@@ -180,19 +185,22 @@
* @param profile profile for which runtime info is created.
* @return Runtime info.
* @throws IOException If unable to read the runtime properties.
+ * @throws URISyntaxException
*/
- private StandaloneRuntimeInfo createRuntimeInfo(String profile) throws IOException {
+ private StandaloneRuntimeInfo createRuntimeInfo(String profile) throws IOException, URISyntaxException {
File profileDir = DirectoryHelper.getProfileDirectory(installDirectory, profile);
// load properties for this runtime
File propFile = new File(profileDir, "etc/runtime.properties");
Properties props = DirectoryHelper.loadProperties(propFile, System.getProperties());
-
+ String domain = props.getProperty("domain");
+
// online unless the offline property is set
boolean online = !Boolean.parseBoolean(props.getProperty("offline", "false"));
- return new StandaloneRuntimeInfoImpl(null, profile, installDirectory, profileDir, null, online, props);
+
+ return new StandaloneRuntimeInfoImpl(new URI(domain), profile, installDirectory, profileDir, null, online, props);
}
/**
Modified: incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java?view=diff&rev=500565&r1=500564&r2=500565
==============================================================================
--- incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java (original)
+++ incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java Sat Jan 27 09:21:37 2007
@@ -57,7 +57,7 @@
* @version $Revision$ $Date$
*
*/
-public class JxtaDiscoveryService extends AbstractDiscoveryService implements Runnable {
+public class JxtaDiscoveryService extends AbstractDiscoveryService {
/** Default discovery interval. */
private static long DEFAULT_INTERVAL = 10000L;
@@ -119,13 +119,17 @@
*/
@Override
public void onStart() throws JxtaException {
- workScheduler.scheduleWork(this);
+ workScheduler.scheduleWork(new Runnable() {
+ public void run() {
+ startService();
+ }
+ });
}
/**
* Rusn the discovery service in a different thread.
*/
- public void run() {
+ private void startService() {
try {
@@ -135,14 +139,17 @@
setupDiscovery();
setupResolver();
- started.set(true);
+ started.set(true);
peerListener.start();
} catch (PeerGroupException ex) {
+ ex.printStackTrace();
throw new JxtaException(ex);
} catch (IOException ex) {
+ ex.printStackTrace();
throw new JxtaException(ex);
} catch (Exception ex) {
+ ex.printStackTrace();
throw new JxtaException(ex);
}
Modified: incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java?view=diff&rev=500565&r1=500564&r2=500565
==============================================================================
--- incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java (original)
+++ incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java Sat Jan 27 09:21:37 2007
@@ -71,10 +71,13 @@
*/
public void start() {
+ System.err.println("Starting discovery");
live.set(true);
discoveryService.addDiscoveryListener(this);
while(live.get()) {
+ System.err.println("Sending discovery message");
discoveryService.getRemoteAdvertisements(null, DiscoveryService.PEER, null, null, 5);
+ System.err.println("Discovery message sent");
try {
Thread.sleep(interval);
} catch(Exception e) {}
@@ -105,6 +108,7 @@
String peerName = adv.getName();
if(!runtimeId.equals(peerName)) {
availablePeers.put(adv.getName(), adv.getPeerID());
+ // System.err.println("Peer discovered:" + peerName);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org