#99152# transition to new cfg format

2 files changed, 37 insertions, 32 deletions

diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index 53e5e02debbc..e3d72413d9b6 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,8 +1,14 @@
 oc	officecfg								usr30073	-	none	 NULL
 oc	officecfg								usr1	-	all	oc_mkout NULL
-oc	officecfg\org\openoffice\configuration			nmake	-	all	oc_config NULL
+oc	officecfg\org\openoffice\configuration	nmake	-	all	oc_config NULL
 oc	officecfg\org\openoffice\helper			nmake	-	all	oc_helper oc_config NULL
-oc	officecfg\data							nmake	-	all	oc_data oc_helper NULL
-oc	officecfg\data\org\openoffice\Office	get		-	all	oc_office NULL
-oc	officecfg\data\org\openoffice\ucb		get		-	all	oc_ucb NULL
-oc	officecfg\data\org\openoffice			get		-	all	oc_ooo NULL
+oc	officecfg\registry\schema				nmake	-	all	oc_reg_schema oc_helper NULL
+oc	officecfg\registry\data					nmake	-	all	oc_reg_data oc_reg_schema NULL
+oc	officecfg\registry\schema\org\openoffice\Office	get			-	all	oc_reg_schema_office NULL
+oc	officecfg\registry\schema\org\openoffice\ucb		get		-	all	oc_reg_schema_ucb NULL
+oc	officecfg\registry\schema\org\openoffice			get		-	all	oc_reg_schema_ooo NULL
+oc	officecfg\registry\data\org\openoffice\Office	get		-	all	oc_reg_data_office NULL
+oc	officecfg\registry\data\org\openoffice\ucb		get		-	all	oc_reg_data_ucb NULL
+oc	officecfg\registry\data\org\openoffice			get		-	all	oc_reg_data_ooo NULL
+
+
diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst
index 1f103e1a4cca..2600bbb07b43 100644
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
@@ -31,36 +31,36 @@ mkdir: %_DEST%\xml%_EXT%\office\ldap
 ..\util\ldap-schema.xsl %_DEST%\xml%_EXT%\office\schema\ldap-schema.xsl
 ..\util\ldapv3-schema.xsl %_DEST%\xml%_EXT%\office\schema\ldapv3-schema.xsl
 
-..\data\org\openoffice\Office\Bibliography.xcd %_DEST%\xml%_EXT%\office\definition\org.openoffice.Office.Bibliography.xcd
-..\data\org\openoffice\Office\Calc.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Calc.xcd
-..\data\org\openoffice\Office\Player.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Player.xcd
-..\data\org\openoffice\Office\Chart.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Chart.xcd
-..\data\org\openoffice\Office\UI.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\UI.xcd
-..\data\org\openoffice\Office\Common.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Common.xcd
-..\data\org\openoffice\Office\SFX.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\SFX.xcd
-..\data\org\openoffice\Office\DataAccess.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\DataAccess.xcd
-..\data\org\openoffice\Office\Labels.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Labels.xcd
-..\data\org\openoffice\Office\Views.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Views.xcd
-..\data\org\openoffice\Office\TypeDetection.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\TypeDetection.xcd
-..\data\org\openoffice\Office\Draw.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Draw.xcd
-..\data\org\openoffice\Office\Impress.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Impress.xcd
-..\data\org\openoffice\Office\Java.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Java.xcd
-..\data\org\openoffice\Office\Linguistic.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Linguistic.xcd
-..\data\org\openoffice\Office\Math.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Math.xcd
-..\data\org\openoffice\Office\Writer.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Writer.xcd
-..\data\org\openoffice\Office\WriterWeb.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\WriterWeb.xcd
-..\data\org\openoffice\Office\Commands.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Commands.xcd
-..\data\org\openoffice\Office\ProtocolHandler.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\ProtocolHandler.xcd
-..\data\org\openoffice\Inet.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Inet.xcd
-..\data\org\openoffice\ucb\Store.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\ucb\Store.xcd
-..\data\org\openoffice\Setup.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Setup.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Bibliography.xcd %_DEST%\xml%_EXT%\office\definition\org.openoffice.Office.Bibliography.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Calc.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Calc.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Player.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Player.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Chart.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Chart.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\UI.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\UI.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Common.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Common.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\SFX.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\SFX.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\DataAccess.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\DataAccess.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Labels.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Labels.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Views.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Views.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\TypeDetection.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\TypeDetection.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Draw.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Draw.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Impress.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Impress.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Java.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Java.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Linguistic.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Linguistic.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Math.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Math.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Writer.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Writer.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\WriterWeb.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\WriterWeb.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\Commands.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\Commands.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Office\ProtocolHandler.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Office\ProtocolHandler.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Inet.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Inet.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\ucb\Store.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\ucb\Store.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\Setup.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Setup.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\UserProfile.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\UserProfile.xcd
+..\%__SRC%\misc\xcdformat\org\openoffice\VCL.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\VCL.xcd
+
 ..\data\org\openoffice\Types.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\Types.xcd
-..\data\org\openoffice\UserProfile.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\UserProfile.xcd
-..\data\org\openoffice\VCL.xcd %_DEST%\xml%_EXT%\office\definition\org\openoffice\VCL.xcd
 
 ..\%__SRC%\misc\instance\org\openoffice\Office\Bibliography.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\Bibliography.xml
 ..\%__SRC%\misc\instance\org\openoffice\Office\Calc.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\Calc.xml
-..\%__SRC%\misc\instance\org\openoffice\Office\Player.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\Player.xml
 ..\%__SRC%\misc\instance\org\openoffice\Office\Chart.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\Chart.xml
 ..\%__SRC%\misc\instance\org\openoffice\Office\UI.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\UI.xml
 ..\%__SRC%\misc\instance\org\openoffice\Office\Common.xml %_DEST%\xml%_EXT%\office\instance\org\openoffice\Office\Common.xml
@@ -89,7 +89,6 @@ mkdir: %_DEST%\xml%_EXT%\office\ldap
 
 ..\%__SRC%\misc\template\org\openoffice\Office\Bibliography.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\Bibliography.xml
 ..\%__SRC%\misc\template\org\openoffice\Office\Calc.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\Calc.xml
-..\%__SRC%\misc\template\org\openoffice\Office\Player.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\Player.xml
 ..\%__SRC%\misc\template\org\openoffice\Office\Chart.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\Chart.xml
 ..\%__SRC%\misc\template\org\openoffice\Office\UI.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\UI.xml
 ..\%__SRC%\misc\template\org\openoffice\Office\Common.xml %_DEST%\xml%_EXT%\office\template\org\openoffice\Office\Common.xml