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:13:05 UTC
svn commit: r1177090 - in
/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded: ./
src/main/java/org/apache/openejb/arquillian/
src/main/java/org/apache/openejb/arquillian/embedded/
src/main/resources/META-INF/services/ src/main/resources/...
Author: jgallimore
Date: Wed Sep 28 22:13:04 2011
New Revision: 1177090
URL: http://svn.apache.org/viewvc?rev=1177090&view=rev
Log:
OPENEJB-1687 use common classes
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
- copied, changed from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Removed:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/FileUtils.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEArchiveAppender.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1177090&r1=1177089&r2=1177090&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml Wed Sep 28 22:13:04 2011
@@ -181,6 +181,13 @@
<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-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (from r1177059, openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?p2=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java&p1=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java&r1=1177059&r2=1177090&rev=1177090&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Wed Sep 28 22:13:04 2011
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian;
+package org.apache.openejb.arquillian.embedded;
import java.io.File;
+import org.apache.openejb.arquillian.common.FileUtils;
+import org.apache.openejb.arquillian.common.TomEEConfiguration;
+import org.apache.openejb.arquillian.common.TomEEContainer;
import org.apache.tomee.embedded.Configuration;
import org.apache.tomee.embedded.Container;
-import org.jboss.arquillian.spi.client.container.DeployableContainer;
import org.jboss.arquillian.spi.client.container.DeploymentException;
import org.jboss.arquillian.spi.client.container.LifecycleException;
import org.jboss.arquillian.spi.client.protocol.ProtocolDescription;
@@ -28,14 +30,12 @@ import org.jboss.arquillian.spi.client.p
import org.jboss.arquillian.spi.client.protocol.metadata.ProtocolMetaData;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
-public class TomEEContainer implements DeployableContainer<TomEEConfiguration> {
+public class EmbeddedTomEEContainer extends TomEEContainer {
private Container container;
- private TomEEConfiguration configuration;
- public TomEEContainer() {
+ public EmbeddedTomEEContainer() {
container = new Container();
}
@@ -44,11 +44,24 @@ public class TomEEContainer implements D
}
public void setup(TomEEConfiguration configuration) {
- container.setup((Configuration) configuration);
+ container.setup(convertConfiguration(configuration));
this.configuration = configuration;
}
- public void start() throws LifecycleException {
+ /*
+ * Not exactly as elegant as I'd like. Maybe we could have the EmbeddedServer configuration in openejb-core so all the adapters can use it.
+ * Depending on tomee-embedded is fine in this adapter, but less desirable in the others, as we'd get loads of stuff in the classpath we don't need.
+ */
+ private Configuration convertConfiguration(TomEEConfiguration tomeeConfiguration) {
+ Configuration configuration = new Configuration();
+ configuration.setDir(tomeeConfiguration.getDir());
+ configuration.setHttpPort(tomeeConfiguration.getHttpPort());
+ configuration.setStopPort(tomeeConfiguration.getStopPort());
+
+ return configuration;
+ }
+
+ public void start() throws LifecycleException {
try {
container.start();
@@ -69,7 +82,7 @@ public class TomEEContainer implements D
public ProtocolDescription getDefaultProtocol() {
return new ProtocolDescription("Servlet 3.0");
}
-
+
public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
try {
@@ -98,13 +111,4 @@ public class TomEEContainer implements D
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");
- }
-
}
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/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-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer?rev=1177090&r1=1177089&r2=1177090&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer Wed Sep 28 22:13:04 2011
@@ -1 +1 @@
-org.apache.openejb.arquillian.TomEEContainer
\ No newline at end of file
+org.apache.openejb.arquillian.embedded.EmbeddedTomEEContainer
\ No newline at end of file
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/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-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender?rev=1177090&r1=1177089&r2=1177090&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender Wed Sep 28 22:13:04 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