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/03/18 12:02:05 UTC
svn commit: r519594 - in
/incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta:
JxtaDiscoveryService.java pdp/PeerListener.java
Author: meerajk
Date: Sun Mar 18 04:02:04 2007
New Revision: 519594
URL: http://svn.apache.org/viewvc?view=rev&rev=519594
Log:
Fixed problem in generating well known peer group ids.
Now working domain peer groups are working fine, there is
no need to setup the peers in the world peer group.
Modified:
incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java
Modified: incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java?view=diff&rev=519594&r1=519593&r2=519594
==============================================================================
--- incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java (original)
+++ incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java Sun Mar 18 04:02:04 2007
@@ -27,15 +27,18 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import net.jxta.credential.AuthenticationCredential;
import net.jxta.discovery.DiscoveryService;
import net.jxta.exception.PeerGroupException;
-import net.jxta.impl.id.binaryID.DigestTool;
+import net.jxta.impl.id.UUID.UUID;
import net.jxta.impl.protocol.ResolverQuery;
+import net.jxta.membership.Authenticator;
+import net.jxta.membership.MembershipService;
import net.jxta.peer.PeerID;
import net.jxta.peergroup.NetPeerGroupFactory;
import net.jxta.peergroup.PeerGroup;
-import net.jxta.peergroup.PeerGroupID;
import net.jxta.platform.NetworkConfigurator;
+import net.jxta.protocol.ModuleImplAdvertisement;
import net.jxta.resolver.QueryHandler;
import net.jxta.resolver.ResolverService;
@@ -59,6 +62,10 @@
*/
public class JxtaDiscoveryService extends AbstractDiscoveryService {
+ /** Well known peer group id. */
+ private static final TuscanyPeerGroupID PEER_GROUP_ID =
+ new TuscanyPeerGroupID(new UUID("aea468a4-6450-47dc-a288-a7f1bbcc5927"));
+
/** Default discovery interval. */
private static long DEFAULT_INTERVAL = 10000L;
@@ -260,13 +267,11 @@
*/
private void createAndJoinDomainGroup() throws Exception {
- //String domain = getRuntimeInfo().getDomain().toString();
- domainGroup = new NetPeerGroupFactory().getInterface();
+ String domain = getRuntimeInfo().getDomain().toString();
- /*PeerGroup netGroup = new NetPeerGroupFactory().getInterface();
- PeerGroupID peerGroupId = createPeerGroupId(domain, netGroup);
+ PeerGroup netGroup = new NetPeerGroupFactory().getInterface();
ModuleImplAdvertisement implAdv = netGroup.getAllPurposePeerGroupImplAdvertisement();
- domainGroup = netGroup.newGroup(peerGroupId, implAdv, domain, "Tuscany domain group");
+ domainGroup = netGroup.newGroup(PEER_GROUP_ID, implAdv, domain, "Tuscany domain group");
AuthenticationCredential authCred = new AuthenticationCredential(domainGroup, null, null);
MembershipService membership = domainGroup.getMembershipService();
@@ -276,7 +281,7 @@
membership.join(auth);
} else {
throw new DiscoveryException("Unable to join domain group");
- }*/
+ }
}
@@ -301,16 +306,15 @@
peerListener = new PeerListener(discoveryService, interval, getRuntimeInfo().getRuntimeId());
}
-
- /**
- * Creates a well-known peer group id for the domain.
- *
- * @param domain Name of the domain.
- * @param netGroup Parent net peer group.
- * @return Well-known peer group id.
+
+ /*
+ * Well known peer grroup.
*/
- private PeerGroupID createPeerGroupId(String domain, PeerGroup netGroup) {
- return new DigestTool().createPeerGroupID(netGroup.getPeerGroupID(), domain, null);
+ @SuppressWarnings("serial")
+ private static class TuscanyPeerGroupID extends net.jxta.impl.id.CBID.PeerGroupID {
+ public TuscanyPeerGroupID(UUID uuid) {
+ super(uuid);
+ }
}
}
Modified: incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java?view=diff&rev=519594&r1=519593&r2=519594
==============================================================================
--- incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java (original)
+++ incubator/tuscany/java/sca/contrib/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/pdp/PeerListener.java Sun Mar 18 04:02:04 2007
@@ -108,10 +108,10 @@
String peerName = adv.getName();
if(!runtimeId.equals(peerName)) {
availablePeers.put(adv.getName(), adv.getPeerID());
- // System.err.println("Peer discovered:" + peerName);
}
}
}
+ System.err.println("Peer view for " + runtimeId + ": " + availablePeers.keySet());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org