JCLOUDS-56: update paths so jclouds-cli can launch
Tested against aws-s3.
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>
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>
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 @@
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"
diff --git a/assembly/src/main/filtered-resources/win/bin/shell.bat b/assembly/src/main/filtered-resources/win/bin/shell.bat
index 100e9b7..2f20064 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 @@
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
@@ -120,7 +120,7 @@
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dlog4j.configuration="file:///%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.jclouds.cli.runner.Main %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dlog4j.configuration="file:///%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.jclouds.cli.runner.Main %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/pom.xml b/pom.xml
index b5564a5..a0ca1b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
<configuration>
<instructions>
<Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>org.jclouds.cli.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.jclouds.cli.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${osgi.export}</Export-Package>
<Import-Package>${osgi.import}</Import-Package>
<DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package>
