Author: ptahchiev
Date: Tue Apr 22 04:28:33 2008
New Revision: 650443
URL: http://svn.apache.org/viewvc?rev=650443&view=rev
Log:
moved the container/ContainerRunner.java and the
container/ContainerWrapper.java to the shared-api.
Added:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java
Removed:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java?rev=650443&r1=650442&r2=650443&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
Tue Apr 22 04:28:33 2008
@@ -30,8 +30,8 @@
import java.util.Map;
import java.util.ResourceBundle;
-import org.apache.cactus.integration.ant.container.ContainerRunner;
-import org.apache.cactus.integration.ant.container.ContainerWrapper;
+import org.apache.cactus.container.ContainerRunner;
+import org.apache.cactus.container.ContainerWrapper;
import org.apache.cactus.integration.ant.deployment.DeployableFile;
import org.apache.cactus.integration.ant.deployment.EarParser;
import org.apache.cactus.integration.ant.deployment.WarParser;
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java?rev=650443&r1=650442&r2=650443&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java
Tue Apr 22 04:28:33 2008
@@ -22,7 +22,7 @@
import java.net.URL;
-import org.apache.cactus.integration.ant.container.ContainerRunner;
+import org.apache.cactus.container.ContainerRunner;
import org.apache.cactus.integration.ant.container.GenericContainer;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java?rev=650443&r1=650442&r2=650443&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java
Tue Apr 22 04:28:33 2008
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.cactus.container.ContainerWrapper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskContainer;
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java&r1=650442&r2=650443&rev=650443&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
Tue Apr 22 04:28:33 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.container;
+package org.apache.cactus.container;
import java.io.IOException;
import java.io.InputStream;
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java&r1=650442&r2=650443&rev=650443&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
Tue Apr 22 04:28:33 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.container;
+package org.apache.cactus.container;
import java.io.File;
import java.util.Map;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
