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 2013/02/22 17:52:11 UTC
svn commit: r1449114 - in
/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4: ./
src/main/java/org/apache/openejb/arquillian/openejb/
src/main/java/org/apache/openejb/arquillian/openejb/cucumber/
src/main/resources/META-INF/services/
Author: rmannibucau
Date: Fri Feb 22 16:52:11 2013
New Revision: 1449114
URL: http://svn.apache.org/r1449114
Log:
OPENEJB-2001 making cucumber archive: handling correct in openejb embedded arquillian adapter
Added:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/resources/META-INF/services/cucumber.runtime.io.ResourceIteratorFactory
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/pom.xml
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/pom.xml?rev=1449114&r1=1449113&r2=1449114&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/pom.xml Fri Feb 22 16:52:11 2013
@@ -106,13 +106,20 @@
<version>1.9.0</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-core</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>once</forkMode>
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java?rev=1449114&r1=1449113&r2=1449114&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java Fri Feb 22 16:52:11 2013
@@ -157,4 +157,9 @@ public class SWClassLoader extends Class
}
}
}
+
+ // to let frameworks using TCCL use the archive directly
+ public Archive<?> getArchive() {
+ return archive;
+ }
}
Added: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java?rev=1449114&view=auto
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java (added)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java Fri Feb 22 16:52:11 2013
@@ -0,0 +1,99 @@
+/**
+ * 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.openejb.cucumber;
+
+import cucumber.runtime.io.Resource;
+import cucumber.runtime.io.ResourceIteratorFactory;
+import org.apache.openejb.arquillian.openejb.SWClassLoader;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Filter;
+import org.jboss.shrinkwrap.api.Node;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+public class ArchiveResourceIteratorFactory implements ResourceIteratorFactory {
+ @Override
+ public boolean isFactoryFor(final URL url) {
+ return url.getProtocol().startsWith("archive");
+ }
+
+ @Override
+ public Iterator<Resource> createIterator(URL url, String path, String suffix) {
+ return findResources(path, suffix).iterator();
+ }
+
+ private Collection<Resource> findResources(final String path, final String suffix) {
+ final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ final Collection<Resource> resources = new ArrayList<Resource>();
+ if (SWClassLoader.class.isInstance(loader)) {
+ final Archive<?> archive = SWClassLoader.class.cast(loader).getArchive();
+ final ClassLoader parent = loader.getParent();
+ final Map<ArchivePath, Node> content = archive.getContent(new Filter<ArchivePath>() {
+ @Override
+ public boolean include(final ArchivePath object) {
+ final String currentPath = classloaderPath(object);
+
+ return !(parent != null && parent.getResource(currentPath) != null)
+ && currentPath.startsWith('/' + path) && currentPath.endsWith(suffix);
+
+ }
+ });
+
+ for (final Map.Entry<ArchivePath, Node> entry : content.entrySet()) {
+ resources.add(new SWResource(entry.getKey(), entry.getValue()));
+ }
+ }
+ return resources;
+ }
+
+ private static class SWResource implements Resource {
+ private final Node node;
+ private final String path;
+
+ public SWResource(final ArchivePath key, final Node value) {
+ path = classloaderPath(key);
+ node = value;
+ }
+
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return node.getAsset().openStream();
+ }
+
+ @Override
+ public String getClassName() {
+ return path.replace('/', '.');
+ }
+ }
+
+ private static String classloaderPath(ArchivePath key) {
+ return key.get().replace("/WEB-INF/classes/", "");
+ }
+}
+
Added: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/resources/META-INF/services/cucumber.runtime.io.ResourceIteratorFactory
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/resources/META-INF/services/cucumber.runtime.io.ResourceIteratorFactory?rev=1449114&view=auto
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/resources/META-INF/services/cucumber.runtime.io.ResourceIteratorFactory (added)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/resources/META-INF/services/cucumber.runtime.io.ResourceIteratorFactory Fri Feb 22 16:52:11 2013
@@ -0,0 +1 @@
+org.apache.openejb.arquillian.openejb.cucumber.ArchiveResourceIteratorFactory