Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@tomee.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rmannibucau@apache.org
To: commits@tomee.apache.org
Message-Id: <51afcae6451b41cba3df5043663d0e23@git.apache.org>
Subject: tomee git commit: test showing how to use resources.xml in a war in a
 ear
Date: Tue,  9 May 2017 07:01:55 +0000 (UTC)
archived-at: Tue, 09 May 2017 07:01:57 -0000

Repository: tomee
Updated Branches:
  refs/heads/master 5d04bc4ce -> b60e6fd1b


test showing how to use resources.xml in a war in a ear


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b60e6fd1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b60e6fd1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b60e6fd1

Branch: refs/heads/master
Commit: b60e6fd1ba09b30f68bceab75eae008bd0762311
Parents: 5d04bc4
Author: rmannibucau <rmannibucau@apache.org>
Authored: Tue May 9 09:01:49 2017 +0200
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Tue May 9 09:01:49 2017 +0200

----------------------------------------------------------------------
 arquillian/arquillian-tomee-remote/pom.xml      |  6 ++
 .../arquillian/EarWarResourcesXmlTest.java      | 65 ++++++++++++++++++++
 2 files changed, 71 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b60e6fd1/arquillian/arquillian-tomee-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index b3eaf03..0000bea 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -176,6 +176,12 @@
       <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.10.1.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/tomee/blob/b60e6fd1/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/EarWarResourcesXmlTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/EarWarResourcesXmlTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/EarWarResourcesXmlTest.java
new file mode 100644
index 0000000..81b7cfb
--- /dev/null
+++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/EarWarResourcesXmlTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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;
+
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.apache.openejb.loader.JarLocation.jarLocation;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Arquillian.class)
+public class EarWarResourcesXmlTest {
+    @Deployment
+    public static Archive<?> app() {
+        return ShrinkWrap.create(EnterpriseArchive.class, "EarWarResourcesXmlTest.ear")
+                .addAsModule(ShrinkWrap.create(WebArchive.class, "web.war")
+                        .addClass(EarWarResourcesXmlTest.class)
+                        .addAsLibraries(jarLocation(EmbeddedDriver.class))
+                        .addAsWebInfResource(new StringAsset("<resources>\n" +
+                                "  <Resource id=\"derby\" type=\"DataSource\">\n" +
+                                "    JdbcDriver = org.apache.derby.jdbc.EmbeddedDriver\n" +
+                                "    JdbcUrl = jdbc:derby:memory:EarWarResourcesXmlTest;create=true\n" +
+                                "    UserName = SA\n" +
+                                "    Lazy = true\n" +
+                                "  </Resource>\n" +
+                                "</resources>"), "resources.xml"));
+    }
+
+    @Resource(name = "derby")
+    private DataSource ds;
+
+    @Test
+    public void checkServerInfo() throws SQLException {
+        try (final Connection c = ds.getConnection()) {
+            assertEquals("jdbc:derby:memory:EarWarResourcesXmlTest", c.getMetaData().getURL());
+        }
+    }
+}