From e8b241b833cdda315cc463b322a89ba888c5e781 Mon Sep 17 00:00:00 2001 From: Theo Schlossnagle Date: Thu, 26 Sep 2013 10:23:19 -0400 Subject: [PATCH] juggle files around for cleaner builds. --- .gitignore | 5 +- src/java/Makefile.in | 134 +++++++++--------- .../{ => src}/com/omniti/jezebel/Jezebel.java | 0 .../com/omniti/jezebel/JezebelCheck.java | 0 .../omniti/jezebel/JezebelClassLoader.java | 0 .../com/omniti/jezebel/JezebelDispatch.java | 0 .../com/omniti/jezebel/JezebelResmon.java | 0 .../com/omniti/jezebel/JezebelTools.java | 0 .../{ => src}/com/omniti/jezebel/Resmon.java | 0 .../com/omniti/jezebel/ResmonResult.java | 0 .../com/omniti/jezebel/SampleCheck.java | 0 .../com/omniti/jezebel/check/JDBC.java | 0 .../com/omniti/jezebel/check/jmx.java | 0 .../com/omniti/jezebel/check/ldap.java | 0 .../com/omniti/jezebel/check/mysql.java | 0 .../com/omniti/jezebel/check/oracle.java | 0 .../com/omniti/jezebel/check/postgres.java | 0 .../com/omniti/jezebel/check/snmp.java | 0 .../com/omniti/jezebel/check/sqlserver.java | 0 .../com/omniti/reconnoiter/CheckStatus.java | 0 .../com/omniti/reconnoiter/EventHandler.java | 0 .../com/omniti/reconnoiter/IEPEngine.java | 0 .../com/omniti/reconnoiter/IEventHandler.java | 0 .../com/omniti/reconnoiter/MQListener.java | 0 .../omniti/reconnoiter/MessageHandler.java | 0 .../omniti/reconnoiter/StratconConfig.java | 0 .../omniti/reconnoiter/StratconMessage.java | 0 .../reconnoiter/StratconMessageFactory.java | 0 .../omniti/reconnoiter/broker/AMQBroker.java | 0 .../reconnoiter/broker/AMQListener.java | 0 .../reconnoiter/broker/BrokerFactory.java | 0 .../omniti/reconnoiter/broker/IMQBroker.java | 0 .../reconnoiter/broker/NoitListener.java | 0 .../reconnoiter/broker/RabbitBroker.java | 0 .../reconnoiter/broker/RabbitListener.java | 0 .../omniti/reconnoiter/esper/CounterView.java | 0 .../reconnoiter/esper/CounterViewFactory.java | 0 .../omniti/reconnoiter/esper/DeriveView.java | 0 .../reconnoiter/esper/DeriveViewFactory.java | 0 .../ExactBaseBivariateStatisticsView.java | 0 .../esper/ExactBaseStatisticsBean.java | 0 .../esper/ExactRegressionBean.java | 0 .../esper/ExactRegressionLinestView.java | 0 .../esper/ExactStatViewFactory.java | 0 .../reconnoiter/esper/WeightedValueBean.java | 0 .../reconnoiter/event/NoitBundlev1.java | 0 .../reconnoiter/event/NoitBundlev2.java | 0 .../omniti/reconnoiter/event/NoitCheck.java | 0 .../omniti/reconnoiter/event/NoitEvent.java | 0 .../omniti/reconnoiter/event/NoitMetric.java | 0 .../reconnoiter/event/NoitMetricGeneric.java | 0 .../reconnoiter/event/NoitMetricNumeric.java | 0 .../reconnoiter/event/NoitMetricText.java | 0 .../omniti/reconnoiter/event/NoitStatus.java | 0 .../reconnoiter/event/StratconQuery.java | 0 .../reconnoiter/event/StratconQueryBase.java | 0 .../reconnoiter/event/StratconQueryStop.java | 0 .../reconnoiter/event/StratconStatement.java | 0 58 files changed, 70 insertions(+), 69 deletions(-) rename src/java/{ => src}/com/omniti/jezebel/Jezebel.java (100%) rename src/java/{ => src}/com/omniti/jezebel/JezebelCheck.java (100%) rename src/java/{ => src}/com/omniti/jezebel/JezebelClassLoader.java (100%) rename src/java/{ => src}/com/omniti/jezebel/JezebelDispatch.java (100%) rename src/java/{ => src}/com/omniti/jezebel/JezebelResmon.java (100%) rename src/java/{ => src}/com/omniti/jezebel/JezebelTools.java (100%) rename src/java/{ => src}/com/omniti/jezebel/Resmon.java (100%) rename src/java/{ => src}/com/omniti/jezebel/ResmonResult.java (100%) rename src/java/{ => src}/com/omniti/jezebel/SampleCheck.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/JDBC.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/jmx.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/ldap.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/mysql.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/oracle.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/postgres.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/snmp.java (100%) rename src/java/{ => src}/com/omniti/jezebel/check/sqlserver.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/CheckStatus.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/EventHandler.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/IEPEngine.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/IEventHandler.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/MQListener.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/MessageHandler.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/StratconConfig.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/StratconMessage.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/StratconMessageFactory.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/AMQBroker.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/AMQListener.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/BrokerFactory.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/IMQBroker.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/NoitListener.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/RabbitBroker.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/broker/RabbitListener.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/CounterView.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/CounterViewFactory.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/DeriveView.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/DeriveViewFactory.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/ExactRegressionBean.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/ExactStatViewFactory.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/esper/WeightedValueBean.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitBundlev1.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitBundlev2.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitCheck.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitEvent.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitMetric.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitMetricGeneric.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitMetricNumeric.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitMetricText.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/NoitStatus.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/StratconQuery.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/StratconQueryBase.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/StratconQueryStop.java (100%) rename src/java/{ => src}/com/omniti/reconnoiter/event/StratconStatement.java (100%) diff --git a/.gitignore b/.gitignore index db8ed6403..222980df2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,10 +26,7 @@ src/java/jezebel src/java/run-iep.sh src/java/jezebel.jar src/java/reconnoiter.jar -src/java/com/omniti/jezebel/*.class -src/java/com/omniti/jezebel/*/*.class -src/java/com/omniti/reconnoiter/*.class -src/java/com/omniti/reconnoiter/*/*.class +src/java/classes src/jlog/jlog_config.h src/jlog/perl/Makefile.PL src/jlog/jlogctl diff --git a/src/java/Makefile.in b/src/java/Makefile.in index 935f69459..985ca26db 100644 --- a/src/java/Makefile.in +++ b/src/java/Makefile.in @@ -22,66 +22,68 @@ sysconfdir=@sysconfdir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ -R_JAVA=com/omniti/reconnoiter/MQListener.java \ - com/omniti/reconnoiter/EventHandler.java \ - com/omniti/reconnoiter/IEventHandler.java \ - com/omniti/reconnoiter/MessageHandler.java \ - com/omniti/reconnoiter/CheckStatus.java \ - com/omniti/reconnoiter/broker/NoitListener.java \ - com/omniti/reconnoiter/broker/RabbitBroker.java \ - com/omniti/reconnoiter/broker/IMQBroker.java \ - com/omniti/reconnoiter/broker/AMQBroker.java \ - com/omniti/reconnoiter/broker/RabbitListener.java \ - com/omniti/reconnoiter/broker/AMQListener.java \ - com/omniti/reconnoiter/broker/BrokerFactory.java \ - com/omniti/reconnoiter/event/NoitEvent.java \ - com/omniti/reconnoiter/event/NoitBundlev1.java \ - com/omniti/reconnoiter/event/NoitBundlev2.java \ - com/omniti/reconnoiter/event/NoitCheck.java \ - com/omniti/reconnoiter/event/NoitStatus.java \ - com/omniti/reconnoiter/event/NoitMetric.java \ - com/omniti/reconnoiter/event/NoitMetricText.java \ - com/omniti/reconnoiter/event/NoitMetricNumeric.java \ - com/omniti/reconnoiter/event/NoitMetricGeneric.java \ - com/omniti/reconnoiter/event/StratconStatement.java \ - com/omniti/reconnoiter/event/StratconQueryBase.java \ - com/omniti/reconnoiter/event/StratconQuery.java \ - com/omniti/reconnoiter/event/StratconQueryStop.java \ - com/omniti/reconnoiter/esper/ExactStatViewFactory.java \ - com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java \ - com/omniti/reconnoiter/esper/ExactRegressionLinestView.java \ - com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java \ - com/omniti/reconnoiter/esper/ExactRegressionBean.java \ - com/omniti/reconnoiter/esper/WeightedValueBean.java \ - com/omniti/reconnoiter/esper/CounterView.java \ - com/omniti/reconnoiter/esper/CounterViewFactory.java \ - com/omniti/reconnoiter/esper/DeriveView.java \ - com/omniti/reconnoiter/esper/DeriveViewFactory.java \ - com/omniti/reconnoiter/IEPEngine.java \ - com/omniti/reconnoiter/StratconConfig.java \ - com/omniti/reconnoiter/StratconMessage.java \ - com/omniti/reconnoiter/StratconMessageFactory.java - +R_FILE=src/com/omniti/reconnoiter/MQListener.java \ + src/com/omniti/reconnoiter/EventHandler.java \ + src/com/omniti/reconnoiter/IEventHandler.java \ + src/com/omniti/reconnoiter/MessageHandler.java \ + src/com/omniti/reconnoiter/CheckStatus.java \ + src/com/omniti/reconnoiter/broker/NoitListener.java \ + src/com/omniti/reconnoiter/broker/RabbitBroker.java \ + src/com/omniti/reconnoiter/broker/IMQBroker.java \ + src/com/omniti/reconnoiter/broker/AMQBroker.java \ + src/com/omniti/reconnoiter/broker/RabbitListener.java \ + src/com/omniti/reconnoiter/broker/AMQListener.java \ + src/com/omniti/reconnoiter/broker/BrokerFactory.java \ + src/com/omniti/reconnoiter/event/NoitEvent.java \ + src/com/omniti/reconnoiter/event/NoitBundlev1.java \ + src/com/omniti/reconnoiter/event/NoitBundlev2.java \ + src/com/omniti/reconnoiter/event/NoitCheck.java \ + src/com/omniti/reconnoiter/event/NoitStatus.java \ + src/com/omniti/reconnoiter/event/NoitMetric.java \ + src/com/omniti/reconnoiter/event/NoitMetricText.java \ + src/com/omniti/reconnoiter/event/NoitMetricNumeric.java \ + src/com/omniti/reconnoiter/event/NoitMetricGeneric.java \ + src/com/omniti/reconnoiter/event/StratconStatement.java \ + src/com/omniti/reconnoiter/event/StratconQueryBase.java \ + src/com/omniti/reconnoiter/event/StratconQuery.java \ + src/com/omniti/reconnoiter/event/StratconQueryStop.java \ + src/com/omniti/reconnoiter/esper/ExactStatViewFactory.java \ + src/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java \ + src/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java \ + src/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java \ + src/com/omniti/reconnoiter/esper/ExactRegressionBean.java \ + src/com/omniti/reconnoiter/esper/WeightedValueBean.java \ + src/com/omniti/reconnoiter/esper/CounterView.java \ + src/com/omniti/reconnoiter/esper/CounterViewFactory.java \ + src/com/omniti/reconnoiter/esper/DeriveView.java \ + src/com/omniti/reconnoiter/esper/DeriveViewFactory.java \ + src/com/omniti/reconnoiter/IEPEngine.java \ + src/com/omniti/reconnoiter/StratconConfig.java \ + src/com/omniti/reconnoiter/StratconMessage.java \ + src/com/omniti/reconnoiter/StratconMessageFactory.java + +R_JAVA = $(R_FILE:src/%=%) R_CLASS = $(R_JAVA:.java=*.class) -J_JAVA = com/omniti/jezebel/Jezebel.java \ - com/omniti/jezebel/JezebelDispatch.java \ - com/omniti/jezebel/JezebelCheck.java \ - com/omniti/jezebel/JezebelClassLoader.java \ - com/omniti/jezebel/JezebelResmon.java \ - com/omniti/jezebel/JezebelTools.java \ - com/omniti/jezebel/Resmon.java \ - com/omniti/jezebel/ResmonResult.java \ - com/omniti/jezebel/SampleCheck.java \ - com/omniti/jezebel/check/JDBC.java \ - com/omniti/jezebel/check/mysql.java \ - com/omniti/jezebel/check/oracle.java \ - com/omniti/jezebel/check/sqlserver.java \ - com/omniti/jezebel/check/postgres.java \ - com/omniti/jezebel/check/jmx.java \ - com/omniti/jezebel/check/ldap.java \ - com/omniti/jezebel/check/snmp.java - +J_FILE = src/com/omniti/jezebel/Jezebel.java \ + src/com/omniti/jezebel/JezebelDispatch.java \ + src/com/omniti/jezebel/JezebelCheck.java \ + src/com/omniti/jezebel/JezebelClassLoader.java \ + src/com/omniti/jezebel/JezebelResmon.java \ + src/com/omniti/jezebel/JezebelTools.java \ + src/com/omniti/jezebel/Resmon.java \ + src/com/omniti/jezebel/ResmonResult.java \ + src/com/omniti/jezebel/SampleCheck.java \ + src/com/omniti/jezebel/check/JDBC.java \ + src/com/omniti/jezebel/check/mysql.java \ + src/com/omniti/jezebel/check/oracle.java \ + src/com/omniti/jezebel/check/sqlserver.java \ + src/com/omniti/jezebel/check/postgres.java \ + src/com/omniti/jezebel/check/jmx.java \ + src/com/omniti/jezebel/check/ldap.java \ + src/com/omniti/jezebel/check/snmp.java + +J_JAVA = $(J_FILE:src/%=%) J_CLASS = $(J_JAVA:.java=*.class) R_SUPPORT=lib/activemq-all-5.2.0.jar lib/antlr-runtime-3.1.1.jar lib/esper-4.5.0.jar \ @@ -101,17 +103,19 @@ all: reconnoiter.jar jezebel.jar @chmod 755 run-iep.sh @chmod 755 jezebel -reconnoiter.jar: $(R_JAVA) +reconnoiter.jar: $(R_FILE) @echo "- $@ compiling files" - @$(JAVAC) -Xlint:unchecked -g -cp `echo $(R_SUPPORT) | sed -e 's/ /:/g;'` $(R_JAVA) + @mkdir -p classes + (cd src && $(JAVAC) -Xlint:unchecked -g -cp ../`echo $(R_SUPPORT) | sed -e 's/ /:..\//g;'` -d ../classes $(R_JAVA)) @echo "- creating $@" - @$(JAR) cf $@ $(R_CLASS) + @(cd classes && $(JAR) cf ../$@ $(R_CLASS)) -jezebel.jar: $(J_JAVA) +jezebel.jar: $(J_FILE) @echo "- $@ compiling files" - @$(JAVAC) -Xlint:unchecked -g -cp `echo $(J_SUPPORT) | sed -e 's/ /:/g;'` $(J_JAVA) + @mkdir -p classes + @(cd src && $(JAVAC) -Xlint:unchecked -g -cp ../`echo $(J_SUPPORT) | sed -e 's/ /:..\//g;'` -d ../classes $(J_JAVA)) @echo "- creating $@" - @$(JAR) cf $@ $(J_CLASS) + @(cd classes && $(JAR) cf ../$@ $(J_CLASS)) install-dirs: all $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(javalibdir) @@ -136,7 +140,7 @@ install-jezebel: install-dirs all install: install-iep install-jezebel clean: - find com -name \*.class -exec rm {} \; + rm -rf classes rm -f reconnoiter.jar jezebel.jar distclean: clean diff --git a/src/java/com/omniti/jezebel/Jezebel.java b/src/java/src/com/omniti/jezebel/Jezebel.java similarity index 100% rename from src/java/com/omniti/jezebel/Jezebel.java rename to src/java/src/com/omniti/jezebel/Jezebel.java diff --git a/src/java/com/omniti/jezebel/JezebelCheck.java b/src/java/src/com/omniti/jezebel/JezebelCheck.java similarity index 100% rename from src/java/com/omniti/jezebel/JezebelCheck.java rename to src/java/src/com/omniti/jezebel/JezebelCheck.java diff --git a/src/java/com/omniti/jezebel/JezebelClassLoader.java b/src/java/src/com/omniti/jezebel/JezebelClassLoader.java similarity index 100% rename from src/java/com/omniti/jezebel/JezebelClassLoader.java rename to src/java/src/com/omniti/jezebel/JezebelClassLoader.java diff --git a/src/java/com/omniti/jezebel/JezebelDispatch.java b/src/java/src/com/omniti/jezebel/JezebelDispatch.java similarity index 100% rename from src/java/com/omniti/jezebel/JezebelDispatch.java rename to src/java/src/com/omniti/jezebel/JezebelDispatch.java diff --git a/src/java/com/omniti/jezebel/JezebelResmon.java b/src/java/src/com/omniti/jezebel/JezebelResmon.java similarity index 100% rename from src/java/com/omniti/jezebel/JezebelResmon.java rename to src/java/src/com/omniti/jezebel/JezebelResmon.java diff --git a/src/java/com/omniti/jezebel/JezebelTools.java b/src/java/src/com/omniti/jezebel/JezebelTools.java similarity index 100% rename from src/java/com/omniti/jezebel/JezebelTools.java rename to src/java/src/com/omniti/jezebel/JezebelTools.java diff --git a/src/java/com/omniti/jezebel/Resmon.java b/src/java/src/com/omniti/jezebel/Resmon.java similarity index 100% rename from src/java/com/omniti/jezebel/Resmon.java rename to src/java/src/com/omniti/jezebel/Resmon.java diff --git a/src/java/com/omniti/jezebel/ResmonResult.java b/src/java/src/com/omniti/jezebel/ResmonResult.java similarity index 100% rename from src/java/com/omniti/jezebel/ResmonResult.java rename to src/java/src/com/omniti/jezebel/ResmonResult.java diff --git a/src/java/com/omniti/jezebel/SampleCheck.java b/src/java/src/com/omniti/jezebel/SampleCheck.java similarity index 100% rename from src/java/com/omniti/jezebel/SampleCheck.java rename to src/java/src/com/omniti/jezebel/SampleCheck.java diff --git a/src/java/com/omniti/jezebel/check/JDBC.java b/src/java/src/com/omniti/jezebel/check/JDBC.java similarity index 100% rename from src/java/com/omniti/jezebel/check/JDBC.java rename to src/java/src/com/omniti/jezebel/check/JDBC.java diff --git a/src/java/com/omniti/jezebel/check/jmx.java b/src/java/src/com/omniti/jezebel/check/jmx.java similarity index 100% rename from src/java/com/omniti/jezebel/check/jmx.java rename to src/java/src/com/omniti/jezebel/check/jmx.java diff --git a/src/java/com/omniti/jezebel/check/ldap.java b/src/java/src/com/omniti/jezebel/check/ldap.java similarity index 100% rename from src/java/com/omniti/jezebel/check/ldap.java rename to src/java/src/com/omniti/jezebel/check/ldap.java diff --git a/src/java/com/omniti/jezebel/check/mysql.java b/src/java/src/com/omniti/jezebel/check/mysql.java similarity index 100% rename from src/java/com/omniti/jezebel/check/mysql.java rename to src/java/src/com/omniti/jezebel/check/mysql.java diff --git a/src/java/com/omniti/jezebel/check/oracle.java b/src/java/src/com/omniti/jezebel/check/oracle.java similarity index 100% rename from src/java/com/omniti/jezebel/check/oracle.java rename to src/java/src/com/omniti/jezebel/check/oracle.java diff --git a/src/java/com/omniti/jezebel/check/postgres.java b/src/java/src/com/omniti/jezebel/check/postgres.java similarity index 100% rename from src/java/com/omniti/jezebel/check/postgres.java rename to src/java/src/com/omniti/jezebel/check/postgres.java diff --git a/src/java/com/omniti/jezebel/check/snmp.java b/src/java/src/com/omniti/jezebel/check/snmp.java similarity index 100% rename from src/java/com/omniti/jezebel/check/snmp.java rename to src/java/src/com/omniti/jezebel/check/snmp.java diff --git a/src/java/com/omniti/jezebel/check/sqlserver.java b/src/java/src/com/omniti/jezebel/check/sqlserver.java similarity index 100% rename from src/java/com/omniti/jezebel/check/sqlserver.java rename to src/java/src/com/omniti/jezebel/check/sqlserver.java diff --git a/src/java/com/omniti/reconnoiter/CheckStatus.java b/src/java/src/com/omniti/reconnoiter/CheckStatus.java similarity index 100% rename from src/java/com/omniti/reconnoiter/CheckStatus.java rename to src/java/src/com/omniti/reconnoiter/CheckStatus.java diff --git a/src/java/com/omniti/reconnoiter/EventHandler.java b/src/java/src/com/omniti/reconnoiter/EventHandler.java similarity index 100% rename from src/java/com/omniti/reconnoiter/EventHandler.java rename to src/java/src/com/omniti/reconnoiter/EventHandler.java diff --git a/src/java/com/omniti/reconnoiter/IEPEngine.java b/src/java/src/com/omniti/reconnoiter/IEPEngine.java similarity index 100% rename from src/java/com/omniti/reconnoiter/IEPEngine.java rename to src/java/src/com/omniti/reconnoiter/IEPEngine.java diff --git a/src/java/com/omniti/reconnoiter/IEventHandler.java b/src/java/src/com/omniti/reconnoiter/IEventHandler.java similarity index 100% rename from src/java/com/omniti/reconnoiter/IEventHandler.java rename to src/java/src/com/omniti/reconnoiter/IEventHandler.java diff --git a/src/java/com/omniti/reconnoiter/MQListener.java b/src/java/src/com/omniti/reconnoiter/MQListener.java similarity index 100% rename from src/java/com/omniti/reconnoiter/MQListener.java rename to src/java/src/com/omniti/reconnoiter/MQListener.java diff --git a/src/java/com/omniti/reconnoiter/MessageHandler.java b/src/java/src/com/omniti/reconnoiter/MessageHandler.java similarity index 100% rename from src/java/com/omniti/reconnoiter/MessageHandler.java rename to src/java/src/com/omniti/reconnoiter/MessageHandler.java diff --git a/src/java/com/omniti/reconnoiter/StratconConfig.java b/src/java/src/com/omniti/reconnoiter/StratconConfig.java similarity index 100% rename from src/java/com/omniti/reconnoiter/StratconConfig.java rename to src/java/src/com/omniti/reconnoiter/StratconConfig.java diff --git a/src/java/com/omniti/reconnoiter/StratconMessage.java b/src/java/src/com/omniti/reconnoiter/StratconMessage.java similarity index 100% rename from src/java/com/omniti/reconnoiter/StratconMessage.java rename to src/java/src/com/omniti/reconnoiter/StratconMessage.java diff --git a/src/java/com/omniti/reconnoiter/StratconMessageFactory.java b/src/java/src/com/omniti/reconnoiter/StratconMessageFactory.java similarity index 100% rename from src/java/com/omniti/reconnoiter/StratconMessageFactory.java rename to src/java/src/com/omniti/reconnoiter/StratconMessageFactory.java diff --git a/src/java/com/omniti/reconnoiter/broker/AMQBroker.java b/src/java/src/com/omniti/reconnoiter/broker/AMQBroker.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/AMQBroker.java rename to src/java/src/com/omniti/reconnoiter/broker/AMQBroker.java diff --git a/src/java/com/omniti/reconnoiter/broker/AMQListener.java b/src/java/src/com/omniti/reconnoiter/broker/AMQListener.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/AMQListener.java rename to src/java/src/com/omniti/reconnoiter/broker/AMQListener.java diff --git a/src/java/com/omniti/reconnoiter/broker/BrokerFactory.java b/src/java/src/com/omniti/reconnoiter/broker/BrokerFactory.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/BrokerFactory.java rename to src/java/src/com/omniti/reconnoiter/broker/BrokerFactory.java diff --git a/src/java/com/omniti/reconnoiter/broker/IMQBroker.java b/src/java/src/com/omniti/reconnoiter/broker/IMQBroker.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/IMQBroker.java rename to src/java/src/com/omniti/reconnoiter/broker/IMQBroker.java diff --git a/src/java/com/omniti/reconnoiter/broker/NoitListener.java b/src/java/src/com/omniti/reconnoiter/broker/NoitListener.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/NoitListener.java rename to src/java/src/com/omniti/reconnoiter/broker/NoitListener.java diff --git a/src/java/com/omniti/reconnoiter/broker/RabbitBroker.java b/src/java/src/com/omniti/reconnoiter/broker/RabbitBroker.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/RabbitBroker.java rename to src/java/src/com/omniti/reconnoiter/broker/RabbitBroker.java diff --git a/src/java/com/omniti/reconnoiter/broker/RabbitListener.java b/src/java/src/com/omniti/reconnoiter/broker/RabbitListener.java similarity index 100% rename from src/java/com/omniti/reconnoiter/broker/RabbitListener.java rename to src/java/src/com/omniti/reconnoiter/broker/RabbitListener.java diff --git a/src/java/com/omniti/reconnoiter/esper/CounterView.java b/src/java/src/com/omniti/reconnoiter/esper/CounterView.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/CounterView.java rename to src/java/src/com/omniti/reconnoiter/esper/CounterView.java diff --git a/src/java/com/omniti/reconnoiter/esper/CounterViewFactory.java b/src/java/src/com/omniti/reconnoiter/esper/CounterViewFactory.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/CounterViewFactory.java rename to src/java/src/com/omniti/reconnoiter/esper/CounterViewFactory.java diff --git a/src/java/com/omniti/reconnoiter/esper/DeriveView.java b/src/java/src/com/omniti/reconnoiter/esper/DeriveView.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/DeriveView.java rename to src/java/src/com/omniti/reconnoiter/esper/DeriveView.java diff --git a/src/java/com/omniti/reconnoiter/esper/DeriveViewFactory.java b/src/java/src/com/omniti/reconnoiter/esper/DeriveViewFactory.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/DeriveViewFactory.java rename to src/java/src/com/omniti/reconnoiter/esper/DeriveViewFactory.java diff --git a/src/java/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java b/src/java/src/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java rename to src/java/src/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java diff --git a/src/java/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java b/src/java/src/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java rename to src/java/src/com/omniti/reconnoiter/esper/ExactBaseStatisticsBean.java diff --git a/src/java/com/omniti/reconnoiter/esper/ExactRegressionBean.java b/src/java/src/com/omniti/reconnoiter/esper/ExactRegressionBean.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/ExactRegressionBean.java rename to src/java/src/com/omniti/reconnoiter/esper/ExactRegressionBean.java diff --git a/src/java/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java b/src/java/src/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java rename to src/java/src/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java diff --git a/src/java/com/omniti/reconnoiter/esper/ExactStatViewFactory.java b/src/java/src/com/omniti/reconnoiter/esper/ExactStatViewFactory.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/ExactStatViewFactory.java rename to src/java/src/com/omniti/reconnoiter/esper/ExactStatViewFactory.java diff --git a/src/java/com/omniti/reconnoiter/esper/WeightedValueBean.java b/src/java/src/com/omniti/reconnoiter/esper/WeightedValueBean.java similarity index 100% rename from src/java/com/omniti/reconnoiter/esper/WeightedValueBean.java rename to src/java/src/com/omniti/reconnoiter/esper/WeightedValueBean.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitBundlev1.java b/src/java/src/com/omniti/reconnoiter/event/NoitBundlev1.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitBundlev1.java rename to src/java/src/com/omniti/reconnoiter/event/NoitBundlev1.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitBundlev2.java b/src/java/src/com/omniti/reconnoiter/event/NoitBundlev2.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitBundlev2.java rename to src/java/src/com/omniti/reconnoiter/event/NoitBundlev2.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitCheck.java b/src/java/src/com/omniti/reconnoiter/event/NoitCheck.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitCheck.java rename to src/java/src/com/omniti/reconnoiter/event/NoitCheck.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitEvent.java b/src/java/src/com/omniti/reconnoiter/event/NoitEvent.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitEvent.java rename to src/java/src/com/omniti/reconnoiter/event/NoitEvent.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitMetric.java b/src/java/src/com/omniti/reconnoiter/event/NoitMetric.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitMetric.java rename to src/java/src/com/omniti/reconnoiter/event/NoitMetric.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitMetricGeneric.java b/src/java/src/com/omniti/reconnoiter/event/NoitMetricGeneric.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitMetricGeneric.java rename to src/java/src/com/omniti/reconnoiter/event/NoitMetricGeneric.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitMetricNumeric.java b/src/java/src/com/omniti/reconnoiter/event/NoitMetricNumeric.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitMetricNumeric.java rename to src/java/src/com/omniti/reconnoiter/event/NoitMetricNumeric.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitMetricText.java b/src/java/src/com/omniti/reconnoiter/event/NoitMetricText.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitMetricText.java rename to src/java/src/com/omniti/reconnoiter/event/NoitMetricText.java diff --git a/src/java/com/omniti/reconnoiter/event/NoitStatus.java b/src/java/src/com/omniti/reconnoiter/event/NoitStatus.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/NoitStatus.java rename to src/java/src/com/omniti/reconnoiter/event/NoitStatus.java diff --git a/src/java/com/omniti/reconnoiter/event/StratconQuery.java b/src/java/src/com/omniti/reconnoiter/event/StratconQuery.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/StratconQuery.java rename to src/java/src/com/omniti/reconnoiter/event/StratconQuery.java diff --git a/src/java/com/omniti/reconnoiter/event/StratconQueryBase.java b/src/java/src/com/omniti/reconnoiter/event/StratconQueryBase.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/StratconQueryBase.java rename to src/java/src/com/omniti/reconnoiter/event/StratconQueryBase.java diff --git a/src/java/com/omniti/reconnoiter/event/StratconQueryStop.java b/src/java/src/com/omniti/reconnoiter/event/StratconQueryStop.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/StratconQueryStop.java rename to src/java/src/com/omniti/reconnoiter/event/StratconQueryStop.java diff --git a/src/java/com/omniti/reconnoiter/event/StratconStatement.java b/src/java/src/com/omniti/reconnoiter/event/StratconStatement.java similarity index 100% rename from src/java/com/omniti/reconnoiter/event/StratconStatement.java rename to src/java/src/com/omniti/reconnoiter/event/StratconStatement.java