You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/11/29 01:00:57 UTC
svn commit: r1415001 - in /openejb/trunk/openejb:
arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
arquillian/arquillian-to...
Author: rmannibucau
Date: Thu Nov 29 00:00:56 2012
New Revision: 1415001
URL: http://svn.apache.org/viewvc?rev=1415001&view=rev
Log:
reactivating the ability to configure app working dir for arquillian tomee embedded + fixing failing resource test + setting contextxml path when created the standardcontext from test
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SomeResourceFactory.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/ResourceMergeTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Thu Nov 29 00:00:56 2012
@@ -262,23 +262,7 @@ public abstract class TomEEContainer<Con
@Override
public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
try {
- String tmpDir = configuration.getAppWorkingDir();
- File file, folderFile;
- int i = 0;
- do { // be sure we don't override something existing
- file = new File(tmpDir + File.separator + i++ + File.separator + archive.getName());
- if (file.isDirectory() || !file.getName().endsWith("ar")) {
- folderFile = file;
- } else {
- final String name = file.getName();
- folderFile = new File(file.getParentFile(), name.substring(0, name.length() - 4));
- }
- } while (file.getParentFile().exists()); // we will delete the parent (to clean even complicated unpacking)
- if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
- LOGGER.warning("can't create " + file.getParent());
- }
-
- archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file, true);
+ final File file = dumpFile(archive);
final String fileName = file.getName();
if (fileName.endsWith(".war")) { // ??
@@ -326,6 +310,32 @@ public abstract class TomEEContainer<Con
}
}
+ protected File dumpFile(final Archive<?> archive) {
+ String tmpDir = configuration.getAppWorkingDir();
+ Files.deleteOnExit(new File(tmpDir));
+
+ File file, folderFile;
+ int i = 0;
+ do { // be sure we don't override something existing
+ file = new File(tmpDir + File.separator + i++ + File.separator + archive.getName());
+ if (file.isDirectory() || !file.getName().endsWith("ar")) {
+ folderFile = file;
+ } else {
+ final String name = file.getName();
+ folderFile = new File(file.getParentFile(), name.substring(0, name.length() - 4));
+ }
+ } while (file.getParentFile().exists()); // we will delete the parent (to clean even complicated unpacking)
+ if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
+ LOGGER.warning("can't create " + file.getParent());
+ }
+
+ Files.deleteOnExit(file.getParentFile());
+
+ archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file, true);
+
+ return file;
+ }
+
private Collection<String> apps() {
final Collection<String> paths = new ArrayList<String>();
try {
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Thu Nov 29 00:00:56 2012
@@ -96,11 +96,14 @@ public class EmbeddedTomEEContainer exte
}
@Override
- public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
+ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentException {
try {
+ /* don't do it since it should be configurable
final File tempDir = Files.createTempDir();
- final String name = archive.getName();
final File file = new File(tempDir, name);
+ */
+ final String name = archive.getName();
+ final File file = dumpFile(archive);
ARCHIVES.put(archive, file);
archiveWithTestInfo(archive).as(ZipExporter.class).exportTo(file, true);
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/ResourceMergeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/ResourceMergeTest.java?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/ResourceMergeTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/ResourceMergeTest.java Thu Nov 29 00:00:56 2012
@@ -26,26 +26,29 @@ import org.jboss.shrinkwrap.descriptor.a
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.annotation.Resource;
import javax.naming.NamingException;
+import static org.junit.Assert.assertNotNull;
+
@RunWith(Arquillian.class)
public class ResourceMergeTest {
@Deployment
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class, "resource.war")
- .addClasses(SomeResource.class)
- .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .getOrCreateResourceRef()
- .resRefName("some-resource")
- .mappedName("some-resource")
- .resType(SomeResource.class.getName())
- .up()
- .exportAsString()));
+ .addClasses(SomeResource.class, SomeResourceFactory.class)
+ .add(new StringAsset("<Context>\n" +
+ " <Resource name=\"some-resource\"\n" +
+ " type=\"" + SomeResource.class.getName() + "\"\n" +
+ " factory=\"" + SomeResourceFactory.class.getName() + "\"/>\n" +
+ "</Context>"), "META-INF/context.xml");
}
+ @Resource(name = "some-resource")
+ private SomeResource sr;
+
@Test
- public void noExceptionWereThrownDuringDeployment() throws NamingException {
- // no-op
+ public void checkResource() throws NamingException {
+ assertNotNull(sr);
}
}
Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SomeResourceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SomeResourceFactory.java?rev=1415001&view=auto
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SomeResourceFactory.java (added)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SomeResourceFactory.java Thu Nov 29 00:00:56 2012
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian.tests.tomcat;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
+import java.util.Hashtable;
+
+public class SomeResourceFactory implements ObjectFactory {
+ @Override
+ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception {
+ return new SomeResource();
+ }
+}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Thu Nov 29 00:00:56 2012
@@ -356,6 +356,7 @@
<skip>true</skip>
<parallel>none</parallel>
<threadCount>1</threadCount>
+<includes><include>**/ResourceMergeTest*</include></includes>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Thu Nov 29 00:00:56 2012
@@ -381,16 +381,19 @@ public class TomcatWebAppBuilder impleme
// look for context.xml
final File war = new File(webApp.path);
InputStream contextXml = null;
+ URL contextXmlUrl = null;
if (war.isDirectory()) {
final File cXml = new File(war, Constants.ApplicationContextXml);
if (cXml.exists()) {
contextXml = IO.read(cXml);
+ contextXmlUrl = cXml.toURI().toURL();
logger.info("using context file " + cXml.getAbsolutePath());
}
} else { // war
final JarFile warAsJar = new JarFile(war);
final JarEntry entry = warAsJar.getJarEntry(Constants.ApplicationContextXml);
if (entry != null) {
+ contextXmlUrl = new URL("jar:file://" + war.getAbsolutePath() + "!/" + Constants.ApplicationContextXml);
contextXml = warAsJar.getInputStream(entry);
}
}
@@ -400,6 +403,7 @@ public class TomcatWebAppBuilder impleme
synchronized (CONTEXT_DIGESTER) {
try {
standardContext = (StandardContext) CONTEXT_DIGESTER.parse(contextXml);
+ standardContext.setConfigFile(contextXmlUrl);
} catch (Exception e) {
logger.error("can't parse context xml for webapp " + webApp.path, e);
standardContext = new StandardContext();
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml?rev=1415001&r1=1415000&r2=1415001&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml Thu Nov 29 00:00:56 2012
@@ -40,4 +40,9 @@
<ServiceProvider id="Default ORB" parent="org.apache.openejb.embedded:Default ORB"/>
<ServiceProvider id="Default Mail Session" parent="org.apache.openejb.embedded:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider" parent="org.apache.openejb.embedded:Default Remote Jndi Provider"/>
+ <ServiceProvider id="ProvidedByTomcat" service="Resource" class-name="org.apache.tomee.catalina.TomcatResourceFactory" factory-name="create">
+ jndiName =
+ appName =
+ factory =
+ </ServiceProvider>
</ServiceJar>
\ No newline at end of file