Updated Branches: refs/heads/1.6.x 5b53b81a5 -> 1a6c01f56
JCLOUDS-56: update paths so jclouds-cli can launch Tested against aws-s3. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/commit/1a6c01f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/tree/1a6c01f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/diff/1a6c01f5 Branch: refs/heads/1.6.x Commit: 1a6c01f56a34f184e8d19cdc6cd95673ad427c15 Parents: 5b53b81 Author: Andrew Gaul <[email protected]> Authored: Mon May 20 11:42:14 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon May 20 11:42:14 2013 -0700 ---------------------------------------------------------------------- assembly/src/main/assembly/unix.xml | 8 ++++---- assembly/src/main/assembly/win.xml | 8 ++++---- .../src/main/filtered-resources/unix/bin/shell | 6 +++--- .../src/main/filtered-resources/win/bin/shell.bat | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/1a6c01f5/assembly/src/main/assembly/unix.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml index e097b26..bafc45e 100644 --- a/assembly/src/main/assembly/unix.xml +++ b/assembly/src/main/assembly/unix.xml @@ -116,15 +116,15 @@ <outputFileNameMapping>jclouds-version.jar</outputFileNameMapping> <fileMode>0644</fileMode> <includes> - <include>org.jclouds.cli:branding</include> + <include>org.apache.jclouds.cli:branding</include> </includes> <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> <dependencySet> - <outputDirectory>/system/org/jclouds/cli/runner/${project.version}/</outputDirectory> + <outputDirectory>/system/org/apache/jclouds/cli/runner/${project.version}/</outputDirectory> <fileMode>0644</fileMode> <includes> - <include>org.jclouds.cli:runner</include> + <include>org.apache.jclouds.cli:runner</include> </includes> </dependencySet> <dependencySet> @@ -138,4 +138,4 @@ </dependencySet> </dependencySets> -</assembly> \ No newline at end of file +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/1a6c01f5/assembly/src/main/assembly/win.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml index 1565df5..372111a 100644 --- a/assembly/src/main/assembly/win.xml +++ b/assembly/src/main/assembly/win.xml @@ -115,15 +115,15 @@ <outputFileNameMapping>jclouds-version.jar</outputFileNameMapping> <fileMode>0644</fileMode> <includes> - <include>org.jclouds.cli:branding</include> + <include>org.apache.jclouds.cli:branding</include> </includes> <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> <dependencySet> - <outputDirectory>/system/org/jclouds/cli/runner/${project.version}/</outputDirectory> + <outputDirectory>/system/org/apache/jclouds/cli/runner/${project.version}/</outputDirectory> <fileMode>0644</fileMode> <includes> - <include>org.jclouds.cli:runner</include> + <include>org.apache.jclouds.cli:runner</include> </includes> </dependencySet> <dependencySet> @@ -137,4 +137,4 @@ </dependencySet> </dependencySets> -</assembly> \ No newline at end of file +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/1a6c01f5/assembly/src/main/filtered-resources/unix/bin/shell ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/unix/bin/shell b/assembly/src/main/filtered-resources/unix/bin/shell index fe3eacc..d5c9e9d 100644 --- a/assembly/src/main/filtered-resources/unix/bin/shell +++ b/assembly/src/main/filtered-resources/unix/bin/shell @@ -261,9 +261,9 @@ setupDefaults() { fi # Setup classpath - CLASSPATH="$KARAF_HOME/system/org/jclouds/cli/runner/${project.version}/runner-${project.version}.jar" - CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jclouds/jclouds-core/${jclouds.version}/jclouds-core-${jclouds.version}.jar" - CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jclouds/jclouds-blobstore/${jclouds.version}/jclouds-blobstore-${jclouds.version}.jar" + CLASSPATH="$KARAF_HOME/system/org/apache/jclouds/cli/runner/${project.version}/runner-${project.version}.jar" + CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/jclouds/jclouds-core/${jclouds.version}/jclouds-core-${jclouds.version}.jar" + CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/jclouds/jclouds-blobstore/${jclouds.version}/jclouds-blobstore-${jclouds.version}.jar" CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar" #We set external libraries for logging. CLASSPATH="$CLASSPATH:$KARAF_HOME/lib/other/slf4j-api-${slf4j.version}.jar:$KARAF_HOME/lib/other/slf4j-log4j12-${slf4j.version}.jar:$KARAF_HOME/lib/other/log4j-${log4j.version}.jar" http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/1a6c01f5/assembly/src/main/filtered-resources/win/bin/shell.bat ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/win/bin/shell.bat b/assembly/src/main/filtered-resources/win/bin/shell.bat index 100e9b7..ec68228 100644 --- a/assembly/src/main/filtered-resources/win/bin/shell.bat +++ b/assembly/src/main/filtered-resources/win/bin/shell.bat @@ -111,7 +111,7 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS% :KARAF_DEBUG_END -set CLASSPATH=%KARAF_HOME%\system\org\jclouds\cli\runner\${project.version}\runner-${project.version}.jar +set CLASSPATH=%KARAF_HOME%\system\org\apache\jclouds\cli\runner\${project.version}\runner-${project.version}.jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${karaf.version}\org.apache.karaf.shell.console-${karaf.version}.jar set CLASSPATH="%CLASSPATH%;%KARAF_HOME%/lib/other/slf4j-api-${slf4j.version}.jar;%KARAF_HOME%/lib/other/slf4j-log4j12-${slf4j.version}.jar;%KARAF_HOME%/lib/other/log4j-${log4j.version}.jar" set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\etc\log4j.properties
