Added support for executing commands outside the interactive shell.
diff --git a/README.md b/README.md
index 8e8bca8..28e6f59 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,41 @@
jclouds-cli
===========
-jclouds commandline interface
\ No newline at end of file
+Jclouds CLI provides two types of command line interface:
+
+1) An interactive shell.
+2) A shell script.
+
+Installation
+-----------
+To install the jclouds cli you just need to download the zip or the tarball and extract it to the folder of your choice.
+
+Using the interactive shell
+---------------------------
+To start the interactive shell:
+./bin/jclouds-cli
+
+
+Using the script
+----------------
+To use the scirpt:
+./bin/jclouds <category> <action> <options> <arguments>.
+
+Categories: node, group, image, location, hardware.
+Actions: list, create, destroy, runscript.
+Options: --provider, --identity, --credential --endpoint etc.
+
+Some examples:
+To create 10 nodes on EC2 under group: myGroupName using Ubuntu 10.04
+./jclouds node create --provider aws-ec2 --identity <identity> --credential <credential> --os-family ubuntu --os-version 10.04 --adminAcess myGroupName 10
+
+To list all nodes:
+./jclouds node list --provider aws-ec2 --identity <identity> --credential <credential>
+
+To destroy a node:
+./jclouds node destroy <node id>
+
+
+
+
+
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 2a36719..fdd26d9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -40,14 +40,12 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
- <classifier>minimal</classifier>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
- <classifier>minimal</classifier>
<type>zip</type>
</dependency>
@@ -57,6 +55,10 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -77,7 +79,6 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
- <classifier>minimal</classifier>
<type>tar.gz</type>
<outputDirectory>target/dependencies/unix</outputDirectory>
</artifactItem>
@@ -96,7 +97,6 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
- <classifier>minimal</classifier>
<type>zip</type>
<outputDirectory>target/dependencies/win</outputDirectory>
</artifactItem>
diff --git a/assembly/src/main/assembly/unix.xml b/assembly/src/main/assembly/unix.xml
index 8025b43..981ba20 100644
--- a/assembly/src/main/assembly/unix.xml
+++ b/assembly/src/main/assembly/unix.xml
@@ -59,8 +59,8 @@
<include>bin/*</include>
</includes>
<excludes>
- <exclude>bin/karaf</exclude>
<exclude>bin/shell</exclude>
+ <exclude>bin/karaf</exclude>
<exclude>bin/start</exclude>
<exclude>bin/stop</exclude>
<exclude>bin/admin</exclude>
@@ -79,6 +79,17 @@
<fileMode>0644</fileMode>
</fileSet>
+ <!-- Copy over resources -->
+ <fileSet>
+ <directory>target/classes/bin</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
<!-- Add jclouds features to system repository -->
<fileSet>
<outputDirectory>system</outputDirectory>
@@ -90,7 +101,7 @@
<file>
<source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
<outputDirectory>/bin/</outputDirectory>
- <destName>jclouds</destName>
+ <destName>jclouds-cli</destName>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</file>
diff --git a/assembly/src/main/assembly/win.xml b/assembly/src/main/assembly/win.xml
index c18114e..7f23eaa 100644
--- a/assembly/src/main/assembly/win.xml
+++ b/assembly/src/main/assembly/win.xml
@@ -58,11 +58,10 @@
<include>bin/*</include>
</includes>
<excludes>
- <exclude>bin/karaf</exclude>
- <exclude>bin/shell</exclude>
- <exclude>bin/start</exclude>
- <exclude>bin/stop</exclude>
- <exclude>bin/admin</exclude>
+ <exclude>bin/karaf.bat</exclude>
+ <exclude>bin/start.bat</exclude>
+ <exclude>bin/stop.bat</exclude>
+ <exclude>bin/admin.bat</exclude>
</excludes>
<lineEnding>dos</lineEnding>
<fileMode>0644</fileMode>
@@ -90,7 +89,7 @@
<file>
<source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
<outputDirectory>/bin/</outputDirectory>
- <destName>jclouds.bat</destName>
+ <destName>jclouds-cli.bat</destName>
<lineEnding>dos</lineEnding>
<fileMode>0644</fileMode>
</file>
diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/filtered-resources/etc/custom.properties
similarity index 100%
rename from assembly/src/main/resources/etc/custom.properties
rename to assembly/src/main/filtered-resources/etc/custom.properties
diff --git a/assembly/src/main/resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
similarity index 100%
rename from assembly/src/main/resources/etc/org.apache.karaf.features.cfg
rename to assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
diff --git a/assembly/src/main/resources/etc/shell.init.script b/assembly/src/main/filtered-resources/etc/shell.init.script
similarity index 100%
rename from assembly/src/main/resources/etc/shell.init.script
rename to assembly/src/main/filtered-resources/etc/shell.init.script
diff --git a/assembly/src/main/resources/etc/startup.properties b/assembly/src/main/filtered-resources/etc/startup.properties
similarity index 100%
rename from assembly/src/main/resources/etc/startup.properties
rename to assembly/src/main/filtered-resources/etc/startup.properties
diff --git a/pom.xml b/pom.xml
index 2823888..219cf7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<felix.fileinstall.version>3.2.2</felix.fileinstall.version>
- <jclouds.karaf.version>1.5.0-beta.1</jclouds.karaf.version>
+ <jclouds.karaf.version>1.5.0-SNAPSHOT</jclouds.karaf.version>
<!-- Plugin Versions -->
<maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
<maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
@@ -109,4 +109,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
