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 2014/12/20 09:57:01 UTC
tomee git commit: upgrading cucumber + fixing a typo in beans.xml url
check
Repository: tomee
Updated Branches:
refs/heads/develop 88a9af20d -> 64664a125
upgrading cucumber + fixing a typo in beans.xml url check
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/64664a12
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/64664a12
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/64664a12
Branch: refs/heads/develop
Commit: 64664a1255f4ea4bba78542e0c1acb68bce53aa9
Parents: 88a9af2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sat Dec 20 09:56:12 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sat Dec 20 09:56:12 2014 +0100
----------------------------------------------------------------------
arquillian/arquillian-openejb-embedded-5/pom.xml | 2 +-
.../openejb/OpenEJBArchiveProcessor.java | 17 ++++++++++++-----
.../cucumber/ArchiveResourceIteratorFactory.java | 9 +++++++--
3 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/64664a12/arquillian/arquillian-openejb-embedded-5/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/pom.xml b/arquillian/arquillian-openejb-embedded-5/pom.xml
index 041c0dd..55c25f5 100644
--- a/arquillian/arquillian-openejb-embedded-5/pom.xml
+++ b/arquillian/arquillian-openejb-embedded-5/pom.xml
@@ -145,7 +145,7 @@
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-core</artifactId>
- <version>1.1.1</version>
+ <version>1.1.8</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/64664a12/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
index 0d59ee1..350d722 100644
--- a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
+++ b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
@@ -93,7 +93,14 @@ public class OpenEJBArchiveProcessor {
private static final String PERSISTENCE_XML = "persistence.xml";
private static final String OPENEJB_JAR_XML = "openejb-jar.xml";
private static final String ENV_ENTRIES_PROPERTIES = "env-entries.properties";
- public static final String WEB_INF_CLASSES = "/WEB-INF/classes/";
+ private static final String WEB_INF_CLASSES = "/WEB-INF/classes/";
+
+ private static final ClassLoader EMPTY_LOADER = new ClassLoader() {
+ @Override
+ public URL getResource(final String name) {
+ return null;
+ }
+ };
public static AppModule createModule(final Archive<?> archive, final TestClass testClass, final Closeables closeables) {
final Class<?> javaClass;
@@ -163,7 +170,7 @@ public class OpenEJBArchiveProcessor {
final Map<String, Object> altDD = new HashMap<>();
final Node beansXml = findBeansXml(webArchive, WEB_INF);
- final List<URL> webappAdditionalPaths = new LinkedList<URL>();
+ final List<URL> webappAdditionalPaths = new LinkedList<>();
final CompositeBeans webAppBeansXml = new CompositeBeans();
final List<Archive> webAppArchives = new LinkedList<Archive>();
final Map<URL, List<String>> webAppClassesByUrl = new HashMap<URL, List<String>>();
@@ -331,10 +338,10 @@ public class OpenEJBArchiveProcessor {
new WebappAggregatedArchive.ScanXmlSaverFilter(false, null, classes, null)));
additionalPaths.add(url);
- final URLClassLoader loader = new URLClassLoader(new URL[] { url }, ClassLoader.getSystemClassLoader().getParent());
- for (final String beans : asList("/META-INF/beans.xml", "/META-INF/beans.xml")) {
+ final URLClassLoader loader = new URLClassLoader(new URL[] { url }, EMPTY_LOADER);
+ for (final String beans : asList("META-INF/beans.xml", "/META-INF/beans.xml")) {
final URL u = loader.getResource(beans);
- if (beans != null) {
+ if (u != null) {
try {
DeploymentLoader.doMerge(u, earBeans, ReadDescriptors.readBeans(u.openStream()));
} catch (final OpenEJBException e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/64664a12/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
index a3d1e76..f4de4ec 100644
--- a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
+++ b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
@@ -84,13 +84,18 @@ public class ArchiveResourceIteratorFactory implements ResourceIteratorFactory {
}
@Override
+ public String getAbsolutePath() {
+ return path;
+ }
+
+ @Override
public InputStream getInputStream() throws IOException {
return node.getAsset().openStream();
}
@Override
- public String getClassName() {
- return path.replace('/', '.');
+ public String getClassName(final String extension) {
+ return path.replace('/', '.') + extension;
}
}