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 2014/11/25 01:24:57 UTC
[1/3] tomee git commit: TOMEE-1456 support endorsed libs
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 6bca9fb6c -> e85aee313
TOMEE-1456 support endorsed libs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8ae9e8e7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8ae9e8e7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8ae9e8e7
Branch: refs/heads/tomee-1.7.x
Commit: 8ae9e8e75e3f6fdc2079c95f2d4cf58ba7f736a1
Parents: 80ec6f1
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Nov 24 22:39:26 2014 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Nov 24 22:39:26 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8ae9e8e7/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 07029dd..ae8ea94 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -244,6 +244,10 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
protected List<String> libs;
@Parameter
+ protected List<String> endorsedLibs;
+
+
+ @Parameter
protected List<String> javaagents;
@Parameter(property = "tomee-plugin.persist-javaagents", defaultValue = "false")
@@ -344,6 +348,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
removeDefaultWebapps(removeTomeeWebapp, existingWebapps);
}
copyLibs(libs, new File(catalinaBase, libDir), "jar");
+ copyLibs(endorsedLibs, new File(catalinaBase, "endorsed"), "jar");
copyLibs(webapps, new File(catalinaBase, webappDir), "war");
copyLibs(apps, new File(catalinaBase, appDir), "jar");
overrideConf(config, "conf");
[3/3] tomee git commit: TOMEE-1456 add endorsedLib support
Posted by jg...@apache.org.
TOMEE-1456 add endorsedLib support
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e85aee31
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e85aee31
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e85aee31
Branch: refs/heads/tomee-1.7.x
Commit: e85aee313284350f103410a56e8c232117a6ae97
Parents: 66bd9b1
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Nov 24 23:40:13 2014 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Nov 24 23:40:13 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e85aee31/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index a4b7019..b9659f5 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -245,7 +245,6 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
@Parameter
protected List<String> endorsedLibs;
-
@Parameter
protected List<String> javaagents;
[2/3] tomee git commit: Merge branch 'tomee-1.7.x' of
https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.x
Posted by jg...@apache.org.
Merge branch 'tomee-1.7.x' of https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/66bd9b1f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/66bd9b1f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/66bd9b1f
Branch: refs/heads/tomee-1.7.x
Commit: 66bd9b1fb8b5545d97c095abd09b4cd3700eaa37
Parents: 8ae9e8e 6bca9fb
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Nov 24 22:40:01 2014 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Nov 24 22:40:01 2014 +0000
----------------------------------------------------------------------
.../org/apache/openejb/config/AutoConfig.java | 11 ++++++-
.../src/main/resources/META-INF/persistence.xml | 4 ---
.../openejb/maven/plugin/AbstractTomEEMojo.java | 2 +-
.../server/cxf/transport/event/BusCreated.java | 33 ++++++++++++++++++++
.../server/cxf/transport/util/CxfUtil.java | 15 +++++----
.../openejb/server/webservices/WsService.java | 22 +++++++++----
.../org/apache/tomee/installer/Installer.java | 2 +-
7 files changed, 70 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/66bd9b1f/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------