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

Removed some duplicate copyright header and made gogrid inherit from project, not multi.

This commit is contained in:
Andrew Phillips 2010-03-20 14:18:35 +01:00
parent 83d0b24e53
commit 7d399704d2
4 changed files with 87 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
gogrid/pom.xml
View File

@ -1,88 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$HeadURL$ $HeadURL$
$Revision$ $Revision$
$Date$ $Date$
Copyright (C) 2010 Cloud Conscious, LLC <info@cloudconscious.com> Copyright (C) 2010 Cloud Conscious, LLC <info@cloudconscious.com>
==================================================================== ====================================================================
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
distributed with this work for additional information distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0.html http://www.apache.org/licenses/LICENSE-2.0.html
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the KIND, either express or implied. See the License for the
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
==================================================================== ====================================================================
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.jclouds</groupId> <parent>
<artifactId>jclouds-multi</artifactId> <groupId>org.jclouds</groupId>
<version>1.0-SNAPSHOT</version> <artifactId>jclouds-project</artifactId>
<relativePath>../pom.xml</relativePath> <version>1.0-SNAPSHOT</version>
</parent> <relativePath>../project/pom.xml</relativePath>
<modelVersion>4.0.0</modelVersion> </parent>
<groupId>org.jclouds</groupId> <artifactId>jclouds-gogrid</artifactId>
<artifactId>jclouds-gogrid</artifactId> <name>jclouds GoGrid compute</name>
<name>jclouds GoGrid compute</name> <description>jclouds components to access GoGrid</description>
<packaging>jar</packaging>
<description>jclouds components to access GoGrid</description> <scm>
<connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/gogrid</connection>
<scm> <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/gogrid</developerConnection>
<connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/gogrid</connection> <url>http://jclouds.googlecode.com/svn/trunk/gogrid</url>
<developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/gogrid</developerConnection> </scm>
<url>http://jclouds.googlecode.com/svn/trunk/gogrid</url> <properties>
</scm> <jclouds.test.user>${jclouds.gogrid.apikey}</jclouds.test.user>
<properties> <jclouds.test.key>${jclouds.gogrid.secret}</jclouds.test.key>
<jclouds.test.user>${jclouds.gogrid.apikey}</jclouds.test.user> </properties>
<jclouds.test.key>${jclouds.gogrid.secret}</jclouds.test.key> <dependencies>
</properties> <dependency>
<dependencies> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>jclouds-compute</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>jclouds-compute</artifactId> </dependency>
<version>${project.version}</version> <dependency>
</dependency> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>jclouds-jsch</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>jclouds-compute</artifactId> </dependency>
<version>${project.version}</version> <dependency>
<type>test-jar</type> <groupId>${project.groupId}</groupId>
<scope>test</scope> <artifactId>jclouds-compute</artifactId>
</dependency> <version>${project.version}</version>
<dependency> <type>test-jar</type>
<groupId>${project.groupId}</groupId> <scope>test</scope>
<artifactId>jclouds-core</artifactId> </dependency>
<version>${project.version}</version> <dependency>
<type>test-jar</type> <groupId>${project.groupId}</groupId>
<scope>test</scope> <artifactId>jclouds-core</artifactId>
</dependency> <version>${project.version}</version>
<dependency> <type>test-jar</type>
<groupId>log4j</groupId> <scope>test</scope>
<artifactId>log4j</artifactId> </dependency>
<version>1.2.14</version> <dependency>
<scope>test</scope> <groupId>log4j</groupId>
</dependency> <artifactId>log4j</artifactId>
<dependency> <version>1.2.14</version>
<groupId>${project.groupId}</groupId> <scope>test</scope>
<artifactId>jclouds-log4j</artifactId> </dependency>
<version>${project.version}</version> <dependency>
<scope>test</scope> <groupId>${project.groupId}</groupId>
</dependency> <artifactId>jclouds-log4j</artifactId>
<dependency> <version>${project.version}</version>
<groupId>org.jclouds</groupId> <scope>test</scope>
<artifactId>jclouds-jsch</artifactId> </dependency>
<version>1.0-SNAPSHOT</version> </dependencies>
</dependency> </project>
</dependencies>
</project>

18
gogrid/src/main/java/org/jclouds/gogrid/GoGridPropertiesBuilder.java
View File

@ -1,21 +1,3 @@
/**
*
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed 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.
* ====================================================================
*/
/** /**
* *
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com> * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>

18
gogrid/src/main/java/org/jclouds/gogrid/reference/GoGridConstants.java
View File

@ -1,21 +1,3 @@
/**
*
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed 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.
* ====================================================================
*/
/** /**
* *
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com> * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>

2
gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java
View File

@ -279,7 +279,7 @@ public class GoGridLiveTest {
} }
@Test(enabled=true) @Test(enabled=true)
private void testShellAccess() throws IOException { public void testShellAccess() throws IOException {
final String nameOfServer = "Server" + String.valueOf(new Date().getTime()).substring(6); final String nameOfServer = "Server" + String.valueOf(new Date().getTime()).substring(6);
serversToDeleteAfterTheTests.add(nameOfServer); serversToDeleteAfterTheTests.add(nameOfServer);