bf

woorea · woorea · commit cf300b6ecadf · 2012-04-18T06:51:07.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -72,20 +72,20 @@
 			<artifactId>guava</artifactId>
 			<version>12.0-rc1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>2.0-m03</version>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json</artifactId>
-			<version>2.0-m02</version>
+			<version>2.0-m03</version>
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/org/openstack/api/identity/IdentityPublicEndpoint.java b/src/main/java/org/openstack/api/identity/IdentityPublicEndpoint.java
@@ -1,18 +1,26 @@
 package org.openstack.api.identity;
 
 import java.util.Properties;
+import java.util.logging.Logger;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Target;
 
+import org.glassfish.jersey.filter.LoggingFilter;
 import org.openstack.api.common.Resource;
+import org.openstack.api.compute.TenantResource;
 import org.openstack.api.identity.resources.TenantsResource;
 import org.openstack.api.identity.resources.TokensResource;
 
 public class IdentityPublicEndpoint extends Resource {
+	
+	private LoggingFilter loggingFilter = new LoggingFilter(Logger.getLogger(TenantResource.class.getPackage().getName()),true);
 
 	public IdentityPublicEndpoint(Target target, Properties properties) {
 		super(target, properties);
+		if(Boolean.parseBoolean(properties.getProperty("verbose"))) {
+			target.configuration().register(loggingFilter);
+		}
 	}
 	
 	public static IdentityPublicEndpoint endpoint(Client client, String endpoint, Properties properties) {
diff --git a/src/main/java/org/openstack/client/ComputeClient.java b/src/main/java/org/openstack/client/ComputeClient.java
@@ -14,6 +14,7 @@
 import org.openstack.model.compute.KeyPair;
 import org.openstack.model.compute.KeyPairListItem;
 import org.openstack.model.compute.SecurityGroup;
+import org.openstack.model.compute.SecurityGroupForCreate;
 import org.openstack.model.compute.SecurityGroupRule;
 import org.openstack.model.compute.SecurityGroupRuleForCreate;
 import org.openstack.model.compute.Server;
@@ -126,8 +127,8 @@ public List<SecurityGroup> listSecurityGroups() {
 		return resource.securityGroups().get().getList();
 	}
 	
-	public SecurityGroup createSecurityGroup(String name, String description) {
-		return resource.securityGroups().post(null);
+	public SecurityGroup createSecurityGroup(SecurityGroupForCreate securityGroupForCreate) {
+		return resource.securityGroups().post(securityGroupForCreate);
 	}
 	
 	public SecurityGroup showSecurityGroup(Integer id) {
diff --git a/src/main/java/org/openstack/client/ImagesClient.java b/src/main/java/org/openstack/client/ImagesClient.java
@@ -25,4 +25,9 @@ public ImageList listImages(Map<String, Object> params) {
 		return resource.get();
 	}
 
+	public void deleteImage(String id) {
+		resource.image(id).delete();
+		
+	}
+
 }
diff --git a/src/main/java/org/openstack/client/OpenStackClient.java b/src/main/java/org/openstack/client/OpenStackClient.java
@@ -85,6 +85,7 @@ public void exchangeTokenForTenant(String tenantId) {
 		String endpoint = properties.getProperty("identity.endpoint.publicURL");
 		Authentication authentication = new KeystoneAuthentication().withTokenAndTenant(access.getToken().getId(), tenantId);
 		this.access = target(endpoint, IdentityPublicEndpoint.class).tokens().post(authentication);
+		System.out.println("EX " + this.access);
 	}
 	
 	public Access getAccess() {

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,9 @@ public ImageList listImages(Map<String, Object> params) {`
`25`	`25`	`return resource.get();`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ public void deleteImage(String id) {`
	`29`	`+ resource.image(id).delete();`
	`30`	`+`
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public void exchangeTokenForTenant(String tenantId) {`
`85`	`85`	`String endpoint = properties.getProperty("identity.endpoint.publicURL");`
`86`	`86`	`Authentication authentication = new KeystoneAuthentication().withTokenAndTenant(access.getToken().getId(), tenantId);`
`87`	`87`	`this.access = target(endpoint, IdentityPublicEndpoint.class).tokens().post(authentication);`
	`88`	`+ System.out.println("EX " + this.access);`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`public Access getAccess() {`