Author: rmannibucau
Date: Fri Nov 9 15:51:29 2012
New Revision: 1407503
URL: http://svn.apache.org/viewvc?rev=1407503&view=rev
Log:
support WEB-INF/classes/META-INF/beans.xml in arquillian embedded adapter
Added:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/WARArquillianTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1407503&r1=1407502&r2=1407503&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
Fri Nov 9 15:51:29 2012
@@ -42,7 +42,6 @@ import org.jboss.shrinkwrap.api.asset.As
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.FileAsset;
import org.jboss.shrinkwrap.api.asset.UrlAsset;
-import org.jboss.shrinkwrap.api.classloader.ShrinkWrapClassLoader;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.impl.base.filter.IncludeRegExpPaths;
@@ -162,7 +161,10 @@ public class OpenEJBArchiveProcessor {
appModule.getEjbModules().add(ejbModule);
{
- final Node beansXml = archive.get(prefix.concat(BEANS_XML));
+ Node beansXml = archive.get(prefix.concat(BEANS_XML));
+ if (beansXml == null && WEB_INF.equals(prefix)) {
+ beansXml =
archive.get(WEB_INF_CLASSES.concat(META_INF).concat(BEANS_XML));
+ }
if (beansXml != null) {
ejbModule.getAltDDs().put(BEANS_XML, new
AssetSource(beansXml.getAsset()));
}
@@ -170,8 +172,8 @@ public class OpenEJBArchiveProcessor {
{
Node persistenceXml = archive.get(prefix.concat(PERSISTENCE_XML));
- if (persistenceXml == null && prefix.startsWith("WEB-INF")) { //
particular case
- persistenceXml =
archive.get(prefix.concat("classes/META-INF/").concat(PERSISTENCE_XML));
+ if (persistenceXml == null && WEB_INF.equals(prefix)) {
+ persistenceXml =
archive.get(WEB_INF_CLASSES.concat(META_INF).concat(PERSISTENCE_XML));
}
if (persistenceXml != null) {
final Asset asset = persistenceXml.getAsset();
Added:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/WARArquillianTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/WARArquillianTest.java?rev=1407503&view=auto
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/WARArquillianTest.java
(added)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/WARArquillianTest.java
Fri Nov 9 15:51:29 2012
@@ -0,0 +1,57 @@
+/**
+ * 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;
+
+import org.apache.openejb.loader.SystemInstance;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Arquillian.class)
+public class WARArquillianTest {
+ @Inject
+ private ABean bean;
+
+ @Deployment
+ public static WebArchive archive() {
+ return ShrinkWrap.create(WebArchive.class,
WARArquillianTest.class.getSimpleName().concat(".war"))
+ .addClasses(ABean.class)
+ .addAsWebInfResource(EmptyAsset.INSTANCE,
ArchivePaths.create("classes/META-INF/beans.xml"));
+ }
+
+ @Test
+ public void checkItIsStarted() {
+ assertTrue(SystemInstance.isInitialized());
+ }
+
+ @Test
+ public void checkInjections() {
+ assertNotNull(bean);
+ }
+
+ public static class ABean {}
+}
