modules/enterprise/gui/downloads-war/pom.xml | 4 +++- modules/enterprise/gui/downloads-war/src/main/webapp/WEB-INF/.gitignore | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit aba1c59ca7622c02cdae361192eda498de5ce2e1 Author: Jirka Kremser jkremser@redhat.com Date: Tue Oct 1 13:45:48 2013 +0200
Adding empty .gitignore file to allow git to push an empty directory structure.
diff --git a/modules/enterprise/gui/downloads-war/src/main/webapp/WEB-INF/.gitignore b/modules/enterprise/gui/downloads-war/src/main/webapp/WEB-INF/.gitignore new file mode 100644 index 0000000..a93362a --- /dev/null +++ b/modules/enterprise/gui/downloads-war/src/main/webapp/WEB-INF/.gitignore @@ -0,0 +1 @@ +# this file is here just to allow the git to accept empty directory structure
commit 7193c54d1a01a2eac01586090b664224ea0cf370 Author: Thomas Segismont tsegismo@redhat.com Date: Tue Oct 1 10:39:34 2013 +0200
Fix master-compile: rhq-downloads-war may not have a src/main/webapp directory (i.e. on fresh checkouts)
diff --git a/modules/enterprise/gui/downloads-war/pom.xml b/modules/enterprise/gui/downloads-war/pom.xml index ad157f8..e5f7ca7 100644 --- a/modules/enterprise/gui/downloads-war/pom.xml +++ b/modules/enterprise/gui/downloads-war/pom.xml @@ -101,8 +101,10 @@ <copy todir="${classes.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo> + <!-- Create src/main/webapp if it does not exist --> + <mkdir dir="${basedir}/src/main/webapp"/> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/src/main/webapp" /> </copy>
rhq-commits@lists.fedorahosted.org