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

updated pcs

This commit is contained in:
Adrian Cole 2011-02-18 16:55:18 -08:00
parent 5c1c731311
commit 5f676d99b8
62 changed files with 305 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/jclouds/logging/internal/Wire.java
View File

@ -20,6 +20,8 @@
package org.jclouds.logging.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.io.Closeables.closeQuietly;
import static org.jclouds.io.Payloads.newPayload;
import java.io.ByteArrayInputStream;
import java.io.File;
@ -33,11 +35,9 @@ import javax.annotation.Resource;
import org.jclouds.io.MutableContentMetadata;
import org.jclouds.io.Payload;
import org.jclouds.io.PayloadEnclosing;
import org.jclouds.io.Payloads;
import org.jclouds.logging.Logger;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
import com.google.common.io.FileBackedOutputStream;
/**
@ -101,8 +101,8 @@ public abstract class Wire {
} catch (IOException e) {
throw new RuntimeException("Error tapping line", e);
} finally {
Closeables.closeQuietly(out);
Closeables.closeQuietly(instream);
closeQuietly(out);
closeQuietly(instream);
}
}
@ -112,14 +112,19 @@ public abstract class Wire {
public void input(PayloadEnclosing request) {
Payload oldContent = request.getPayload();
Payload wiredPayload = Payloads.newPayload(input(oldContent.getInput()));
Payload wiredPayload = newPayload(input(oldContent.getInput()));
copyPayloadMetadata(oldContent, wiredPayload);
request.setPayload(wiredPayload);
}
public void output(PayloadEnclosing request) {
Payload oldContent = request.getPayload();
Payload wiredPayload = Payloads.newPayload(output(oldContent.getRawContent()));
Payload wiredPayload;
try {
wiredPayload = newPayload(output(oldContent.getRawContent()));
} catch (UnsupportedOperationException e) {
wiredPayload = newPayload(output(oldContent.getInput()));
}
copyPayloadMetadata(oldContent, wiredPayload);
request.setPayload(wiredPayload);
}
@ -150,9 +155,8 @@ public abstract class Wire {
} else if (data instanceof File) {
output(((File) data));
return data;
} else {
throw new UnsupportedOperationException("Content not supported " + data.getClass());
}
throw new UnsupportedOperationException("Content not supported " + data.getClass());
}
private void output(final File out) {
@ -164,7 +168,7 @@ public abstract class Wire {
} catch (FileNotFoundException e) {
logger.error(e, "Error tapping file: %s", out);
} finally {
Closeables.closeQuietly(in);
closeQuietly(in);
}
}

4
core/src/main/resources/rest.properties
View File

@ -29,8 +29,8 @@ azurequeue.endpoint=https://{identity}.queue.core.windows.net
azureblob.contextbuilder=org.jclouds.azureblob.AzureBlobContextBuilder
azureblob.propertiesbuilder=org.jclouds.azureblob.AzureBlobPropertiesBuilder
pcs.contextbuilder=org.jclouds.mezeo.pcs2.PCSContextBuilder
pcs.apiVersion=unknown
pcs.contextbuilder=org.jclouds.mezeo.pcs.PCSContextBuilder
pcs.propertiesbuilder=org.jclouds.mezeo.pcs.PCSPropertiesBuilder
sdn.contextbuilder=org.jclouds.nirvanix.sdn.SDNContextBuilder
sdn.propertiesbuilder=org.jclouds.nirvanix.sdn.SDNPropertiesBuilder

16
sandbox-apis/pcs/pom.xml
View File

@ -30,7 +30,7 @@
</parent>
<groupId>org.jclouds.api</groupId>
<artifactId>pcs</artifactId>
<name>jclouds mezeo cloud storage platform v2 core</name>
<name>jclouds mezeo cloud storage platform core</name>
<description>jclouds Core components to access mezeo pcs2</description>
<!-- bootstrapping: need to fetch the project POM -->
<repositories>
@ -55,6 +55,11 @@
<artifactId>jclouds-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
@ -62,6 +67,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@ -83,7 +95,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>:%s/
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>

26
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/PCSAsyncClient.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import java.io.InputStream;
import java.net.URI;
@ -33,17 +33,17 @@ import javax.ws.rs.Produces;
import org.jclouds.blobstore.functions.ReturnNullOnKeyNotFound;
import org.jclouds.http.filters.BasicAuthentication;
import org.jclouds.mezeo.pcs2.binders.BindContainerNameToXmlPayload;
import org.jclouds.mezeo.pcs2.binders.BindFileInfoToXmlPayload;
import org.jclouds.mezeo.pcs2.binders.BindPCSFileToMultipartForm;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.endpoints.RootContainer;
import org.jclouds.mezeo.pcs2.functions.AddMetadataItemIntoMap;
import org.jclouds.mezeo.pcs2.options.PutBlockOptions;
import org.jclouds.mezeo.pcs2.xml.ContainerHandler;
import org.jclouds.mezeo.pcs2.xml.FileHandler;
import org.jclouds.mezeo.pcs.binders.BindContainerNameToXmlPayload;
import org.jclouds.mezeo.pcs.binders.BindFileInfoToXmlPayload;
import org.jclouds.mezeo.pcs.binders.BindPCSFileToMultipartForm;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.endpoints.RootContainer;
import org.jclouds.mezeo.pcs.functions.AddMetadataItemIntoMap;
import org.jclouds.mezeo.pcs.options.PutBlockOptions;
import org.jclouds.mezeo.pcs.xml.ContainerHandler;
import org.jclouds.mezeo.pcs.xml.FileHandler;
import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Endpoint;
import org.jclouds.rest.annotations.EndpointParam;
@ -59,7 +59,7 @@ import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
import com.google.common.util.concurrent.ListenableFuture;
/**
* Provides asynchronous access to Mezeo PCS v2 via their REST API.
* Provides asynchronous access to Mezeo PCS via their REST API.
* <p/>
*
* @see PCSClient

12
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/PCSClient.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import java.io.InputStream;
import java.net.URI;
@ -25,13 +25,13 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.options.PutBlockOptions;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.options.PutBlockOptions;
/**
* Provides access to Mezeo PCS v2 via their REST API.
* Provides access to Mezeo PCS via their REST API.
* <p/>
*
* @see <a href=

20
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/PCSCloudAsyncClient.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import java.net.URI;
@ -25,14 +25,14 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import org.jclouds.http.filters.BasicAuthentication;
import org.jclouds.mezeo.pcs2.endpoints.Contacts;
import org.jclouds.mezeo.pcs2.endpoints.Metacontainers;
import org.jclouds.mezeo.pcs2.endpoints.Projects;
import org.jclouds.mezeo.pcs2.endpoints.Recyclebin;
import org.jclouds.mezeo.pcs2.endpoints.RootContainer;
import org.jclouds.mezeo.pcs2.endpoints.Shares;
import org.jclouds.mezeo.pcs2.endpoints.Tags;
import org.jclouds.mezeo.pcs2.xml.CloudXlinkHandler;
import org.jclouds.mezeo.pcs.endpoints.Contacts;
import org.jclouds.mezeo.pcs.endpoints.Metacontainers;
import org.jclouds.mezeo.pcs.endpoints.Projects;
import org.jclouds.mezeo.pcs.endpoints.Recyclebin;
import org.jclouds.mezeo.pcs.endpoints.RootContainer;
import org.jclouds.mezeo.pcs.endpoints.Shares;
import org.jclouds.mezeo.pcs.endpoints.Tags;
import org.jclouds.mezeo.pcs.xml.CloudXlinkHandler;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.XMLResponseParser;
@ -72,6 +72,6 @@ public interface PCSCloudAsyncClient {
@GET
@XMLResponseParser(CloudXlinkHandler.class)
@Path("/")
@Path("/v{jclouds.api-version}")
ListenableFuture<Response> authenticate();
}

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/PCSContextBuilder.java
View File

@ -17,12 +17,12 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import java.util.List;
import java.util.Properties;
import org.jclouds.mezeo.pcs2.config.PCSRestClientModule;
import org.jclouds.mezeo.pcs.config.PCSRestClientModule;
import org.jclouds.rest.RestContextBuilder;
import com.google.inject.Module;

45
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/PCSPropertiesBuilder.java Normal file
View File

@ -0,0 +1,45 @@
/**
*
* 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.
* ====================================================================
*/
package org.jclouds.mezeo.pcs;
import static org.jclouds.Constants.PROPERTY_API_VERSION;
import java.util.Properties;
import org.jclouds.PropertiesBuilder;
/**
* Builds properties used in PCS Connections
*
* @author Adrian Cole
*/
public class PCSPropertiesBuilder extends PropertiesBuilder {
@Override
protected Properties defaultProperties() {
Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_API_VERSION, "2");
return properties;
}
public PCSPropertiesBuilder(Properties properties) {
super(properties);
}
}

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/binders/BindContainerNameToXmlPayload.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.binders;
package org.jclouds.mezeo.pcs.binders;
import javax.inject.Singleton;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/binders/BindFileInfoToXmlPayload.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.binders;
package org.jclouds.mezeo.pcs.binders;
import java.io.File;
@ -26,7 +26,7 @@ import javax.ws.rs.core.HttpHeaders;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.utils.ModifyRequest;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.rest.Binder;
import com.google.common.collect.ImmutableMultimap;

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/binders/BindPCSFileToMultipartForm.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.binders;
package org.jclouds.mezeo.pcs.binders;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@ -27,8 +27,8 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.binders.BindBlobToMultipartForm;
import org.jclouds.http.HttpRequest;
import org.jclouds.mezeo.pcs2.blobstore.functions.PCSFileToBlob;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.blobstore.functions.PCSFileToBlob;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.rest.Binder;
@Singleton

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/blobstore/functions/BlobToFileInfo.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.blobstore.functions;
package org.jclouds.mezeo.pcs.blobstore.functions;
import javax.inject.Singleton;
import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.mezeo.pcs2.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs2.domain.internal.MutableFileInfoImpl;
import org.jclouds.mezeo.pcs.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs.domain.internal.MutableFileInfoImpl;
import com.google.common.base.Function;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/blobstore/functions/BlobToPCSFile.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.blobstore.functions;
package org.jclouds.mezeo.pcs.blobstore.functions;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import com.google.common.base.Function;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/blobstore/functions/FileInfoToBlobMetadata.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.blobstore.functions;
package org.jclouds.mezeo.pcs.blobstore.functions;
import java.util.regex.Pattern;
@ -26,7 +26,7 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.domain.MutableBlobMetadata;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.mezeo.pcs2.domain.FileInfo;
import org.jclouds.mezeo.pcs.domain.FileInfo;
import org.jclouds.util.Strings2;
import com.google.common.base.Function;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/blobstore/functions/PCSFileToBlob.java
View File

