Merge branch 'master' of github.com:egymgmbh/sitebricks

dhanji · Nov 13, 2014 · d7076bd · d7076bd
2 parents 28c9e53 + 68b3e8d
commit d7076bd
Show file tree

Hide file tree

Showing 52 changed files with 16 additions and 1,908 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,6 @@
     <module>sitebricks-mail</module>
     <module>sitebricks-options</module>
     <module>sitebricks-channel</module>
-    <module>sitebricks-cloud</module>
     <module>stat</module>
     <module>slf4j</module>
     <module>sitebricks-persist</module>
@@ -385,8 +384,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.5.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
    </plugins>

diff --git a/...a/com/google/sitebricks/acceptance/RestfuWebServiceWithCRUDConversionsAcceptanceTest.java b/...a/com/google/sitebricks/acceptance/RestfuWebServiceWithCRUDConversionsAcceptanceTest.java
@@ -95,6 +95,7 @@ public void update() {
 
 
 	public void delete() {
+    create();  // create, then delete.
 		String url = AcceptanceTest.baseUrl() + RestfulWebServiceWithCRUDConversions.AT_ME + "/" + testWidget.getId();
 		System.out.println("DELETE " + url);
 		WebResponse response = createInjector()

diff --git a/sitebricks-cloud/Procfile b/sitebricks-cloud/Procfile
diff --git a/sitebricks-cloud/pom.xml b/sitebricks-cloud/pom.xml
diff --git a/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Cloud.java b/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Cloud.java
diff --git a/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Command.java b/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Command.java
diff --git a/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Config.java b/sitebricks-cloud/src/main/java/com/google/sitebricks/cloud/Config.java