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 2015/05/22 12:28:01 UTC
[1/3] tomee git commit: fixing some test + avoiding npe when no p.xml
is found at appmodule level
Repository: tomee
Updated Branches:
refs/heads/master 961371dd1 -> 7293e6655
fixing some test + avoiding npe when no p.xml is found at appmodule level
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/39d2f255
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/39d2f255
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/39d2f255
Branch: refs/heads/master
Commit: 39d2f255dbc979708a27c3ac339a587b22b02eb3
Parents: 961371d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri May 22 12:08:28 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri May 22 12:08:28 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/config/DeploymentLoader.java | 2 +-
examples/cucumber-jvm/pom.xml | 8 +++++++-
.../org/apache/openejb/itest/legacy/LegacyServerTest.java | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/39d2f255/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index e88b0b2..b74e526 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -831,7 +831,7 @@ public class DeploymentLoader implements DeploymentFilterable {
{
final Object pXml = appModule.getAltDDs().get("persistence.xml");
- List<URL> persistenceXmls = List.class.isInstance(pXml) ? (List<URL>) pXml : new ArrayList<>(asList(URL.class.cast(pXml)));
+ List<URL> persistenceXmls = pXml == null ? null : (List.class.isInstance(pXml) ? (List<URL>) pXml : new ArrayList<>(asList(URL.class.cast(pXml))));
if (persistenceXmls == null) {
persistenceXmls = new ArrayList<>();
appModule.getAltDDs().put("persistence.xml", persistenceXmls);
http://git-wip-us.apache.org/repos/asf/tomee/blob/39d2f255/examples/cucumber-jvm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index 885e122..de06eab 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -32,7 +32,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
@@ -74,6 +74,12 @@
<artifactId>cucumber-openejb</artifactId>
<version>1.0.10</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/39d2f255/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
----------------------------------------------------------------------
diff --git a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
index 4316325..fd4d765 100644
--- a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
+++ b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
@@ -72,8 +72,8 @@ public class LegacyServerTest {
// System.setProperty("version", OpenEjbVersion.get().getVersion());
System.setProperty("openejb.client.connection.strategy", "roundrobin");
- logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.tomee", "openejb-standalone") + " - This may take a while...");
- final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
+ logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.openejb", "openejb-standalone") + " - This may take a while...");
+ final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
final File dir = Files.tmpdir();
[3/3] tomee git commit: no need of openejb-core 3
Posted by rm...@apache.org.
no need of openejb-core 3
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7293e665
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7293e665
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7293e665
Branch: refs/heads/master
Commit: 7293e6655bf41deb16392507a73c11277ee65cc7
Parents: cca3994
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri May 22 12:27:37 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri May 22 12:27:37 2015 +0200
----------------------------------------------------------------------
tck/cdi-tomee/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7293e665/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 00df2af..d7f0bb2 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -85,6 +85,12 @@
<artifactId>openwebbeans-porting</artifactId>
<version>${org.apache.openwebbeans.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
[2/3] tomee git commit: missing tomee-loader in war assemblies
Posted by rm...@apache.org.
missing tomee-loader in war assemblies
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cca3994d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cca3994d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cca3994d
Branch: refs/heads/master
Commit: cca3994dcbd460b63674dab9a9e598c5c2552de7
Parents: 39d2f25
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri May 22 12:20:47 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri May 22 12:20:47 2015 +0200
----------------------------------------------------------------------
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 2 +-
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 2 +-
tomee/tomee-webaccess/pom.xml | 4 ++--
tomee/tomee-webapp/src/main/assembly/war.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cca3994d/tomee/tomee-plume-webapp/src/main/assembly/war.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index ad525d9..a87a364 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -95,7 +95,7 @@
<outputDirectory>WEB-INF/lib</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.openejb:tomee-loader</include>
+ <include>org.apache.tomee:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/tomee/blob/cca3994d/tomee/tomee-plus-webapp/src/main/assembly/war.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
index 8f2943e..77ece96 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
@@ -90,7 +90,7 @@
<outputDirectory>WEB-INF/lib</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.openejb:tomee-loader</include>
+ <include>org.apache.tomee:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/tomee/blob/cca3994d/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index de351cf..0e99aec 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -279,7 +279,7 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.openejb.maven</groupId>
+ <groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
@@ -307,4 +307,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/cca3994d/tomee/tomee-webapp/src/main/assembly/war.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml
index 314d6b7..077b584 100644
--- a/tomee/tomee-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-webapp/src/main/assembly/war.xml
@@ -91,7 +91,7 @@
<outputDirectory>WEB-INF/lib</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.openejb:tomee-loader</include>
+ <include>org.apache.tomee:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>