LPS-49562 Create new local package and move related files to it

xieh · Aug 24, 2014 · 29bcaaa · 29bcaaa
1 parent 94da558
commit 29bcaaa
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/...nel/process/ExceptionProcessCallable.java → ...ocess/local/ExceptionProcessCallable.java b/...nel/process/ExceptionProcessCallable.java → ...ocess/local/ExceptionProcessCallable.java
@@ -12,7 +12,10 @@
  * details.
  */
 
-package com.liferay.portal.kernel.process;
+package com.liferay.portal.kernel.process.local;
+
+import com.liferay.portal.kernel.process.ProcessCallable;
+import com.liferay.portal.kernel.process.ProcessException;
 
 /**
  * @author Shuyang Zhou

diff --git a/.../kernel/process/LocalProcessExecutor.java → ...l/process/local/LocalProcessExecutor.java b/.../kernel/process/LocalProcessExecutor.java → ...l/process/local/LocalProcessExecutor.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portal.kernel.process;
+package com.liferay.portal.kernel.process.local;
 
 import com.liferay.portal.kernel.concurrent.AbortPolicy;
 import com.liferay.portal.kernel.concurrent.ConcurrentHashSet;
@@ -25,6 +25,11 @@
 import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayOutputStream;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.process.ProcessCallable;
+import com.liferay.portal.kernel.process.ProcessConfig;
+import com.liferay.portal.kernel.process.ProcessException;
+import com.liferay.portal.kernel.process.ProcessExecutor;
+import com.liferay.portal.kernel.process.TerminationProcessException;
 import com.liferay.portal.kernel.util.ClassLoaderObjectInputStream;
 import com.liferay.portal.kernel.util.NamedThreadFactory;
 import com.liferay.portal.kernel.util.PortalClassLoaderUtil;
@@ -105,7 +110,7 @@ public <T extends Serializable> NoticeableFuture<T> execute(
 			commands.add("-cp");
 			commands.add(processConfig.getBootstrapClassPath());
 			commands.addAll(arguments);
-			commands.add(ProcessLauncher.class.getName());
+			commands.add(LocalProcessLauncher.class.getName());
 
 			ProcessBuilder processBuilder = new ProcessBuilder(commands);
 

diff --git a/...ortal/kernel/process/ProcessLauncher.java → ...l/process/local/LocalProcessLauncher.java b/...ortal/kernel/process/ProcessLauncher.java → ...l/process/local/LocalProcessLauncher.java
@@ -12,9 +12,12 @@
  * details.
  */
 
-package com.liferay.portal.kernel.process;
+package com.liferay.portal.kernel.process.local;
 
 import com.liferay.portal.kernel.io.unsync.UnsyncBufferedOutputStream;
+import com.liferay.portal.kernel.process.ClassPathUtil;
+import com.liferay.portal.kernel.process.ProcessCallable;
+import com.liferay.portal.kernel.process.ProcessException;
 import com.liferay.portal.kernel.process.log.ProcessOutputStream;
 import com.liferay.portal.kernel.util.ClassLoaderObjectInputStream;
 import com.liferay.portal.kernel.util.StringPool;
@@ -36,7 +39,7 @@
 /**
  * @author Shuyang Zhou
  */
-public class ProcessLauncher {
+public class LocalProcessLauncher {
 
 	public static void main(String[] arguments)
 		throws ClassNotFoundException, IOException {

diff --git a/...kernel/process/ReturnProcessCallable.java → .../process/local/ReturnProcessCallable.java b/...kernel/process/ReturnProcessCallable.java → .../process/local/ReturnProcessCallable.java
@@ -12,7 +12,9 @@
  * details.
  */
 
-package com.liferay.portal.kernel.process;
+package com.liferay.portal.kernel.process.local;
+
+import com.liferay.portal.kernel.process.ProcessCallable;
 
 import java.io.Serializable;
 

diff --git a/...nel/process/LocalProcessExecutorTest.java → ...ocess/local/LocalProcessExecutorTest.java b/...nel/process/LocalProcessExecutorTest.java → ...ocess/local/LocalProcessExecutorTest.java
@@ -12,15 +12,20 @@
  * details.
  */
 
-package com.liferay.portal.kernel.process;
+package com.liferay.portal.kernel.process.local;
 
 import com.liferay.portal.kernel.concurrent.ThreadPoolExecutor;
 import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayOutputStream;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.process.ProcessCallable;
+import com.liferay.portal.kernel.process.ProcessConfig;
 import com.liferay.portal.kernel.process.ProcessConfig.Builder;
-import com.liferay.portal.kernel.process.ProcessLauncher.ProcessContext;
-import com.liferay.portal.kernel.process.ProcessLauncher.ShutdownHook;
+import com.liferay.portal.kernel.process.ProcessException;
+import com.liferay.portal.kernel.process.ProcessExecutor;
+import com.liferay.portal.kernel.process.TerminationProcessException;
+import com.liferay.portal.kernel.process.local.LocalProcessLauncher.ProcessContext;
+import com.liferay.portal.kernel.process.local.LocalProcessLauncher.ShutdownHook;
 import com.liferay.portal.kernel.process.log.ProcessOutputStream;
 import com.liferay.portal.kernel.test.CaptureHandler;
 import com.liferay.portal.kernel.test.CodeCoverageAssertor;
@@ -100,9 +105,10 @@ public void appendAssertClasses(List<Class<?>> assertClasses) {
 				assertClasses.add(ProcessConfig.class);
 				assertClasses.addAll(
 					Arrays.asList(ProcessConfig.class.getDeclaredClasses()));
-				assertClasses.add(ProcessLauncher.class);
+				assertClasses.add(LocalProcessLauncher.class);
 				assertClasses.addAll(
-					Arrays.asList(ProcessLauncher.class.getDeclaredClasses()));
+					Arrays.asList(
+						LocalProcessLauncher.class.getDeclaredClasses()));
 			}
 
 		};
@@ -556,7 +562,7 @@ public void run() {
 
 	@Test
 	public void testConstructor() {
-		new ProcessLauncher();
+		new LocalProcessLauncher();
 	}
 
 	@Test