Skip to content

Removed old CNS code #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayadavumass wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed old CNS code #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ ${build.major.number}.${build.minor.number}.${build.revision.number})</h1>]]>
<pathelement location="${lib.dir}/commons-cli-1.1.jar"/>
<pathelement location="${lib.dir}/derby.jar"/>
<pathelement location="${lib.dir}/log4j-1.2.16.jar"/>
<pathelement location="${lib.dir}/context-client-GNS.jar"/>
<pathelement location="${lib.dir}/mongo-java-driver-2.12.1.jar"/>
<pathelement location="${lib.dir}/android.jar"/>
<pathelement location="${conf.dir}"/>
Expand Down
Binary file removed lib/context-client-GNS.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/guava-22.0.jar
View file
Open in desktop
Binary file not shown.
99 changes: 0 additions & 99 deletions src/edu/umass/cs/contextservice/integration/ContextServiceGNSClient.java
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/edu/umass/cs/contextservice/integration/ContextServiceGNSInterface.java
View file
Open in desktop

This file was deleted.

179 changes: 0 additions & 179 deletions src/edu/umass/cs/contextservice/integration/examples/ContextServiceExample.java
View file
Open in desktop

This file was deleted.

31 changes: 1 addition & 30 deletions src/edu/umass/cs/gnsserver/gnsapp/GNSApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* Initial developer(s): Westy, arun */
package edu.umass.cs.gnsserver.gnsapp;

import edu.umass.cs.contextservice.integration.ContextServiceGNSClient;
import edu.umass.cs.contextservice.integration.ContextServiceGNSInterface;
import edu.umass.cs.gigapaxos.interfaces.AppRequestParserBytes;
import edu.umass.cs.gigapaxos.interfaces.ClientMessenger;
import edu.umass.cs.gigapaxos.interfaces.ClientRequest;
Expand Down Expand Up @@ -138,11 +136,6 @@ private static boolean enqueueCommand() {
*/
private ActiveCodeHandler activeCodeHandler;

/**
* context service interface
*/
private ContextServiceGNSInterface contextServiceGNSClient;

/**
* The non-secure http server
*/
Expand Down Expand Up @@ -471,22 +464,7 @@ private void GnsAppConstructor(JSONMessenger<String> messenger) throws IOExcepti
}
this.activeCodeHandler = !Config.getGlobalBoolean(GNSConfig.GNSC.DISABLE_ACTIVE_CODE)
? new ActiveCodeHandler(nodeID) : null;

// context service init
if (Config.getGlobalBoolean(GNSConfig.GNSC.ENABLE_CNS)) {
String nodeAddressString = Config.getGlobalString(GNSConfig.GNSC.CNS_NODE_ADDRESS);

String[] parsed = nodeAddressString.split(":");

assert (parsed.length == 2);

String host = parsed[0];
int port = Integer.parseInt(parsed[1]);
GNSConfig.getLogger().fine("ContextServiceGNSClient initialization started");
contextServiceGNSClient = new ContextServiceGNSClient(host, port);
GNSConfig.getLogger().fine("ContextServiceGNSClient initialization completed");
}


constructed = true;
}

Expand Down Expand Up @@ -824,13 +802,6 @@ public ClientRequestHandlerInterface getRequestHandler() {
return requestHandler;
}

/**
* @return ContextServiceGNSInterface
*/
public ContextServiceGNSInterface getContextServiceGNSClient() {
return contextServiceGNSClient;
}

private void startDNS() throws SecurityException, SocketException,
UnknownHostException {
try {
Expand Down
Loading