Permalink
Browse files

V.4-06/18/2012

  • Loading branch information...
1 parent 04f7a09 commit 81b81b090d652d7b3c1de4359597c4836eb617da @ngasiproj committed Jun 18, 2012
View
4 bin/derby.log
@@ -1,6 +1,6 @@
----------------------------------------------------------------
-Sat Jun 16 10:41:16 EDT 2012:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0137-f5bd-a852-000002f9ad78
+Mon Jun 18 07:38:38 EDT 2012:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0137-ff63-2b87-000002f69fb8
on database directory /usr/caimito/bin/caimito_db with class loader org.apache.catalina.loader.StandardClassLoader@2a4983
Loaded from file:/usr/caimito/lib/derby.jar
java.vendor=Sun Microsystems Inc.
View
2 source/ngasi/caimito/CaimitoConfig.java
@@ -51,7 +51,7 @@
public static boolean cacheable = true;
public static String serverinfo = "Caimito";
public static String CAIMITO_CSS = null;
- public static String version = "0.3";
+ public static String version = "0.4";
public static void init()throws CaimitoException{
if (! new File(getConfigFile()).exists())
{
View
14 source/ngasi/caimito/resource/OpenStackResourceObj.java
@@ -457,16 +457,22 @@ void auth()throws CaimitoException{
try{
if (X_Auth_Token != null && X_Storage_Url != null && !((System.currentTimeMillis() - authtime) > maxautint))return;
+ X_Auth_Token = null;
+ X_Storage_Url = null;
Hashtable<String,String> h = new Hashtable<String,String>();
- String curl = null;
+ //String curl = null;
String nv = null;
+ String curl = CaimitoConfig.getConfig().getString("cloud.url");
+ if (curl.endsWith("/"))
+ curl = curl.substring(0,curl.length() - 1);
+
if (CaimitoConfig.getConfig().get("cloud.api.version") == null || CaimitoConfig.getConfig().getString("cloud.api.version").startsWith("1."))
try{
h.put("X-Auth-User",CaimitoConfig.getConfig().getString("cloud.username"));
h.put("X-Auth-Key",CaimitoConfig.getConfig().getString("cloud.api.key_password"));
- curl = CaimitoConfig.getConfig().getString("cloud.url");
- if (curl.endsWith("/"))
- curl = curl.substring(0,curl.length() - 1);
+ //curl = CaimitoConfig.getConfig().getString("cloud.url");
+ //if (curl.endsWith("/"))
+ // curl = curl.substring(0,curl.length() - 1);
nv = HttpClientUtil.trustGet(h,curl);
X_Storage_Url = h.get("X-Storage-Url");
View
BIN webapps/WEB-INF/classes/ngasi/caimito/CaimitoConfig.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/EndPoints.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/OSRAttribute.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/OSV2TokenResponse.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/OpenStackResourceObj$1.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/OpenStackResourceObj.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/TokenObj.class
Binary file not shown.
View
BIN webapps/WEB-INF/classes/ngasi/caimito/resource/TokenObj2.class
Binary file not shown.

0 comments on commit 81b81b0

Please sign in to comment.