CLOUDSTACK-1273: Fixed the problem with the paths on the systemvm
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b176654b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b176654b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b176654b Branch: refs/heads/storage_refactor Commit: b176654b19a88e62b0e138acf526e9d38d3db377 Parents: 70ac773 Author: Alex Huang <[email protected]> Authored: Wed Feb 20 12:37:21 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Wed Feb 20 12:37:34 2013 -0800 ---------------------------------------------------------------------- .../console-proxy/server/systemvm-descriptor.xml | 14 +++++++------- tools/pom.xml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b176654b/services/console-proxy/server/systemvm-descriptor.xml ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/systemvm-descriptor.xml b/services/console-proxy/server/systemvm-descriptor.xml index 7efe7fd..e34026b 100644 --- a/services/console-proxy/server/systemvm-descriptor.xml +++ b/services/console-proxy/server/systemvm-descriptor.xml @@ -31,13 +31,13 @@ </dependencySets> <fileSets> <fileSet> - <directory>../scripts/storage/secondary/</directory> + <directory>../../../scripts/storage/secondary/</directory> <outputDirectory>scripts/storage/secondary</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> </fileSet> <fileSet> - <directory>../scripts/storage/secondary/</directory> + <directory>../../../scripts/storage/secondary/</directory> <outputDirectory>scripts/storage/secondary</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> @@ -60,7 +60,7 @@ </includes> </fileSet> <fileSet> - <directory>../console-proxy/images</directory> + <directory>images</directory> <outputDirectory>images</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> @@ -72,7 +72,7 @@ </includes> </fileSet> <fileSet> - <directory>../console-proxy/js</directory> + <directory>js</directory> <outputDirectory>js</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> @@ -81,7 +81,7 @@ </includes> </fileSet> <fileSet> - <directory>../console-proxy/ui</directory> + <directory>ui</directory> <outputDirectory>ui</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> @@ -90,7 +90,7 @@ </includes> </fileSet> <fileSet> - <directory>../console-proxy/css</directory> + <directory>css</directory> <outputDirectory>css</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> @@ -99,7 +99,7 @@ </includes> </fileSet> <fileSet> - <directory>../console-proxy/certs</directory> + <directory>certs</directory> <outputDirectory>certs</outputDirectory> <directoryMode>555</directoryMode> <fileMode>555</fileMode> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b176654b/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 09961bb..2e31955 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -35,7 +35,7 @@ <defaultGoal>install</defaultGoal> </build> <modules> - <module>apidoc</module> + <!--<module>apidoc</module--> <module>marvin</module> <module>cli</module> <module>devcloud</module>
