Skip to content

Commit

Permalink
If those sources are there, they should be compiled.
Browse files Browse the repository at this point in the history
- if we don't need them, let's delete them!

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
dmatej committed Oct 5, 2023
1 parent 4edb578 commit b80c5d7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
13 changes: 0 additions & 13 deletions gms/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@
<finalName>${project.artifactId}</finalName>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--exclude the Shoal classes that internally call JXTA specific classes -->
<excludes>
<exclude>**/com/sun/enterprise/ee/cms/impl/jxta/*.java</exclude>
<exclude>**/com/sun/enterprise/jxtamgmt/**/*.java</exclude>
<exclude>**/com/sun/enterprise/mgmt/transport/jxta/*.java</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2023 Contributors to the Eclipse Foundation
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -315,7 +316,7 @@ public void removePeerID( final PeerID peerID ) {

public boolean isConnected( final PeerID peerID ) {
net.jxta.peer.PeerID jxtaPeerID = (net.jxta.peer.PeerID)peerID.getUniqueID();
return getRouteControl().isConnected( jxtaPeerID, getCachedRoute( jxtaPeerID ) );
return getRouteControl().isConnected(jxtaPeerID);
}

public net.jxta.peer.PeerID getJxtaPeerID( final String instanceName ) {
Expand Down Expand Up @@ -780,18 +781,19 @@ private PeerGroup startDomain() throws PeerGroupException, IOException {
if( mcastPort > 0 ) {
config.setMulticastPort( mcastPort );
}
if( multicastPoolsize != 0 ) {
config.setMulticastPoolSize( multicastPoolsize );
if( LOG.isLoggable( Level.CONFIG ) ) {
LOG.config( "set jxta Multicast Poolsize to " + config.getMulticastPoolSize() );
}
}
// TODO: Not supported as of 2023, 3.0.2-SNAPSHOT
// if( multicastPoolsize != 0 ) {
// config.setMulticastPoolSize( multicastPoolsize );
// if( LOG.isLoggable( Level.CONFIG ) ) {
// LOG.config( "set jxta Multicast Poolsize to " + config.getMulticastPoolSize() );
// }
// }

//if a machine has multiple network interfaces,
//specify which interface the group communication should start on
if( tcpAddress != null && !tcpAddress.equals( "" ) ) {
config.setTcpInterfaceAddress( tcpAddress );
config.setMulticastInterface( tcpAddress );
config.setMulticastAddress(tcpAddress);
}
if( LOG.isLoggable( Level.CONFIG ) ) {
LOG.config( "node config adv = " + config.getPlatformConfig().toString() );
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2023 Contributors to the Eclipse Foundation
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -106,11 +107,11 @@ public boolean send( net.jxta.peer.PeerID peerid, net.jxta.endpoint.Message mess
output = null;
for( int createOutputPipeAttempts = 0; output == null && createOutputPipeAttempts < MAX_RETRIES; createOutputPipeAttempts++ )
{
route = networkManager.getCachedRoute( (PeerID)peerid );
route = networkManager.getCachedRoute( peerid );
if( route != null ) {
try {
output = new BlockingWireOutputPipe( networkManager.getNetPeerGroup(), pipeAdv, (PeerID)peerid, route );
} catch( IOException ioe ) {
output = new BlockingWireOutputPipe( networkManager.getNetPeerGroup(), pipeAdv, peerid, route );
} catch( Exception ioe ) {
lastOne = ioe;
}
}
Expand Down
Empty file.

0 comments on commit b80c5d7

Please sign in to comment.