@ -17,14 +17,14 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.blobstore.functions;
package org.jclouds.mezeo.pcs.blobstore.functions;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.Blob.Factory;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import com.google.common.base.Function;

8
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/config/PCSObjectModule.java
View File

@ -17,15 +17,15 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.config;
package org.jclouds.mezeo.pcs.config;
import javax.inject.Inject;
import javax.inject.Provider;
import org.jclouds.blobstore.config.BlobStoreObjectModule;
import org.jclouds.mezeo.pcs2.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.domain.internal.PCSFileImpl;
import org.jclouds.mezeo.pcs.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.internal.PCSFileImpl;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

37
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/config/PCSRestClientModule.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.config;
package org.jclouds.mezeo.pcs.config;
import java.net.URI;
import java.util.concurrent.ExecutionException;
@ -31,19 +31,19 @@ import org.jclouds.Constants;
import org.jclouds.http.HttpRetryHandler;
import org.jclouds.http.RequiresHttp;
import org.jclouds.http.annotation.ClientError;
import org.jclouds.mezeo.pcs2.PCSAsyncClient;
import org.jclouds.mezeo.pcs2.PCSClient;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs2.endpoints.Contacts;
import org.jclouds.mezeo.pcs2.endpoints.Metacontainers;
import org.jclouds.mezeo.pcs2.endpoints.Projects;
import org.jclouds.mezeo.pcs2.endpoints.Recyclebin;
import org.jclouds.mezeo.pcs2.endpoints.RootContainer;
import org.jclouds.mezeo.pcs2.endpoints.Shares;
import org.jclouds.mezeo.pcs2.endpoints.Tags;
import org.jclouds.mezeo.pcs2.endpoints.WebDAV;
import org.jclouds.mezeo.pcs2.handlers.PCSClientErrorRetryHandler;
import org.jclouds.mezeo.pcs.PCSAsyncClient;
import org.jclouds.mezeo.pcs.PCSClient;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs.endpoints.Contacts;
import org.jclouds.mezeo.pcs.endpoints.Metacontainers;
import org.jclouds.mezeo.pcs.endpoints.Projects;
import org.jclouds.mezeo.pcs.endpoints.Recyclebin;
import org.jclouds.mezeo.pcs.endpoints.RootContainer;
import org.jclouds.mezeo.pcs.endpoints.Shares;
import org.jclouds.mezeo.pcs.endpoints.Tags;
import org.jclouds.mezeo.pcs.endpoints.WebDAV;
import org.jclouds.mezeo.pcs.handlers.PCSClientErrorRetryHandler;
import org.jclouds.rest.AsyncClientFactory;
import org.jclouds.rest.ConfiguresRestClient;
import org.jclouds.rest.config.RestClientModule;
@ -71,8 +71,8 @@ public class PCSRestClientModule extends RestClientModule<PCSClient, PCSAsyncCli
@Provides
@Singleton
protected Response provideCloudResponse(AsyncClientFactory factory) throws InterruptedException,
ExecutionException, TimeoutException {
protected Response provideCloudResponse(AsyncClientFactory factory) throws InterruptedException, ExecutionException,
TimeoutException {
return factory.create(PCSCloudAsyncClient.class).authenticate().get(10, TimeUnit.SECONDS);
}
@ -80,7 +80,7 @@ public class PCSRestClientModule extends RestClientModule<PCSClient, PCSAsyncCli
@Singleton
@WebDAV
protected URI provideWebDAVURI(@Named(Constants.PROPERTY_ENDPOINT) String endpoint) {
return URI.create(endpoint.replaceAll("v2", "dav"));
return URI.create(endpoint + "/dav");
}
@Provides
@ -134,8 +134,7 @@ public class PCSRestClientModule extends RestClientModule<PCSClient, PCSAsyncCli
@Override
protected void bindRetryHandlers() {
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(
PCSClientErrorRetryHandler.class);
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(PCSClientErrorRetryHandler.class);
}
}

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/ContainerInfo.java
View File

