Move agent implementation to internal package.

16 files changed, 35 insertions, 24 deletions

diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/AgentTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java
index 6e338914..e98dcfed 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/AgentTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java
@@ -9,7 +9,7 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt;
+package org.jacoco.agent.rt.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -19,10 +19,12 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 
-import org.jacoco.agent.rt.controller.LocalController;
-import org.jacoco.agent.rt.controller.MBeanController;
-import org.jacoco.agent.rt.controller.TcpClientController;
-import org.jacoco.agent.rt.controller.TcpServerController;
+import org.jacoco.agent.rt.internal.Agent;
+import org.jacoco.agent.rt.internal.IExceptionLogger;
+import org.jacoco.agent.rt.internal.controller.LocalController;
+import org.jacoco.agent.rt.internal.controller.MBeanController;
+import org.jacoco.agent.rt.internal.controller.TcpClientController;
+import org.jacoco.agent.rt.internal.controller.TcpServerController;
 import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.AgentOptions.OutputMode;
 import org.junit.Rule;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ClassFileDumperTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ClassFileDumperTest.java
index bd7d9e8f..3079120b 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ClassFileDumperTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ClassFileDumperTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt;
+package org.jacoco.agent.rt.internal;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -19,6 +19,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.jacoco.agent.rt.internal.ClassFileDumper;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ConfigLoaderTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ConfigLoaderTest.java
index f81a7bd0..52065595 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ConfigLoaderTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ConfigLoaderTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt;
+package org.jacoco.agent.rt.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -27,7 +27,7 @@ public class ConfigLoaderTest {
 	public void testResource() {
 		Properties system = new Properties();
 		Properties config = ConfigLoader.load(
-				"/org/jacoco/agent/rt/agent-test.properties", system);
+				"/org/jacoco/agent/rt/internal/agent-test.properties", system);
 
 		assertEquals("tcpclient", config.get("output"));
 	}
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/CoverageTransformerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/CoverageTransformerTest.java
index 91032a32..563f531f 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/CoverageTransformerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/CoverageTransformerTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt;
+package org.jacoco.agent.rt.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -60,7 +60,7 @@ public class CoverageTransformerTest {
 	public void testFilterAgentClass() {
 		CoverageTransformer t = createTransformer();
 		assertFalse(t.filter(classLoader,
-				"org/jacoco/agent/rt/somepkg/SomeClass"));
+				"org/jacoco/agent/rt/internal/somepkg/SomeClass"));
 	}
 
 	@Test
@@ -78,7 +78,7 @@ public class CoverageTransformerTest {
 
 	@Test
 	public void testFilterClassLoaderNegative() {
-		options.setExclClassloader("org.jacoco.agent.rt.CoverageTransformerTest$*");
+		options.setExclClassloader("org.jacoco.agent.rt.internal.CoverageTransformerTest$*");
 		CoverageTransformer t = createTransformer();
 		ClassLoader myClassLoader = new ClassLoader(null) {
 		};
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ExceptionRecorder.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ExceptionRecorder.java
index 5c034c9c..96d1e2d3 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/ExceptionRecorder.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ExceptionRecorder.java
@@ -9,11 +9,13 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt;
+package org.jacoco.agent.rt.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.jacoco.agent.rt.internal.IExceptionLogger;
+
 /**
  * {@link IExceptionLogger} implementation for testing purposes.
  */
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/agent-test.properties b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/agent-test.properties
index d13081c8..d13081c8 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/agent-test.properties
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/agent-test.properties
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/ExecutorTestBase.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/ExecutorTestBase.java
index 8686ed13..a2ec01d4 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/ExecutorTestBase.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/ExecutorTestBase.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.fail;
 
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/LocalControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/LocalControllerTest.java
index 0a8a6cdb..15a869e9 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/LocalControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/LocalControllerTest.java
@@ -9,13 +9,14 @@
  *    Brock Janiczak - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.jacoco.agent.rt.internal.controller.LocalController;
 import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 import org.junit.Rule;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MBeanControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MBeanControllerTest.java
index b3ec3d33..3b50c658 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MBeanControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MBeanControllerTest.java
@@ -9,7 +9,7 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,6 +25,7 @@ import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.ObjectName;
 
+import org.jacoco.agent.rt.internal.controller.MBeanController;
 import org.jacoco.core.JaCoCo;
 import org.jacoco.core.data.ExecutionDataReader;
 import org.jacoco.core.data.ExecutionDataStore;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockServerSocket.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocket.java
index 60ba46e1..a9a55ec1 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockServerSocket.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocket.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockServerSocketTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocketTest.java
index 9d597299..b98258dd 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockServerSocketTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocketTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockSocketConnection.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnection.java
index 5b2a87e8..2118fe8d 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockSocketConnection.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnection.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockSocketConnectionTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnectionTest.java
index 332b9978..fd373bf2 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/MockSocketConnectionTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnectionTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpClientControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpClientControllerTest.java
index 222855b4..be935cfa 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpClientControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpClientControllerTest.java
@@ -11,7 +11,7 @@
  *    Marc R. Hoffmann - migration to mock socket
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -20,7 +20,9 @@ import java.io.IOException;
 import java.net.Socket;
 import java.util.List;
 
-import org.jacoco.agent.rt.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.controller.IAgentController;
+import org.jacoco.agent.rt.internal.controller.TcpClientController;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfo;
 import org.jacoco.core.data.SessionInfoStore;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpConnectionTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpConnectionTest.java
index 1e1f89a7..546661ca 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpConnectionTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpConnectionTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
+import org.jacoco.agent.rt.internal.controller.TcpConnection;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.ExecutionDataWriter;
 import org.jacoco.core.data.SessionInfo;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpServerControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpServerControllerTest.java
index 1af200b0..90e5efd0 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/controller/TcpServerControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpServerControllerTest.java
@@ -10,7 +10,7 @@
  *    Marc R. Hoffmann - migration to mock socket
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.controller;
+package org.jacoco.agent.rt.internal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -24,7 +24,8 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.List;
 
-import org.jacoco.agent.rt.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.controller.TcpServerController;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.ExecutionDataWriter;
 import org.jacoco.core.data.SessionInfo;