You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/06/24 22:30:54 UTC
git commit: JCLOUDS-584: Removing file committed by mistake in
fbb4f049
Repository: jclouds
Updated Branches:
refs/heads/1.7.x fbb4f0493 -> a8ce28190
JCLOUDS-584: Removing file committed by mistake in fbb4f049
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a8ce2819
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a8ce2819
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a8ce2819
Branch: refs/heads/1.7.x
Commit: a8ce281904735d0c1954e31bd626f60557352cac
Parents: fbb4f04
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Jun 24 22:26:06 2014 +0200
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Jun 24 22:26:06 2014 +0200
----------------------------------------------------------------------
...CloudObjectStorageProviderMetadata.java.orig | 90 --------------------
1 file changed, 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a8ce2819/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig
deleted file mode 100644
index 56d8bad..0000000
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig
+++ /dev/null
@@ -1,90 +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.
- */
-package org.jclouds.hpcloud.objectstorage;
-
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.REQUIRES_TENANT;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
-<<<<<<< HEAD
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for StratoGen VMware hosting
- *
- * @author Adrian Cole
-=======
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud
->>>>>>> 7d89840... JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
- */
-public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public HPCloudObjectStorageProviderMetadata() {
- super(builder());
- }
-
- public HPCloudObjectStorageProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(REQUIRES_TENANT, "true");
- properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.API_ACCESS_KEY_CREDENTIALS);
-
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("hpcloud-objectstorage")
- .name("HP Cloud Services Object Storage")
- .apiMetadata(new HPCloudObjectStorageApiMetadata())
- .homepage(URI.create("http://hpcloud.com"))
- .console(URI.create("https://manage.hpcloud.com/objects/us-west"))
- .linkedServices("hpcloud-compute", "hpcloud-objectstorage")
- .iso3166Codes("US-NV", "US-VA")
- .endpoint("https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/")
- .defaultProperties(HPCloudObjectStorageProviderMetadata.defaultProperties());
- }
-
- @Override
- public HPCloudObjectStorageProviderMetadata build() {
- return new HPCloudObjectStorageProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
- }
-}