@ -17,11 +17,11 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.ContainerInfoImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/ContainerList.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import java.util.Map;
import java.util.SortedSet;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerListImpl;
import org.jclouds.mezeo.pcs.domain.internal.ContainerListImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/FileInfo.java
View File

@ -17,11 +17,11 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/FileInfoWithMetadata.java
View File

@ -17,12 +17,12 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import java.util.Map;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoWithMetadataImpl;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoWithMetadataImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/MutableFileInfo.java
View File

@ -17,11 +17,11 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import org.jclouds.mezeo.pcs2.domain.internal.MutableFileInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.MutableFileInfoImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/MutableResourceInfo.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.internal.MutableResourceInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.MutableResourceInfoImpl;
import com.google.inject.ImplementedBy;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/PCSFile.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import javax.annotation.Nullable;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/ResourceInfo.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain;
package org.jclouds.mezeo.pcs.domain;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.internal.ResourceInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.ResourceInfoImpl;
import com.google.inject.ImplementedBy;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerInfoImpl.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.ContainerInfo;
import org.jclouds.mezeo.pcs.domain.ContainerInfo;
/**
*

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerListImpl.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
@ -26,8 +26,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
/**
*

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/FileInfoImpl.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.FileInfo;
import org.jclouds.mezeo.pcs.domain.FileInfo;
/**
*

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/FileInfoWithMetadataImpl.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
import java.util.Map;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
/**
*

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/MutableFileInfoImpl.java
View File

@ -17,14 +17,14 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import javax.ws.rs.core.MediaType;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs.domain.MutableFileInfo;
/**
*

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/MutableResourceInfoImpl.java
View File

@ -17,14 +17,14 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.MutableResourceInfo;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.domain.MutableResourceInfo;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
/**
*

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/PCSFileImpl.java
View File

@ -17,15 +17,15 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Inject;
import org.jclouds.http.internal.PayloadEnclosingImpl;
import org.jclouds.mezeo.pcs2.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.MutableFileInfo;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ResourceInfoImpl.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.domain.internal;
package org.jclouds.mezeo.pcs.domain.internal;
import java.net.URI;
import java.util.Date;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
/**
*

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Contacts.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Metacontainers.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Projects.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Recyclebin.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/RootContainer.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Shares.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/Tags.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/endpoints/WebDAV.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.endpoints;
package org.jclouds.mezeo.pcs.endpoints;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/functions/AddMetadataItemIntoMap.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.functions;
package org.jclouds.mezeo.pcs.functions;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/functions/ReturnFalseIfContainerNotFound.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.functions;
package org.jclouds.mezeo.pcs.functions;
import static org.jclouds.util.Throwables2.propagateOrNull;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/functions/ReturnTrueIfContainerAlreadyExists.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.functions;
package org.jclouds.mezeo.pcs.functions;
import static org.jclouds.util.Throwables2.propagateOrNull;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/handlers/PCSClientErrorRetryHandler.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.handlers;
package org.jclouds.mezeo.pcs.handlers;
import javax.annotation.Resource;
import javax.inject.Inject;

2
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/options/PutBlockOptions.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.options;
package org.jclouds.mezeo.pcs.options;
import static com.google.common.base.Preconditions.checkArgument;

4
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/xml/CloudXlinkHandler.java
View File

@ -17,13 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import java.net.URI;
import java.util.Map;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

12
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/xml/ContainerHandler.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import java.net.URI;
import java.util.Date;
@ -31,11 +31,11 @@ import javax.inject.Inject;
import org.jclouds.date.DateService;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.logging.Logger;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerInfoImpl;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerListImpl;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoImpl;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.domain.internal.ContainerInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.ContainerListImpl;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoImpl;
import org.jclouds.util.Strings2;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

6
sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java → sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/xml/FileHandler.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import java.net.URI;
import java.util.Date;
@ -28,8 +28,8 @@ import javax.inject.Inject;
import org.jclouds.date.DateService;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoWithMetadataImpl;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoWithMetadataImpl;
import org.jclouds.util.Strings2;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

21
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSAsyncClientTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import static org.testng.Assert.assertEquals;
@ -37,14 +37,16 @@ import org.jclouds.http.functions.ParseSax;
import org.jclouds.http.functions.ParseURIFromListOrLocationHeaderIf20x;
import org.jclouds.http.functions.ReleasePayloadAndReturn;
import org.jclouds.http.functions.ReturnInputStream;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs2.blobstore.functions.BlobToPCSFile;
import org.jclouds.mezeo.pcs2.config.PCSRestClientModule;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.functions.AddMetadataItemIntoMap;
import org.jclouds.mezeo.pcs2.options.PutBlockOptions;
import org.jclouds.mezeo.pcs2.xml.ContainerHandler;
import org.jclouds.mezeo.pcs2.xml.FileHandler;
import org.jclouds.mezeo.pcs.PCSAsyncClient;
import org.jclouds.mezeo.pcs.PCSClient;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs.blobstore.functions.BlobToPCSFile;
import org.jclouds.mezeo.pcs.config.PCSRestClientModule;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.functions.AddMetadataItemIntoMap;
import org.jclouds.mezeo.pcs.options.PutBlockOptions;
import org.jclouds.mezeo.pcs.xml.ContainerHandler;
import org.jclouds.mezeo.pcs.xml.FileHandler;
import org.jclouds.rest.AsyncClientFactory;
import org.jclouds.rest.ConfiguresRestClient;
import org.jclouds.rest.RestClientTest;
@ -291,7 +293,6 @@ public class PCSAsyncClientTest extends RestClientTest<PCSAsyncClient> {
@Override
public RestContextSpec<PCSClient, PCSAsyncClient> createContextSpec() {
Properties properties = new Properties();
properties.setProperty("pcs.apiversion", "foo");
properties.setProperty("pcs.endpoint", "http://goo");
return new RestContextFactory().createContextSpec("pcs", "identity", "credential", properties);
}

85
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSClientLiveTest.java
View File

@ -17,10 +17,10 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.mezeo.pcs2.options.PutBlockOptions.Builder.range;
import static org.jclouds.mezeo.pcs.options.PutBlockOptions.Builder.range;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@ -36,15 +36,18 @@ import java.util.concurrent.TimeoutException;
import javax.inject.Provider;
import javax.ws.rs.core.UriBuilder;
import org.jclouds.Constants;
import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.http.HttpResponseException;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.PCSAsyncClient;
import org.jclouds.mezeo.pcs.PCSClient;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory;
import org.jclouds.util.Strings2;
@ -64,9 +67,6 @@ import com.sun.jersey.api.uri.UriBuilderImpl;
@Test(groups = "live", testName = "pcs2.PCSClientLiveTest")
public class PCSClientLiveTest {
private PCSClient connection;
private String identity;
Provider<UriBuilder> uriBuilderProvider = new Provider<UriBuilder>() {
@Override
@ -77,24 +77,47 @@ public class PCSClientLiveTest {
};
private RestContext<PCSClient, PCSAsyncClient> context;
private PCSClient connection;
protected String provider = "pcs";
protected String identity;
protected String credential;
protected String endpoint;
protected String apiversion;
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+ ".credential");
endpoint = System.getProperty("test." + provider + ".endpoint");
apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
Properties overrides = new Properties();
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
overrides.setProperty(provider + ".credential", credential);
if (endpoint != null)
overrides.setProperty(provider + ".endpoint", endpoint);
if (apiversion != null)
overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
@BeforeGroups(groups = { "live" })
public void setupClient() throws InterruptedException, ExecutionException, TimeoutException {
identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
String endpoint = checkNotNull(System.getProperty("jclouds.test.endpoint"),
"jclouds.test.endpoint");
public void setupClient() {
setupCredentials();
Properties overrides = setupProperties();
Properties props = new Properties();
props.setProperty("pcs.endpoint", endpoint);
context = new RestContextFactory().createContext("pcs", identity, credential, ImmutableSet
.<Module> of(new Log4JLoggingModule()), props);
context = new RestContextFactory().createContext(provider, ImmutableSet.<Module> of(new Log4JLoggingModule()),
overrides);
connection = context.getApi();
ContainerList response = connection.list();
for (ResourceInfo resource : response) {
if (resource.getType() == StorageType.FOLDER
&& resource.getName().startsWith(containerPrefix)) {
if (resource.getType() == StorageType.FOLDER && resource.getName().startsWith(containerPrefix)) {
System.err.printf("*** deleting container %s...%n", resource.getName());
connection.deleteContainer(resource.getUrl());
}
@ -116,15 +139,14 @@ public class PCSClientLiveTest {
// Create test containers
for (String container : new String[] { containerPrefix + ".testListOwnedContainers1",
containerPrefix + ".testListOwnedContainers2" }) {
containerPrefix + ".testListOwnedContainers2" }) {
URI containerURI = connection.createContainer(container);
connection.putMetadataItem(containerURI, "name", container);
response = connection.list(containerURI);
validateContainerList(response, rootUrl, container);
assertEquals(response.getMetadataItems().get("name"), URI.create(containerURI
.toASCIIString()
+ "/metadata/name"));
assertEquals(response.getMetadataItems().get("name"),
URI.create(containerURI.toASCIIString() + "/metadata/name"));
validateMetadataItemNameEquals(containerURI, container);
@ -132,8 +154,8 @@ public class PCSClientLiveTest {
}
}
private void validateMetadataItemNameEquals(URI resource, String name)
throws InterruptedException, ExecutionException, TimeoutException {
private void validateMetadataItemNameEquals(URI resource, String name) throws InterruptedException,
ExecutionException, TimeoutException {
Map<String, String> metadata = Maps.newHashMap();
connection.addMetadataItemToMap(resource, "name", metadata);
assertEquals(metadata.get("name"), name);
@ -144,8 +166,7 @@ public class PCSClientLiveTest {
validateResource(response, parent, name);
}
private void validateFileInfo(FileInfoWithMetadata response, URI parent, String name, Long size,
String mimeType) {
private void validateFileInfo(FileInfoWithMetadata response, URI parent, String name, Long size, String mimeType) {
assertNotNull(response.getMetadataItems());
assertFalse(response.isPublic());
assertEquals(response.getBytes(), size);
@ -241,17 +262,15 @@ public class PCSClientLiveTest {
connection.deleteContainer(container);
}
private FileInfoWithMetadata validateFileInfoAndNameIsInMetadata(URI container, URI objectURI,
String name, Long size) throws InterruptedException, ExecutionException,
TimeoutException {
private FileInfoWithMetadata validateFileInfoAndNameIsInMetadata(URI container, URI objectURI, String name, Long size)
throws InterruptedException, ExecutionException, TimeoutException {
FileInfoWithMetadata response;
connection.putMetadataItem(objectURI, "name", name);
response = connection.getFileInfo(objectURI);
validateFileInfo(response, container, name, size, "text/plain");
assertEquals(response.getMetadataItems().get("name"), URI.create(objectURI.toASCIIString()
+ "/metadata/name"));
assertEquals(response.getMetadataItems().get("name"), URI.create(objectURI.toASCIIString() + "/metadata/name"));
validateMetadataItemNameEquals(objectURI, name);
return response;

17
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSCloudAsyncClientTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import static org.jclouds.rest.RestContextFactory.contextSpec;
@ -28,8 +28,9 @@ import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs2.xml.CloudXlinkHandler;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient.Response;
import org.jclouds.mezeo.pcs.xml.CloudXlinkHandler;
import org.jclouds.rest.RestClientTest;
import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.internal.RestAnnotationProcessor;
@ -38,18 +39,18 @@ import org.testng.annotations.Test;
import com.google.inject.TypeLiteral;
/**
* Tests behavior of {@code PCSClient}
* Tests behavior of {@code PCSCloudAsyncClient}
*
* @author Adrian Cole
*/
@Test(groups = "unit", testName = "pcs2.PCSCloudTest")
public class PCSCloudTest extends RestClientTest<PCSCloudAsyncClient> {
public class PCSCloudAsyncClientTest extends RestClientTest<PCSCloudAsyncClient> {
public void testAuthenticate() throws SecurityException, NoSuchMethodException, IOException {
Method method = PCSCloudAsyncClient.class.getMethod("authenticate");
HttpRequest request = processor.createRequest(method);
assertRequestLineEquals(request, "GET http://localhost:8080/ HTTP/1.1");
assertRequestLineEquals(request, "GET http://localhost:8080/v3 HTTP/1.1");
assertNonPayloadHeadersEqual(request, "");
assertPayloadEquals(request, null, null, false);
@ -68,8 +69,8 @@ public class PCSCloudTest extends RestClientTest<PCSCloudAsyncClient> {
@Override
public RestContextSpec<PCSCloudClient, PCSCloudAsyncClient> createContextSpec() {
return contextSpec("test", "http://localhost:8080", "1", "identity", "credential",
PCSCloudClient.class, PCSCloudAsyncClient.class);
return contextSpec("test", "http://localhost:8080", "3", "", "identity", "credential", PCSCloudClient.class,
PCSCloudAsyncClient.class);
}
@Override

2
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/ProvidersInPropertiesTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2;
package org.jclouds.mezeo.pcs;
import org.jclouds.blobstore.util.BlobStoreUtils;
import org.jclouds.rest.Providers;

3
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/binders/BindContainerNameToXmlPayloadTest.java
View File

@ -17,13 +17,14 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.binders;
package org.jclouds.mezeo.pcs.binders;
import static org.testng.Assert.assertEquals;
import java.net.URI;
import org.jclouds.http.HttpRequest;
import org.jclouds.mezeo.pcs.binders.BindContainerNameToXmlPayload;
import org.testng.annotations.Test;
/**

7
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/binders/BindFileInfoToXmlPayloadTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.binders;
package org.jclouds.mezeo.pcs.binders;
import static org.testng.Assert.assertEquals;
@ -26,8 +26,9 @@ import java.net.URI;
import javax.ws.rs.core.HttpHeaders;
import org.jclouds.http.HttpRequest;
import org.jclouds.mezeo.pcs2.config.PCSObjectModule;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs.binders.BindFileInfoToXmlPayload;
import org.jclouds.mezeo.pcs.config.PCSObjectModule;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.testng.annotations.Test;
import com.google.inject.Guice;

2
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/functions/AddMetadataAndReturnIdTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.functions;
package org.jclouds.mezeo.pcs.functions;
import org.testng.annotations.Test;

2
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/functions/AssembleBlobFromBlobMetadataCallTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.functions;
package org.jclouds.mezeo.pcs.functions;
/**

12
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/internal/StubPCSAsyncClient.java
View File

@ -17,17 +17,17 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.internal;
package org.jclouds.mezeo.pcs.internal;
import java.io.InputStream;
import java.net.URI;
import java.util.Map;
import org.jclouds.mezeo.pcs2.PCSAsyncClient;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.PCSFile;
import org.jclouds.mezeo.pcs2.options.PutBlockOptions;
import org.jclouds.mezeo.pcs.PCSAsyncClient;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.PCSFile;
import org.jclouds.mezeo.pcs.options.PutBlockOptions;
import com.google.common.util.concurrent.ListenableFuture;

5
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/options/PutBlockOptionsTest.java
View File

@ -17,12 +17,13 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.options;
package org.jclouds.mezeo.pcs.options;
import static org.jclouds.mezeo.pcs2.options.PutBlockOptions.Builder.range;
import static org.jclouds.mezeo.pcs.options.PutBlockOptions.Builder.range;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import org.jclouds.mezeo.pcs.options.PutBlockOptions;
import org.testng.annotations.Test;
/**

7
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/xml/CloudXlinkHanderTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import static org.testng.Assert.assertEquals;
@ -26,8 +26,9 @@ import java.net.URI;
import java.util.Map;
import org.jclouds.http.functions.BaseHandlerTest;
import org.jclouds.mezeo.pcs2.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs2.xml.CloudXlinkHandler.PCSCloudResponseImpl;
import org.jclouds.mezeo.pcs.PCSCloudAsyncClient;
import org.jclouds.mezeo.pcs.xml.CloudXlinkHandler;
import org.jclouds.mezeo.pcs.xml.CloudXlinkHandler.PCSCloudResponseImpl;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;

13
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/xml/ContainerHandlerTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import static org.testng.Assert.assertEquals;
@ -26,11 +26,12 @@ import java.net.URI;
import org.jclouds.date.DateService;
import org.jclouds.http.functions.BaseHandlerTest;
import org.jclouds.mezeo.pcs2.domain.ContainerList;
import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerInfoImpl;
import org.jclouds.mezeo.pcs2.domain.internal.ContainerListImpl;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoImpl;
import org.jclouds.mezeo.pcs.domain.ContainerList;
import org.jclouds.mezeo.pcs.domain.ResourceInfo;
import org.jclouds.mezeo.pcs.domain.internal.ContainerInfoImpl;
import org.jclouds.mezeo.pcs.domain.internal.ContainerListImpl;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoImpl;
import org.jclouds.mezeo.pcs.xml.ContainerHandler;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;

7
sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java → sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/xml/FileMetadataHandlerTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.mezeo.pcs2.xml;
package org.jclouds.mezeo.pcs.xml;
import static org.testng.Assert.assertEquals;
@ -26,8 +26,9 @@ import java.net.URI;
import org.jclouds.date.DateService;
import org.jclouds.http.functions.BaseHandlerTest;
import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs2.domain.internal.FileInfoWithMetadataImpl;
import org.jclouds.mezeo.pcs.domain.FileInfoWithMetadata;
import org.jclouds.mezeo.pcs.domain.internal.FileInfoWithMetadataImpl;
import org.jclouds.mezeo.pcs.xml.FileHandler;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;