src/java/m/oms/ages/V1_01.java
@@ -4,7 +4,6 @@ |
*/ |
package m.oms.ages; |
|
-import csip.Config; |
import csip.ModelDataService; |
import csip.annotations.*; |
import static csip.annotations.ResourceType.*; |
@@ -13,9 +12,8 @@ |
import java.util.LinkedHashMap; |
import java.util.Map; |
import javax.ws.rs.Path; |
-import static m.oms.ages.V1_0.*; |
+import static m.oms.Resources.LOCATION_MNT_DATA; |
import oms.utils.Utils; |
-import static oms.utils.Utils.LOCATION_MNT_DATA; |
|
/** |
* Ages service. |
src/java/oms/utils/Utils.java
@@ -5,7 +5,6 @@ |
*/ |
package oms.utils; |
|
-import csip.Config; |
import csip.api.server.Executable; |
import csip.api.server.PayloadParameter; |
import csip.api.server.ServiceException; |
@@ -14,14 +13,10 @@ |
import csip.utils.Binaries; |
import java.io.File; |
import java.io.IOException; |
-import java.util.ArrayList; |
import java.util.Arrays; |
import java.util.Date; |
import java.util.HashMap; |
-import java.util.List; |
import java.util.Map; |
-import java.util.logging.Level; |
-import java.util.logging.Logger; |
import java.util.regex.Matcher; |
import java.util.regex.Pattern; |
import jersey.repackaged.com.google.common.base.Objects; |
@@ -33,6 +28,7 @@ |
import org.apache.commons.io.FileUtils; |
import org.apache.commons.lang3.ArrayUtils; |
import org.codehaus.jettison.json.JSONArray; |
+import static m.oms.Resources.LOCATION_MNT_DATA; |
|
/** |
* |
@@ -41,18 +37,16 @@ |
public class Utils { |
|
// parameter keys |
+ public static final String PROJECT = "project"; |
+ |
public static final String KEY_LOGLEVEL = "loglevel"; |
+ |
public static final String KEY_OPTIONS = "java.options"; |
|
public static final String ID_AGES_JAR = "ages.jar"; |
|
public static final String FILE_PARAMETER_REGEX_PATTERN = "\\A([^/]+)/([^/]+)/([^/]+)(?:/([^/;]+(?:;[^/;]+)*))?\\Z"; |
|
- public static final String LOCATION_MNT_DATA |
- = Config.getString("oms.data.path", "/mnt/csip-oms"); |
- |
- public static final String PROJECT = "project"; |
- |
/** |
* |
*/ |