Author: andygumbrecht
Date: Thu May 8 09:56:26 2014
New Revision: 1593221
URL: http://svn.apache.org/r1593221
Log:
Apply patch from Romain for: https://issues.apache.org/jira/browse/TOMEE-1199
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
tomee/tomee/trunk/pom.xml
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1593221&r1=1593220&r2=1593221&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Thu May 8 09:56:26 2014
@@ -68,13 +68,20 @@ public abstract class TomEEContainer<Con
@Inject
private Instance<TestClass> testClass;
- @Inject
- protected Instance<DeploymentDescription> deployment;
+ @Inject
+ protected Instance<DeploymentDescription> deployment;
protected TomEEContainer() {
this.options = new Options(System.getProperties());
}
+ protected boolean isTestable(final Archive<?> archive, final
DeploymentDescription deploymentDescription) {
+ return deploymentDescription != null
+ && deploymentDescription.isArchiveDeployment()
+ && (deploymentDescription.getArchive() == archive ||
deploymentDescription.getTestableArchive() == archive)
+ && deploymentDescription.testable();
+ }
+
@Override
public void setup(Configuration configuration) {
this.configuration = configuration;
@@ -337,11 +344,11 @@ public abstract class TomEEContainer<Con
Files.deleteOnExit(file.getParentFile());
- if (deployment.get().testable()) {
-
archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file, true);
- } else {
- archive.as(ZipExporter.class).exportTo(file, true);
- }
+ if (isTestable(archive, deployment.get())) {
+ archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file,
true);
+ } else {
+ archive.as(ZipExporter.class).exportTo(file, true);
+ }
return file;
}
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1593221&r1=1593220&r2=1593221&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
Thu May 8 09:56:26 2014
@@ -38,17 +38,11 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.web.lifecycle.test.MockHttpSession;
import org.jboss.arquillian.container.spi.client.container.DeploymentException;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
-import org.jboss.arquillian.container.spi.client.deployment.Deployment;
-import
org.jboss.arquillian.container.spi.client.deployment.DeploymentDescription;
import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
import org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext;
import
org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
-import org.jboss.arquillian.core.api.Instance;
-import org.jboss.arquillian.core.api.InstanceProducer;
-import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
public class EmbeddedTomEEContainer extends
TomEEContainer<EmbeddedTomEEConfiguration> {
@@ -75,11 +69,11 @@ public class EmbeddedTomEEContainer exte
* 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(final
EmbeddedTomEEConfiguration tomeeConfiguration) {
- final Configuration configuration = new Configuration();
+ final Configuration configuration = new Configuration();
- configuration.setDir(tomeeConfiguration.getDir());
- configuration.setHttpPort(tomeeConfiguration.getHttpPort());
- configuration.setStopPort(tomeeConfiguration.getStopPort());
+ configuration.setDir(tomeeConfiguration.getDir());
+ configuration.setHttpPort(tomeeConfiguration.getHttpPort());
+ configuration.setStopPort(tomeeConfiguration.getStopPort());
configuration.setHost(tomeeConfiguration.getHost());
configuration.setServerXml(tomeeConfiguration.getServerXml());
configuration.setProperties(tomeeConfiguration.systemPropertiesAsProperties());
@@ -95,8 +89,8 @@ public class EmbeddedTomEEContainer exte
configuration.setKeyAlias(tomeeConfiguration.getKeyAlias());
configuration.setSslProtocol(tomeeConfiguration.getSslProtocol());
- return configuration;
- }
+ return configuration;
+ }
@Override
public void start() throws LifecycleException {
@@ -127,7 +121,7 @@ public class EmbeddedTomEEContainer exte
@Override
public ProtocolMetaData deploy(final Archive<?> archive) throws
DeploymentException {
- try {
+ try {
/* don't do it since it should be configurable
final File tempDir = Files.createTempDir();
final File file = new File(tempDir, name);
@@ -135,11 +129,6 @@ public class EmbeddedTomEEContainer exte
final String name = archive.getName();
final File file = this.dumpFile(archive);
ARCHIVES.put(archive, file);
- if (deployment.get().testable()) {
-
this.archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file, true);
- } else {
- archive.as(ZipExporter.class).exportTo(file,
true);
- }
this.container.deploy(name, file);
final AppInfo info = this.container.getInfo(name);
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1593221&r1=1593220&r2=1593221&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu May 8 09:56:26 2014
@@ -98,7 +98,7 @@
<tomee.version>1.6.1-SNAPSHOT</tomee.version>
<openjpa.version>2.4.0-SNAPSHOT</openjpa.version>
-
<org.apache.openwebbeans.version>1.2.4-SNASPHOT</org.apache.openwebbeans.version>
+ <org.apache.openwebbeans.version>1.2.4</org.apache.openwebbeans.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
@@ -570,6 +570,9 @@
<repository>
<id>temp-owb</id>
<url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1003/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</repository>
<repository>
<id>apache-snapshots</id>
