modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java |
2
modules/common/ant-bundle/src/test/resources/test-bundle-v2-commonSubdirectories.xml |
65 ----------
modules/common/ant-bundle/src/test/resources/test-bundle-v2-filesAndDirectories.xml |
65 ++++++++++
3 files changed, 66 insertions(+), 66 deletions(-)
New commits:
commit 3440e0033ca3e3b34e9a40e9ee85d33472575f9b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Aug 2 10:24:02 2013 +0200
Updating the test recipes for the new names of compliance.
diff --git
a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 22aa418..6073be9 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -303,7 +303,7 @@ public class AntLauncherTest {
}
public void testUpgradeNoManageRootDir() throws Exception {
- testUpgradeNoManageRootDir(true,
"test-bundle-v2-commonSubdirectories.xml");
+ testUpgradeNoManageRootDir(true,
"test-bundle-v2-filesAndDirectories.xml");
}
private void testUpgradeNoManageRootDir(boolean validate, String recipeFile) throws
Exception {
diff --git
a/modules/common/ant-bundle/src/test/resources/test-bundle-v2-commonSubdirectories.xml
b/modules/common/ant-bundle/src/test/resources/test-bundle-v2-commonSubdirectories.xml
deleted file mode 100644
index 3a82a3d..0000000
---
a/modules/common/ant-bundle/src/test/resources/test-bundle-v2-commonSubdirectories.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ RHQ Management Platform
- ~ Copyright (C) 2013 Red Hat, Inc.
- ~ All rights reserved.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU General Public License as published by
- ~ the Free Software Foundation version 2 of the License.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ~ GNU General Public License for more details.
- ~
- ~ You should have received a copy of the GNU General Public License
- ~ along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- -->
-
-<project name="test-bundle" default="main"
xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle
name="example.com (JBoss EAP 4.3)" version="2.5"
- description="updated bundle">
-
- <rhq:input-property
- name="listener.port"
- description="This is where the product will listen for incoming
messages"
- required="true"
- defaultValue="9090"
- type="integer"/>
-
- <rhq:deployment-unit name="appserver"
preinstallTarget="preinstall" postinstallTarget="postinstall"
- compliance="commonDirectories"> <!-- this is
the only difference with test-bundle-v2.xml -->
- <rhq:system-service name="foo"
scriptFile="foo-script"
- configFile="foo-config"
overwriteScript="true"
- startLevels="3,4,5" startPriority="80"
stopPriority="20" root="root"/>
- <rhq:file name="test-v2.properties"
destinationFile="subdir/test.properties" replace="true"/>
- <rhq:archive name="file.zip">
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
- </rhq:archive>
- <!-- the files that should be ignored during upgrades -->
- <rhq:ignore>
- <rhq:fileset includes="*.log"/>
- </rhq:ignore>
- </rhq:deployment-unit>
-
- </rhq:bundle>
-
- <target name="main"/>
-
- <target name="preinstall">
- <echo>Deploying Test Bundle v2.5 to ${rhq.deploy.dir}...</echo>
- <property name="preinstallTargetExecuted" value="2a"/>
- </target>
-
- <target name="postinstall">
- <echo>Done deploying Test Bundle v2.5 to ${rhq.deploy.dir}.</echo>
- <property name="postinstallTargetExecuted"
value="2b"/>
- </target>
-
-</project>
diff --git
a/modules/common/ant-bundle/src/test/resources/test-bundle-v2-filesAndDirectories.xml
b/modules/common/ant-bundle/src/test/resources/test-bundle-v2-filesAndDirectories.xml
new file mode 100644
index 0000000..b82da55
--- /dev/null
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v2-filesAndDirectories.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ RHQ Management Platform
+ ~ Copyright (C) 2013 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation version 2 of the License.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
+
+<project name="test-bundle" default="main"
xmlns:rhq="antlib:org.rhq.bundle">
+
+ <rhq:bundle
name="example.com (JBoss EAP 4.3)" version="2.5"
+ description="updated bundle">
+
+ <rhq:input-property
+ name="listener.port"
+ description="This is where the product will listen for incoming
messages"
+ required="true"
+ defaultValue="9090"
+ type="integer"/>
+
+ <rhq:deployment-unit name="appserver"
preinstallTarget="preinstall" postinstallTarget="postinstall"
+ compliance="filesAndDirectories"> <!-- this
is the only difference with test-bundle-v2.xml -->
+ <rhq:system-service name="foo"
scriptFile="foo-script"
+ configFile="foo-config"
overwriteScript="true"
+ startLevels="3,4,5" startPriority="80"
stopPriority="20" root="root"/>
+ <rhq:file name="test-v2.properties"
destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
+ <!-- the files that should be ignored during upgrades -->
+ <rhq:ignore>
+ <rhq:fileset includes="*.log"/>
+ </rhq:ignore>
+ </rhq:deployment-unit>
+
+ </rhq:bundle>
+
+ <target name="main"/>
+
+ <target name="preinstall">
+ <echo>Deploying Test Bundle v2.5 to ${rhq.deploy.dir}...</echo>
+ <property name="preinstallTargetExecuted" value="2a"/>
+ </target>
+
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v2.5 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted"
value="2b"/>
+ </target>
+
+</project>