You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/05/17 23:37:22 UTC
[1/3] tomee git commit: tomcat 7.0.62
Repository: tomee
Updated Branches:
refs/heads/release-tomee-1.7.2 6d7188165 -> 57cb87f6f
tomcat 7.0.62
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f95d9592
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f95d9592
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f95d9592
Branch: refs/heads/release-tomee-1.7.2
Commit: f95d9592f6d97104318d34c9eab45e77e07a8f9e
Parents: 6d71881
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 22:48:01 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 22:36:36 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/tomee/loader/TomEEJarScanner.java | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f95d9592/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 427c69b..e0039bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<jaxb.version>2.2.7</jaxb.version>
- <tomcat.version>7.0.61</tomcat.version>
+ <tomcat.version>7.0.62</tomcat.version>
<cxf.version>2.6.16</cxf.version>
<!--2.6.4 requires wss4j 1.6.8-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/f95d9592/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
index e6e21eb..e70f9d6 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
@@ -84,9 +84,17 @@ public class TomEEJarScanner extends StandardJarScanner {
tldConfigScanStream = TldConfig.class.getDeclaredMethod("tldScanStream", InputStream.class);
tldConfigScanStream.setAccessible(true);
- tldConfig = loader.loadClass("org.apache.catalina.startup.TldConfig$TldJarScannerCallback")
- .getDeclaredFields()[0]; // there is a unique field and this way it is portable
- //.getDeclaredField("this$0");
+
+ // .getDeclaredField("this$0");
+ final Field[] declaredFields = loader.loadClass("org.apache.catalina.startup.TldConfig$TldJarScannerCallback").getDeclaredFields();
+ Field tldConfigTmp = null;
+ for (final Field f : declaredFields) {
+ if ("org.apache.catalina.startup.TldConfig".equals(f.getType().getName())) {
+ tldConfigTmp = f;
+ break;
+ }
+ }
+ tldConfig = tldConfigTmp; // there is a unique field and this way it is portable
tldConfig.setAccessible(true);
final Class<?> tldLocationsCache = loader.loadClass("org.apache.jasper.compiler.TldLocationsCache");
[3/3] tomee git commit: TOMEE-1580 correct computing of jarFilesUrl
Posted by jg...@apache.org.
TOMEE-1580 correct computing of jarFilesUrl
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/57cb87f6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/57cb87f6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/57cb87f6
Branch: refs/heads/release-tomee-1.7.2
Commit: 57cb87f6fe45fb0f7fc43f557271da4ffee1cacf
Parents: 39fe3a0
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 23:05:59 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 22:36:53 2015 +0100
----------------------------------------------------------------------
.../openejb/persistence/PersistenceUnitInfoImpl.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/57cb87f6/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index 5883af4..c849ad6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -250,11 +250,17 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
this.persistenceUnitRootUrl = toUrl(root);
try {
+ if (!jarFiles.isEmpty()) {
+ final File tmpRoot;
+ if (root.getName().endsWith(".jar")) {
+ tmpRoot = root.getParentFile(); // lib for a war, / of the ear otherwise, no sense in other cases
+ } else {
+ tmpRoot = root;
+ }
- for (final String path : jarFiles) {
- File file = new File(root, path);
- file = file.getCanonicalFile();
- jarFileUrls.add(toUrl(file));
+ for (final String path : jarFiles) {
+ jarFileUrls.add(toUrl(new File(tmpRoot, path).getCanonicalFile()));
+ }
}
} catch (final IOException e) {
throw new IllegalStateException(e);
[2/3] tomee git commit: this part is not needed
Posted by jg...@apache.org.
this part is not needed
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/39fe3a03
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/39fe3a03
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/39fe3a03
Branch: refs/heads/release-tomee-1.7.2
Commit: 39fe3a03620fe01b7ab17b0e256d0e0c1239658e
Parents: f95d959
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 22:54:38 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 22:36:43 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/39fe3a03/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index 5cd9f84..81ccd72 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -150,8 +150,6 @@ public class ReadDescriptors implements DynamicDeployer {
final String parent = parentFile.getName();
if (parent.equalsIgnoreCase("WEB-INF") || parent.equalsIgnoreCase("META-INF")) {
file = parentFile.getParentFile();
- } else if (parent.equalsIgnoreCase("lib") && "WEB-INF".equals(parentFile.getParentFile().getName())) {
- file = parentFile.getParentFile().getParentFile();
} else { // we don't really know so simply go back (users will often put persistence.xml in root resource folder with arquillian)
file = file.getParentFile();
}