From 165107b44ce934beb39be5998bc7cc82c46d426d Mon Sep 17 00:00:00 2001
From: Hans Boom <boom@astron.nl>
Date: Thu, 11 Oct 2012 09:37:52 +0000
Subject: [PATCH] Task #1771: move jParmFacade to OTB module
---
.gitattributes | 4 ++--
.gitignore | 14 +++++++-------
{JAVA/CEP => SAS/OTB}/jParmFacade/Makefile.am | 0
{JAVA/CEP => SAS/OTB}/jParmFacade/bootstrap | 0
{JAVA/CEP => SAS/OTB}/jParmFacade/build.xml | 0
.../conf/Plotter-config-jparmfacade.jar | Bin
{JAVA/CEP => SAS/OTB}/jParmFacade/configure.in | 0
.../OTB}/jParmFacade/include/Makefile.am | 0
.../jParmFacade/include/jParmFacade/Makefile.am | 0
...nl_astron_lofar_java_cep_jparmfacade_jCommon.h | 0
...stron_lofar_java_cep_jparmfacade_jParmFacade.h | 0
.../OTB}/jParmFacade/jParmFacade.spec.in | 0
{JAVA/CEP => SAS/OTB}/jParmFacade/manifest.mf | 0
{JAVA/CEP => SAS/OTB}/jParmFacade/pom.xml | 0
{JAVA/CEP => SAS/OTB}/jParmFacade/src/Makefile.am | 0
.../lofar/java/cep/jparmfacade/jParmFacade.java | 0
.../java/cep/jparmfacade/jParmFacade.log_prop | 0
.../java/cep/jparmfacade/jParmFacadeAdapter.java | 0
.../cep/jparmfacade/jParmFacadeInterface.java | 0
.../java/cep/jparmfacade/jParmFacadeServer.java | 0
...tron_lofar_java_cep_jparmfacade_jParmFacade.cc | 0
.../CEP => SAS/OTB}/jParmFacade/test/Makefile.am | 0
.../OTB}/jParmFacade/test/tParmFacade.java | 0
.../OTB}/jParmFacade/test/tRemoteParmFacade.java | 0
24 files changed, 9 insertions(+), 9 deletions(-)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/Makefile.am (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/bootstrap (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/build.xml (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/conf/Plotter-config-jparmfacade.jar (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/configure.in (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/include/Makefile.am (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/include/jParmFacade/Makefile.am (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/jParmFacade.spec.in (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/manifest.mf (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/pom.xml (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/Makefile.am (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/test/Makefile.am (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/test/tParmFacade.java (100%)
rename {JAVA/CEP => SAS/OTB}/jParmFacade/test/tRemoteParmFacade.java (100%)
diff --git a/.gitattributes b/.gitattributes
index 9289de05418..652c63a9c57 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1982,8 +1982,6 @@ CMake/variants/variants.lofar17 -text
CMake/variants/variants.macdiepen -text
CMake/variants/variants.mars -text
CMake/variants/variants.sas099 -text
-JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar -text
-JAVA/CEP/jParmFacade/pom.xml -text
JAVA/GUI/Plotter/.cvsignore -text
JAVA/GUI/Plotter/PlotterConfig/.cvsignore -text
JAVA/GUI/Plotter/PlotterConfig/nbproject/.cvsignore -text
@@ -3881,6 +3879,8 @@ SAS/OTB/jOTDB3/test/tTreeMaintenance.in -text
SAS/OTB/jOTDB3/test/tTreeMaintenance.java -text
SAS/OTB/jOTDB3/test/tTreeMaintenance.log_prop -text
SAS/OTB/jOTDB3/test/testStates.java -text
+SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar -text
+SAS/OTB/jParmFacade/pom.xml -text
SAS/OTB/jRSP/.cvsignore -text
SAS/OTB/jRSP/pom.xml -text
SAS/OTB/scripts/CMakeLists.txt -text
diff --git a/.gitignore b/.gitignore
index e64a63e8180..7603b5aab09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,13 +26,6 @@ CEP/pyparmdb/Makefile.common
CEP/pyparmdb/autoconf_share
CEP/pyparmdb/lofarconf
CEP/pyparmdb/py-compile
-JAVA/CEP/jParmFacade/Makefile.common
-JAVA/CEP/jParmFacade/autoconf_share
-JAVA/CEP/jParmFacade/build
-JAVA/CEP/jParmFacade/dist
-JAVA/CEP/jParmFacade/lofarconf
-JAVA/CEP/jParmFacade/nbproject
-JAVA/CEP/jParmFacade/target
JAVA/GUI/Plotter/PlotterConfig/build
JAVA/GUI/Plotter/PlotterConfig/dist
JAVA/GUI/Plotter/PlotterConfig/nbproject/private
@@ -259,6 +252,13 @@ SAS/OTB/RSP/src/nl/astron/lofar/java/gui/mac/jrsp/subbandstats/WaveformSettingsL
SAS/OTB/jOTDB3/build
SAS/OTB/jOTDB3/dist
SAS/OTB/jOTDB3/target
+SAS/OTB/jParmFacade/Makefile.common
+SAS/OTB/jParmFacade/autoconf_share
+SAS/OTB/jParmFacade/build
+SAS/OTB/jParmFacade/dist
+SAS/OTB/jParmFacade/lofarconf
+SAS/OTB/jParmFacade/nbproject
+SAS/OTB/jParmFacade/target
SAS/OTB/jRSP/Makefile.am
SAS/OTB/jRSP/autoconf_share
SAS/OTB/jRSP/bootstrap
diff --git a/JAVA/CEP/jParmFacade/Makefile.am b/SAS/OTB/jParmFacade/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/Makefile.am
rename to SAS/OTB/jParmFacade/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/bootstrap b/SAS/OTB/jParmFacade/bootstrap
similarity index 100%
rename from JAVA/CEP/jParmFacade/bootstrap
rename to SAS/OTB/jParmFacade/bootstrap
diff --git a/JAVA/CEP/jParmFacade/build.xml b/SAS/OTB/jParmFacade/build.xml
similarity index 100%
rename from JAVA/CEP/jParmFacade/build.xml
rename to SAS/OTB/jParmFacade/build.xml
diff --git a/JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar b/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
similarity index 100%
rename from JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar
rename to SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
diff --git a/JAVA/CEP/jParmFacade/configure.in b/SAS/OTB/jParmFacade/configure.in
similarity index 100%
rename from JAVA/CEP/jParmFacade/configure.in
rename to SAS/OTB/jParmFacade/configure.in
diff --git a/JAVA/CEP/jParmFacade/include/Makefile.am b/SAS/OTB/jParmFacade/include/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/Makefile.am
rename to SAS/OTB/jParmFacade/include/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am b/SAS/OTB/jParmFacade/include/jParmFacade/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am
rename to SAS/OTB/jParmFacade/include/jParmFacade/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
rename to SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
rename to SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
diff --git a/JAVA/CEP/jParmFacade/jParmFacade.spec.in b/SAS/OTB/jParmFacade/jParmFacade.spec.in
similarity index 100%
rename from JAVA/CEP/jParmFacade/jParmFacade.spec.in
rename to SAS/OTB/jParmFacade/jParmFacade.spec.in
diff --git a/JAVA/CEP/jParmFacade/manifest.mf b/SAS/OTB/jParmFacade/manifest.mf
similarity index 100%
rename from JAVA/CEP/jParmFacade/manifest.mf
rename to SAS/OTB/jParmFacade/manifest.mf
diff --git a/JAVA/CEP/jParmFacade/pom.xml b/SAS/OTB/jParmFacade/pom.xml
similarity index 100%
rename from JAVA/CEP/jParmFacade/pom.xml
rename to SAS/OTB/jParmFacade/pom.xml
diff --git a/JAVA/CEP/jParmFacade/src/Makefile.am b/SAS/OTB/jParmFacade/src/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/Makefile.am
rename to SAS/OTB/jParmFacade/src/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
diff --git a/JAVA/CEP/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc b/SAS/OTB/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
rename to SAS/OTB/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
diff --git a/JAVA/CEP/jParmFacade/test/Makefile.am b/SAS/OTB/jParmFacade/test/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/Makefile.am
rename to SAS/OTB/jParmFacade/test/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/test/tParmFacade.java b/SAS/OTB/jParmFacade/test/tParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/tParmFacade.java
rename to SAS/OTB/jParmFacade/test/tParmFacade.java
diff --git a/JAVA/CEP/jParmFacade/test/tRemoteParmFacade.java b/SAS/OTB/jParmFacade/test/tRemoteParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/tRemoteParmFacade.java
rename to SAS/OTB/jParmFacade/test/tRemoteParmFacade.java
--
GitLab