On 04/04/2013 11:26 AM, Hugo Trippaers wrote:
Hey Wido,
I've reverted this commit. These files are used by people like me that run
cloudstack using the jetty:run target. I need at least the components and log4j
files in there to work. It is also part of the put-everyting-in-a-single-webapp
plan that will allow us to redistribute the management server as a webapp.
No problem!
So this is a packaging problem which needs to be resolved. The problem
is that on a running system you don't want your db.properties to be in
/usr/share/../../.. but in /etc. Same goes for your log4j.xml
The problem right now is that db.properties is in /etc and in /usr where
the one in /usr is preferred.
We have to think of a smart way to NOT package those files in the RPM
and DEB packages since they cause problems like CS-1877
The DEB currently packages: /usr/share/cloudstack-management/*
That is OK, but configuration should be excluded.
Ideas?
Tried to reach you to discuss alternatives, but didn't get hold of you yet. If
you have a moment lets discuss alternatives. I think we can fix some stuff with
packaging.
I was in a meeting, but I just saw your iMessage :)
Wido
Cheers,
Hugo
-----Original Message-----
From: wid...@apache.org [mailto:wid...@apache.org]
Sent: Thursday, April 04, 2013 8:52 AM
To: comm...@cloudstack.apache.org
Subject: [1/2] git commit: updated refs/heads/master to a773ab1
Updated Branches:
refs/heads/master f18a1d6f1 -> a773ab16d
maven: Do not copy the management server configuration to the webapp
All configuration should be in /etc/cloudstack/management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-
us.apache.org/repos/asf/cloudstack/commit/a773ab16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a773ab16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a773ab16
Branch: refs/heads/master
Commit: a773ab16d6af5cd98245ddb14f0e065acfee48bd
Parents: d80d8d8
Author: Wido den Hollander <w...@42on.com>
Authored: Wed Apr 3 20:08:34 2013 +0200
Committer: Wido den Hollander <w...@42on.com>
Committed: Thu Apr 4 08:51:38 2013 +0200
----------------------------------------------------------------------
client/pom.xml | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-
us.apache.org/repos/asf/cloudstack/blob/a773ab16/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml index 9323d0f..06d80d2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -329,31 +329,6 @@
<copy todir="${basedir}/target/generated-webapp">
<fileset dir="${basedir}/../ui" />
</copy>
- <copy overwrite="true"
- todir="${basedir}/target/generated-webapp/WEB-INF/classes">
- <fileset dir="${basedir}/tomcatconf">
- <include name="*.in" />
- </fileset>
- <globmapper from="*.in" to="*" />
- <filterchain>
- <filterreader
- classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile"
- value="${cs.replace.properties}" />
- </filterreader>
- </filterchain>
- </copy>
- <copy overwrite="true" todir="${basedir}/target/generated-
webapp/WEB-INF/classes">
- <fileset dir="${basedir}/tomcatconf">
- <include name="*.in" />
- </fileset>
- <globmapper from="*.in" to="*" />
- <filterchain>
- <filterreader
classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile"
value="${cs.replace.properties}"
/>
- </filterreader>
- </filterchain>
- </copy>
<copy overwrite="true"
todir="${basedir}/target/utilities/bin">
<fileset dir="${basedir}/../setup/bindir">
<include name="*.in" />
