- [ZBX-3710] renamed "Zabbix Java Proxy" to "Zabbix Java Gateway"

asaveljevs · asaveljevs · commit 8c773e6e4e9a · 2011-10-31T14:33:19.000Z
git-svn-id: svn://svn.zabbix.com/trunk/src/zabbix_java@22824 f4e7fd02-d210-4e34-a1e0-d4093fb66cc2
diff --git a/Makefile.am b/Makefile.am
@@ -9,37 +9,37 @@ EXTRA_DIST = \
 	shutdown.sh \
 	startup.sh
 
-ZJP = bin/zabbix-java-proxy-$(VERSION).jar
+ZJG = bin/zabbix-java-gateway-$(VERSION).jar
 LIB = lib/org-json-2010-12-28.jar:lib/logback-core-0.9.27.jar:lib/logback-classic-0.9.27.jar:lib/slf4j-api-1.6.1.jar
 JUNIT = tests/junit-4.8.2.jar
 
-ZJP_DEST = $(DESTDIR)$(sbindir)/zabbix_java
+ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
 
-all: $(ZJP)
+all: $(ZJG)
 
-$(ZJP): class src/com/zabbix/proxy/*.java
-	$(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/proxy/*.java
-	$(JAR) cf $(ZJP) -C class/src .
+$(ZJG): class src/com/zabbix/gateway/*.java
+	$(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java
+	$(JAR) cf $(ZJG) -C class/src .
 
 test: class
-	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/proxy/*.java
-	java -classpath class/tests:$(LIB):$(ZJP):$(JUNIT) com.zabbix.proxy.AllTestRunner
+	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java
+	java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner
 
 class:
 	$(MKDIR_P) class/src
 	$(MKDIR_P) class/tests
 
 install: all
-	$(MKDIR_P) "$(ZJP_DEST)/bin"
-	$(MKDIR_P) "$(ZJP_DEST)/lib"
-	cp startup.sh shutdown.sh "$(ZJP_DEST)"
-	if test ! -f "$(ZJP_DEST)/settings.sh"; then cp settings.sh "$(ZJP_DEST)"; fi
-	cp $(ZJP) "$(ZJP_DEST)/bin"
-	cp lib/*.jar "$(ZJP_DEST)/lib"
-	if test ! -f "$(ZJP_DEST)/lib/logback.xml"; then cp lib/logback.xml "$(ZJP_DEST)/lib"; fi
-	if test ! -f "$(ZJP_DEST)/lib/logback-console.xml"; then cp lib/logback-console.xml "$(ZJP_DEST)/lib"; fi
+	$(MKDIR_P) "$(ZJG_DEST)/bin"
+	$(MKDIR_P) "$(ZJG_DEST)/lib"
+	cp startup.sh shutdown.sh "$(ZJG_DEST)"
+	if test ! -f "$(ZJG_DEST)/settings.sh"; then cp settings.sh "$(ZJG_DEST)"; fi
+	cp $(ZJG) "$(ZJG_DEST)/bin"
+	cp lib/*.jar "$(ZJG_DEST)/lib"
+	if test ! -f "$(ZJG_DEST)/lib/logback.xml"; then cp lib/logback.xml "$(ZJG_DEST)/lib"; fi
+	if test ! -f "$(ZJG_DEST)/lib/logback-console.xml"; then cp lib/logback-console.xml "$(ZJG_DEST)/lib"; fi
 
 clean:
-	rm -f $(ZJP)
+	rm -f $(ZJG)
 	rm -rf class/src/*
 	rm -rf class/tests/*
diff --git a/settings.sh b/settings.sh
@@ -1,4 +1,4 @@
-# This is a configuration file for Zabbix Java Proxy.
+# This is a configuration file for Zabbix Java Gateway.
 # It is sourced by startup.sh and shutdown.sh scripts.
 
 ### Option: zabbix.listenIP
@@ -14,11 +14,11 @@
 # Mandatory: no
 # Range: 1024-32767
 # Default:
-# LISTEN_PORT=10051
+# LISTEN_PORT=10052
 
 ### Option: zabbix.pidFile
 #	Name of PID file.
-#	If omitted, Zabbix Java Proxy is started as a console application.
+#	If omitted, Zabbix Java Gateway is started as a console application.
 #
 # Mandatory: no
 # Default:
diff --git a/shutdown.sh b/shutdown.sh
@@ -7,10 +7,10 @@ if [ -n "$PID_FILE" ]; then
 	if [ -e "$PID_FILE" ]; then
 		kill `cat $PID_FILE`
 	else
-		echo "Zabbix Java Proxy is not running"
+		echo "Zabbix Java Gateway is not running"
 		exit 1
 	fi
 else
-	echo "Zabbix Java Proxy is not configured as a daemon: variable \$PID_FILE is not set"
+	echo "Zabbix Java Gateway is not configured as a daemon: variable \$PID_FILE is not set"
 	exit 1
 fi
diff --git a/src/com/zabbix/gateway/BinaryProtocolSpeaker.java b/src/com/zabbix/gateway/BinaryProtocolSpeaker.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.io.*;
 import java.net.Socket;
diff --git a/src/com/zabbix/gateway/ConfigurationManager.java b/src/com/zabbix/gateway/ConfigurationManager.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,7 +63,7 @@ public void execute(Object value)
 		new ConfigurationParameter(LISTEN_IP, ConfigurationParameter.TYPE_INETADDRESS, null,
 				null,
 				null),
-		new ConfigurationParameter(LISTEN_PORT, ConfigurationParameter.TYPE_INTEGER, 10051,
+		new ConfigurationParameter(LISTEN_PORT, ConfigurationParameter.TYPE_INTEGER, 10052,
 				new IntegerValidator(1024, 32767),
 				null),
 		new ConfigurationParameter(START_POLLERS, ConfigurationParameter.TYPE_INTEGER, 5,
@@ -105,6 +105,6 @@ public static int getIntegerParameterValue(String name)
 
 	public static String getPackage()
 	{
-		return "com.zabbix.proxy";
+		return "com.zabbix.gateway";
 	}
 }
diff --git a/src/com/zabbix/gateway/ConfigurationParameter.java b/src/com/zabbix/gateway/ConfigurationParameter.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.io.File;
 import java.net.InetAddress;
diff --git a/src/com/zabbix/gateway/GeneralInformation.java b/src/com/zabbix/gateway/GeneralInformation.java
@@ -17,11 +17,11 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 class GeneralInformation
 {
-	public static final String APPLICATION_NAME = "Zabbix Java Proxy";
+	public static final String APPLICATION_NAME = "Zabbix Java Gateway";
 	public static final String REVISION_DATE = "27 October 2011";
 	public static final String REVISION = "{ZABBIX_REVISION}";
 	public static final String VERSION = "1.9.8";
diff --git a/src/com/zabbix/gateway/HelperFunctionChest.java b/src/com/zabbix/gateway/HelperFunctionChest.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 class HelperFunctionChest
 {
diff --git a/src/com/zabbix/gateway/InputValidator.java b/src/com/zabbix/gateway/InputValidator.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 interface InputValidator
 {
diff --git a/src/com/zabbix/gateway/IntegerValidator.java b/src/com/zabbix/gateway/IntegerValidator.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 class IntegerValidator implements InputValidator
 {
diff --git a/src/com/zabbix/gateway/InternalItemChecker.java b/src/com/zabbix/gateway/InternalItemChecker.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import org.json.*;
 
diff --git a/src/com/zabbix/gateway/ItemChecker.java b/src/com/zabbix/gateway/ItemChecker.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.util.Vector;
 
@@ -41,8 +41,8 @@ abstract class ItemChecker
 	public static final String JSON_TAG_USERNAME = "username";
 	public static final String JSON_TAG_VALUE = "value";
 
-	public static final String JSON_REQUEST_INTERNAL = "java proxy internal";
-	public static final String JSON_REQUEST_JMX = "java proxy jmx";
+	public static final String JSON_REQUEST_INTERNAL = "java gateway internal";
+	public static final String JSON_REQUEST_JMX = "java gateway jmx";
 
 	public static final String JSON_RESPONSE_FAILED = "failed";
 	public static final String JSON_RESPONSE_SUCCESS = "success";
diff --git a/src/com/zabbix/gateway/JMXItemChecker.java b/src/com/zabbix/gateway/JMXItemChecker.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.util.HashMap;
 import java.util.Vector;
diff --git a/src/com/zabbix/gateway/JavaGateway.java b/src/com/zabbix/gateway/JavaGateway.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.net.InetAddress;
 import java.net.ServerSocket;
@@ -26,9 +26,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class JavaProxy
+public class JavaGateway
 {
-	private static final Logger logger = LoggerFactory.getLogger(JavaProxy.class);
+	private static final Logger logger = LoggerFactory.getLogger(JavaGateway.class);
 
 	public static void main(String[] args)
 	{
@@ -43,13 +43,13 @@ else if (0 != args.length)
 			System.exit(1);
 		}
 
-		logger.info("Zabbix Java Proxy {} (revision {}) has started", GeneralInformation.VERSION, GeneralInformation.REVISION);
+		logger.info("Zabbix Java Gateway {} (revision {}) has started", GeneralInformation.VERSION, GeneralInformation.REVISION);
 
 		Thread shutdownHook = new Thread()
 		{
 			public void run()
 			{
-				logger.info("Zabbix Java Proxy {} (revision {}) has stopped", GeneralInformation.VERSION, GeneralInformation.REVISION);
+				logger.info("Zabbix Java Gateway {} (revision {}) has stopped", GeneralInformation.VERSION, GeneralInformation.REVISION);
 			}
 		};
 
diff --git a/src/com/zabbix/gateway/PostInputValidator.java b/src/com/zabbix/gateway/PostInputValidator.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 interface PostInputValidator
 {
diff --git a/src/com/zabbix/gateway/SocketProcessor.java b/src/com/zabbix/gateway/SocketProcessor.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.net.Socket;
 import java.util.Formatter;
diff --git a/src/com/zabbix/gateway/ZabbixException.java b/src/com/zabbix/gateway/ZabbixException.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.util.Formatter;
 
diff --git a/src/com/zabbix/gateway/ZabbixItem.java b/src/com/zabbix/gateway/ZabbixItem.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import java.util.Vector;
 
diff --git a/startup.sh b/startup.sh
@@ -4,7 +4,7 @@ cd $(dirname $0)
 source settings.sh
 
 if [ -n "$PID_FILE" -a -e "$PID_FILE" ]; then
-	echo "Zabbix Java Proxy is already running"
+	echo "Zabbix Java Gateway is already running"
 	exit 1
 fi
 
@@ -36,14 +36,14 @@ if [ -n "$START_POLLERS" ]; then
 	ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.startPollers=$START_POLLERS"
 fi
 
-COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.proxy.JavaProxy"
+COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway"
 
 if [ -n "$PID_FILE" ]; then
 	PID=$(/bin/bash -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
 	if ps -p $PID > /dev/null 2>&1; then
 		echo $PID > $PID_FILE
 	else
-		echo "Zabbix Java Proxy did not start"
+		echo "Zabbix Java Gateway did not start"
 		exit 1
 	fi
 else
diff --git a/tests/com/zabbix/gateway/AllTestRunner.java b/tests/com/zabbix/gateway/AllTestRunner.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 public class AllTestRunner
 {
diff --git a/tests/com/zabbix/gateway/IntegerValidatorTest.java b/tests/com/zabbix/gateway/IntegerValidatorTest.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import org.junit.*;
 import static org.junit.Assert.*;
diff --git a/tests/com/zabbix/gateway/ZabbixItemTest.java b/tests/com/zabbix/gateway/ZabbixItemTest.java
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-package com.zabbix.proxy;
+package com.zabbix.gateway;
 
 import org.junit.*;
 import static org.junit.Assert.*;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.`
`18`	`18`	`**/`
`19`	`19`
`20`		`-package com.zabbix.proxy;`
	`20`	`+package com.zabbix.gateway;`
`21`	`21`
`22`	`22`	`class HelperFunctionChest`
`23`	`23`	`{`