Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jclouds-vbox

This commit is contained in:
David Ribeiro Alves 2012-02-13 13:40:03 -06:00
parent d0e8c13a99 af104325a7
commit c82a1e48f4
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/tweetstore/gae-tweetstore-spring/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<artifactId>jclouds-demo-gae-tweetstore-spring</artifactId> <artifactId>jclouds-demo-gae-tweetstore-spring</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Spring version of JClouds TweetStore for Google App Engine</name> <name>jclouds TweetStore for Google App Engine (Spring)</name>
<description>JClouds TweetStore for Google App Engine using Spring for Dependency Injection</description> <description>JClouds TweetStore for Google App Engine using Spring for Dependency Injection</description>
<properties> <properties>

4
demos/tweetstore/gae-tweetstore/pom.xml
View File

@ -28,8 +28,8 @@
</parent> </parent>
<artifactId>jclouds-demo-gae-tweetstore</artifactId> <artifactId>jclouds-demo-gae-tweetstore</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>JClouds TweetStore for Google App Engine</name> <name>jclouds TweetStore for Google App Engine</name>
<description>JClouds TweetStore for Google App Engine using Guice for Dependency Injection</description> <description>jclouds TweetStore for Google App Engine using Guice for Dependency Injection</description>
<properties> <properties>
<!-- <!--

11
labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java → labs/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsLiveTest.java
View File

@ -19,20 +19,19 @@
package org.jclouds.virtualbox.statements; package org.jclouds.virtualbox.statements;
import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX; import com.google.common.base.CaseFormat;
import com.google.inject.Injector;
import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest; import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.CaseFormat; import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX;
import com.google.inject.Injector;
/** /**
* @author Andrea Turli * @author Andrea Turli
*/ */
@Test(groups = "live", singleThreaded = true, testName = "InstallGuestAdditionsTest") @Test(groups = "live", singleThreaded = true, testName = "InstallGuestAdditionsLiveTest")
public class InstallGuestAdditionsTest extends BaseVirtualBoxClientLiveTest { public class InstallGuestAdditionsLiveTest extends BaseVirtualBoxClientLiveTest {
private String vmName; private String vmName;