Repository: jclouds-cli Updated Branches: refs/heads/master e2e0ea7f0 -> f9b2b9063
[JCLOUDS-804] Align assembly descriptors and scripts with the new artifactId of jclouds-cli-runner. Ensure guava is in the classpath. Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/f9b2b906 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/f9b2b906 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/f9b2b906 Branch: refs/heads/master Commit: f9b2b9063ddff7c186238ce369012bef4344002f Parents: e2e0ea7 Author: Ioannis Canellos <[email protected]> Authored: Thu Jan 15 18:11:15 2015 +0200 Committer: Ioannis Canellos <[email protected]> Committed: Thu Jan 15 22:14:17 2015 +0200 ---------------------------------------------------------------------- assembly/pom.xml | 7 ++- assembly/src/main/assembly/unix.xml | 11 +++- assembly/src/main/assembly/win.xml | 11 +++- .../filtered-resources/etc/custom.properties | 7 +++ .../etc/org.apache.jclouds.shell.cfg | 53 ++++++++++++++++++++ .../etc/org.jclouds.shell.cfg | 53 -------------------- .../filtered-resources/etc/startup.properties | 9 ++-- .../src/main/filtered-resources/unix/bin/shell | 3 +- .../main/filtered-resources/win/bin/shell.bat | 3 +- project/pom.xml | 25 +++++---- .../main/java/org/jclouds/cli/runner/Main.java | 2 +- 11 files changed, 109 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index d300c36..df63526 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -39,10 +39,15 @@ </dependency> <dependency> <groupId>org.apache.jclouds.cli</groupId> - <artifactId>runner</artifactId> + <artifactId>jclouds-cli-runner</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + <dependency> <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <type>tar.gz</type> http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/assembly/unix.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml index 0c00ed6..66f2dc7 100644 --- a/assembly/src/main/assembly/unix.xml +++ b/assembly/src/main/assembly/unix.xml @@ -138,10 +138,17 @@ <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> <dependencySet> - <outputDirectory>/system/org/apache/jclouds/cli/runner/${project.version}/</outputDirectory> + <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory> <fileMode>0644</fileMode> <includes> - <include>org.apache.jclouds.cli:runner</include> + <include>com.google:guava</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory> + <fileMode>0644</fileMode> + <includes> + <include>org.apache.jclouds.cli:jclouds-cli-runner</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/assembly/win.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml index df3d11b..fc46e34 100644 --- a/assembly/src/main/assembly/win.xml +++ b/assembly/src/main/assembly/win.xml @@ -136,10 +136,17 @@ <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> <dependencySet> - <outputDirectory>/system/org/apache/jclouds/cli/runner/${project.version}/</outputDirectory> + <outputDirectory>/system/com/google/guava/guava/${guava.version}/</outputDirectory> <fileMode>0644</fileMode> <includes> - <include>org.apache.jclouds.cli:runner</include> + <include>com.google:guava</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/</outputDirectory> + <fileMode>0644</fileMode> + <includes> + <include>org.apache.jclouds.cli:jclouds-cli-runner</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/filtered-resources/etc/custom.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/custom.properties b/assembly/src/main/filtered-resources/etc/custom.properties index e0f6cee..be0f24e 100644 --- a/assembly/src/main/filtered-resources/etc/custom.properties +++ b/assembly/src/main/filtered-resources/etc/custom.properties @@ -17,6 +17,13 @@ # ################################################################################ +# +# All the values specified here will override the default values given +# in config.properties. +# + +karaf.systemBundlesStartLevel=50 + # Extra packages appended after standard packages org.osgi.framework.system.packages.extra = \ org.apache.karaf.branding, \ http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/filtered-resources/etc/org.apache.jclouds.shell.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.jclouds.shell.cfg b/assembly/src/main/filtered-resources/etc/org.apache.jclouds.shell.cfg new file mode 100644 index 0000000..beb9cd0 --- /dev/null +++ b/assembly/src/main/filtered-resources/etc/org.apache.jclouds.shell.cfg @@ -0,0 +1,53 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +#This is the default configuration for the jclouds command output. +#All entries are prefixed by type. +#headers: The headers that will be displayed by the table. +#expressions: Groovy expressions that are evaluated on the object. The object is noted by its type (e.g. image,node,location etc). +#shortBy: The column that will be used for sorting the table. +#ascending: A boolean that specifies if the order should be ascending or descending. + +# Not yet implemented: +# color: The color of each column. + + +image.headers=[id];[location];[os family];[os version];[status] +image.expressions=image.id;image.location.id;image.operatingSystem.family;image.operatingSystem.version;image.status +image.shortby=[id] +image.ascending=true + +node.headers=[id];[location];[hardware];[group];[status] +node.expressions=node.id;node.location.id;node.hardware.id;node.group;node.status + +hardware.headers=[id];[ram];[cpu];[cores] +hardware.expressions=hardware.id;hardware.ram;hardware.processors.sum{it.cores*it.speed};hardware.processors.sum{it.cores} +hardware.alignments=left;right;right;right +hardware.shortby=[cpu] +hardware.ascending=true + + +location.headers=[id];[scope];[description];[parent] +location.expressions=location.id;location.scope;location.description;location.parent.id +location.shortby=[parent] +location.ascending=true + +#Chef Commands +cookbook.headers=[id];[name];[version] +cookbook.expressions=cookbook.name;cookbook.cookbookName;cookbook.version +cookbook.shortBy=[name] +cookbook.ascending=true \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg b/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg deleted file mode 100644 index beb9cd0..0000000 --- a/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#This is the default configuration for the jclouds command output. -#All entries are prefixed by type. -#headers: The headers that will be displayed by the table. -#expressions: Groovy expressions that are evaluated on the object. The object is noted by its type (e.g. image,node,location etc). -#shortBy: The column that will be used for sorting the table. -#ascending: A boolean that specifies if the order should be ascending or descending. - -# Not yet implemented: -# color: The color of each column. - - -image.headers=[id];[location];[os family];[os version];[status] -image.expressions=image.id;image.location.id;image.operatingSystem.family;image.operatingSystem.version;image.status -image.shortby=[id] -image.ascending=true - -node.headers=[id];[location];[hardware];[group];[status] -node.expressions=node.id;node.location.id;node.hardware.id;node.group;node.status - -hardware.headers=[id];[ram];[cpu];[cores] -hardware.expressions=hardware.id;hardware.ram;hardware.processors.sum{it.cores*it.speed};hardware.processors.sum{it.cores} -hardware.alignments=left;right;right;right -hardware.shortby=[cpu] -hardware.ascending=true - - -location.headers=[id];[scope];[description];[parent] -location.expressions=location.id;location.scope;location.description;location.parent.id -location.shortby=[parent] -location.ascending=true - -#Chef Commands -cookbook.headers=[id];[name];[version] -cookbook.expressions=cookbook.name;cookbook.cookbookName;cookbook.version -cookbook.shortBy=[name] -cookbook.ascending=true \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/assembly/src/main/filtered-resources/etc/startup.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/startup.properties b/assembly/src/main/filtered-resources/etc/startup.properties index 4674d78..d7f990c 100644 --- a/assembly/src/main/filtered-resources/etc/startup.properties +++ b/assembly/src/main/filtered-resources/etc/startup.properties @@ -31,10 +31,13 @@ org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.a # # The rest of the services.. # -org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar=20 +org/ow2/asm/asm-all/${asm.version}/asm-all-${asm.version}.jar=20 org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20 -org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20 -org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20 +org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20 +org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20 +org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar=20 +org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar=20 +org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar=20 org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=29 org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30 http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/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 327b505..d6ee688 100644 --- a/assembly/src/main/filtered-resources/unix/bin/shell +++ b/assembly/src/main/filtered-resources/unix/bin/shell @@ -261,7 +261,8 @@ setupDefaults() { fi # Setup classpath - CLASSPATH="$KARAF_HOME/system/org/apache/jclouds/cli/runner/${project.version}/runner-${project.version}.jar" + CLASSPATH="$KARAF_HOME/system/org/apache/jclouds/cli/jclouds-cli-runner/${project.version}/jclouds-cli-runner-${project.version}.jar" + CLASSPATH="$CLASSPATH:$KARAF_HOME/system/com/google/guava/guava/${guava.version}/guava-${guava.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" http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/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 1a41ef6..7597649 100644 --- a/assembly/src/main/filtered-resources/win/bin/shell.bat +++ b/assembly/src/main/filtered-resources/win/bin/shell.bat @@ -111,7 +111,8 @@ 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\apache\jclouds\cli\runner\${project.version}\runner-${project.version}.jar +set CLASSPATH=%KARAF_HOME%\system\org\apache\jclouds\cli\jclouds-cli-runner\${project.version}\jclouds-cli-runner-${project.version}.jar +set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\com\google\guava\guava/${guava.version}\guava-${guava.version}.jar" set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\jclouds\jclouds-core\${jclouds.version}\jclouds-core-${jclouds.version}.jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\jclouds\jclouds-blobstore\${jclouds.version}\jclouds-blobstore-${jclouds.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 http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 82123c0..2a89a18 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -66,20 +66,23 @@ <properties> <!-- Karaf Version Dependencies --> - <karaf.version>2.2.7</karaf.version> - <pax.url.version>1.2.8</pax.url.version> - <pax.logging.version>1.6.5</pax.logging.version> - <felix.configadmin.version>1.2.8</felix.configadmin.version> - <aries.util.version>0.3</aries.util.version> - <aries.proxy.version>0.3</aries.proxy.version> - <aries.blueprint.version>0.3.1</aries.blueprint.version> - <aries.jmx.version>0.3</aries.jmx.version> - <asm.bundle.version>3.3.1_1</asm.bundle.version> - <felix.fileinstall.version>3.2.2</felix.fileinstall.version> + <karaf.version>2.3.2</karaf.version> + <pax.url.version>1.3.6</pax.url.version> + <pax.logging.version>1.7.0</pax.logging.version> + <felix.configadmin.version>1.6.0</felix.configadmin.version> + <aries.util.version>1.1.0</aries.util.version> + <aries.proxy.version>1.0.1</aries.proxy.version> + <aries.proxy.api.version>1.0.0</aries.proxy.api.version> + <aries.blueprint.api.version>1.0.0</aries.blueprint.api.version> + <aries.blueprint.core.version>1.1.0</aries.blueprint.core.version> + <aries.blueprint.cm.version>1.0.1</aries.blueprint.cm.version> + <aries.jmx.version>1.1.0</aries.jmx.version> + <asm.version>4.1</asm.version> + <felix.fileinstall.version>3.2.6</felix.fileinstall.version> <jclouds.karaf.version>${project.parent.version}</jclouds.karaf.version> <jclouds.version>${project.parent.version}</jclouds.version> <log4j.version>1.2.17</log4j.version> - <slf4j.version>1.6.6</slf4j.version> + <slf4j.version>1.7.2</slf4j.version> <!-- Plugin Versions --> <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version> http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/f9b2b906/runner/src/main/java/org/jclouds/cli/runner/Main.java ---------------------------------------------------------------------- diff --git a/runner/src/main/java/org/jclouds/cli/runner/Main.java b/runner/src/main/java/org/jclouds/cli/runner/Main.java index 52f1b7a..f4df6cb 100644 --- a/runner/src/main/java/org/jclouds/cli/runner/Main.java +++ b/runner/src/main/java/org/jclouds/cli/runner/Main.java @@ -305,7 +305,7 @@ public class Main { * @throws Exception */ protected Console createConsole(CommandProcessorImpl commandProcessor, InputStream in, PrintStream out, PrintStream err, Terminal terminal) throws Exception { - return new Console(commandProcessor, in, out, err, terminal, null); + return new Console(commandProcessor, in, out, err, terminal, "UTF-8", null); } /**
