Author: ptahchiev
Date: Tue Apr 22 05:51:16 2008
New Revision: 650492
URL: http://svn.apache.org/viewvc?rev=650492&view=rev
Log:
moved the deployment components to the shared-api archive.
Added:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/AbstractDeployableFile.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/DeployableFile.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarDeployableFile.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarParser.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarDeployableFile.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarParser.java
- copied, changed from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/package.html
- copied unchanged from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/package.html
Removed:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/package.html
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/CactusTestTask.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.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=650492&r1=650491&r2=650492&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 05:51:16 2008
@@ -22,7 +22,6 @@
package org.apache.cactus.integration.ant;
import java.io.File;
-import java.lang.reflect.Field;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -32,11 +31,10 @@
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;
import org.apache.cactus.integration.ant.util.PropertySet;
-
+import org.apache.cactus.integration.api.deployable.DeployableFile;
+import org.apache.cactus.integration.api.deployable.EarParser;
+import org.apache.cactus.integration.api.deployable.WarParser;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.optional.junit.JUnitTask;
@@ -187,7 +185,7 @@
wrapper.setSystemProperties(this.systemProperties);
// Add extra classpath entries
- wrapper.setContainerClasspath(this.containerClasspath);
+ wrapper.setContainerClasspath(this.containerClasspath.list());
if (wrapper.isEnabled())
{
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTestTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTestTask.java?rev=650492&r1=650491&r2=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTestTask.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTestTask.java
Tue Apr 22 05:51:16 2008
@@ -29,9 +29,9 @@
import java.net.URL;
import java.net.MalformedURLException;
import org.apache.cactus.integration.ant.util.HttpProbe;
-import org.apache.cactus.integration.ant.deployment.DeployableFile;
-import org.apache.cactus.integration.ant.deployment.EarParser;
-import org.apache.cactus.integration.ant.deployment.WarParser;
+import org.apache.cactus.integration.api.deployable.DeployableFile;
+import org.apache.cactus.integration.api.deployable.EarParser;
+import org.apache.cactus.integration.api.deployable.WarParser;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.optional.junit.JUnitTask;
Modified:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java?rev=650492&r1=650491&r2=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerRunner.java
Tue Apr 22 05:51:16 2008
@@ -25,7 +25,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
-import org.apache.tools.ant.BuildException;
+import org.apache.cactus.integration.api.exception.CactusRuntimeException;
import org.codehaus.cargo.util.log.Logger;
/**
@@ -154,7 +154,7 @@
{
if ((System.currentTimeMillis() - startTime) > this.timeout)
{
- throw new BuildException("Failed to start the container after "
+ throw new CactusRuntimeException("Failed to start the
container after "
+ "more than [" + this.timeout + "] ms. Trying to connect "
+ "to the [" + this.testURL + "] test URL yielded a ["
+ responseCode + "] error code. Please run in debug mode "
@@ -296,7 +296,7 @@
* @return the HTTP response code or -1 if no connection could be
* established
*/
- private int testConnectivity(URL theUrl)
+ public int testConnectivity(URL theUrl)
{
int code;
try
@@ -397,9 +397,9 @@
* Pauses the current thread for the specified amount.
*
* @param theMs The time to sleep in milliseconds
- * @throws BuildException If the sleeping thread is interrupted
+ * @throws CactusRuntimeException If the sleeping thread is interrupted
*/
- private void sleep(long theMs) throws BuildException
+ private void sleep(long theMs) throws CactusRuntimeException
{
try
{
@@ -407,7 +407,7 @@
}
catch (InterruptedException e)
{
- throw new BuildException("Interruption during sleep", e);
+ throw new CactusRuntimeException("Interruption during sleep", e);
}
}
}
Modified:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java?rev=650492&r1=650491&r2=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/container/ContainerWrapper.java
Tue Apr 22 05:51:16 2008
@@ -23,7 +23,6 @@
import java.io.File;
import java.util.Map;
-import org.apache.tools.ant.types.Path;
import org.codehaus.cargo.container.Container;
import org.codehaus.cargo.container.InstalledLocalContainer;
import org.codehaus.cargo.container.property.GeneralPropertySet;
@@ -202,12 +201,12 @@
* @see Container#setContainerClasspath(Path)
* @since Cactus 1.6
*/
- public void setContainerClasspath(Path theClasspath)
+ public void setContainerClasspath(String[] theClasspath)
{
if (theClasspath != null)
{
((InstalledLocalContainer) container)
- .setExtraClasspath(theClasspath.list());
+ .setExtraClasspath(theClasspath);
}
}
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/AbstractDeployableFile.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/AbstractDeployableFile.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/AbstractDeployableFile.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/AbstractDeployableFile.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
import java.io.File;
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/DeployableFile.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/DeployableFile.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/DeployableFile.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/DeployableFile.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
import java.io.File;
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarDeployableFile.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarDeployableFile.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarDeployableFile.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarDeployableFile.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
/**
* Represents an EAR file to deploy in a container.
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarParser.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarParser.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarParser.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/EarParser.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
import java.io.File;
import java.io.FileInputStream;
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarDeployableFile.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarDeployableFile.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarDeployableFile.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarDeployableFile.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
/**
* Represents a WAR file to deploy in a container.
Copied:
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarParser.java
(from r650442,
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java)
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarParser.java?p2=jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarParser.java&p1=jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java&r1=650442&r2=650492&rev=650492&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
(original)
+++
jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/deployable/WarParser.java
Tue Apr 22 05:51:16 2008
@@ -18,7 +18,7 @@
*
* ========================================================================
*/
-package org.apache.cactus.integration.ant.deployment;
+package org.apache.cactus.integration.api.deployable;
import java.io.File;
import java.io.FileInputStream;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
