Api for service registry

Makefile

@@ -19,15 +19,6 @@ export LD_LIBRARY_PATH=/usr/local/lib
 local:
 	cd tools && sudo make && cd ../lucida && make
 
-start_all:
-	cd tools && ./start_all_tmux.sh
-
-start_all_secure:
-	cd tools && ./start_all_tmux.sh secure
-
-start_test_all:
-	cd tools && ./start_all_tmux.sh test
-
 all_service:
 	cd lucida && make all
 

lucida/calendar/CalendarClient/CalendarClient.java

@@ -1,9 +1,6 @@
 //Java packages
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Properties;
 
 //Thrift java libraries 
 import org.apache.thrift.TException;
@@ -22,17 +19,11 @@
 public class CalendarClient {
 	public static void main(String [] args) 
 			throws IOException {
-		// Collect the port number.
-		Properties port_cfg = new Properties();
-		InputStream input = new FileInputStream("../../config.properties");
-		port_cfg.load(input);
-		String port_str = port_cfg.getProperty("CA_PORT");
-		Integer port = Integer.valueOf(port_str);
-		if (args.length == 1) {
-			port = Integer.parseInt(args[0]);
-		} else {
-			System.out.println("Using default port for Calendar Client: " + port);
+		if (args.length != 1){
+			System.out.println("Wrong arguments!");
+			System.exit(1);
 		}
+		Integer port = Integer.valueOf(args[0]);
 
 		// Query.
 		String LUCID = "Clinc";

lucida/calendar/CalendarClient/start-Calendar-client.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
+
 # Add Thrift classes to class path
 export JAVA_CLASS_PATH=$JAVA_CLASS_PATH:thrift
 # Add other jar files to class path
 export JAVA_CLASS_PATH=$JAVA_CLASS_PATH:lib/libthrift-0.9.3.jar:lib/slf4j-api-1.7.13.jar:lib/slf4j-simple-1.7.13.jar
 
 # run the server
-java -cp "$JAVA_CLASS_PATH" CalendarClient "$@"
+java -cp "$JAVA_CLASS_PATH" CalendarClient "$1"

lucida/calendar/Makefile

@@ -24,10 +24,15 @@ corenlp:
 	fi
 
 start_server: 
-	./gradlew run
+	@if [ "$(port)" != "" ]; then \
+		./gradlew run -Pargs=$(port); \
+	fi
 
 start_test: 
-	cd CalendarClient; ./start-Calendar-client.sh 
+	@if [ "$(port)" != "" ]; then \
+		cd CalendarClient; \
+		./start-Calendar-client.sh $(port); \
+	fi
 
 clean:
 	rm -rf src/main/java/thrift && rm -rf CalendarClient/thrift && rm -rf CalendarClient/*.class && rm -rf build && rm -rf lib

lucida/calendar/build.gradle

@@ -39,5 +39,4 @@ dependencies {
 	compile name: 'stanford-corenlp-3.7.0'
 	compile name: 'xom-1.2.10-src'
 	compile name: 'xom'
-
 }

lucida/calendar/src/main/java/calendar/CalendarDaemon.java

@@ -1,13 +1,10 @@
 package calendar;
 
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.ArrayList;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.Properties;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.server.TNonblockingServer;
@@ -34,11 +31,12 @@
 public class CalendarDaemon {
 	public static void main(String [] args) 
 			throws TTransportException, IOException, InterruptedException {	
-		Properties port_cfg = new Properties();
-		InputStream input = new FileInputStream("../config.properties");
-		port_cfg.load(input);
-		String port_str = port_cfg.getProperty("CA_PORT");
-		Integer port = Integer.valueOf(port_str);
+		if (args.length != 1){
+			System.out.println("Wrong arguments!");
+			System.exit(1);
+		}
+		Integer port = Integer.valueOf(args[0]);
+
 		TProcessor proc = new LucidaService.AsyncProcessor(
 				new CAServiceHandler.AsyncCAServiceHandler());
 		TNonblockingServerTransport transport = new TNonblockingServerSocket(port);
@@ -47,7 +45,7 @@ public static void main(String [] args)
 		.protocolFactory(new TBinaryProtocol.Factory())
 		.transportFactory(new TFramedTransport.Factory());
 		final TThreadedSelectorServer server = new TThreadedSelectorServer(arguments);
-		System.out.println("CA at port " + port_str);
+		System.out.println("CA at port " + port);
 		server.serve();
 	}
 }