Revision 5966cc0b

b/src/gr/grnet/pithos/web/client/Pithos.java
93 93
    }
94 94

  
95 95
    public static final Configuration config = GWT.create(Configuration.class);
96
    public static final String CONFIG_API_PATH = getFromOtherPropertiesOrDefaultString("STORAGE_API_URL", config.apiPath());
96
    public static final String CONFIG_API_PATH = config.apiPath();
97 97
    static {
98 98
        LOG("CONFIG_API_PATH = ", CONFIG_API_PATH);
99 99
    }
......
108 108
            return null;
109 109
        }
110 110
    }
111
    public static String getFromOtherPropertiesOrDefaultString(String key, String dflt) {
112
        try {
113
            return otherProperties.get(key);
114
        }
115
        catch(Exception e) {
116
            return dflt;
117
        }
118
    }
111

  
119 112
    public static final String OTHERPROPS_STORAGE_API_URL = getFromOtherPropertiesOrNull("STORAGE_API_URL");
120 113
    public static final String OTHERPROPS_USER_CATALOGS_API_URL = getFromOtherPropertiesOrNull("USER_CATALOGS_API_URL");
121 114
    static {
......
134 127
        else {
135 128
            throw new RuntimeException("Unknown STORAGE_API_URL");
136 129
        }
130

  
131
        LOG("Computed STORAGE_API_URL = ", STORAGE_API_URL);
137 132
    }
138 133
    public static final String USER_CATALOGS_API_URL;
139 134
    static {
......
153 148

  
154 149
            USER_CATALOGS_API_URL = url;
155 150

  
156
            LOG("USER_CATALOGS_API_URL = ", USER_CATALOGS_API_URL);
151
            LOG("Computed USER_CATALOGS_API_URL = ", USER_CATALOGS_API_URL);
157 152
        }
158 153
    }
159 154

  

Also available in: Unified diff