Change protocol sand to iot.

Author: jelly-b

pack/lite/configuration/sand/components.ini renamed to pack/lite/configuration/iot/components.ini

@@ -0,0 +1,3 @@
+#disabled.services=stream.service
+component.binding.profile=${config.dir}/iot-component-binding-lite.ini
+domain.name=localhost

pack/lite/configuration/sand/sand-component-binding-lite.ini renamed to pack/lite/configuration/iot/iot-component-binding-lite.ini

@@ -13,7 +13,7 @@
 	</parent>
 
 	<groupId>com.thefirstlineofcode.granite.pack.lite</groupId>
-	<artifactId>granite-pack-lite-sand</artifactId>
+	<artifactId>granite-pack-lite-iot</artifactId>
 
 		<dependencies>
 			<!-- Sand Stream Plugin -->

pack/lite/configuration/sand/plugins.ini renamed to pack/lite/configuration/iot/plugins.ini

@@ -94,10 +94,10 @@ private Options parseOptions(String[] args) {
 					options.setProtocol(Options.Protocol.MINI);
 				} else if ("standard".equals(args[i])) {
 					options.setProtocol(Options.Protocol.STANDARD);
-				} else if ("sand".equals(args[i])) {
-					options.setProtocol(Options.Protocol.SAND);
+				} else if ("iot".equals(args[i])) {
+					options.setProtocol(Options.Protocol.IOT);
 				} else {
-					throw new IllegalArgumentException(String.format("Illegal protocol: %s. Only 'mini', 'standard' and 'sand' are supported.", args[i]));
+					throw new IllegalArgumentException(String.format("Illegal protocol: %s. Only 'mini', 'standard' and 'iot' are supported.", args[i]));
 				}
 				i++;
 			} else if ("-webcamMode".equals(args[i])) {
@@ -182,7 +182,7 @@ private void printUsage() {
 		System.out.println("-cleanCache                            Clean the packing cache.");
 		System.out.println("-offline                               Run in offline mode.");
 		// System.out.println("-version <VERSION>                     Specify the version. Default is 1.0.2-RELEASE.");
-		System.out.println("-protocol <PROTOCOL>                   Specify the protocol. Optional protocols are 'mini', 'standard' or 'sand'. Default is 'standard'.");
+		System.out.println("-protocol <PROTOCOL>                   Specify the protocol. Optional protocols are 'mini', 'standard' or 'iot'. Default is 'standard'.");
 		System.out.println("-webcamMode <WEBCAM-MODE>              Specify that which webcam plugin needs to be deployed. Optional plugins are 'none', 'p2p', 'kurento'. Default is 'none'.");
 		System.out.println("-sandProjectName <SAND-PROJECT-NAME>   Specify the sand project name. Default is 'com.thefirstlineofcode.sand'.");
 	}

pack/lite/configuration/iot/server.ini

@@ -27,7 +27,7 @@ public enum WebcamMode {
 	public enum Protocol {
 		MINI,
 		STANDARD,
-		SAND
+		IOT
 	}
 
 	public Options() {

pack/lite/configuration/sand/server.ini

@@ -94,7 +94,7 @@ private void copyBasicServerToZip(File basicServerZip, ZipOutputStream zos) {
 					int lastSlash = entryName.lastIndexOf('/');
 					String libraryName = entryName.substring(lastSlash + 1);
 					if (libraryName.startsWith(SAND_PROJECT_PREFIX) &&
-							options.getProtocol() != Protocol.SAND)
+							options.getProtocol() != Protocol.IOT)
 						continue;
 					systemLibraries.add(libraryName);
 				}
@@ -212,7 +212,7 @@ private void copyDependencies() {
 		} else if (options.getProtocol() == Options.Protocol.STANDARD) {
 			PackUtils.runMvn(new File(options.getProjectDirPath()), options.isOffline(), "-fstandard-pom.xml", "dependency:copy-dependencies");
 		} else {
-			PackUtils.runMvn(new File(options.getProjectDirPath()), options.isOffline(), "-fsand-pom.xml", "dependency:copy-dependencies");
+			PackUtils.runMvn(new File(options.getProjectDirPath()), options.isOffline(), "-fiot-pom.xml", "dependency:copy-dependencies");
 
 			if (options.getWebcamMode() == WebcamMode.P2P) {
 				PackUtils.runMvn(new File(options.getProjectDirPath()), options.isOffline(), "-fp2p-webcam-pom.xml", "dependency:copy-dependencies");
@@ -237,14 +237,14 @@ private void writeGraniteConfigFilesToZip(String targetDirPath, ZipOutputStream
 			configurationFilesDir = new File(configurationDir, "mini");
 		} else if (options.getProtocol() == Options.Protocol.STANDARD) {
 			configurationFilesDir = new File(configurationDir, "standard");
-		} else if (options.getProtocol() == Options.Protocol.SAND) {
-			configurationFilesDir = new File(configurationDir, "sand");	
+		} else if (options.getProtocol() == Options.Protocol.IOT) {
+			configurationFilesDir = new File(configurationDir, "iot");	
 		} else {
-			throw new IllegalArgumentException("Only support 'mini', 'standard' and 'sand' protocols now.");
+			throw new IllegalArgumentException("Only support 'mini', 'standard' and 'iot' protocols now.");
 		}
 
 		for (File configurationFile : configurationFilesDir.listFiles()) {
-			writeFileToZip(zos, String.format("/%s/%s/%s", options.getAppName(), CONFIGURATION_DIR, configurationFile.getName()), configurationFile);
+			writeFileToZip(zos, String.format("%s/%s/%s", options.getAppName(), CONFIGURATION_DIR, configurationFile.getName()), configurationFile);
 		}
 	}