tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [41/50] [abbrv] tomee git commit: fix duplicate persistence.xml in classpath
Date Thu, 26 Jul 2018 10:18:56 GMT
fix duplicate persistence.xml in classpath


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

Branch: refs/heads/master
Commit: 26d3300e87c1a803a792e605c79dc9f2ac60313d
Parents: 36f420a
Author: Mark Struberg <struberg@apache.org>
Authored: Sat Jun 9 16:25:03 2018 +0200
Committer: Mark Struberg <struberg@apache.org>
Committed: Sat Jun 9 16:25:03 2018 +0200

----------------------------------------------------------------------
 examples/polling-parent/polling-client/pom.xml                  | 4 ++--
 .../test/java/jug/rest/arquillian/SubjectServiceTomEETest.java  | 5 ++++-
 examples/polling-parent/pom.xml                                 | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/26d3300e/examples/polling-parent/polling-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index cb34e0a..20a5a4e 100644
--- a/examples/polling-parent/polling-client/pom.xml
+++ b/examples/polling-parent/polling-client/pom.xml
@@ -85,8 +85,8 @@
         <dependencies>
           <dependency>
             <groupId>org.apache.tomee</groupId>
-                  <artifactId>javaee-api</artifactId>
-       <version>8.0-SNAPSHOT</version>
+            <artifactId>javaee-api</artifactId>
+            <version>8.0-SNAPSHOT</version>
           </dependency>
           <dependency> <!-- because entities was enhanced -->
             <groupId>org.apache.openjpa</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/26d3300e/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
index aadd71e..ab7ccf4 100644
--- a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
+++ b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
@@ -52,7 +52,10 @@ public class SubjectServiceTomEETest {
         return new WebModule(SubjectServiceTomEETest.class).getArchive()
                 .addClass(VoteCounter.class)
                 .addPackage(Subject.class.getPackage()) // domain
-                .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml")
+
+                //X creates duplicate perstence units :(
+                //X.addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"),
"persistence.xml")
+
                 .addAsWebInfResource(new ClassLoaderAsset("META-INF/env-entries.properties"),
"env-entries.properties")
                 .addAsWebInfResource(new ClassLoaderAsset("META-INF/resources.xml"), "resources.xml")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")

http://git-wip-us.apache.org/repos/asf/tomee/blob/26d3300e/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 1dde83a..e7c7395 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -82,8 +82,8 @@
       <!-- API -->
       <dependency>
         <groupId>org.apache.tomee</groupId>
-              <artifactId>javaee-api</artifactId>
-       <version>8.0-SNAPSHOT</version>
+        <artifactId>javaee-api</artifactId>
+        <version>8.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <dependency>


Mime
View raw message