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/01/27 10:27:08 UTC
tomee git commit: tomee embedded maven plugin enhancements: double
exclusions cause if you specify classpath exclude you can miss few exclusions
impacting with maven for instance + fixing jndi names for webapps
Repository: tomee
Updated Branches:
refs/heads/develop 0ee520090 -> db433d69a
tomee embedded maven plugin enhancements: double exclusions cause if you specify classpath exclude you can miss few exclusions impacting with maven for instance + fixing jndi names for webapps
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db433d69
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db433d69
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db433d69
Branch: refs/heads/develop
Commit: db433d69a6bf618a0202b45c50e5d8d5f5708063
Parents: 0ee5200
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Jan 27 10:26:11 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Jan 27 10:26:11 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/tomee/embedded/Container.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/db433d69/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 72bb056..0337570 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -79,6 +79,7 @@ import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.log.NullLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.apache.xbean.finder.UrlSet;
import org.apache.xbean.finder.filter.Filters;
import org.codehaus.swizzle.stream.ReplaceStringsInputStream;
@@ -153,7 +154,11 @@ public class Container implements AutoCloseable {
}
}
- return deployPathsAsWebapp(context, jarList, docBase);
+ try {
+ return deployPathsAsWebapp(context, NewLoaderLogic.applyBuiltinExcludes(new UrlSet(jarList), null).getUrls(), docBase);
+ } catch (final MalformedURLException e) {
+ return deployPathsAsWebapp(context, jarList, docBase);
+ }
}
public Container deployPathsAsWebapp(final String context, final List<URL> jarList, final File docBase) {
@@ -166,7 +171,7 @@ public class Container implements AutoCloseable {
}
final File jarLocation = docBase == null ? fakeRootDir() : docBase;
- final WebModule webModule = new WebModule(new WebApp(), contextRoot, loader, jarLocation.getAbsolutePath(), contextRoot);
+ final WebModule webModule = new WebModule(new WebApp(), contextRoot, loader, jarLocation.getAbsolutePath(), contextRoot.replace("/", ""));
if (docBase == null) {
webModule.getProperties().put("fakeJarLocation", "true");
}
@@ -189,6 +194,8 @@ public class Container implements AutoCloseable {
final AppModule app = new AppModule(loader, null);
app.setStandloneWebModule();
+ app.setStandaloneModule(true);
+ app.setModuleId(webModule.getModuleId());
try {
webModule.getAltDDs().putAll(DeploymentLoader.getWebDescriptors(jarLocation));
DeploymentLoader.addWebModule(webModule, app);
Re: tomee git commit: tomee embedded maven plugin enhancements:
double exclusions cause if you specify classpath exclude you can miss few
exclusions impacting with maven for instance + fixing jndi names for webapps
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hello Thiago
true, will fix it quickly
Romain Manni-Bucau
@rmannibucau
http://www.tomitribe.com
http://rmannibucau.wordpress.com
https://github.com/rmannibucau
2015-01-30 12:05 GMT+01:00 Thiago Veronezi <th...@veronezi.org>:
> Hi Romain,
>
> Heads up. It looks like this change breaks "tomee-embedded-maven-plugin".
>
> []s,
> Thiago.
>
>
> On Tue, Jan 27, 2015 at 4:27 AM, <rm...@apache.org> wrote:
>
>> Repository: tomee
>> Updated Branches:
>> refs/heads/develop 0ee520090 -> db433d69a
>>
>>
>> tomee embedded maven plugin enhancements: double exclusions cause if you
>> specify classpath exclude you can miss few exclusions impacting with maven
>> for instance + fixing jndi names for webapps
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db433d69
>> Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db433d69
>> Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db433d69
>>
>> Branch: refs/heads/develop
>> Commit: db433d69a6bf618a0202b45c50e5d8d5f5708063
>> Parents: 0ee5200
>> Author: Romain Manni-Bucau <rm...@apache.org>
>> Authored: Tue Jan 27 10:26:11 2015 +0100
>> Committer: Romain Manni-Bucau <rm...@apache.org>
>> Committed: Tue Jan 27 10:26:11 2015 +0100
>>
>> ----------------------------------------------------------------------
>> .../main/java/org/apache/tomee/embedded/Container.java | 11 +++++++++--
>> 1 file changed, 9 insertions(+), 2 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/tomee/blob/db433d69/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
>> b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
>> index 72bb056..0337570 100644
>> ---
>> a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
>> +++
>> b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
>> @@ -79,6 +79,7 @@ import org.apache.velocity.app.Velocity;
>> import org.apache.velocity.app.VelocityEngine;
>> import org.apache.velocity.runtime.log.NullLogChute;
>> import
>> org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
>> +import org.apache.xbean.finder.UrlSet;
>> import org.apache.xbean.finder.filter.Filters;
>> import org.codehaus.swizzle.stream.ReplaceStringsInputStream;
>>
>> @@ -153,7 +154,11 @@ public class Container implements AutoCloseable {
>> }
>> }
>>
>> - return deployPathsAsWebapp(context, jarList, docBase);
>> + try {
>> + return deployPathsAsWebapp(context,
>> NewLoaderLogic.applyBuiltinExcludes(new UrlSet(jarList), null).getUrls(),
>> docBase);
>> + } catch (final MalformedURLException e) {
>> + return deployPathsAsWebapp(context, jarList, docBase);
>> + }
>> }
>>
>> public Container deployPathsAsWebapp(final String context, final
>> List<URL> jarList, final File docBase) {
>> @@ -166,7 +171,7 @@ public class Container implements AutoCloseable {
>> }
>>
>> final File jarLocation = docBase == null ? fakeRootDir() :
>> docBase;
>> - final WebModule webModule = new WebModule(new WebApp(),
>> contextRoot, loader, jarLocation.getAbsolutePath(), contextRoot);
>> + final WebModule webModule = new WebModule(new WebApp(),
>> contextRoot, loader, jarLocation.getAbsolutePath(),
>> contextRoot.replace("/", ""));
>> if (docBase == null) {
>> webModule.getProperties().put("fakeJarLocation", "true");
>> }
>> @@ -189,6 +194,8 @@ public class Container implements AutoCloseable {
>>
>> final AppModule app = new AppModule(loader, null);
>> app.setStandloneWebModule();
>> + app.setStandaloneModule(true);
>> + app.setModuleId(webModule.getModuleId());
>> try {
>>
>> webModule.getAltDDs().putAll(DeploymentLoader.getWebDescriptors(jarLocation));
>> DeploymentLoader.addWebModule(webModule, app);
>>
>>
Re: tomee git commit: tomee embedded maven plugin enhancements:
double exclusions cause if you specify classpath exclude you can miss few
exclusions impacting with maven for instance + fixing jndi names for webapps
Posted by Thiago Veronezi <th...@veronezi.org>.
Hi Romain,
Heads up. It looks like this change breaks "tomee-embedded-maven-plugin".
[]s,
Thiago.
On Tue, Jan 27, 2015 at 4:27 AM, <rm...@apache.org> wrote:
> Repository: tomee
> Updated Branches:
> refs/heads/develop 0ee520090 -> db433d69a
>
>
> tomee embedded maven plugin enhancements: double exclusions cause if you
> specify classpath exclude you can miss few exclusions impacting with maven
> for instance + fixing jndi names for webapps
>
>
> Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
> Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db433d69
> Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db433d69
> Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db433d69
>
> Branch: refs/heads/develop
> Commit: db433d69a6bf618a0202b45c50e5d8d5f5708063
> Parents: 0ee5200
> Author: Romain Manni-Bucau <rm...@apache.org>
> Authored: Tue Jan 27 10:26:11 2015 +0100
> Committer: Romain Manni-Bucau <rm...@apache.org>
> Committed: Tue Jan 27 10:26:11 2015 +0100
>
> ----------------------------------------------------------------------
> .../main/java/org/apache/tomee/embedded/Container.java | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/tomee/blob/db433d69/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
> ----------------------------------------------------------------------
> diff --git
> a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
> b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
> index 72bb056..0337570 100644
> ---
> a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
> +++
> b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
> @@ -79,6 +79,7 @@ import org.apache.velocity.app.Velocity;
> import org.apache.velocity.app.VelocityEngine;
> import org.apache.velocity.runtime.log.NullLogChute;
> import
> org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
> +import org.apache.xbean.finder.UrlSet;
> import org.apache.xbean.finder.filter.Filters;
> import org.codehaus.swizzle.stream.ReplaceStringsInputStream;
>
> @@ -153,7 +154,11 @@ public class Container implements AutoCloseable {
> }
> }
>
> - return deployPathsAsWebapp(context, jarList, docBase);
> + try {
> + return deployPathsAsWebapp(context,
> NewLoaderLogic.applyBuiltinExcludes(new UrlSet(jarList), null).getUrls(),
> docBase);
> + } catch (final MalformedURLException e) {
> + return deployPathsAsWebapp(context, jarList, docBase);
> + }
> }
>
> public Container deployPathsAsWebapp(final String context, final
> List<URL> jarList, final File docBase) {
> @@ -166,7 +171,7 @@ public class Container implements AutoCloseable {
> }
>
> final File jarLocation = docBase == null ? fakeRootDir() :
> docBase;
> - final WebModule webModule = new WebModule(new WebApp(),
> contextRoot, loader, jarLocation.getAbsolutePath(), contextRoot);
> + final WebModule webModule = new WebModule(new WebApp(),
> contextRoot, loader, jarLocation.getAbsolutePath(),
> contextRoot.replace("/", ""));
> if (docBase == null) {
> webModule.getProperties().put("fakeJarLocation", "true");
> }
> @@ -189,6 +194,8 @@ public class Container implements AutoCloseable {
>
> final AppModule app = new AppModule(loader, null);
> app.setStandloneWebModule();
> + app.setStandaloneModule(true);
> + app.setModuleId(webModule.getModuleId());
> try {
>
> webModule.getAltDDs().putAll(DeploymentLoader.getWebDescriptors(jarLocation));
> DeploymentLoader.addWebModule(webModule, app);
>
>