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 22:20:06 UTC
[1/8] tomee git commit: Add TomEE response header
Repository: tomee
Updated Branches:
refs/heads/release-tomee-1.7.2 428ea6045 -> 6d7188165
Add TomEE response header
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/30a37af0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/30a37af0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/30a37af0
Branch: refs/heads/release-tomee-1.7.2
Commit: 30a37af090554cba33f500a4bd01e3f5fb46ac77
Parents: 428ea60
Author: AndyGee <an...@gmx.de>
Authored: Thu May 7 21:30:40 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:18:22 2015 +0100
----------------------------------------------------------------------
.../apache/tomee/RemoteTomEEEJBContainerIT.java | 2 +-
.../java/org/apache/tomee/installer/Installer.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/30a37af0/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
index 0fa6828..94bfe30 100644
--- a/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
+++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
@@ -67,7 +67,7 @@ public class RemoteTomEEEJBContainerIT {
" <!-- TomEE plugin for Tomcat -->\n" +
" <Listener className=\"org.apache.tomee.catalina.ServerListener\" />\n" +
" <Service name=\"Catalina\">\n" +
- " <Connector port=\"" + http + "\" protocol=\"HTTP/1.1\" />\n" +
+ " <Connector port=\"" + http + "\" protocol=\"HTTP/1.1\" xpoweredBy=\"false\" server=\"Apache TomEE\" />\n" +
" <Engine name=\"Catalina\" defaultHost=\"localhost\">\n" +
" <Host name=\"localhost\" appBase=\"webapps\"\n" +
" unpackWARs=\"true\" autoDeploy=\"true\">\n" +
http://git-wip-us.apache.org/repos/asf/tomee/blob/30a37af0/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 6febc40..aae1fbc 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -447,6 +447,23 @@ public class Installer implements InstallerInterface {
alerts.addError("Error while adding listener to server.xml file", e);
}
+ //Add TomEE header
+ try {
+ newServerXml = Installers.replace(serverXmlOriginal,
+ "<Connector port=\"8080\"",
+ "<Connector port=\"8080\"",
+ "/>",
+ "xpoweredBy=\"false\" server=\"Apache TomEE\" />");
+
+ newServerXml = Installers.replace(serverXmlOriginal,
+ "<Connector port=\"8443\"",
+ "<Connector port=\"8443\"",
+ "/>",
+ "xpoweredBy=\"false\" server=\"Apache TomEE\" />");
+ } catch (final IOException e) {
+ alerts.addError("Error adding server attribute to server.xml file", e);
+ }
+
// overwrite server.xml
if (Installers.writeAll(paths.getServerXmlFile(), newServerXml, alerts)) {
alerts.addInfo("Add OpenEJB listener to server.xml");
[6/8] tomee git commit: PMD
Posted by jg...@apache.org.
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6bcfc6f1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6bcfc6f1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6bcfc6f1
Branch: refs/heads/release-tomee-1.7.2
Commit: 6bcfc6f1df5626cf9b4e37a3b3bdc6b90e8b597e
Parents: c6b76a2
Author: AndyGee <an...@gmx.de>
Authored: Tue May 12 00:58:29 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:19:17 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/loader/ProvisioningUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6bcfc6f1/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
index 2d4a26b..3cb68c9 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
@@ -236,6 +236,7 @@ public final class ProvisioningUtil {
final XPath xp = xpf.newXPath();
home = xp.evaluate("//settings/localRepository/text()", document.getDocumentElement());
} catch (final Exception ignore) {
+ //no-op
}
}
}
[3/8] tomee git commit: Typo
Posted by jg...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5e9524a2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5e9524a2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5e9524a2
Branch: refs/heads/release-tomee-1.7.2
Commit: 5e9524a2a7b0bbecf93cfc47985f77a806282038
Parents: 14855cf
Author: AndyGee <an...@gmx.de>
Authored: Thu May 7 22:58:24 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:18:45 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/tomee/installer/Installer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5e9524a2/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index aae1fbc..c5c5b75 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -449,13 +449,13 @@ public class Installer implements InstallerInterface {
//Add TomEE header
try {
- newServerXml = Installers.replace(serverXmlOriginal,
+ newServerXml = Installers.replace(newServerXml,
"<Connector port=\"8080\"",
"<Connector port=\"8080\"",
"/>",
"xpoweredBy=\"false\" server=\"Apache TomEE\" />");
- newServerXml = Installers.replace(serverXmlOriginal,
+ newServerXml = Installers.replace(newServerXml,
"<Connector port=\"8443\"",
"<Connector port=\"8443\"",
"/>",
[2/8] tomee git commit: PMD
Posted by jg...@apache.org.
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/14855cf1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/14855cf1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/14855cf1
Branch: refs/heads/release-tomee-1.7.2
Commit: 14855cf14b0e8ec86270e325236411d58aa76404
Parents: 30a37af
Author: AndyGee <an...@gmx.de>
Authored: Thu May 7 22:07:04 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:18:33 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/14855cf1/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 5a0735e..7b7e8d2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -985,7 +985,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
}
}
}
- return info.className != null ? ((canLoad(classLoader, info.className) ? info.className : defaultType)) : defaultType;
+ return (info.className != null ? (canLoad(classLoader, info.className) ? info.className : defaultType) : defaultType);
}
private static boolean canLoad(final ClassLoader classLoader, final String type) {
[8/8] tomee git commit: TOMEE-1580 issue with p.xml root url when
p.mlx is in a jar + trying to fix datasource url in p.xml properties +
TOMEE-1585 fix concurrency in live registry of base ejb proxy handler (all
are backport from master)
Posted by jg...@apache.org.
TOMEE-1580 issue with p.xml root url when p.mlx is in a jar + trying to fix datasource url in p.xml properties + TOMEE-1585 fix concurrency in live registry of base ejb proxy handler (all are backport from master)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6d718816
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6d718816
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6d718816
Branch: refs/heads/release-tomee-1.7.2
Commit: 6d7188165520384b25bd3975e68805484a7d36ce
Parents: e4b29d0
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri May 15 15:30:29 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:19:35 2015 +0100
----------------------------------------------------------------------
.../apache/openejb/config/AppInfoBuilder.java | 16 +++++++++++
.../apache/openejb/config/ReadDescriptors.java | 7 +++--
.../openejb/core/ivm/BaseEjbProxyHandler.java | 30 +++++++++++---------
3 files changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d718816/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
index c2517cd..3b9c86f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
@@ -97,6 +97,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
import static org.apache.openejb.util.URLs.toFile;
/**
@@ -845,6 +847,13 @@ class AppInfoBuilder {
info.properties.setProperty(ECLIPSELINK_SESSION_CUSTOMIZER, PREFIX_SESSION_CUSTOMIZER);
}
}
+
+ for (final String key : singletonList("eclipselink.jdbc.sequence-connection-pool.non-jta-data-source")) {
+ final String ds = info.properties.getProperty(key);
+ if (ds != null && !ds.contains(":") /* java:, openejb:, other: namespace */) {
+ info.properties.setProperty(key, "java:openejb/Resource/" + ds);
+ }
+ }
} else if (info.provider == null || "org.apache.openjpa.persistence.PersistenceProviderImpl".equals(info.provider)) {
// Apply the overrides that apply to all persistence units of this provider
@@ -895,6 +904,13 @@ class AppInfoBuilder {
// Apply the overrides that apply to just this persistence unit
override(appModule.getProperties(), info);
+
+ for (final String key : asList("javax.persistence.jtaDataSource", "javax.persistence.nonJtaDataSource")) {
+ final String ds = info.properties.getProperty(key);
+ if (ds != null && !ds.contains(":") /* java:, openejb:, other: namespace */) {
+ info.properties.setProperty(key, "java:openejb/Resource/" + ds);
+ }
+ }
}
private static void overrideFromSystemProp(final PersistenceUnitInfo info) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d718816/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 aaf31ed..5cd9f84 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
@@ -146,9 +146,12 @@ public class ReadDescriptors implements DynamicDeployer {
path = file.getAbsolutePath();
if (file.getName().endsWith("persistence.xml")) {
- final String parent = file.getParentFile().getName();
+ final File parentFile = file.getParentFile();
+ final String parent = parentFile.getName();
if (parent.equalsIgnoreCase("WEB-INF") || parent.equalsIgnoreCase("META-INF")) {
- file = file.getParentFile().getParentFile();
+ 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();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d718816/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
index 2a01773..34f9ef7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
@@ -52,6 +52,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.ReentrantLock;
import javax.ejb.AccessLocalException;
import javax.ejb.EJBException;
@@ -608,20 +610,20 @@ public abstract class BaseEjbProxyHandler implements InvocationHandler, Serializ
protected abstract Object _writeReplace(Object proxy) throws ObjectStreamException;
protected void registerHandler(final Object key, final BaseEjbProxyHandler handler) {
- HashSet set = (HashSet) getLiveHandleRegistry().get(key);
- if (set != null) {
- final ReentrantLock l = lock;
- l.lock();
-
- try {
- set.add(handler);
- } finally {
- l.unlock();
- }
- } else {
+ Set set = (Set) getLiveHandleRegistry().get(key);
+ if (set == null) {
set = new HashSet();
+ final Object existing = getLiveHandleRegistry().putIfAbsent(key, set);
+ if (existing != null) {
+ set = Set.class.cast(existing);
+ }
+ }
+ final ReentrantLock l = lock;
+ l.lock();
+ try {
set.add(handler);
- getLiveHandleRegistry().put(key, set);
+ } finally {
+ l.unlock();
}
}
@@ -640,7 +642,7 @@ public abstract class BaseEjbProxyHandler implements InvocationHandler, Serializ
this.beanContextRef = new WeakReference<BeanContext>(beanContext);
}
- public HashMap getLiveHandleRegistry() {
+ public ConcurrentMap getLiveHandleRegistry() {
final BeanContext beanContext = getBeanContext();
ProxyRegistry proxyRegistry = beanContext.get(ProxyRegistry.class);
if (proxyRegistry == null) {
@@ -675,6 +677,6 @@ public abstract class BaseEjbProxyHandler implements InvocationHandler, Serializ
private static class ProxyRegistry {
- protected final HashMap liveHandleRegistry = new HashMap();
+ protected final ConcurrentMap liveHandleRegistry = new ConcurrentHashMap();
}
}
[7/8] tomee git commit: Should be correct now - No documentation,
but would be nice
Posted by jg...@apache.org.
Should be correct now - No documentation, but would be nice
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e4b29d0c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e4b29d0c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e4b29d0c
Branch: refs/heads/release-tomee-1.7.2
Commit: e4b29d0ce98793e44dc285cbae5814cc10dded60
Parents: 6bcfc6f
Author: AndyGee <an...@gmx.de>
Authored: Tue May 12 01:24:39 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:19:26 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/loader/ProvisioningUtil.java | 5 +++++
.../java/org/apache/openejb/loader/ProvisioningUtilTest.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e4b29d0c/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
index 3cb68c9..8359900 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
@@ -124,6 +124,11 @@ public final class ProvisioningUtil {
return location.substring(idx + 1, location.length());
}
+ /**
+ *
+ * @param rawLocation
+ * @return
+ */
public static String realLocation(final String rawLocation) {
if (hasHttpOrHttpsPrefix(rawLocation)) {
final File file = cacheFile(lastPart(rawLocation));
http://git-wip-us.apache.org/repos/asf/tomee/blob/e4b29d0c/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java b/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
index f59494e..0bc5ca0 100644
--- a/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
+++ b/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
@@ -32,6 +32,6 @@ public class ProvisioningUtilTest {
@Test
public void mvnUrlRawLocation() throws MalformedURLException {
final String url = ProvisioningUtil.realLocation("mvn:org.apache.openejb:apache-tomee:x.y.z-SNAPSHOT:zip");
- assertEquals("https/repository.apache.org/snapshots/org/apache/openejb/apache-tomee/x.y.z-SNAPSHOT/apache-tomee-x.y.z-SNAPSHOT.zip", url);
+ assertEquals("https://repository.apache.org/snapshots/org/apache/openejb/apache-tomee/x.y.z-SNAPSHOT/apache-tomee-x.y.z-SNAPSHOT.zip", url);
}
}
[4/8] tomee git commit: Remove duplicate & add schema
Posted by jg...@apache.org.
Remove duplicate & add schema
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a4592478
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a4592478
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a4592478
Branch: refs/heads/release-tomee-1.7.2
Commit: a459247877a89d57a782dfbfde13cb44e78ef6e8
Parents: 5e9524a
Author: AndyGee <an...@gmx.de>
Authored: Mon May 11 21:45:22 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:18:56 2015 +0100
----------------------------------------------------------------------
examples/cdi-event-realm/pom.xml | 6 ------
.../main/resources/META-INF/spring/calculator-camel-ctx.xml | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a4592478/examples/cdi-event-realm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-event-realm/pom.xml b/examples/cdi-event-realm/pom.xml
index 2897b24..9532661 100644
--- a/examples/cdi-event-realm/pom.xml
+++ b/examples/cdi-event-realm/pom.xml
@@ -87,12 +87,6 @@
<version>6.0-6</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
<!-- Needed to observe events in the AuthBean -->
<dependency>
<groupId>org.apache.openejb</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/a4592478/examples/simple-osgi/simple-osgi-camel-client/src/main/resources/META-INF/spring/calculator-camel-ctx.xml
----------------------------------------------------------------------
diff --git a/examples/simple-osgi/simple-osgi-camel-client/src/main/resources/META-INF/spring/calculator-camel-ctx.xml b/examples/simple-osgi/simple-osgi-camel-client/src/main/resources/META-INF/spring/calculator-camel-ctx.xml
index 0e082ea..f1ed86c 100644
--- a/examples/simple-osgi/simple-osgi-camel-client/src/main/resources/META-INF/spring/calculator-camel-ctx.xml
+++ b/examples/simple-osgi/simple-osgi-camel-client/src/main/resources/META-INF/spring/calculator-camel-ctx.xml
@@ -19,7 +19,7 @@
xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring-2.8.3.xsd">
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camel:camelContext id="helloContext">
<camel:route id="TimerHelloRoute">
[5/8] tomee git commit: Fix m2Home alternate location & allow https
prefix. Fix init.
Posted by jg...@apache.org.
Fix m2Home alternate location & allow https prefix.
Fix init.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c6b76a28
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c6b76a28
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c6b76a28
Branch: refs/heads/release-tomee-1.7.2
Commit: c6b76a28aeac5af561a2a42803c5925928dc5eeb
Parents: a459247
Author: AndyGee <an...@gmx.de>
Authored: Tue May 12 00:43:18 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 21:19:04 2015 +0100
----------------------------------------------------------------------
.gitignore | 1 +
.../openejb/arquillian/common/MavenCache.java | 4 +-
.../apache/openejb/loader/ProvisioningUtil.java | 39 ++++++++++++++++++--
3 files changed, 38 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c6b76a28/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 92dd6e3..7da116c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ target
quick.bat
/tomee/tomee-plume-webapp/overlays/
/tomee/tomee-plus-webapp/overlays/
+/arquillian/arquillian-tomee-remote/temp
http://git-wip-us.apache.org/repos/asf/tomee/blob/c6b76a28/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
index 09bab04..3c87072 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
@@ -36,7 +36,7 @@ public class MavenCache {
// initializing the SystemInstance because we'll need it for configuration
try {
- SystemInstance.get().init(new Properties());
+ SystemInstance.init(new Properties());
} catch (final Exception e) {
// no-op
}
@@ -84,7 +84,7 @@ public class MavenCache {
os.write(buffer, 0, bytesRead);
}
} catch (final Exception e) {
- throw new DownloadException("Unable to download " + source + " to " + file.getAbsolutePath(), e);
+ throw new DownloadException("Unable to download " + source + " to " + file, e);
} finally {
if (is != null) {
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/c6b76a28/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
index fb25a8d..2d4a26b 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
@@ -16,12 +16,17 @@
*/
package org.apache.openejb.loader;
+import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -51,6 +56,7 @@ public final class ProvisioningUtil {
public static final String OPENEJB_DEPLOYER_CACHE_FOLDER = "openejb.deployer.cache.folder";
public static final String HTTP_PREFIX = "http";
+ public static final String HTTPS_PREFIX = "https";
public static final String MVN_PREFIX = "mvn:";
public static final String SNAPSHOT_SUFFIX = "-SNAPSHOT";
@@ -119,7 +125,7 @@ public final class ProvisioningUtil {
}
public static String realLocation(final String rawLocation) {
- if (rawLocation.startsWith(HTTP_PREFIX)) {
+ if (hasHttpOrHttpsPrefix(rawLocation)) {
final File file = cacheFile(lastPart(rawLocation));
if (file.exists()) {
return file.getAbsolutePath();
@@ -149,7 +155,8 @@ public final class ProvisioningUtil {
if (rawLocation.startsWith(MVN_PREFIX)) {
try {
final String repo1Url = quickMvnUrl(rawLocation.substring(MVN_PREFIX.length()).replace(":", "/"));
- return realLocation(repo1Url).replace(":", "/").replace("///","/");
+ final String real = realLocation(repo1Url);
+ return real;
} catch (final MalformedURLException e1) {
Logger.getLogger(ProvisioningUtil.class.getName()).severe("Can't find " + rawLocation);
}
@@ -213,7 +220,27 @@ public final class ProvisioningUtil {
}
private static String m2Home() {
- return SystemInstance.get().getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository/");
+ String home = "";
+ File f = new File(SystemInstance.get().getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository/"));
+
+ if (f.exists()) {
+ home = f.getAbsolutePath();
+ } else {
+ f = new File(SystemInstance.get().getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/settings.xml"));
+ if (f.exists()) {
+ try {
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ final DocumentBuilder builder = factory.newDocumentBuilder();
+ final Document document = builder.parse(f);
+ final XPathFactory xpf = XPathFactory.newInstance();
+ final XPath xp = xpf.newXPath();
+ home = xp.evaluate("//settings/localRepository/text()", document.getDocumentElement());
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ return (home.endsWith("/") ? home : home + "/");
}
private static String mvnArtifactPath(final String toParse, final String snapshotBase) throws MalformedURLException {
@@ -243,7 +270,7 @@ public final class ProvisioningUtil {
builder.append(version).append("/");
String artifactVersion;
- if (snapshotBase != null && snapshotBase.startsWith(HTTP_PREFIX) && version.endsWith(SNAPSHOT_SUFFIX)) {
+ if (snapshotBase != null && hasHttpOrHttpsPrefix(snapshotBase) && version.endsWith(SNAPSHOT_SUFFIX)) {
final String meta = snapshotBase + builder.toString() + "maven-metadata.xml";
final URL url = new URL(meta);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -280,6 +307,10 @@ public final class ProvisioningUtil {
return builder.append(".").append(type).toString();
}
+ private static boolean hasHttpOrHttpsPrefix(final String str) {
+ return str.startsWith(HTTP_PREFIX) || str.startsWith(HTTPS_PREFIX);
+ }
+
private static String extractLastSnapshotVersion(final String defaultVersion, final InputStream metadata) {
final QuickMvnMetadataParser handler = new QuickMvnMetadataParser();
try {