You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/09/29 00:08:02 UTC
svn commit: r1177089 - in
/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip:
./ src/main/java/org/apache/openejb/arquillian/
src/main/java/org/apache/openejb/arquillian/remote/
src/main/resources/META-INF/org.apache.openejb.tomca...
Author: jgallimore
Date: Wed Sep 28 22:08:01 2011
New Revision: 1177089
URL: http://svn.apache.org/viewvc?rev=1177089&view=rev
Log:
OPENEJB-1687 use common classes
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java
- copied, changed from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/ContainersImplTomEE.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
- copied, changed from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Removed:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/ContainersImplTomEE.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/SimpleMavenBuilderImpl.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEArchiveAppender.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/org.apache.openejb.tomcat/
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/org/
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/pom.xml?rev=1177089&r1=1177088&r2=1177089&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/pom.xml (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/pom.xml Wed Sep 28 22:08:01 2011
@@ -334,5 +334,12 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Copied: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java (from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/ContainersImplTomEE.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java?p2=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java&p1=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/ContainersImplTomEE.java&r1=1177059&r2=1177089&rev=1177089&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/ContainersImplTomEE.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java Wed Sep 28 22:08:01 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian;
+package org.apache.openejb.arquillian.remote;
import java.io.Closeable;
import java.io.File;
Copied: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java (from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?p2=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java&p1=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java&r1=1177059&r2=1177089&rev=1177089&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java Wed Sep 28 22:08:01 2011
@@ -14,39 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian;
+package org.apache.openejb.arquillian.remote;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Collection;
-import org.jboss.arquillian.spi.client.container.DeployableContainer;
-import org.jboss.arquillian.spi.client.container.DeploymentException;
+import org.apache.openejb.arquillian.common.SimpleMavenBuilderImpl;
+import org.apache.openejb.arquillian.common.TomEEContainer;
+import org.apache.openejb.config.RemoteServer;
import org.jboss.arquillian.spi.client.container.LifecycleException;
-import org.jboss.arquillian.spi.client.protocol.ProtocolDescription;
-import org.jboss.arquillian.spi.client.protocol.metadata.HTTPContext;
-import org.jboss.arquillian.spi.client.protocol.metadata.ProtocolMetaData;
-import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.GenericArchive;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.jboss.shrinkwrap.resolver.impl.maven.filter.StrictFilter;
-public class TomEEContainer implements DeployableContainer<TomEEConfiguration> {
+public class RemoteTomEEContainer extends TomEEContainer {
private static final String OPENEJB_VERSION = "4.0.0-beta-1-SNAPSHOT";
- private TomEEConfiguration configuration;
- private ContainersImplTomEE container;
-
- public Class<TomEEConfiguration> getConfigurationClass() {
- return TomEEConfiguration.class;
- }
-
- public void setup(TomEEConfiguration configuration) {
- this.configuration = configuration;
- }
+ private RemoteServer container;
public void start() throws LifecycleException {
File catalinaDirectory = new File(configuration.getDir());
@@ -87,61 +71,19 @@ public class TomEEContainer implements D
}
System.setProperty("tomee.http.port", String.valueOf(configuration.getHttpPort()));
- System.setProperty("tomee.shutdown.port", String.valueOf(configuration.getShutdownPort()));
+ System.setProperty("tomee.shutdown.port", String.valueOf(configuration.getStopPort()));
System.setProperty("java.naming.provider.url","http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
System.setProperty("connect.tries","90");
System.setProperty("server.http.port", String.valueOf(configuration.getHttpPort()));
- System.setProperty("server.shutdown.port", String.valueOf(configuration.getShutdownPort()));
+ System.setProperty("server.shutdown.port", String.valueOf(configuration.getStopPort()));
System.setProperty("java.opts", "-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m");
System.setProperty("openejb.home", openejbHome.getAbsolutePath());
-
- container = new ContainersImplTomEE();
- try {
- container.setup();
- } catch (IOException e) {
- throw new LifecycleException("Unable to start TomEE", e);
- }
- }
-
- public void stop() throws LifecycleException {
- try {
- container.cleanup();
- } catch (IOException e) {
- throw new LifecycleException("Unable to stop TomEE", e);
- }
- }
- public ProtocolDescription getDefaultProtocol() {
- return new ProtocolDescription("Servlet 3.0");
- }
-
- public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
- try {
- InputStream is = archive.as(ZipExporter.class).exportAsInputStream();
- String name = archive.getName();
- container.deploy(is, name);
-
- HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
- return new ProtocolMetaData().addContext(httpContext);
- } catch (Exception e) {
- e.printStackTrace();
- throw new DeploymentException("Unable to deploy", e);
- }
+ container = new RemoteServer();
+ container.start();
}
- public void undeploy(Archive<?> archive) throws DeploymentException {
- try {
- container.undeploy(archive.getName());
- } catch (IOException e) {
- throw new DeploymentException("Unable to undeploy", e);
- }
- }
-
- public void deploy(Descriptor descriptor) throws DeploymentException {
- throw new UnsupportedOperationException("Not implemented");
- }
-
- public void undeploy(Descriptor descriptor) throws DeploymentException {
- throw new UnsupportedOperationException("Not implemented");
+ public void stop() throws LifecycleException {
+ container.stop();
}
}
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer?rev=1177089&r1=1177088&r2=1177089&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer Wed Sep 28 22:08:01 2011
@@ -1 +1 @@
-org.apache.openejb.arquillian.TomEEContainer
\ No newline at end of file
+org.apache.openejb.arquillian.remote.RemoteTomEEContainer
\ No newline at end of file
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender?rev=1177089&r1=1177088&r2=1177089&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender Wed Sep 28 22:08:01 2011
@@ -1 +1 @@
-org.apache.openejb.arquillian.TomEEArchiveAppender
\ No newline at end of file
+org.apache.openejb.arquillian.common.TomEEArchiveAppender
\ No newline at end of file