Commit 770bc832973601dd11543eb090f9fea964948800

Authored by Benjamin Renard
1 parent 2e9cc1bb

All xsd files used for config (parameters, requests, spice kernels) are now defi…

…ned in config/xsd/ directory
Showing 32 changed files with 24 additions and 28 deletions   Show diff stats
.gitignore
... ... @@ -34,7 +34,3 @@ test/FitNesseRoot/files/
34 34 test/FitNesseRoot/properties
35 35 test/FitNesseRoot/updateDoNotCopyOverList
36 36 test/FitNesseRoot/updateList
37   -config/MissionInfo/*
38   -config/InstrumentInfo/*
39   -config/DataSetInfo/*
40   -config/DataBaseParameters/*.xml
... ...
app-debug/app.properties
1 1 #Configuration file of Log4Cxx logger component
2 2 app.log4cxx.configfile=log4cxx.config
3 3 app.param.path=../test/data/DataBaseParameters
4   -app.parameter.xsd=../config/Parameters/xsd/parameter/all.xsd
5   -app.request.xsd=../config/Parameters/xsd/request/all.xsd
6   -app.paramInfo.xsd=../config/Parameters/xsd/info/paramInfo.xsd
  4 +app.parameter.xsd=../config/xsd/parameter/all.xsd
  5 +app.request.xsd=../config/xsd/request/all.xsd
  6 +app.paramInfo.xsd=../config/xsd/info/paramInfo.xsd
7 7 app.dataSetInfo.path=../test/data/DataSetInfo
8   -app.dataSetInfo.xsd=../config/Parameters/xsd/info/dataSetInfo.xsd
  8 +app.dataSetInfo.xsd=../config/xsd/info/dataSetInfo.xsd
9 9 app.instrumentInfo.path=../test/data/InstrumentInfo
10   -app.instrumentInfo.xsd=../config/Parameters/xsd/info/instrumentInfo.xsd
  10 +app.instrumentInfo.xsd=../config/xsd/info/instrumentInfo.xsd
11 11 app.missionInfo.path=../test/data/MissionInfo
12   -app.missionInfo.xsd=../config/Parameters/xsd/info/missionInfo.xsd
  12 +app.missionInfo.xsd=../config/xsd/info/missionInfo.xsd
13 13 # Local base properties
14 14 app.localbase.path=../test/data/LocalBase
15   -app.localbase.xsd=../config/Parameters/xsd/localbase/base.xsd
  15 +app.localbase.xsd=../config/xsd/localbase/base.xsd
16 16 # Spice Kernel config schema
17   -app.spicekernel.configxsd=../config/SpiceKernel/config.xsd
  17 +app.spicekernel.configxsd=../config/xsd/spicekernel/config.xsd
18 18 # Spice Kernel config file
19 19 app.spicekernel.configfile=spiceKernelConfig.xml
20 20 # Directory of AMDA plugin
... ...
app-generate-paraminfo/app.properties
1 1 #Configuration file of Log4Cxx logger component
2 2 app.log4cxx.configfile=log4cxx.config
3 3 app.param.path=../test/data/DataBaseParameters
4   -app.parameter.xsd=../config/Parameters/xsd/parameter/all.xsd
5   -app.request.xsd=../config/Parameters/xsd/request/all.xsd
6   -app.paramInfo.xsd=../config/Parameters/xsd/info/paramInfo.xsd
  4 +app.parameter.xsd=../config/xsd/parameter/all.xsd
  5 +app.request.xsd=../config/xsd/request/all.xsd
  6 +app.paramInfo.xsd=../config/xsd/info/paramInfo.xsd
7 7 app.dataSetInfo.path=../test/data/DataSetInfo
8   -app.dataSetInfo.xsd=../config/Parameters/xsd/info/dataSetInfo.xsd
  8 +app.dataSetInfo.xsd=../config/xsd/info/dataSetInfo.xsd
9 9 app.instrumentInfo.path=../test/data/InstrumentInfo
10   -app.instrumentInfo.xsd=../config/Parameters/xsd/info/instrumentInfo.xsd
  10 +app.instrumentInfo.xsd=../config/xsd/info/instrumentInfo.xsd
11 11 app.missionInfo.path=../test/data/MissionInfo
12   -app.missionInfo.xsd=../config/Parameters/xsd/info/missionInfo.xsd
  12 +app.missionInfo.xsd=../config/xsd/info/missionInfo.xsd
13 13 # Local base properties
14 14 app.localbase.path=../test/data/LocalBase
15   -app.localbase.xsd=../config/Parameters/xsd/localbase/base.xsd
  15 +app.localbase.xsd=../config/xsd/localbase/base.xsd
16 16 # Spice Kernel config schema
17   -app.spicekernel.configxsd=../config/SpiceKernel/config.xsd
  17 +app.spicekernel.configxsd=../config/xsd/spicekernel/config.xsd
18 18 # Spice Kernel config file
19 19 app.spicekernel.configfile=spiceKernelConfig.xml
20 20 # Directory of AMDA plugin
... ...
app-release/app.properties
1 1 #Configuration file of Log4Cxx logger component
2 2 app.log4cxx.configfile=log4cxx.config
3 3 app.param.path=../test/data/DataBaseParameters
4   -app.parameter.xsd=../config/Parameters/xsd/parameter/all.xsd
5   -app.request.xsd=../config/Parameters/xsd/request/all.xsd
6   -app.paramInfo.xsd=../config/Parameters/xsd/info/paramInfo.xsd
  4 +app.parameter.xsd=../config/xsd/parameter/all.xsd
  5 +app.request.xsd=../config/xsd/request/all.xsd
  6 +app.paramInfo.xsd=../config/xsd/info/paramInfo.xsd
7 7 app.dataSetInfo.path=../test/data/DataSetInfo
8   -app.dataSetInfo.xsd=../config/Parameters/xsd/info/dataSetInfo.xsd
  8 +app.dataSetInfo.xsd=../config/xsd/info/dataSetInfo.xsd
9 9 app.instrumentInfo.path=../test/data/InstrumentInfo
10   -app.instrumentInfo.xsd=../config/Parameters/xsd/info/instrumentInfo.xsd
  10 +app.instrumentInfo.xsd=../config/xsd/info/instrumentInfo.xsd
11 11 app.missionInfo.path=../test/data/MissionInfo
12   -app.missionInfo.xsd=../config/Parameters/xsd/info/missionInfo.xsd
  12 +app.missionInfo.xsd=../config/xsd/info/missionInfo.xsd
13 13 # Local base properties
14 14 app.localbase.path=../test/data/LocalBase
15   -app.localbase.xsd=../config/Parameters/xsd/localbase/base.xsd
  15 +app.localbase.xsd=../config/xsd/localbase/base.xsd
16 16 # Spice Kernel config schema
17   -app.spicekernel.configxsd=../config/SpiceKernel/config.xsd
  17 +app.spicekernel.configxsd=../config/xsd/spicekernel/config.xsd
18 18 # Spice Kernel config file
19 19 app.spicekernel.configfile=spiceKernelConfig.xml
20 20 # Directory of AMDA plugin
... ...
config/Parameters/xsd/info/dataSetInfo.xsd renamed to config/xsd/info/dataSetInfo.xsd
config/Parameters/xsd/info/instrumentInfo.xsd renamed to config/xsd/info/instrumentInfo.xsd
config/Parameters/xsd/info/missionInfo.xsd renamed to config/xsd/info/missionInfo.xsd
config/Parameters/xsd/info/paramInfo.xsd renamed to config/xsd/info/paramInfo.xsd
config/Parameters/xsd/localbase/base.xsd renamed to config/xsd/localbase/base.xsd
config/Parameters/xsd/parameter/all.xsd renamed to config/xsd/parameter/all.xsd
config/Parameters/xsd/parameter/getamdaparam.xsd renamed to config/xsd/parameter/getamdaparam.xsd
config/Parameters/xsd/parameter/getddbase.xsd renamed to config/xsd/parameter/getddbase.xsd
config/Parameters/xsd/parameter/getlocalfile.xsd renamed to config/xsd/parameter/getlocalfile.xsd
config/Parameters/xsd/parameter/parameter.xsd renamed to config/xsd/parameter/parameter.xsd
config/Parameters/xsd/request/all.xsd renamed to config/xsd/request/all.xsd
config/Parameters/xsd/request/asciiPlot.xsd renamed to config/xsd/request/asciiPlot.xsd
config/Parameters/xsd/request/dataMining.xsd renamed to config/xsd/request/dataMining.xsd
config/Parameters/xsd/request/download.xsd renamed to config/xsd/request/download.xsd
config/Parameters/xsd/request/epochPlot.xsd renamed to config/xsd/request/epochPlot.xsd
config/Parameters/xsd/request/instantPlot.xsd renamed to config/xsd/request/instantPlot.xsd
config/Parameters/xsd/request/interval.xsd renamed to config/xsd/request/interval.xsd
config/Parameters/xsd/request/intervalTrue.xsd renamed to config/xsd/request/intervalTrue.xsd
config/Parameters/xsd/request/paramPlot.xsd renamed to config/xsd/request/paramPlot.xsd
config/Parameters/xsd/request/plot.xsd renamed to config/xsd/request/plot.xsd
config/Parameters/xsd/request/postProcessing.xsd renamed to config/xsd/request/postProcessing.xsd
config/Parameters/xsd/request/request.xsd renamed to config/xsd/request/request.xsd
config/Parameters/xsd/request/statistic.xsd renamed to config/xsd/request/statistic.xsd
config/Parameters/xsd/request/statusPlot.xsd renamed to config/xsd/request/statusPlot.xsd
config/Parameters/xsd/request/tickPlot.xsd renamed to config/xsd/request/tickPlot.xsd
config/Parameters/xsd/request/timePlot.xsd renamed to config/xsd/request/timePlot.xsd
config/Parameters/xsd/request/xyPlot.xsd renamed to config/xsd/request/xyPlot.xsd
config/SpiceKernel/config.xsd renamed to config/xsd/spicekernel/config.xsd