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/12/15 11:07:50 UTC
[1/3] tomee git commit: using released jcs
Repository: tomee
Updated Branches:
refs/heads/master f336adb5b -> 15c64360f
using released jcs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/abd6c8a7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/abd6c8a7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/abd6c8a7
Branch: refs/heads/master
Commit: abd6c8a72be75f118717c0197edc0cd49e5f175e
Parents: f336adb
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Dec 15 11:07:09 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Dec 15 11:07:09 2015 +0100
----------------------------------------------------------------------
tck/cdi-tomee/pom.xml | 2 +-
tomee/tomee-plus-webapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/abd6c8a7/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 3f24efb..672f783 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -134,7 +134,7 @@
<!-- debugging: said otherwise you can remove them, kept to ease future debugging if needed -->
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>org.apache.tomee.patch</groupId>
<artifactId>commons-jcs-jcache</artifactId>
<version>${jcs.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/abd6c8a7/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 09e5e7a..cfa55fb 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -140,7 +140,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>org.apache.tomee.patch</groupId>
<artifactId>commons-jcs-jcache</artifactId>
<version>${jcs.version}</version>
<scope>runtime</scope>
[2/3] tomee git commit: using released jcs
Posted by rm...@apache.org.
using released jcs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3f29ce16
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3f29ce16
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3f29ce16
Branch: refs/heads/master
Commit: 3f29ce1646549ceb2088497456bf53023b8ca6dd
Parents: abd6c8a
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Dec 15 11:07:22 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Dec 15 11:07:22 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3f29ce16/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8cdb3d5..c34cc92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<openjpa.version>2.4.0</openjpa.version>
<org.apache.openwebbeans.version>1.6.2</org.apache.openwebbeans.version>
- <jcs.version>2.0-SNAPSHOT</jcs.version>
+ <jcs.version>2.0-M1</jcs.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
[3/3] tomee git commit: excluding java.lang.Process from default
deserializable classes + ensuring openejb-client BlacklistClassResolver uses
the same config as server one by default
Posted by rm...@apache.org.
excluding java.lang.Process from default deserializable classes + ensuring openejb-client BlacklistClassResolver uses the same config as server one by default
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/15c64360
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/15c64360
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/15c64360
Branch: refs/heads/master
Commit: 15c64360f610aac9bd13dd370bc9e0f36417b045
Parents: 3f29ce1
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Dec 15 11:07:53 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Dec 15 11:07:53 2015 +0100
----------------------------------------------------------------------
.../apache/openejb/core/rmi/BlacklistClassResolver.java | 2 +-
.../org/apache/openejb/client/EjbObjectInputStream.java | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/15c64360/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
index 0d3b994..1a07ec8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
@@ -22,7 +22,7 @@ public class BlacklistClassResolver {
public static final BlacklistClassResolver DEFAULT = new BlacklistClassResolver(
toArray(System.getProperty(
"tomee.serialization.class.blacklist",
- "org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan")),
+ "org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process")),
toArray(System.getProperty("tomee.serialization.class.whitelist")));
private final String[] blacklist;
http://git-wip-us.apache.org/repos/asf/tomee/blob/15c64360/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
index bb9ea83..1a0abe7 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
@@ -26,9 +26,7 @@ import java.lang.reflect.Proxy;
* @version $Rev$ $Date$
*/
public class EjbObjectInputStream extends ObjectInputStream {
- public static final BlacklistClassResolver DEFAULT = new BlacklistClassResolver(
- new String[]{"org.codehaus.groovy.runtime.", "org.apache.commons.collections.functors.", "org.apache.xalan"},
- null);
+ private static final BlacklistClassResolver DEFAULT = new BlacklistClassResolver();
public EjbObjectInputStream(final InputStream in) throws IOException {
super(in);
@@ -92,11 +90,16 @@ public class EjbObjectInputStream extends ObjectInputStream {
public static class BlacklistClassResolver {
private static final String[] WHITELIST = toArray(System.getProperty("tomee.serialization.class.whitelist"));
- private static final String[] BLACKLIST = toArray(System.getProperty("tomee.serialization.class.blacklist"));
+ private static final String[] BLACKLIST = toArray(System.getProperty(
+ "tomee.serialization.class.blacklist", "org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process"));
private final String[] blacklist;
private final String[] whitelist;
+ protected BlacklistClassResolver() {
+ this(BLACKLIST, WHITELIST);
+ }
+
protected BlacklistClassResolver(final String[] blacklist, final String[] whitelist) {
this.whitelist = whitelist;
this.blacklist = blacklist;