Skip to content

Commit

Permalink
use latest stable jersey library
Browse files Browse the repository at this point in the history
  • Loading branch information
@woorea
woorea committed Feb 12, 2013
1 parent c51a33d commit dbe1a60
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 58 deletions.
7 changes: 0 additions & 7 deletions ceilometer-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>ceilometer-model</artifactId> <artifactId>ceilometer-model</artifactId>
<name>OpenStack Ceilometer Model</name> <name>OpenStack Ceilometer Model</name>
<description>OpenStack Ceilometer Model</description> <description>OpenStack Ceilometer Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>
7 changes: 0 additions & 7 deletions glance-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>glance-model</artifactId> <artifactId>glance-model</artifactId>
<name>OpenStack Glance Model</name> <name>OpenStack Glance Model</name>
<description>OpenStack Glance Model</description> <description>OpenStack Glance Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>
7 changes: 0 additions & 7 deletions keystone-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>keystone-model</artifactId> <artifactId>keystone-model</artifactId>
<name>OpenStack Keystone Model</name> <name>OpenStack Keystone Model</name>
<description>OpenStack Keystone Model</description> <description>OpenStack Keystone Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>
7 changes: 0 additions & 7 deletions nova-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>nova-model</artifactId> <artifactId>nova-model</artifactId>
<name>OpenStack Nova Model</name> <name>OpenStack Nova Model</name>
<description>OpenStack Nova Model</description> <description>OpenStack Nova Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>
14 changes: 2 additions & 12 deletions openstack-client/pom.xml
View file
Expand Up @@ -13,22 +13,12 @@
<dependency> <dependency>
<groupId>org.glassfish.jersey.core</groupId> <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-m12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-m12</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>1.9.8</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
7 changes: 3 additions & 4 deletions openstack-examples/src/main/java/org/openstack/examples/keystone/KeystoneCreateTenant.java
View file
Expand Up @@ -10,11 +10,11 @@


public class KeystoneCreateTenant { public class KeystoneCreateTenant {


private static final String KEYSTONE_AUTH_URL = "http://10.1.245.150:5000/v2.0"; private static final String KEYSTONE_AUTH_URL = "http://identity.x.org/v2.0";


private static final String KEYSTONE_USERNAME = "admin"; private static final String KEYSTONE_USERNAME = "admin";


private static final String KEYSTONE_PASSWORD = "admin"; private static final String KEYSTONE_PASSWORD = "secret0";


/** /**
* @param args * @param args
Expand All @@ -31,8 +31,7 @@ public static void main(String[] args) {
tenant.setDescription("benn.cs"); tenant.setDescription("benn.cs");
tenant.setEnabled(true); tenant.setEnabled(true);
//Get the adminURL client and use the token got above //Get the adminURL client and use the token got above
keystone = new KeystoneClient(KeystoneUtils.findEndpointURL(access.getServiceCatalog(), "identity", null, "admin"), keystone = new KeystoneClient("http://keystone.x.org/v2.0", access.getToken().getId());
access.getToken().getId());
tenant = keystone.execute(new CreateTenant(tenant)); tenant = keystone.execute(new CreateTenant(tenant));
System.out.println(tenant); System.out.println(tenant);
keystone.execute(new DeleteTenant(tenant.getId())); keystone.execute(new DeleteTenant(tenant.getId()));
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
View file
Expand Up @@ -65,6 +65,15 @@
<url>https://maven.java.net/content/repositories/snapshots</url> <url>https://maven.java.net/content/repositories/snapshots</url>
</repository> </repository>
</repositories> </repositories>

<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>

<build> <build>
<plugins> <plugins>
<plugin> <plugin>
Expand All @@ -82,6 +91,11 @@
<artifactId>maven-eclipse-plugin</artifactId> <artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version> <version>2.9</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
7 changes: 0 additions & 7 deletions quantum-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>quantum-model</artifactId> <artifactId>quantum-model</artifactId>
<name>Quantum Model</name> <name>Quantum Model</name>
<description>Quantum Model</description> <description>Quantum Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>
7 changes: 0 additions & 7 deletions swift-model/pom.xml
View file
Expand Up @@ -9,11 +9,4 @@
<artifactId>swift-model</artifactId> <artifactId>swift-model</artifactId>
<name>OpenStack Swift Model</name> <name>OpenStack Swift Model</name>
<description>OpenStack Swift Model</description> <description>OpenStack Swift Model</description>
<dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.8</version>
</dependency>
</dependencies>
</project> </project>

0 comments on commit dbe1a60

Please sign in to comment.