[PATCH] Allow clean install to still copy over the license file.
by Bryan Kearney
This patch moves the license file from the server container module to the ear module. It is copied over in the dev profile only.
---
.../server/container/src/main/license/license.xml | 26 --------------------
.../src/main/scripts/rhq-container.build.xml | 7 -----
modules/enterprise/server/ear/pom.xml | 2 +
.../server/ear/src/main/license/license.xml | 26 ++++++++++++++++++++
4 files changed, 28 insertions(+), 33 deletions(-)
delete mode 100644 modules/enterprise/server/container/src/main/license/license.xml
create mode 100644 modules/enterprise/server/ear/src/main/license/license.xml
diff --git a/modules/enterprise/server/container/src/main/license/license.xml b/modules/enterprise/server/container/src/main/license/license.xml
deleted file mode 100644
index 2b4d104..0000000
--- a/modules/enterprise/server/container/src/main/license/license.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- This license should be uploaded to your RHQ Server in the
- Manage License section of the Administration area. If you have
- not already installed a license, you will be directed to this
- page on your first login to the application.
-
- You must login as an administrator to update your license file.
--->
-
-<!-- License created: Feb-12-2008 17:35 -->
-<license key="f3e30ce3f40d3da5a1b1625f1d8bd253" version="2.0">
-
- <license-owner name="RHQ"
- email="nobody(a)rhq-project.org"
- phone="888-555-1212"
- key="f6a629735537a0ff90c002ada39db105"/>
-
- <license-expiration date="*" key="8a58f1b633e356a321251f2ffdf2c34e" />
- <platform-limit count="*" key="a6ccfd9f9d66f73cff44b5953971166b" />
- <server-ip count="1" address="*" key="945f33206407c7743d205f2b345e8a57" />
- <plugin-enable name="*" key="62fa3b11086463a41abf7daf7fc572ee" />
- <support-level level="3" key="8e820272b1aa2289eb284a47745ab401" />
-
-</license>
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 1c04382..ad1e0f6 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -371,13 +371,6 @@
<!-- optionally package the connectors -->
<antcall target="package-connectors" />
- <!-- Let's deploy some developer-only stuff - we'll remove these later if this is a release build -->
- <echo>Deploying the license file ...</echo>
- <copy file="${basedir}/src/main/license/license.xml"
- todir="${jboss.deploy.dir}/${rhq.earName}/license"
- verbose="true"
- failonerror="false"/>
-
<echo>Enabling server to run on Java 6 ...</echo>
<move todir="${jboss.home}/lib/endorsed" verbose="true">
<fileset dir="${jboss.home}/client">
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 6668703..7308abb 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -434,6 +434,8 @@
<phase>package</phase>
<configuration>
<tasks>
+ <mkdir dir="${earDirectory}/license" />
+ <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml"/>
<property name="deployment.dir" location="${rhq.deploymentDir}" />
<echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo>
<copy todir="${deployment.dir}" verbose="${rhq.verbose}">
diff --git a/modules/enterprise/server/ear/src/main/license/license.xml b/modules/enterprise/server/ear/src/main/license/license.xml
new file mode 100644
index 0000000..2b4d104
--- /dev/null
+++ b/modules/enterprise/server/ear/src/main/license/license.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<!--
+ This license should be uploaded to your RHQ Server in the
+ Manage License section of the Administration area. If you have
+ not already installed a license, you will be directed to this
+ page on your first login to the application.
+
+ You must login as an administrator to update your license file.
+-->
+
+<!-- License created: Feb-12-2008 17:35 -->
+<license key="f3e30ce3f40d3da5a1b1625f1d8bd253" version="2.0">
+
+ <license-owner name="RHQ"
+ email="nobody(a)rhq-project.org"
+ phone="888-555-1212"
+ key="f6a629735537a0ff90c002ada39db105"/>
+
+ <license-expiration date="*" key="8a58f1b633e356a321251f2ffdf2c34e" />
+ <platform-limit count="*" key="a6ccfd9f9d66f73cff44b5953971166b" />
+ <server-ip count="1" address="*" key="945f33206407c7743d205f2b345e8a57" />
+ <plugin-enable name="*" key="62fa3b11086463a41abf7daf7fc572ee" />
+ <support-level level="3" key="8e820272b1aa2289eb284a47745ab401" />
+
+</license>
--
1.6.2.5
14 years, 5 months