Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: increase branding interface number ......................................................................
userportal,webadmin: increase branding interface number - Incremented the branding interface version due to new use of patternfly being incompatible with old version. Change-Id: Ic951d79db8dfcf24a5e3af6ebf11056b87c436da Signed-off-by: Alexander Wels <[email protected]> --- M backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java M backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties M backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties M packaging/branding/ovirt.brand/branding.properties 9 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/31042/1 diff --git a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java index 5327987..18368c7 100644 --- a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java +++ b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java @@ -62,7 +62,7 @@ * branding theme to exist on the file system without interfering with each other. There is no backwards * compatibility, only ONE version will be valid at a time. */ - private static final int CURRENT_BRANDING_VERSION = 1; + private static final int CURRENT_BRANDING_VERSION = 2; /** * A list of available {@code BrandingTheme}s. diff --git a/backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java b/backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java index a554126..ef475b7 100644 --- a/backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java +++ b/backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java @@ -30,7 +30,7 @@ getResource("./org/ovirt/engine/core/branding").toURI().getPath()); //$NON-NLS-1$ File testThemePath = new File(testThemeRootPath.getAbsoluteFile(), "01-test.brand"); //$NON-NLS-1$ testTheme = new BrandingTheme(testThemePath.getAbsolutePath(), - testThemeRootPath, 1); + testThemeRootPath, 2); assertTrue("The theme should load", testTheme.load()); //$NON-NLS-1$ } @@ -84,7 +84,7 @@ // theme 4 is purposely missing a resources.properties file File testThemePath = new File(testThemeRootPath.getAbsoluteFile(), "04-test4.brand"); //$NON-NLS-1$ BrandingTheme theme4 = new BrandingTheme(testThemePath.getAbsolutePath(), - testThemeRootPath, 1); //$NON-NLS-1$ + testThemeRootPath, 2); //$NON-NLS-1$ assertTrue("Theme 4 should load", theme4.load()); //$NON-NLS-1$ assertNull("getCascadingResource not handling missing resources.properties gracefully", //$NON-NLS-1$ @@ -99,7 +99,7 @@ // theme 5 is purposely missing a resources key in branding.properties File testThemePath = new File(testThemeRootPath.getAbsoluteFile(), "05-test5.brand"); //$NON-NLS-1$ BrandingTheme theme5 = new BrandingTheme(testThemePath.getAbsolutePath(), - testThemeRootPath, 1); //$NON-NLS-1$ + testThemeRootPath, 2); //$NON-NLS-1$ assertTrue("Theme 5 should load", theme5.load()); //$NON-NLS-1$ assertNull("getCascadingResource not handling missing resources key gracefully", //$NON-NLS-1$ @@ -126,7 +126,7 @@ .toURI().getPath()); File testThemePath = new File(testThemeRootPath.getAbsoluteFile(), "01-test.brand"); //$NON-NLS-1$ BrandingTheme theme1 = new BrandingTheme(testThemePath.getAbsolutePath(), - testThemeRootPath, 1); //$NON-NLS-1$ + testThemeRootPath, 2); //$NON-NLS-1$ assertTrue("Theme 1 should load", theme1.load()); //$NON-NLS-1$ assertFalse("should replace template should be false", //$NON-NLS-1$ theme1.shouldReplaceWelcomePageSectionTemplate()); diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties index 06fa41f..fba43ab 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties @@ -13,4 +13,4 @@ resources=resources.properties #Version -version=1 +version=2 diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties index f179bf5..f185b5f 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties @@ -13,4 +13,4 @@ resources=resources.properties #Version -version=1 +version=2 diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties index f179bf5..f185b5f 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties @@ -13,4 +13,4 @@ resources=resources.properties #Version -version=1 +version=2 diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties index f179bf5..f185b5f 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties @@ -13,4 +13,4 @@ resources=resources.properties #Version -version=1 +version=2 diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties index e93e8f0..e02ebf9 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties @@ -13,4 +13,4 @@ # purposely don't specify for test #Version -version=1 +version=2 diff --git a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties index 64c42e3..9336952 100644 --- a/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties +++ b/backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/06-test6.brand/branding.properties @@ -15,4 +15,4 @@ welcome_replace=trux #Version -version=1 +version=2 diff --git a/packaging/branding/ovirt.brand/branding.properties b/packaging/branding/ovirt.brand/branding.properties index 3037ff4..6f7e534 100644 --- a/packaging/branding/ovirt.brand/branding.properties +++ b/packaging/branding/ovirt.brand/branding.properties @@ -30,4 +30,4 @@ #welcome_replace= # version (required, the theme will not be applied without this property) -version=1 +version=2 -- To view, visit http://gerrit.ovirt.org/31042 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic951d79db8dfcf24a5e3af6ebf11056b87c436da Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
