Skip to content

Commit f6b4e20

Browse files
wooreawoorea
committed
bug fixing
1 parent 3f8a958 commit f6b4e20

File tree

319 files changed

+174
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+174
-111
lines changed

‎.gitignore‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ target/
77
bin/logs/
88

99

10-
openstack-api/test-output/
10+
openstack-api/test-output/
11+
openstack-ui/src/main/webapp/META-INF/
12+
openstack-ui/src/main/webapp/WEB-INF/deploy/
13+
openstack-ui/src/main/webapp/WEB-INF/classes/
14+
openstack-ui/src/main/gwt-unitCache/
15+
openstack-ui/src/main/webapp/ui/
16+
openstack-ui/src/main/webapp/WEB-INF/lib/

‎openstack-api/src/main/java/org/openstack/client/common/OpenStackSession.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openstack.client.common;
22

33
import java.io.Serializable;
4+
import java.util.Map;
45
import java.util.logging.Logger;
56

67
import javax.ws.rs.core.MediaType;
@@ -13,10 +14,14 @@
1314
import org.openstack.model.exceptions.OpenstackException;
1415
import org.openstack.model.identity.KeyStoneToken;
1516

17+
import com.google.common.collect.Maps;
18+
1619
public abstract class OpenStackSession implements Serializable {
1720

1821
static final Logger log = Logger.getLogger(OpenStackSession.class.getName());
1922

23+
protected final Map<Object, Object> extensions = Maps.newHashMap();
24+
2025
protected OpenStackSessionData data = new OpenStackSessionData();
2126

2227
protected OpenstackCredentials credentials;
@@ -76,6 +81,10 @@ public OpenStackSession disable(Feature feature) {
7681
features = features & ~feature.mask();
7782
return this;
7883
}
84+
85+
public Map<Object, Object> getExtensions() {
86+
return extensions;
87+
}
7988

8089
public OpenStackIdentityConfig getIdentityConfig() {
8190
return identityConfig;

‎openstack-api/src/main/java/org/openstack/client/internals/SimpleClassInfo.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package org.openstack.client.internals;
22

33
import java.lang.reflect.Field;
4+
import java.lang.reflect.Method;
45
import java.lang.reflect.ParameterizedType;
5-
import java.lang.reflect.TypeVariable;
6-
import java.text.DateFormat;
7-
import java.text.ParseException;
8-
import java.text.SimpleDateFormat;
96
import java.util.Date;
107
import java.util.List;
118
import java.util.Map;
12-
import java.util.TimeZone;
139

1410
import javax.xml.bind.annotation.XmlAnyAttribute;
1511
import javax.xml.bind.annotation.XmlAttribute;
@@ -19,7 +15,6 @@
1915
import javax.xml.namespace.QName;
2016

2117
import org.codehaus.jackson.annotate.JsonProperty;
22-
import org.openstack.client.internals.SimpleClassInfo.FieldInfo;
2318

2419
import com.google.common.base.Function;
2520
import com.google.common.collect.ImmutableMap;
@@ -67,7 +62,7 @@ private void discoverClassInfo() {
6762
this.jsonName = jsonName;
6863
}
6964

70-
private static String firstToLowerCase(String s) {
65+
public static String firstToLowerCase(String s) {
7166
if (s == null || s.isEmpty())
7267
return s;
7368

‎openstack-api/src/main/java/org/openstack/client/internals/SmartDeserializer.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,14 @@
44
import java.util.List;
55
import java.util.Map;
66

7-
import javax.xml.bind.annotation.XmlAnyAttribute;
87
import javax.xml.namespace.QName;
98

109
import org.codehaus.jackson.JsonParser;
1110
import org.codehaus.jackson.JsonProcessingException;
1211
import org.codehaus.jackson.JsonToken;
1312
import org.codehaus.jackson.map.DeserializationContext;
14-
import org.codehaus.jackson.map.DeserializerProvider;
15-
import org.codehaus.jackson.map.JsonDeserializer;
1613
import org.codehaus.jackson.map.deser.std.StdDeserializer;
1714
import org.openstack.client.internals.SimpleClassInfo.FieldInfo;
18-
import org.openstack.model.compute.NovaSecurityGroupList;
19-
import org.openstack.model.compute.NovaAddresses.Network;
20-
import org.openstack.model.compute.NovaAddresses.Network.Ip;
2115

2216
import com.google.common.collect.Lists;
2317

‎openstack-api/src/main/java/org/openstack/model/atom/Link.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public void setType(String type) {
4444
this.type = type;
4545
}
4646

47-
48-
4947
@Override
5048
public String toString() {
5149
return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]";

‎openstack-api/src/main/java/org/openstack/model/common/OpenStackSessionData.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,26 @@
22

33
import java.io.Serializable;
44
import java.util.List;
5-
import java.util.Map;
65
import java.util.Set;
7-
import java.util.logging.Logger;
86

9-
import org.openstack.client.common.OpenStackSession;
10-
import org.openstack.client.common.OpenstackCredentials;
117
import org.openstack.model.exceptions.OpenstackException;
128
import org.openstack.model.identity.KeyStoneAccess;
139
import org.openstack.model.identity.KeyStoneService;
1410

1511
import com.google.common.base.Function;
1612
import com.google.common.base.Joiner;
1713
import com.google.common.collect.Lists;
18-
import com.google.common.collect.Maps;
1914
import com.google.common.collect.Sets;
2015

2116
public class OpenStackSessionData implements Serializable {
2217

23-
static final Logger log = Logger.getLogger(OpenStackSessionData.class.getName());
24-
25-
protected final Map<Object, Object> extensions = Maps.newHashMap();
18+
/**
19+
*
20+
*/
21+
private static final long serialVersionUID = 1L;
2622

2723
protected KeyStoneAccess access;
2824

29-
30-
3125
public OpenStackSessionData() {
3226

3327
}
@@ -50,10 +44,6 @@ public boolean isAuthenticated() {
5044
return access != null;
5145
}
5246

53-
54-
public Map<Object, Object> getExtensions() {
55-
return extensions;
56-
}
5747

5848
public String getBestEndpoint(String serviceType) throws OpenstackException {
5949
List<KeyStoneService> foundServices = Lists.newArrayList();
@@ -73,7 +63,7 @@ public String getBestEndpoint(String serviceType) throws OpenstackException {
7363

7464
KeyStoneService service;
7565
if (foundServices.size() != 1) {
76-
log.fine("Found multiple services of type: " + serviceType + ". Found: "
66+
System.out.println("Found multiple services of type: " + serviceType + ". Found: "
7767
+ Joiner.on(',').join(foundServices));
7868
service = pickBest(foundServices);
7969
} else {

‎openstack-api/src/main/java/org/openstack/model/common/PagingListBase.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.Iterator;
44

55
public abstract class PagingListBase<T> extends ListWithAtomLinks {
6+
67
public abstract Iterator<T> iterateItemsOnPage();
78

89
// Note: It's not safe to give access to the items on the page

‎openstack-api/src/main/java/org/openstack/model/compute/NovaServer.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.Serializable;
44
import java.util.Date;
5-
import java.util.HashMap;
65
import java.util.List;
76
import java.util.Map;
87

@@ -14,7 +13,6 @@
1413
import javax.xml.bind.annotation.XmlRootElement;
1514
import javax.xml.namespace.QName;
1615

17-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
1816
import org.codehaus.jackson.annotate.JsonProperty;
1917
import org.openstack.model.atom.Link;
2018

‎openstack-api/src/main/java/org/openstack/model/compute/NovaServerList.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
import java.util.ArrayList;
44
import java.util.Iterator;
55
import java.util.List;
6-
import java.util.Set;
76

87
import javax.xml.bind.annotation.XmlAccessType;
98
import javax.xml.bind.annotation.XmlAccessorType;
109
import javax.xml.bind.annotation.XmlElement;
11-
import javax.xml.bind.annotation.XmlElementWrapper;
1210
import javax.xml.bind.annotation.XmlRootElement;
1311

1412
import org.codehaus.jackson.annotate.JsonProperty;
15-
import org.codehaus.jackson.annotate.JsonUnwrapped;
16-
import org.codehaus.jackson.map.annotate.JsonRootName;
1713
import org.openstack.model.common.PagingListBase;
1814

1915
@XmlRootElement(name = "servers")

‎openstack-api/src/main/java/org/openstack/model/compute/NovaVolumeList.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import javax.xml.bind.annotation.XmlElement;
1010
import javax.xml.bind.annotation.XmlRootElement;
1111

12-
import org.openstack.model.common.ListWithAtomLinks;
13-
1412
@XmlRootElement(name="volumes", namespace="")
1513
@XmlAccessorType(XmlAccessType.NONE)
1614
public class NovaVolumeList implements Serializable {

0 commit comments

Comments
 (0)