From 7232a2195b06165720a752e1bd741c48bc6714b8 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 5 May 2011 12:01:18 -0700 Subject: [PATCH] see #2385 bumped XML DTD version to 21 to make room for the transformation to fix bug #2385. That will be done in branch development --- VERSION | 2 +- src/libfwbuilder/etc/fwbuilder.dtd | 2 +- .../{FWObjectDatabase_19.xslt => FWObjectDatabase_20.xslt} | 6 +++--- src/libfwbuilder/migration/migration.pro | 1 + src/res/objects_init.xml | 2 +- src/res/templates.xml | 2 +- test/ipt/cluster-tests.fwb | 2 +- test/ipt/objects-for-regression-tests.fwb | 2 +- test/pf/cluster-tests.fwb | 2 +- test/pf/objects-for-regression-tests.fwb | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) rename src/libfwbuilder/migration/{FWObjectDatabase_19.xslt => FWObjectDatabase_20.xslt} (98%) diff --git a/VERSION b/VERSION index 93ffa352b..1be902b7d 100644 --- a/VERSION +++ b/VERSION @@ -14,6 +14,6 @@ VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION" # Data format version -FWBUILDER_XML_VERSION=20 +FWBUILDER_XML_VERSION=21 diff --git a/src/libfwbuilder/etc/fwbuilder.dtd b/src/libfwbuilder/etc/fwbuilder.dtd index 68b5ad4c1..c39910788 100644 --- a/src/libfwbuilder/etc/fwbuilder.dtd +++ b/src/libfwbuilder/etc/fwbuilder.dtd @@ -79,7 +79,7 @@ diff --git a/src/libfwbuilder/migration/FWObjectDatabase_19.xslt b/src/libfwbuilder/migration/FWObjectDatabase_20.xslt similarity index 98% rename from src/libfwbuilder/migration/FWObjectDatabase_19.xslt rename to src/libfwbuilder/migration/FWObjectDatabase_20.xslt index 5fb410376..b14d301f7 100644 --- a/src/libfwbuilder/migration/FWObjectDatabase_19.xslt +++ b/src/libfwbuilder/migration/FWObjectDatabase_20.xslt @@ -1,7 +1,7 @@ @@ -235,7 +235,7 @@ - 20 + 21 root diff --git a/src/libfwbuilder/migration/migration.pro b/src/libfwbuilder/migration/migration.pro index 7e71b6137..36c85dac0 100644 --- a/src/libfwbuilder/migration/migration.pro +++ b/src/libfwbuilder/migration/migration.pro @@ -94,5 +94,6 @@ target.files = FWObjectDatabase_0.8.7.xslt \ FWObjectDatabase_17.xslt \ FWObjectDatabase_18.xslt \ FWObjectDatabase_19.xslt \ + FWObjectDatabase_20.xslt \ diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml index e1263269a..ec1274348 100644 --- a/src/res/objects_init.xml +++ b/src/res/objects_init.xml @@ -1,6 +1,6 @@ - + diff --git a/src/res/templates.xml b/src/res/templates.xml index 70e7c1d18..d27ffb6a3 100644 --- a/src/res/templates.xml +++ b/src/res/templates.xml @@ -1,6 +1,6 @@ - + diff --git a/test/ipt/cluster-tests.fwb b/test/ipt/cluster-tests.fwb index 0f730a50c..53d95b743 100644 --- a/test/ipt/cluster-tests.fwb +++ b/test/ipt/cluster-tests.fwb @@ -1,6 +1,6 @@ - + diff --git a/test/ipt/objects-for-regression-tests.fwb b/test/ipt/objects-for-regression-tests.fwb index 61ed77c4e..14c1649fa 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + diff --git a/test/pf/cluster-tests.fwb b/test/pf/cluster-tests.fwb index 8f3a3e2a2..209b97741 100644 --- a/test/pf/cluster-tests.fwb +++ b/test/pf/cluster-tests.fwb @@ -1,6 +1,6 @@ - + diff --git a/test/pf/objects-for-regression-tests.fwb b/test/pf/objects-for-regression-tests.fwb index 1b7f3c50e..7c5fd3c68 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - +