Modify license information.

JIRA:https://jira.open-o.org/browse/OCS-46

Change-Id: Iff62c4f5a9f29e20ab6f54772f60b1ab7ea65b1a
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix  the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

4 files changed, 30 insertions, 19 deletions

diff --git a/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java b/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java
index ee250b1..2661d69 100644
--- a/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java
+++ b/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 31-May-2016
+ * @version   31-May-2016
  */
 public final class RestUtils {
 
@@ -46,7 +46,7 @@ public final class RestUtils {
      * 
      * @param request : request object.
      * @return Request body as string.
-     * @since SDNO 0.5
+     * @since  
      */
     public static String getRequestBody(final HttpServletRequest request) {
         String body = null;
diff --git a/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java
index bd98fb9..0ac707b 100644
--- a/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java
+++ b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,9 +29,9 @@ import java.io.IOException;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 24-Jun-2016
+ * @version   24-Jun-2016
  */
-public class SystemEnvVariablesDefImpl extends SystemEnvVariables {
+public class SystemEnvVariablesDefImpl implements SystemEnvVariables {
 
     private static final Logger LOG = LoggerFactory.getLogger(SystemEnvVariablesDefImpl.class);
 
@@ -50,7 +50,7 @@ public class SystemEnvVariablesDefImpl extends SystemEnvVariables {
      * 
      * @param inPath input path
      * @return the canonical path.
-     * @since SDNO 0.5
+     * @since  
      */
     private String getCanonicalPath(final String inPath) {
         String path = null;
diff --git a/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java
index e40ab53..e75c997 100644
--- a/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java
+++ b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,18 +25,29 @@ import org.openo.baseservice.util.inf.SystemEnvVariables;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 2016年8月13日
+ * @version  
  */
 public class SystemEnvVariablesFactory {
 
     private static SystemEnvVariables systemEnvVariablesInstance = new SystemEnvVariablesDefImpl();
 
     /**
+     * 
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since   
+     */
+    private SystemEnvVariablesFactory() {
+        
+    }
+    /**
      * get the SystemEnvVariables instance
      * <br/>
      * 
      * @return SystemEnvVariables instance
-     * @since SDNO 0.5
+     * @since  
      */
     public static SystemEnvVariables getInstance() {
         return systemEnvVariablesInstance;
diff --git a/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java b/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java
index 014cdbd..cf0c182 100644
--- a/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java
+++ b/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,15 +21,15 @@ package org.openo.baseservice.util.inf;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 31-May-2016
+ * @version   31-May-2016
  */
-public abstract class SystemEnvVariables {
+public interface SystemEnvVariables {
 
     /**
      * Get application root path <br/>
      * 
      * @return application root path.
-     * @since SDNO 0.5
+     * @since  
      */
-    public abstract String getAppRoot();
+    String getAppRoot();
 }