update Version to osgl-version-2

greenlaw110 · greenlaw110 · commit fe452d78e5c3 · 2017-12-19T21:50:05.000+11:00
diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@
     <osgl-mvc.version>1.4.0</osgl-mvc.version>
     <osgl-storage.version>1.5.0</osgl-storage.version>
     <osgl-tool-ext.version>1.1.0</osgl-tool-ext.version>
-    <osgl-ut.version>1.0.1</osgl-ut.version>
+    <osgl-ut.version>2.0.0-BETA-1</osgl-ut.version>
     <reflectasm.version>1.11.3</reflectasm.version>
     <rythmengine.version>1.2.0</rythmengine.version>
     <validation-api.version>1.1.0.Final</validation-api.version>
diff --git a/src/main/java/act/Act.java b/src/main/java/act/Act.java
@@ -22,7 +22,6 @@
 
 import act.app.*;
 import act.app.event.AppEventId;
-import act.crypto.AppCrypto;
 import act.app.util.NamedPort;
 import act.boot.BootstrapClassLoader;
 import act.boot.PluginClassProvider;
@@ -32,6 +31,7 @@
 import act.controller.meta.ActionMethodMetaInfo;
 import act.controller.meta.CatchMethodMetaInfo;
 import act.controller.meta.InterceptorMethodMetaInfo;
+import act.crypto.AppCrypto;
 import act.db.DbManager;
 import act.event.ActEvent;
 import act.event.ActEventListener;
@@ -51,20 +51,23 @@
 import act.plugin.PluginScanner;
 import act.route.RouteSource;
 import act.sys.Env;
-import act.util.*;
+import act.util.AppCodeScannerPluginManager;
+import act.util.Banner;
+import act.util.ClassInfoRepository;
+import act.util.SysProps;
 import act.view.ViewManager;
 import act.xio.Network;
 import act.xio.NetworkHandler;
 import act.xio.undertow.UndertowNetwork;
 import org.osgl.$;
-import org.osgl.bootstrap.Version;
 import org.osgl.cache.CacheService;
 import org.osgl.exception.NotAppliedException;
 import org.osgl.exception.UnexpectedException;
 import org.osgl.http.H;
 import org.osgl.logging.L;
 import org.osgl.logging.Logger;
 import org.osgl.util.*;
+import osgl.version.Version;
 
 import java.io.File;
 import java.io.IOException;
@@ -170,7 +173,7 @@ public static Mode valueOfIgnoreCase(String mode) {
         }
     }
 
-    public static final org.osgl.bootstrap.Version VERSION = org.osgl.bootstrap.Version.of(Act.class);
+    public static final osgl.version.Version VERSION = osgl.version.Version.of(Act.class);
     public static final Logger LOGGER = L.get(Act.class);
     private static ActConfig conf;
     private static Mode mode = Mode.PROD;
diff --git a/src/main/java/act/app/App.java b/src/main/java/act/app/App.java
@@ -26,7 +26,6 @@
 import act.app.data.BinderManager;
 import act.app.data.StringValueResolverManager;
 import act.app.event.AppEventId;
-import act.crypto.AppCrypto;
 import act.app.util.NamedPort;
 import act.boot.BootstrapClassLoader;
 import act.boot.app.BlockIssueSignal;
@@ -36,6 +35,7 @@
 import act.conf.AppConfig;
 import act.conf.AppConfigKey;
 import act.controller.bytecode.ControllerByteCodeScanner;
+import act.crypto.AppCrypto;
 import act.data.DataPropertyRepository;
 import act.data.JodaDateTimeCodec;
 import act.data.util.ActPropertyHandlerFactory;
@@ -70,7 +70,6 @@
 import act.ws.WebSocketConnectionManager;
 import org.osgl.$;
 import org.osgl.Osgl;
-import org.osgl.bootstrap.Version;
 import org.osgl.cache.CacheService;
 import org.osgl.http.HttpConfig;
 import org.osgl.logging.LogManager;
@@ -79,6 +78,7 @@
 import org.osgl.mvc.result.Result;
 import org.osgl.util.*;
 import org.rythmengine.utils.I18N;
+import osgl.version.Version;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Singleton;
diff --git a/src/main/java/act/internal/util/AppDescriptor.java b/src/main/java/act/internal/util/AppDescriptor.java
@@ -22,10 +22,10 @@
 
 import act.Act;
 import org.osgl.$;
-import org.osgl.bootstrap.Version;
 import org.osgl.logging.Logger;
 import org.osgl.util.E;
 import org.osgl.util.S;
+import osgl.version.Version;
 
 import java.io.*;
 
diff --git a/src/test/java/act/ActTestBase.java b/src/test/java/act/ActTestBase.java
@@ -38,10 +38,10 @@
 import org.mockito.stubbing.Answer;
 import org.osgl.$;
 import org.osgl.http.H;
-import org.osgl.ut.TestBase;
 import org.osgl.util.FastStr;
 import org.osgl.util.IO;
 import org.osgl.util.S;
+import osgl.ut.TestBase;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/src/test/java/act/inject/util/LoadResourceTest.java b/src/test/java/act/inject/util/LoadResourceTest.java
@@ -23,8 +23,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.osgl.inject.Genie;
-import org.osgl.ut.TestBase;
 import org.osgl.util.C;
+import osgl.ut.TestBase;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/test/java/act/internal/util/JavaNamesTest.java b/src/test/java/act/internal/util/JavaNamesTest.java
@@ -21,7 +21,7 @@
  */
 
 import org.junit.Test;
-import org.osgl.ut.TestBase;
+import osgl.ut.TestBase;
 
 public class JavaNamesTest extends TestBase {
 
diff --git a/src/test/java/act/session/JWTTest.java b/src/test/java/act/session/JWTTest.java
@@ -26,8 +26,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.osgl.$;
-import org.osgl.ut.TestBase;
 import org.osgl.util.S;
+import osgl.ut.TestBase;
 
 import java.util.Date;
 
