buildbot failure in ASF Buildbot on tomee-trunk-ubuntu-jvm8

[buildbot]

The Buildbot has detected a new failure on builder tomee-trunk-ubuntu-jvm8 
while building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/142

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build
Build Source Stamp: [branch master] c63f2ec304a174ccefd88dda48bbe440c2036a5f
Blamelist: Romain Manni-Bucau 

BUILD FAILED: failed test

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/146

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] c63f2ec304a174ccefd88dda48bbe440c2036a5f
Blamelist: Romain Manni-Bucau 

BUILD FAILED: failed test

Sincerely,
 -The Buildbot

tomee git commit: fixing app composer container handling

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 06f4b74a9 -> c63f2ec30


fixing app composer container handling


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c63f2ec3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c63f2ec3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c63f2ec3

Branch: refs/heads/master
Commit: c63f2ec304a174ccefd88dda48bbe440c2036a5f
Parents: 06f4b74
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 18:37:28 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 18:37:28 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 14 +++---
 .../junit/ContainerAndApplicationRulesTest.java | 46 
 2 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c63f2ec3/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index d7c42f2..bc5fefd 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -385,6 +385,13 @@ public class ApplicationComposers {
 }
 
 public void deployApp(final Object inputTestInstance) throws Exception {
+// test injections
+ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
+if (testClassFinder == null) {
+testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
+testClassFinder = testClassFinders.remove(inputTestInstance);
+}
+
 final ClassLoader loader = testClass.getClassLoader();
 AppModule appModule = new AppModule(loader, testClass.getSimpleName());
 
@@ -731,13 +738,6 @@ public class ApplicationComposers {
 
 System.getProperties().put(OPENEJB_APPLICATION_COMPOSER_CONTEXT, 
appContext.getGlobalJndiContext());
 
-// test injections
-ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
-if (testClassFinder == null) {
-testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
-testClassFinder = testClassFinders.remove(inputTestInstance);
-}
-
 final List fields = new 
ArrayList<>(testClassFinder.findAnnotatedFields(AppResource.class));
 
fields.addAll(testClassFinder.findAnnotatedFields(org.apache.openejb.junit.AppResource.class));
 for (final Field field : fields) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/c63f2ec3/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
new file mode 100644
index 000..1f0ce56
--- /dev/null
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
@@ -0,0 +1,46 @@
+package org.apache.openejb.junit;
+
+import org.apache.openejb.api.configuration.PersistenceUnitDefinition;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class ContainerAndApplicationRulesTest {
+private final ContainerRule instanceContainer = new ContainerRule(new 
Container());
+private final ApplicationRule instanceServer = new ApplicationRule(new 
App());
+
+@Rule
+public final TestRule rule = 
RuleChain.outerRule(instanceContainer).around(instanceServer);
+
+@Test
+public void test() {
+assertNotNull(instanceServer.getInstance(App.class).v);
+assertNull(instanceContainer.getInstance(Container.class).ignored);
+}
+
+@org.apache.openejb.testing.Classes(cdi = true, value = Ignored.class) // 
@Classes invalid for a container
+public static class Container {
+@Inject
+private Provider ignored;
+}
+
+@PersistenceUnitDefinition
+@org.apache.openejb.testing.Classes(context = "App1", cdi = true, value = 
Valuable.class)
+public static class App {
+@Inject
+private Valuable v;
+}
+
+public static class Ignored {
+

tomee git commit: some NPE protections

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 04294bfde -> f9f73a49b


some NPE protections


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f9f73a49
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f9f73a49
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f9f73a49

Branch: refs/heads/master
Commit: f9f73a49bc51e56613da9e64c85b79502fcb5b2a
Parents: 04294bf
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 19:31:31 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 19:31:31 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 35 +++-
 .../apache/openejb/bval/BeanValidationTest.java |  4 +++
 2 files changed, 30 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f73a49/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index bc5fefd..4f54482 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -373,8 +373,7 @@ public class ApplicationComposers {
 
 @SuppressWarnings("unchecked")
 public void before(final Object inputTestInstance) throws Exception {
-// we hacked testInstance while we were not aware of it, now we can 
solve it
-testClassFinders.put(inputTestInstance, testClassFinders.remove(this));
+fixFakeClassFinder(inputTestInstance);
 
 startContainer(inputTestInstance);
 
@@ -385,12 +384,7 @@ public class ApplicationComposers {
 }
 
 public void deployApp(final Object inputTestInstance) throws Exception {
-// test injections
-ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
-if (testClassFinder == null) {
-testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
-testClassFinder = testClassFinders.remove(inputTestInstance);
-}
+final ClassFinder testClassFinder = 
fixFakeClassFinder(inputTestInstance);
 
 final ClassLoader loader = testClass.getClassLoader();
 AppModule appModule = new AppModule(loader, testClass.getSimpleName());
@@ -773,6 +767,29 @@ public class ApplicationComposers {
 testClassFinders.put(this, testClassFinder);
 }
 
+private ClassFinder fixFakeClassFinder(final Object inputTestInstance) {
+// test injections, we faked the instance before having it so ensuring 
we use the right finder
+ClassFinder testClassFinder = testClassFinders.get(inputTestInstance);
+if (testClassFinder == null) {
+final ApplicationComposers self = this;
+final ClassFinder remove = testClassFinders.remove(self);
+if (remove != null) {
+testClassFinders.put(inputTestInstance, remove);
+testClassFinder = remove;
+afterRunnables.add(new Runnable() { // reset state for next 
test
+@Override
+public void run() {
+final ClassFinder classFinder = 
testClassFinders.remove(inputTestInstance);
+if (classFinder != null) {
+testClassFinders.put(self, classFinder);
+}
+}
+});
+}
+}
+return testClassFinder;
+}
+
 private boolean isCdi(final boolean cdi, final Class[] cdiInterceptors,
   final Class[] cdiAlternatives, final Class[] 
cdiStereotypes,
   final Class[] cdiDecorators) {
@@ -1264,7 +1281,7 @@ public class ApplicationComposers {
 public void startContainer(final Object instance) throws Exception {
 originalProperties = (Properties) System.getProperties().clone();
 originalLoader = Thread.currentThread().getContextClassLoader();
-testClassFinders.remove(this); // see constructor
+fixFakeClassFinder(instance);
 
 // For the moment we just take the first @Configuration method
 // maybe later we can add something fancy to allow multiple 
configurations using a qualifier

http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f73a49/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java
--
diff --git 

tomee git commit: header

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master c63f2ec30 -> 04294bfde


header


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/04294bfd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/04294bfd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/04294bfd

Branch: refs/heads/master
Commit: 04294bfdeaeb2d7fa6df80dd5129fbc7bf7e2aea
Parents: c63f2ec
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 18:38:36 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 18:38:36 2015 +0100

--
 .../junit/ContainerAndApplicationRulesTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/04294bfd/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
index 1f0ce56..12df385 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.configuration.PersistenceUnitDefinition;

buildbot success in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/148

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] f9f73a49bc51e56613da9e64c85b79502fcb5b2a
Blamelist: Romain Manni-Bucau 

Build succeeded!

Sincerely,
 -The Buildbot

[4/4] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1

[andygumbrecht]

Merge branch 'master' into tomee-7.0.0-M1


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c90d7ee7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c90d7ee7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c90d7ee7

Branch: refs/heads/tomee-7.0.0-M1
Commit: c90d7ee754d1868f5e158aca841aa37f995ccc3a
Parents: ffa109c f9f73a4
Author: AndyGee 
Authored: Wed Dec 2 22:18:23 2015 +0100
Committer: AndyGee 
Committed: Wed Dec 2 22:18:23 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 37 
 .../apache/openejb/bval/BeanValidationTest.java |  4 ++
 .../junit/ContainerAndApplicationRulesTest.java | 62 
 3 files changed, 93 insertions(+), 10 deletions(-)
--

[3/4] tomee git commit: some NPE protections

[andygumbrecht]

some NPE protections


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f9f73a49
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f9f73a49
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f9f73a49

Branch: refs/heads/tomee-7.0.0-M1
Commit: f9f73a49bc51e56613da9e64c85b79502fcb5b2a
Parents: 04294bf
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 19:31:31 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 19:31:31 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 35 +++-
 .../apache/openejb/bval/BeanValidationTest.java |  4 +++
 2 files changed, 30 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f73a49/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index bc5fefd..4f54482 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -373,8 +373,7 @@ public class ApplicationComposers {
 
 @SuppressWarnings("unchecked")
 public void before(final Object inputTestInstance) throws Exception {
-// we hacked testInstance while we were not aware of it, now we can 
solve it
-testClassFinders.put(inputTestInstance, testClassFinders.remove(this));
+fixFakeClassFinder(inputTestInstance);
 
 startContainer(inputTestInstance);
 
@@ -385,12 +384,7 @@ public class ApplicationComposers {
 }
 
 public void deployApp(final Object inputTestInstance) throws Exception {
-// test injections
-ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
-if (testClassFinder == null) {
-testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
-testClassFinder = testClassFinders.remove(inputTestInstance);
-}
+final ClassFinder testClassFinder = 
fixFakeClassFinder(inputTestInstance);
 
 final ClassLoader loader = testClass.getClassLoader();
 AppModule appModule = new AppModule(loader, testClass.getSimpleName());
@@ -773,6 +767,29 @@ public class ApplicationComposers {
 testClassFinders.put(this, testClassFinder);
 }
 
+private ClassFinder fixFakeClassFinder(final Object inputTestInstance) {
+// test injections, we faked the instance before having it so ensuring 
we use the right finder
+ClassFinder testClassFinder = testClassFinders.get(inputTestInstance);
+if (testClassFinder == null) {
+final ApplicationComposers self = this;
+final ClassFinder remove = testClassFinders.remove(self);
+if (remove != null) {
+testClassFinders.put(inputTestInstance, remove);
+testClassFinder = remove;
+afterRunnables.add(new Runnable() { // reset state for next 
test
+@Override
+public void run() {
+final ClassFinder classFinder = 
testClassFinders.remove(inputTestInstance);
+if (classFinder != null) {
+testClassFinders.put(self, classFinder);
+}
+}
+});
+}
+}
+return testClassFinder;
+}
+
 private boolean isCdi(final boolean cdi, final Class[] cdiInterceptors,
   final Class[] cdiAlternatives, final Class[] 
cdiStereotypes,
   final Class[] cdiDecorators) {
@@ -1264,7 +1281,7 @@ public class ApplicationComposers {
 public void startContainer(final Object instance) throws Exception {
 originalProperties = (Properties) System.getProperties().clone();
 originalLoader = Thread.currentThread().getContextClassLoader();
-testClassFinders.remove(this); // see constructor
+fixFakeClassFinder(instance);
 
 // For the moment we just take the first @Configuration method
 // maybe later we can add something fancy to allow multiple 
configurations using a qualifier

http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f73a49/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java
 

[1/4] tomee git commit: fixing app composer container handling

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.0.0-M1 ffa109cc3 -> c90d7ee75


fixing app composer container handling


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c63f2ec3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c63f2ec3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c63f2ec3

Branch: refs/heads/tomee-7.0.0-M1
Commit: c63f2ec304a174ccefd88dda48bbe440c2036a5f
Parents: 06f4b74
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 18:37:28 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 18:37:28 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 14 +++---
 .../junit/ContainerAndApplicationRulesTest.java | 46 
 2 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c63f2ec3/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index d7c42f2..bc5fefd 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -385,6 +385,13 @@ public class ApplicationComposers {
 }
 
 public void deployApp(final Object inputTestInstance) throws Exception {
+// test injections
+ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
+if (testClassFinder == null) {
+testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
+testClassFinder = testClassFinders.remove(inputTestInstance);
+}
+
 final ClassLoader loader = testClass.getClassLoader();
 AppModule appModule = new AppModule(loader, testClass.getSimpleName());
 
@@ -731,13 +738,6 @@ public class ApplicationComposers {
 
 System.getProperties().put(OPENEJB_APPLICATION_COMPOSER_CONTEXT, 
appContext.getGlobalJndiContext());
 
-// test injections
-ClassFinder testClassFinder = 
testClassFinders.remove(inputTestInstance);
-if (testClassFinder == null) {
-testClassFinders.put(inputTestInstance, 
testClassFinders.remove(this));
-testClassFinder = testClassFinders.remove(inputTestInstance);
-}
-
 final List fields = new 
ArrayList<>(testClassFinder.findAnnotatedFields(AppResource.class));
 
fields.addAll(testClassFinder.findAnnotatedFields(org.apache.openejb.junit.AppResource.class));
 for (final Field field : fields) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/c63f2ec3/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
new file mode 100644
index 000..1f0ce56
--- /dev/null
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
@@ -0,0 +1,46 @@
+package org.apache.openejb.junit;
+
+import org.apache.openejb.api.configuration.PersistenceUnitDefinition;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class ContainerAndApplicationRulesTest {
+private final ContainerRule instanceContainer = new ContainerRule(new 
Container());
+private final ApplicationRule instanceServer = new ApplicationRule(new 
App());
+
+@Rule
+public final TestRule rule = 
RuleChain.outerRule(instanceContainer).around(instanceServer);
+
+@Test
+public void test() {
+assertNotNull(instanceServer.getInstance(App.class).v);
+assertNull(instanceContainer.getInstance(Container.class).ignored);
+}
+
+@org.apache.openejb.testing.Classes(cdi = true, value = Ignored.class) // 
@Classes invalid for a container
+public static class Container {
+@Inject
+private Provider ignored;
+}
+
+@PersistenceUnitDefinition
+@org.apache.openejb.testing.Classes(context = "App1", cdi = true, value = 
Valuable.class)
+public static class App {
+@Inject
+private Valuable v;
+}
+
+public static 

[2/4] tomee git commit: header

[andygumbrecht]

header


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/04294bfd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/04294bfd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/04294bfd

Branch: refs/heads/tomee-7.0.0-M1
Commit: 04294bfdeaeb2d7fa6df80dd5129fbc7bf7e2aea
Parents: c63f2ec
Author: Romain Manni-Bucau 
Authored: Wed Dec 2 18:38:36 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 2 18:38:36 2015 +0100

--
 .../junit/ContainerAndApplicationRulesTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/04294bfd/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
index 1f0ce56..12df385 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/junit/ContainerAndApplicationRulesTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.configuration.PersistenceUnitDefinition;

[jira] [Created] (TOMEE-1673) Upgrade commons-collections to 3.2.2

[Andy Gumbrecht (JIRA)]

Andy Gumbrecht created TOMEE-1673:
-

 Summary: Upgrade commons-collections to 3.2.2
 Key: TOMEE-1673
 URL: https://issues.apache.org/jira/browse/TOMEE-1673
 Project: TomEE
  Issue Type: Dependency upgrade
Reporter: Andy Gumbrecht
Assignee: Andy Gumbrecht
Priority: Critical
 Fix For: 7.0.0-M1, 1.7.3


Excludes required for other deps



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Work started] (TOMEE-1673) Upgrade commons-collections to 3.2.2

[Andy Gumbrecht (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1673?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Work on TOMEE-1673 started by Andy Gumbrecht.
-
> Upgrade commons-collections to 3.2.2
> 
>
> Key: TOMEE-1673
> URL: https://issues.apache.org/jira/browse/TOMEE-1673
> Project: TomEE
>  Issue Type: Dependency upgrade
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
>Priority: Critical
> Fix For: 7.0.0-M1, 1.7.3
>
>
> Excludes required for other deps



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (TOMEE-1669) blacklist org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan in our custom ObjectInputStream

[Andy Gumbrecht (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1669?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andy Gumbrecht updated TOMEE-1669:
--
Affects Version/s: 1.7.3

> blacklist 
> org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan
>  in our custom ObjectInputStream
> 
>
> Key: TOMEE-1669
> URL: https://issues.apache.org/jira/browse/TOMEE-1669
> Project: TomEE
>  Issue Type: Bug
>Affects Versions: 7.0.0-M1, 1.7.3
>Reporter: Romain Manni-Bucau
>Assignee: Romain Manni-Bucau
> Fix For: 7.0.0-M1
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

tomee git commit: commons-collections 3.2.2

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.0.0-M1 c90d7ee75 -> 439eb9a27


commons-collections 3.2.2


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/439eb9a2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/439eb9a2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/439eb9a2

Branch: refs/heads/tomee-7.0.0-M1
Commit: 439eb9a273b239854966bfc1f1d0486f745aae7d
Parents: c90d7ee
Author: AndyGee 
Authored: Thu Dec 3 02:11:56 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:11:56 2015 +0100

--
 pom.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/439eb9a2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 903f06e..ecc6cf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
 1.1
 2.1
 2.3
-3.2.1
+3.2.2
 1.10
 1.3.1
 0.5
@@ -1261,6 +1261,10 @@
 geronimo-jta_1.1_spec
   
   
+commons-collections
+commons-collections
+  
+  
 commons-pool
 commons-pool
   

buildbot failure in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/149

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] 256e140529bf317bdb172d67729cdeb151684aee
Blamelist: AndyGee 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

tomee git commit: commons-collections 3.2.2

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master f9f73a49b -> 256e14052


commons-collections 3.2.2


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/256e1405
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/256e1405
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/256e1405

Branch: refs/heads/master
Commit: 256e140529bf317bdb172d67729cdeb151684aee
Parents: f9f73a4
Author: AndyGee 
Authored: Thu Dec 3 02:11:56 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:13:58 2015 +0100

--
 pom.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/256e1405/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8c74383..aaa2633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
 1.1
 2.1
 2.3
-3.2.1
+3.2.2
 1.10
 1.3.1
 0.5
@@ -1247,6 +1247,10 @@
 geronimo-jta_1.1_spec
   
   
+commons-collections
+commons-collections
+  
+  
 commons-pool
 commons-pool
   

[2/2] tomee git commit: TOMEE-1669 blacklist org.codehaus.groovy.runtime., org.apache.commons.collections.functors., org.apache.xalan in our custom ObjectInputStream

[andygumbrecht]

TOMEE-1669 blacklist 
org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan
 in our custom ObjectInputStream


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8d0f5b8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8d0f5b8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8d0f5b8d

Branch: refs/heads/tomee-1.7.x
Commit: 8d0f5b8daf1e3a626a37d17ef45d8b2e3f743f71
Parents: 9897c84
Author: Romain Manni-Bucau 
Authored: Fri Nov 27 12:57:36 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:19:41 2015 +0100

--
 .../openejb/core/ivm/EjbObjectInputStream.java  |  8 ++-
 .../core/rmi/BlacklistClassResolver.java| 60 
 .../timer/quartz/QuartzObjectInputStream.java   |  3 +-
 .../core/rmi/BlacklistClassResolverTest.java| 41 +
 .../openejb/client/EjbObjectInputStream.java| 43 +-
 5 files changed, 151 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/8d0f5b8d/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
index 1f14489..9324984 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.core.ivm;
 
+import org.apache.openejb.core.rmi.BlacklistClassResolver;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -32,9 +34,11 @@ public class EjbObjectInputStream extends ObjectInputStream {
 super(in);
 }
 
+@Override
 protected Class resolveClass(final ObjectStreamClass classDesc) throws 
IOException, ClassNotFoundException {
+final String checkedName = 
BlacklistClassResolver.DEFAULT.check(classDesc.getName());
 try {
-return Class.forName(classDesc.getName(), false, getClassloader());
+return Class.forName(checkedName, false, getClassloader());
 } catch (final ClassNotFoundException e) {
 final String n = classDesc.getName();
 if (n.equals("boolean")) {
@@ -62,7 +66,7 @@ public class EjbObjectInputStream extends ObjectInputStream {
 return double.class;
 }
 
-return getClass().getClassLoader().loadClass(classDesc.getName()); 
// if CCL is not correct
+return getClass().getClassLoader().loadClass(checkedName); // if 
CCL is not correct
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/8d0f5b8d/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
new file mode 100644
index 000..ffefc3a
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.rmi;
+
+public 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"));
+
+public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver(
+new String[] { "org.codehaus.groovy.runtime.", 
"org.apache.commons.collections.functors.", 

[1/2] tomee git commit: commons-collections 3.2.2

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 62c58ff49 -> 8d0f5b8da


commons-collections 3.2.2


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9897c846
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9897c846
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9897c846

Branch: refs/heads/tomee-1.7.x
Commit: 9897c84621966cd9dd2f72e02d16cf06b547c57c
Parents: 62c58ff
Author: AndyGee 
Authored: Thu Dec 3 02:19:19 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:19:19 2015 +0100

--
 examples/deltaspike-fullstack/pom.xml|  2 +-
 .../simple-osgi/simple-osgi-camel-client/pom.xml |  1 -
 examples/troubleshooting/README.md   |  2 +-
 pom.xml  | 19 ---
 4 files changed, 14 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/deltaspike-fullstack/pom.xml
--
diff --git a/examples/deltaspike-fullstack/pom.xml 
b/examples/deltaspike-fullstack/pom.xml
index fc06d46..ccafd05 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -130,7 +130,7 @@
 
   commons-collections
   commons-collections
-  3.2.1
+  3.2.2
 
 
   org.slf4j

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/simple-osgi/simple-osgi-camel-client/pom.xml
--
diff --git a/examples/simple-osgi/simple-osgi-camel-client/pom.xml 
b/examples/simple-osgi/simple-osgi-camel-client/pom.xml
index 8b08d1b..7096317 100644
--- a/examples/simple-osgi/simple-osgi-camel-client/pom.xml
+++ b/examples/simple-osgi/simple-osgi-camel-client/pom.xml
@@ -42,7 +42,6 @@
   org.superbiz.osgi.calculator,
   org.apache.openejb.client;version="[4.0,5.0)"
 
-
${pom.basedir}/src/main/resources
   
 
   

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/troubleshooting/README.md
--
diff --git a/examples/troubleshooting/README.md 
b/examples/troubleshooting/README.md
index bde0325..094ac12 100644
--- a/examples/troubleshooting/README.md
+++ b/examples/troubleshooting/README.md
@@ -300,7 +300,7 @@ Title: Troubleshooting
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-asm-shaded/3.8/xbean-asm-shaded-3.8.jar!/
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-ee-common/1.1.1/openwebbeans-ee-common-1.1.1.jar!/
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-pool/commons-pool/1.5.6/commons-pool-1.5.6.jar!/
-2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/
+2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-impl/1.1.1/openwebbeans-impl-1.1.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-finder-shaded/3.8/xbean-finder-shaded-3.8.jar!/

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ae0220..40d4980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
 
 
 
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
   4.0.0
 
@@ -109,15 +110,15 @@
 4.2
 
 
-
+
 *
 ${openejb.osgi.import.pkg}
 org.apache.openejb
 
${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}
-
-
+
+
 !*
-
+
 
${project.version}
 
${openejb.osgi.dynamic.import.pkg}
 

tomee git commit: Use property!

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master eb5074943 -> a415f3ee4


Use property!


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a415f3ee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a415f3ee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a415f3ee

Branch: refs/heads/master
Commit: a415f3ee4bbdb39f92bb34c3a9fa2ad9df0e3464
Parents: eb50749
Author: AndyGee 
Authored: Thu Dec 3 04:21:57 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:21:57 2015 +0100

--
 itests/openejb-itests-beans/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a415f3ee/itests/openejb-itests-beans/pom.xml
--
diff --git a/itests/openejb-itests-beans/pom.xml 
b/itests/openejb-itests-beans/pom.xml
index 6303e2d..daf8932 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -65,7 +65,7 @@
   
 org.apache.openjpa
 openjpa
-2.4.0
+${openjpa.version}
   
 
   

[4/5] tomee git commit: Licenses

[andygumbrecht]

Licenses


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b3aec94d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b3aec94d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b3aec94d

Branch: refs/heads/tomee-1.7.3-prepare
Commit: b3aec94deacb28473b0ad55464ba319d57fbabd2
Parents: db5bf16
Author: AndyGee 
Authored: Thu Dec 3 04:33:24 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:33:24 2015 +0100

--
 .../activemq/ConnectionFactoryWrapper.java  | 24 
 .../resource/activemq/ConnectionWrapper.java| 24 
 .../resource/activemq/SessionWrapper.java   | 24 
 3 files changed, 45 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
index 6e024e9..2ade6f2 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
@@ -1,12 +1,18 @@
-/**
- * Tomitribe Confidential
- * 
- * Copyright(c) Tomitribe Corporation. 2014
- * 
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.openejb.resource.activemq;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
index fe86874..1618b83 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
@@ -1,12 +1,18 @@
-/**
- * Tomitribe Confidential
- * 
- * Copyright(c) Tomitribe Corporation. 2014
- * 
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.openejb.resource.activemq;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/SessionWrapper.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/SessionWrapper.java
 

[3/5] tomee git commit: Add commons-collections dep due to exclusion Use ObjectInputStreamFiltered Overrides and finals Close streams 101 Fix LocalMBeanServer recursion Check for null.

[andygumbrecht]

Add commons-collections dep due to exclusion
Use ObjectInputStreamFiltered
Overrides and finals
Close streams 101
Fix LocalMBeanServer recursion
Check for null.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db5bf163
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db5bf163
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db5bf163

Branch: refs/heads/tomee-1.7.3-prepare
Commit: db5bf163145583339f76acc0f1c7a18b6b30e468
Parents: 8d0f5b8
Author: AndyGee 
Authored: Thu Dec 3 04:25:56 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:25:56 2015 +0100

--
 container/openejb-core/pom.xml  |  4 ++
 .../openejb/config/rules/CheckClassLoading.java |  4 +-
 .../openejb/core/ObjectInputStreamFiltered.java | 39 ++
 .../openejb/core/ivm/EjbObjectInputStream.java  |  1 +
 .../openejb/core/managed/SimplePassivater.java  | 17 ++--
 .../core/rmi/BlacklistClassResolver.java| 13 --
 .../openejb/core/timer/EjbTimerServiceImpl.java |  2 +-
 .../apache/openejb/core/timer/TimerData.java| 26 
 .../log/commonslogging/OpenEJBCommonsLog.java   |  2 +-
 .../openejb/monitoring/LocalMBeanServer.java|  2 +-
 .../java/org/apache/openejb/spi/Serializer.java | 39 +-
 .../apache/openejb/util/PojoSerialization.java  | 31 ++-
 .../openejb/server/httpd/HttpResponseImpl.java  | 42 +++-
 .../openejb/tck/cdi/embedded/BeansImpl.java | 16 
 .../tck/cdi/tomee/embedded/BeansImpl.java   | 16 
 .../org/apache/tomee/common/EjbFactory.java |  5 ++-
 16 files changed, 193 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/pom.xml
--
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 805b509..f0e435e 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -492,6 +492,10 @@
   commons-cli
   commons-cli
 
+
+  commons-collections
+  commons-collections
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
index 173810c..bb17b3e 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
@@ -190,8 +190,8 @@ public class CheckClassLoading extends ValidationBase {
 
 public static class DiffItem {
 private Collection files = new ArrayList();
-private String file1;
-private String file2;
+private final String file1;
+private final String file2;
 
 public DiffItem(final Collection files, final String file1, 
final String file2) {
 this.files = files;

http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
new file mode 100644
index 000..8af39a6
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core;
+
+import org.apache.openejb.core.rmi.BlacklistClassResolver;
+
+import java.io.IOException;

[1/5] tomee git commit: commons-collections 3.2.2

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.3-prepare 124eb43b8 -> 4408e959e


commons-collections 3.2.2


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9897c846
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9897c846
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9897c846

Branch: refs/heads/tomee-1.7.3-prepare
Commit: 9897c84621966cd9dd2f72e02d16cf06b547c57c
Parents: 62c58ff
Author: AndyGee 
Authored: Thu Dec 3 02:19:19 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:19:19 2015 +0100

--
 examples/deltaspike-fullstack/pom.xml|  2 +-
 .../simple-osgi/simple-osgi-camel-client/pom.xml |  1 -
 examples/troubleshooting/README.md   |  2 +-
 pom.xml  | 19 ---
 4 files changed, 14 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/deltaspike-fullstack/pom.xml
--
diff --git a/examples/deltaspike-fullstack/pom.xml 
b/examples/deltaspike-fullstack/pom.xml
index fc06d46..ccafd05 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -130,7 +130,7 @@
 
   commons-collections
   commons-collections
-  3.2.1
+  3.2.2
 
 
   org.slf4j

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/simple-osgi/simple-osgi-camel-client/pom.xml
--
diff --git a/examples/simple-osgi/simple-osgi-camel-client/pom.xml 
b/examples/simple-osgi/simple-osgi-camel-client/pom.xml
index 8b08d1b..7096317 100644
--- a/examples/simple-osgi/simple-osgi-camel-client/pom.xml
+++ b/examples/simple-osgi/simple-osgi-camel-client/pom.xml
@@ -42,7 +42,6 @@
   org.superbiz.osgi.calculator,
   org.apache.openejb.client;version="[4.0,5.0)"
 
-
${pom.basedir}/src/main/resources
   
 
   

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/troubleshooting/README.md
--
diff --git a/examples/troubleshooting/README.md 
b/examples/troubleshooting/README.md
index bde0325..094ac12 100644
--- a/examples/troubleshooting/README.md
+++ b/examples/troubleshooting/README.md
@@ -300,7 +300,7 @@ Title: Troubleshooting
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-asm-shaded/3.8/xbean-asm-shaded-3.8.jar!/
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-ee-common/1.1.1/openwebbeans-ee-common-1.1.1.jar!/
 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-pool/commons-pool/1.5.6/commons-pool-1.5.6.jar!/
-2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/
+2011-10-29 11:50:20,012 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-impl/1.1.1/openwebbeans-impl-1.1.1.jar!/
 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: 
jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-finder-shaded/3.8/xbean-finder-shaded-3.8.jar!/

http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ae0220..40d4980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
 
 
 
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
   4.0.0
 
@@ -109,15 +110,15 @@
 4.2
 
 
-
+
 *
 ${openejb.osgi.import.pkg}
 org.apache.openejb
 
${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}
-
-
+
+
 !*
-
+
 
${project.version}
 
${openejb.osgi.dynamic.import.pkg}
   

[5/5] tomee git commit: Merge branch 'tomee-1.7.x' into tomee-1.7.3-prepare

[andygumbrecht]

Merge branch 'tomee-1.7.x' into tomee-1.7.3-prepare


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4408e959
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4408e959
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4408e959

Branch: refs/heads/tomee-1.7.3-prepare
Commit: 4408e959e80cc6d862f941760c7800039c7395ae
Parents: 124eb43 b3aec94
Author: AndyGee 
Authored: Thu Dec 3 04:34:13 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:34:13 2015 +0100

--
 container/openejb-core/pom.xml  |  4 ++
 .../openejb/config/rules/CheckClassLoading.java |  4 +-
 .../openejb/core/ObjectInputStreamFiltered.java | 39 
 .../openejb/core/ivm/EjbObjectInputStream.java  |  9 ++-
 .../openejb/core/managed/SimplePassivater.java  | 17 +++--
 .../core/rmi/BlacklistClassResolver.java| 67 
 .../openejb/core/timer/EjbTimerServiceImpl.java |  2 +-
 .../apache/openejb/core/timer/TimerData.java| 26 +---
 .../timer/quartz/QuartzObjectInputStream.java   |  3 +-
 .../log/commonslogging/OpenEJBCommonsLog.java   |  2 +-
 .../openejb/monitoring/LocalMBeanServer.java|  2 +-
 .../activemq/ConnectionFactoryWrapper.java  | 24 ---
 .../resource/activemq/ConnectionWrapper.java| 24 ---
 .../resource/activemq/SessionWrapper.java   | 24 ---
 .../java/org/apache/openejb/spi/Serializer.java | 39 +---
 .../apache/openejb/util/PojoSerialization.java  | 31 ++---
 .../core/rmi/BlacklistClassResolverTest.java| 41 
 examples/deltaspike-fullstack/pom.xml   |  2 +-
 examples/troubleshooting/README.md  |  2 +-
 pom.xml | 19 --
 .../openejb/client/EjbObjectInputStream.java| 43 -
 .../openejb/server/httpd/HttpResponseImpl.java  | 42 
 .../openejb/tck/cdi/embedded/BeansImpl.java | 16 +++--
 .../tck/cdi/tomee/embedded/BeansImpl.java   | 16 +++--
 .../org/apache/tomee/common/EjbFactory.java |  5 +-
 25 files changed, 400 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/container/openejb-core/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/examples/deltaspike-fullstack/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/4408e959/pom.xml
--

[2/5] tomee git commit: TOMEE-1669 blacklist org.codehaus.groovy.runtime., org.apache.commons.collections.functors., org.apache.xalan in our custom ObjectInputStream

[andygumbrecht]

TOMEE-1669 blacklist 
org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan
 in our custom ObjectInputStream


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8d0f5b8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8d0f5b8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8d0f5b8d

Branch: refs/heads/tomee-1.7.3-prepare
Commit: 8d0f5b8daf1e3a626a37d17ef45d8b2e3f743f71
Parents: 9897c84
Author: Romain Manni-Bucau 
Authored: Fri Nov 27 12:57:36 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:19:41 2015 +0100

--
 .../openejb/core/ivm/EjbObjectInputStream.java  |  8 ++-
 .../core/rmi/BlacklistClassResolver.java| 60 
 .../timer/quartz/QuartzObjectInputStream.java   |  3 +-
 .../core/rmi/BlacklistClassResolverTest.java| 41 +
 .../openejb/client/EjbObjectInputStream.java| 43 +-
 5 files changed, 151 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/8d0f5b8d/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
index 1f14489..9324984 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
@@ -17,6 +17,8 @@
 
 package org.apache.openejb.core.ivm;
 
+import org.apache.openejb.core.rmi.BlacklistClassResolver;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -32,9 +34,11 @@ public class EjbObjectInputStream extends ObjectInputStream {
 super(in);
 }
 
+@Override
 protected Class resolveClass(final ObjectStreamClass classDesc) throws 
IOException, ClassNotFoundException {
+final String checkedName = 
BlacklistClassResolver.DEFAULT.check(classDesc.getName());
 try {
-return Class.forName(classDesc.getName(), false, getClassloader());
+return Class.forName(checkedName, false, getClassloader());
 } catch (final ClassNotFoundException e) {
 final String n = classDesc.getName();
 if (n.equals("boolean")) {
@@ -62,7 +66,7 @@ public class EjbObjectInputStream extends ObjectInputStream {
 return double.class;
 }
 
-return getClass().getClassLoader().loadClass(classDesc.getName()); 
// if CCL is not correct
+return getClass().getClassLoader().loadClass(checkedName); // if 
CCL is not correct
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/8d0f5b8d/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
new file mode 100644
index 000..ffefc3a
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.rmi;
+
+public 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"));
+
+public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver(
+new String[] { "org.codehaus.groovy.runtime.", 
"org.apache.commons.collections.functors.", 

tomee git commit: Use ObjectInputStreamFiltered

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master e6dabe142 -> a7a915f36


Use ObjectInputStreamFiltered


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a7a915f3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a7a915f3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a7a915f3

Branch: refs/heads/master
Commit: a7a915f369c825aad6f5086ef57bd9012f3163f7
Parents: e6dabe1
Author: AndyGee 
Authored: Thu Dec 3 04:07:38 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:07:38 2015 +0100

--
 .../openejb/core/ObjectInputStreamFiltered.java | 39 
 .../openejb/core/managed/SimplePassivater.java  |  3 +-
 .../core/rmi/BlacklistClassResolver.java|  9 -
 .../logging/LoggingPreparedSqlStatement.java|  4 +-
 .../java/org/apache/openejb/spi/Serializer.java | 39 +++-
 .../tck/cdi/tomee/embedded/BeansImpl.java   | 15 
 6 files changed, 88 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
new file mode 100644
index 000..8af39a6
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core;
+
+import org.apache.openejb.core.rmi.BlacklistClassResolver;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+
+/**
+ * Ensures blacklisted classes cannot be loaded
+ */
+public class ObjectInputStreamFiltered extends ObjectInputStream {
+
+public ObjectInputStreamFiltered(final InputStream in) throws IOException {
+super(in);
+}
+
+@Override
+protected Class resolveClass(final ObjectStreamClass classDesc) throws 
IOException, ClassNotFoundException {
+return 
super.resolveClass(BlacklistClassResolver.DEFAULT.check(classDesc));
+}
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
index b0947ee..8360a16 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
@@ -19,6 +19,7 @@ package org.apache.openejb.core.managed;
 
 import org.apache.openejb.SystemException;
 import org.apache.openejb.core.EnvProps;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
@@ -107,7 +108,7 @@ public class SimplePassivater implements 
PassivationStrategy {
 if (sessionFile.exists()) {
 logger.info("Activating from file " + sessionFile);
 
-final ObjectInputStream ois = new 
ObjectInputStream(IO.read(sessionFile));
+final ObjectInputStream ois = new 
ObjectInputStreamFiltered(IO.read(sessionFile));
 final Object state = ois.readObject();
 ois.close();
 if (!sessionFile.delete()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java

[6/9] tomee git commit: Use ObjectInputStreamFiltered

[andygumbrecht]

Use ObjectInputStreamFiltered


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a7a915f3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a7a915f3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a7a915f3

Branch: refs/heads/tomee-7.0.0-M1
Commit: a7a915f369c825aad6f5086ef57bd9012f3163f7
Parents: e6dabe1
Author: AndyGee 
Authored: Thu Dec 3 04:07:38 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:07:38 2015 +0100

--
 .../openejb/core/ObjectInputStreamFiltered.java | 39 
 .../openejb/core/managed/SimplePassivater.java  |  3 +-
 .../core/rmi/BlacklistClassResolver.java|  9 -
 .../logging/LoggingPreparedSqlStatement.java|  4 +-
 .../java/org/apache/openejb/spi/Serializer.java | 39 +++-
 .../tck/cdi/tomee/embedded/BeansImpl.java   | 15 
 6 files changed, 88 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
new file mode 100644
index 000..8af39a6
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core;
+
+import org.apache.openejb.core.rmi.BlacklistClassResolver;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+
+/**
+ * Ensures blacklisted classes cannot be loaded
+ */
+public class ObjectInputStreamFiltered extends ObjectInputStream {
+
+public ObjectInputStreamFiltered(final InputStream in) throws IOException {
+super(in);
+}
+
+@Override
+protected Class resolveClass(final ObjectStreamClass classDesc) throws 
IOException, ClassNotFoundException {
+return 
super.resolveClass(BlacklistClassResolver.DEFAULT.check(classDesc));
+}
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
index b0947ee..8360a16 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
@@ -19,6 +19,7 @@ package org.apache.openejb.core.managed;
 
 import org.apache.openejb.SystemException;
 import org.apache.openejb.core.EnvProps;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
@@ -107,7 +108,7 @@ public class SimplePassivater implements 
PassivationStrategy {
 if (sessionFile.exists()) {
 logger.info("Activating from file " + sessionFile);
 
-final ObjectInputStream ois = new 
ObjectInputStream(IO.read(sessionFile));
+final ObjectInputStream ois = new 
ObjectInputStreamFiltered(IO.read(sessionFile));
 final Object state = ois.readObject();
 ois.close();
 if (!sessionFile.delete()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/a7a915f3/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
--
diff --git 

[5/9] tomee git commit: Close printwriter properly

[andygumbrecht]

Close printwriter properly


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e6dabe14
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e6dabe14
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e6dabe14

Branch: refs/heads/tomee-7.0.0-M1
Commit: e6dabe142d5f4ad21c098342102dd3acad58489f
Parents: 87beb07
Author: AndyGee 
Authored: Thu Dec 3 03:38:15 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:38:15 2015 +0100

--
 .../openejb/server/httpd/HttpResponseImpl.java  | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/e6dabe14/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index f33ad34..2229a42 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -572,6 +572,7 @@ public class HttpResponseImpl implements HttpResponse {
  * @param message the error message to be sent
  * @return the HttpResponseImpl that this error belongs to
  */
+@SuppressWarnings("unused")
 protected static HttpResponseImpl createError(final String message) {
 return createError(message, null);
 }
@@ -611,14 +612,17 @@ public class HttpResponseImpl implements HttpResponse {
 }
 
 if (t != null) {
+
+PrintWriter writer = null;
+
 try {
 body.println("");
 body.println("Stack Trace:");
 final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-final PrintWriter writer = new PrintWriter(baos);
+writer = new PrintWriter(baos);
 t.printStackTrace(writer);
 writer.flush();
-writer.close();
+
 message = new String(baos.toByteArray());
 final StringTokenizer msg = new StringTokenizer(message, 
"\n\r");
 
@@ -627,6 +631,11 @@ public class HttpResponseImpl implements HttpResponse {
 body.println("");
 }
 } catch (final Exception e) {
+//no-op
+} finally {
+if (writer != null) {
+writer.close();
+}
 }
 }
 
@@ -642,6 +651,7 @@ public class HttpResponseImpl implements HttpResponse {
  * @param ip the ip that is forbidden
  * @return the HttpResponseImpl that this error belongs to
  */
+@SuppressWarnings("unused")
 protected static HttpResponseImpl createForbidden(final String ip) {
 final HttpResponseImpl res = new HttpResponseImpl(403, "Forbidden", 
"text/html");
 final PrintWriter body;

buildbot success in ASF Buildbot on tomee-trunk-ubuntu-jvm8

[buildbot]

The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 
while building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/148

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build
Build Source Stamp: [branch master] e6dabe142d5f4ad21c098342102dd3acad58489f
Blamelist: AndyGee 

Build succeeded!

Sincerely,
 -The Buildbot

tomee git commit: Licenses

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x db5bf1631 -> b3aec94de


Licenses


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b3aec94d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b3aec94d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b3aec94d

Branch: refs/heads/tomee-1.7.x
Commit: b3aec94deacb28473b0ad55464ba319d57fbabd2
Parents: db5bf16
Author: AndyGee 
Authored: Thu Dec 3 04:33:24 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:33:24 2015 +0100

--
 .../activemq/ConnectionFactoryWrapper.java  | 24 
 .../resource/activemq/ConnectionWrapper.java| 24 
 .../resource/activemq/SessionWrapper.java   | 24 
 3 files changed, 45 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
index 6e024e9..2ade6f2 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionFactoryWrapper.java
@@ -1,12 +1,18 @@
-/**
- * Tomitribe Confidential
- * 
- * Copyright(c) Tomitribe Corporation. 2014
- * 
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.openejb.resource.activemq;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
index fe86874..1618b83 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ConnectionWrapper.java
@@ -1,12 +1,18 @@
-/**
- * Tomitribe Confidential
- * 
- * Copyright(c) Tomitribe Corporation. 2014
- * 
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.openejb.resource.activemq;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b3aec94d/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/SessionWrapper.java
--
diff --git 

[7/9] tomee git commit: Use ObjectInputStreamFiltered

[andygumbrecht]

Use ObjectInputStreamFiltered


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb507494
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb507494
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb507494

Branch: refs/heads/tomee-7.0.0-M1
Commit: eb5074943832b2b9ad410a25f2d38b352eb24f23
Parents: a7a915f
Author: AndyGee 
Authored: Thu Dec 3 04:11:13 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:11:13 2015 +0100

--
 .../org/apache/openejb/timer/EjbTimerImplSerializableTest.java  | 3 ++-
 .../SerializationOfTransactionRolledBackExceptionTest.java  | 3 ++-
 .../java/org/apache/openejb/util/PojoExternalizationTest.java   | 5 +++--
 .../java/org/apache/openejb/util/PojoSerializationTest.java | 5 +++--
 .../openejb/util/proxy/LocalBeanProxySerializationTest.java | 3 ++-
 .../openejb/util/proxy/LocalReferenceSerializationTest.java | 3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
index b0a951d..daabbc5 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
@@ -18,6 +18,7 @@ package org.apache.openejb.timer;
 
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.MethodContext;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.apache.openejb.core.timer.CalendarTimerData;
 import org.apache.openejb.core.timer.EjbTimeoutJob;
 import org.apache.openejb.core.timer.EjbTimerService;
@@ -113,7 +114,7 @@ public class EjbTimerImplSerializableTest {
 
 private static Object deserialize(final byte[] serial) throws Exception {
 final ByteArrayInputStream bais = new ByteArrayInputStream(serial);
-final ObjectInputStream ois = new ObjectInputStream(bais);
+final ObjectInputStream ois = new ObjectInputStreamFiltered(bais);
 return ois.readObject();
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
index 369a494..c6a2d98 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.openejb.transaction;
 
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.junit.Test;
 
 import javax.transaction.TransactionRolledbackException;
@@ -42,7 +43,7 @@ public class 
SerializationOfTransactionRolledBackExceptionTest {
 
 private static Object deserialize(final byte[] serial) throws Exception {
 final ByteArrayInputStream bais = new ByteArrayInputStream(serial);
-final ObjectInputStream ois = new ObjectInputStream(bais);
+final ObjectInputStream ois = new ObjectInputStreamFiltered(bais);
 return ois.readObject();
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
index e8b49ab..a269a50 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
@@ -17,6 +17,7 @@
 package org.apache.openejb.util;
 
 import junit.framework.TestCase;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -47,7 +48,7 @@ public class PojoExternalizationTest extends 

[9/9] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1

[andygumbrecht]

Merge branch 'master' into tomee-7.0.0-M1


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/93921cbd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/93921cbd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/93921cbd

Branch: refs/heads/tomee-7.0.0-M1
Commit: 93921cbdf8d791fe50196103b9a5d48c1fce2866
Parents: 439eb9a a415f3e
Author: AndyGee 
Authored: Thu Dec 3 04:36:13 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:36:13 2015 +0100

--
 container/openejb-core/pom.xml  |   4 +
 .../openejb/core/ObjectInputStreamFiltered.java |  39 ++
 .../openejb/core/managed/SimplePassivater.java  |   3 +-
 .../core/rmi/BlacklistClassResolver.java|   9 +-
 .../openejb/monitoring/LocalMBeanServer.java|   2 +-
 .../logging/LoggingPreparedSqlStatement.java|   4 +-
 .../java/org/apache/openejb/spi/Serializer.java |  39 --
 .../timer/EjbTimerImplSerializableTest.java |   3 +-
 ...ionOfTransactionRolledBackExceptionTest.java |   3 +-
 .../openejb/util/PojoExternalizationTest.java   |   5 +-
 .../openejb/util/PojoSerializationTest.java |   5 +-
 .../proxy/LocalBeanProxySerializationTest.java  |   3 +-
 .../proxy/LocalReferenceSerializationTest.java  |   3 +-
 itests/openejb-itests-beans/pom.xml |   2 +-
 pom.xml |   2 +-
 .../openejb/server/httpd/HttpResponseImpl.java  | 138 ++-
 .../tck/cdi/tomee/embedded/BeansImpl.java   |  15 +-
 17 files changed, 183 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/container/openejb-core/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/itests/openejb-itests-beans/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/93921cbd/pom.xml
--

[3/9] tomee git commit: Finals

[andygumbrecht]

Finals


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cf2e1138
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cf2e1138
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cf2e1138

Branch: refs/heads/tomee-7.0.0-M1
Commit: cf2e113838a898bc866cb79823bd0022eade0fe5
Parents: 26770ac
Author: AndyGee 
Authored: Thu Dec 3 03:18:10 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:18:10 2015 +0100

--
 .../openejb/server/httpd/HttpResponseImpl.java  | 112 +--
 1 file changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/cf2e1138/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index 180e3e2..cb73dcf 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -33,8 +33,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.URLConnection;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -99,7 +99,7 @@ public class HttpResponseImpl implements HttpResponse {
 private String encoding = "UTF-8";
 private Locale locale = Locale.getDefault();
 
-protected void setRequest(HttpRequestImpl request) {
+protected void setRequest(final HttpRequestImpl request) {
 this.request = request;
 }
 
@@ -109,68 +109,68 @@ public class HttpResponseImpl implements HttpResponse {
  * @param name  the name of the header
  * @param value the value of the header
  */
-public void setHeader(String name, String value) {
+public void setHeader(final String name, final String value) {
 headers.put(name, value);
 }
 
 @Override
-public void setIntHeader(String s, int i) {
+public void setIntHeader(final String s, final int i) {
 headers.put(s, Integer.toString(i));
 }
 
 @Override
-public void setStatus(int i) {
+public void setStatus(final int i) {
 setCode(i);
 }
 
 @Override
-public void setStatus(int i, String s) {
+public void setStatus(final int i, final String s) {
 setCode(i);
 setStatusMessage(s);
 }
 
 @Override
-public void addCookie(Cookie cookie) {
+public void addCookie(final Cookie cookie) {
 headers.put(cookie.getName(), cookie.getValue());
 }
 
 @Override
-public void addDateHeader(String s, long l) {
+public void addDateHeader(final String s, final long l) {
 headers.put(s, Long.toString(l));
 }
 
 @Override
-public void addHeader(String s, String s1) {
+public void addHeader(final String s, final String s1) {
 headers.put(s, s1);
 }
 
 @Override
-public void addIntHeader(String s, int i) {
+public void addIntHeader(final String s, final int i) {
 setIntHeader(s, i);
 }
 
 @Override
-public boolean containsHeader(String s) {
+public boolean containsHeader(final String s) {
 return headers.containsKey(s);
 }
 
 @Override
-public String encodeURL(String s) {
+public String encodeURL(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeRedirectURL(String s) {
+public String encodeRedirectURL(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeUrl(String s) {
+public String encodeUrl(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeRedirectUrl(String s) {
+public String encodeRedirectUrl(final String s) {
 return encodeRedirectURL(s);
 }
 
@@ -180,7 +180,7 @@ public class HttpResponseImpl implements HttpResponse {
  * @param name The name of the header
  * @return the value of the header
  */
-public String getHeader(String name) {
+public String getHeader(final String name) {
 return headers.get(name);
 }
 
@@ -190,8 +190,8 @@ public class HttpResponseImpl implements HttpResponse {
 }
 
 @Override
-public Collection getHeaders(String s) {
-return Arrays.asList(headers.get(s));
+public Collection getHeaders(final String s) {
+return Collections.singletonList(headers.get(s));
 }
 
 @Override
@@ -200,12 +200,12 @@ public 

[1/9] tomee git commit: commons-collections 3.2.2

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.0.0-M1 439eb9a27 -> 93921cbdf


commons-collections 3.2.2


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/256e1405
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/256e1405
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/256e1405

Branch: refs/heads/tomee-7.0.0-M1
Commit: 256e140529bf317bdb172d67729cdeb151684aee
Parents: f9f73a4
Author: AndyGee 
Authored: Thu Dec 3 02:11:56 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 02:13:58 2015 +0100

--
 pom.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/256e1405/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8c74383..aaa2633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
 1.1
 2.1
 2.3
-3.2.1
+3.2.2
 1.10
 1.3.1
 0.5
@@ -1247,6 +1247,10 @@
 geronimo-jta_1.1_spec
   
   
+commons-collections
+commons-collections
+  
+  
 commons-pool
 commons-pool
   

Git Push Summary

[andygumbrecht]

Repository: tomee
Updated Tags:  refs/tags/release-tomee-1.7.3 [deleted] 015a796d2

[8/9] tomee git commit: Use property!

[andygumbrecht]

Use property!


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a415f3ee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a415f3ee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a415f3ee

Branch: refs/heads/tomee-7.0.0-M1
Commit: a415f3ee4bbdb39f92bb34c3a9fa2ad9df0e3464
Parents: eb50749
Author: AndyGee 
Authored: Thu Dec 3 04:21:57 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:21:57 2015 +0100

--
 itests/openejb-itests-beans/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a415f3ee/itests/openejb-itests-beans/pom.xml
--
diff --git a/itests/openejb-itests-beans/pom.xml 
b/itests/openejb-itests-beans/pom.xml
index 6303e2d..daf8932 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -65,7 +65,7 @@
   
 org.apache.openjpa
 openjpa
-2.4.0
+${openjpa.version}
   
 
   

[2/9] tomee git commit: Fix recursion

[andygumbrecht]

Fix recursion


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/26770ac8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/26770ac8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/26770ac8

Branch: refs/heads/tomee-7.0.0-M1
Commit: 26770ac8bc62968e88c55b1b0ca1b383ec3e13d5
Parents: 256e140
Author: AndyGee 
Authored: Thu Dec 3 03:12:52 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:12:52 2015 +0100

--
 .../main/java/org/apache/openejb/monitoring/LocalMBeanServer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/26770ac8/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
index 94b3b2f..2ce5e1a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
@@ -184,7 +184,7 @@ public final class LocalMBeanServer implements MBeanServer {
 
 @Override
 public Set queryMBeans(final ObjectName name, final 
QueryExp query) {
-return queryMBeans(name, query);
+return s().queryMBeans(name, query);
 }
 
 @Override

Git Push Summary

[andygumbrecht]

Repository: tomee
Updated Tags:  refs/tags/release-tomee-7.0.0-M1 [deleted] c3c302e8d

buildbot success in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/153

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] a415f3ee4bbdb39f92bb34c3a9fa2ad9df0e3464
Blamelist: AndyGee 

Build succeeded!

Sincerely,
 -The Buildbot

tomee git commit: Use ObjectInputStreamFiltered

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master a7a915f36 -> eb5074943


Use ObjectInputStreamFiltered


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb507494
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb507494
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb507494

Branch: refs/heads/master
Commit: eb5074943832b2b9ad410a25f2d38b352eb24f23
Parents: a7a915f
Author: AndyGee 
Authored: Thu Dec 3 04:11:13 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:11:13 2015 +0100

--
 .../org/apache/openejb/timer/EjbTimerImplSerializableTest.java  | 3 ++-
 .../SerializationOfTransactionRolledBackExceptionTest.java  | 3 ++-
 .../java/org/apache/openejb/util/PojoExternalizationTest.java   | 5 +++--
 .../java/org/apache/openejb/util/PojoSerializationTest.java | 5 +++--
 .../openejb/util/proxy/LocalBeanProxySerializationTest.java | 3 ++-
 .../openejb/util/proxy/LocalReferenceSerializationTest.java | 3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
index b0a951d..daabbc5 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java
@@ -18,6 +18,7 @@ package org.apache.openejb.timer;
 
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.MethodContext;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.apache.openejb.core.timer.CalendarTimerData;
 import org.apache.openejb.core.timer.EjbTimeoutJob;
 import org.apache.openejb.core.timer.EjbTimerService;
@@ -113,7 +114,7 @@ public class EjbTimerImplSerializableTest {
 
 private static Object deserialize(final byte[] serial) throws Exception {
 final ByteArrayInputStream bais = new ByteArrayInputStream(serial);
-final ObjectInputStream ois = new ObjectInputStream(bais);
+final ObjectInputStream ois = new ObjectInputStreamFiltered(bais);
 return ois.readObject();
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
index 369a494..c6a2d98 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.openejb.transaction;
 
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 import org.junit.Test;
 
 import javax.transaction.TransactionRolledbackException;
@@ -42,7 +43,7 @@ public class 
SerializationOfTransactionRolledBackExceptionTest {
 
 private static Object deserialize(final byte[] serial) throws Exception {
 final ByteArrayInputStream bais = new ByteArrayInputStream(serial);
-final ObjectInputStream ois = new ObjectInputStream(bais);
+final ObjectInputStream ois = new ObjectInputStreamFiltered(bais);
 return ois.readObject();
 }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
index e8b49ab..a269a50 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java
@@ -17,6 +17,7 @@
 package org.apache.openejb.util;
 
 import junit.framework.TestCase;
+import org.apache.openejb.core.ObjectInputStreamFiltered;
 
 import java.io.ByteArrayInputStream;
 import 

tomee git commit: Add commons-collections dep due to exclusion Use ObjectInputStreamFiltered Overrides and finals Close streams 101 Fix LocalMBeanServer recursion Check for null.

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 8d0f5b8da -> db5bf1631


Add commons-collections dep due to exclusion
Use ObjectInputStreamFiltered
Overrides and finals
Close streams 101
Fix LocalMBeanServer recursion
Check for null.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/db5bf163
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db5bf163
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db5bf163

Branch: refs/heads/tomee-1.7.x
Commit: db5bf163145583339f76acc0f1c7a18b6b30e468
Parents: 8d0f5b8
Author: AndyGee 
Authored: Thu Dec 3 04:25:56 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 04:25:56 2015 +0100

--
 container/openejb-core/pom.xml  |  4 ++
 .../openejb/config/rules/CheckClassLoading.java |  4 +-
 .../openejb/core/ObjectInputStreamFiltered.java | 39 ++
 .../openejb/core/ivm/EjbObjectInputStream.java  |  1 +
 .../openejb/core/managed/SimplePassivater.java  | 17 ++--
 .../core/rmi/BlacklistClassResolver.java| 13 --
 .../openejb/core/timer/EjbTimerServiceImpl.java |  2 +-
 .../apache/openejb/core/timer/TimerData.java| 26 
 .../log/commonslogging/OpenEJBCommonsLog.java   |  2 +-
 .../openejb/monitoring/LocalMBeanServer.java|  2 +-
 .../java/org/apache/openejb/spi/Serializer.java | 39 +-
 .../apache/openejb/util/PojoSerialization.java  | 31 ++-
 .../openejb/server/httpd/HttpResponseImpl.java  | 42 +++-
 .../openejb/tck/cdi/embedded/BeansImpl.java | 16 
 .../tck/cdi/tomee/embedded/BeansImpl.java   | 16 
 .../org/apache/tomee/common/EjbFactory.java |  5 ++-
 16 files changed, 193 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/pom.xml
--
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 805b509..f0e435e 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -492,6 +492,10 @@
   commons-cli
   commons-cli
 
+
+  commons-collections
+  commons-collections
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
index 173810c..bb17b3e 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
@@ -190,8 +190,8 @@ public class CheckClassLoading extends ValidationBase {
 
 public static class DiffItem {
 private Collection files = new ArrayList();
-private String file1;
-private String file2;
+private final String file1;
+private final String file2;
 
 public DiffItem(final Collection files, final String file1, 
final String file2) {
 this.files = files;

http://git-wip-us.apache.org/repos/asf/tomee/blob/db5bf163/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
new file mode 100644
index 000..8af39a6
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ObjectInputStreamFiltered.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core;
+
+import 

buildbot exception in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a build exception on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/151

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] 87beb070daf3421515a74ca51502e136422a92d2
Blamelist: AndyGee 

BUILD FAILED: exception interrupted

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/144

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] 06f4b74a90a39564cd24f492d42f29798b6c776e
Blamelist: AndyGee ,Romain Manni-Bucau 

BUILD FAILED: failed test

Sincerely,
 -The Buildbot

buildbot exception in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a build exception on builder tomee-trunk-ubuntu while 
building tomee. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/143

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The SingleBranchScheduler scheduler named 
'on-tomee-trunk-ubuntu-commit' triggered this build
Build Source Stamp: [branch master] f79ce15f70a998cf20a8eb152c49b7b13a89f9c6
Blamelist: Romain Manni-Bucau 

BUILD FAILED: exception interrupted

Sincerely,
 -The Buildbot

[jira] [Commented] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[leonardo kenji shikida (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15035733#comment-15035733
 ] 

leonardo kenji shikida commented on TOMEE-1272:
---

how do I disable this port for tomee 1.6.0?

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0, 7.0.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0, 7.0.0-M1
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Andy Gumbrecht (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15035769#comment-15035769
 ] 

Andy Gumbrecht commented on TOMEE-1272:
---

Also, unless you actually expose the port through a firewall then it is not 
accessible. You'd need a good reason to leave it open.

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

buildbot success in ASF Buildbot on tomee-trunk-ubuntu

[buildbot]

The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/145

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: forced: by IRC user  on channel #openejb: None
Build Source Stamp: HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

[2/3] tomee git commit: EOL

[andygumbrecht]

EOL


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/06f4b74a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/06f4b74a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/06f4b74a

Branch: refs/heads/tomee-7.0.0-M1
Commit: 06f4b74a90a39564cd24f492d42f29798b6c776e
Parents: 2e566b4
Author: AndyGee 
Authored: Tue Dec 1 23:10:44 2015 +0100
Committer: AndyGee 
Committed: Tue Dec 1 23:12:08 2015 +0100

--
 .gitattributes | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/06f4b74a/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index dfc2e4b..1ce88bf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -38,11 +38,17 @@
 *.xsd   text
 *.yml   text
 
-openejb
-ejbd
-ejbds
-NOTICE  text
+activemqtext
+amq4factory text
+amq5factory text
+cipher  text
+ejbdtext
+ejbds   text
+jaastext
 LICENSE text
+NOTICE  text
+openejb text
+Static3DES  text
 
 # These files are binary and should be left untouched
 # (binary is a macro for -text -diff)

[3/3] tomee git commit: Merge branch 'master' into tomee-7.0.0-M1

[andygumbrecht]

Merge branch 'master' into tomee-7.0.0-M1


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ffa109cc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ffa109cc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ffa109cc

Branch: refs/heads/tomee-7.0.0-M1
Commit: ffa109cc3f025298c5148177c45137c8cbc61f8e
Parents: 4966cef 06f4b74
Author: AndyGee 
Authored: Wed Dec 2 13:49:26 2015 +0100
Committer: AndyGee 
Committed: Wed Dec 2 13:49:26 2015 +0100

--
 .gitattributes| 14 ++
 .../openejb/core/ivm/naming/LazyObjectReference.java  |  2 +-
 .../apache/tomee/catalina/TomcatWebAppBuilder.java|  6 --
 .../main/java/org/apache/tomee/overlay/Deployer.java  |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)
--

[1/3] tomee git commit: fixing build/style

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.0.0-M1 4966cef13 -> ffa109cc3


fixing build/style


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2e566b49
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2e566b49
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2e566b49

Branch: refs/heads/tomee-7.0.0-M1
Commit: 2e566b49084ae237411e8c25558d2e89a092fe9e
Parents: 9a32caf
Author: Romain Manni-Bucau 
Authored: Tue Dec 1 22:50:29 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 1 22:50:44 2015 +0100

--
 .../apache/openejb/core/ivm/naming/LazyObjectReference.java| 2 +-
 .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java| 6 --
 .../src/main/java/org/apache/tomee/overlay/Deployer.java   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java
index 80ab060..a8b0b9e 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java
@@ -48,7 +48,7 @@ public class LazyObjectReference extends Reference {
 return instance != null;
 }
 
-public static class LazyNamingException extends NamingException {
+public static final class LazyNamingException extends NamingException {
 private LazyNamingException(final String message) {
 super(message);
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 8949d97..a45de69 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1065,8 +1065,10 @@ public class TomcatWebAppBuilder implements 
WebAppBuilder, ContextListener, Pare
 
contextTransaction.setProperty(org.apache.naming.factory.Constants.FACTORY, 
UserTransactionFactory.class.getName());
 
standardContext.getNamingResources().setTransaction(contextTransaction);
 
-// ensure NamingContext is available for eager usage (@Observes 
@Initialized(ApplicationScoped) for instance)
-standardContext.getNamingContextListener().lifecycleEvent(event);
+if (event != null) {
+// ensure NamingContext is available for eager usage (@Observes 
@Initialized(ApplicationScoped) for instance)
+standardContext.getNamingContextListener().lifecycleEvent(event);
+}
 
 TomcatHelper.configureJarScanner(standardContext);
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java
--
diff --git 
a/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java
 
b/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java
index 92ac728..d104af2 100644
--- 
a/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java
+++ 
b/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java
@@ -27,7 +27,7 @@ import javax.servlet.ServletContext;
 public final class Deployer {
 public static void deploy(final ServletContext ctx) {
 final TomcatWebAppBuilder builder = 
SystemInstance.get().getComponent(TomcatWebAppBuilder.class);
-
builder.configureStart(StandardContext.class.cast(Reflections.get(Reflections.get(ctx,
 "context"), "context")));
+builder.configureStart(null, 
StandardContext.class.cast(Reflections.get(Reflections.get(ctx, "context"), 
"context")));
 }
 
 private Deployer() {

[jira] [Commented] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Romain Manni-Bucau (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15035757#comment-15035757
 ] 

Romain Manni-Bucau commented on TOMEE-1272:
---

[~shikida] it only affects RemoteServer tools (mvn plugin and arquillian) not  
a plain tomee instance. For these tools just set this property to false

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0, 7.0.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0, 7.0.0-M1
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Romain Manni-Bucau (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau updated TOMEE-1272:
--
Fix Version/s: 1.7.2

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Romain Manni-Bucau (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau updated TOMEE-1272:
--
Fix Version/s: (was: 7.0.0)

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Romain Manni-Bucau (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau updated TOMEE-1272:
--
Affects Version/s: (was: 7.0.0-M1)

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Romain Manni-Bucau (JIRA)]

 [ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau updated TOMEE-1272:
--
Affects Version/s: (was: 7.0.0)
   7.0.0-M1

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Andy Gumbrecht (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15035764#comment-15035764
 ] 

Andy Gumbrecht commented on TOMEE-1272:
---

You can't as it is hard coded.
You can however restrict it to localhost:

-Dcom.sun.management.jmxremote.host=localhost

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (TOMEE-1272) Do not force use of system property 'com.sun.management.jmxremote'

[Andy Gumbrecht (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1272?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15035768#comment-15035768
 ] 

Andy Gumbrecht commented on TOMEE-1272:
---

The problem is that TomEE used to force it to true, it ignored the command line 
-Dcom.sun.management.jmxremote=false

> Do not force use of system property 'com.sun.management.jmxremote'
> --
>
> Key: TOMEE-1272
> URL: https://issues.apache.org/jira/browse/TOMEE-1272
> Project: TomEE
>  Issue Type: Improvement
>Affects Versions: 1.7.0
>Reporter: Andy Gumbrecht
>Assignee: Andy Gumbrecht
> Fix For: 7.0.0-M1, 1.7.2
>
>
> We should not be forcing remote JMX by default. For one, it is a security 
> issue. 
> Also running parallel builds is an issue as the default port 1099 is used by 
> both builds.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[1/2] tomee git commit: Finals

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master 26770ac8b -> 87beb070d


Finals


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cf2e1138
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cf2e1138
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cf2e1138

Branch: refs/heads/master
Commit: cf2e113838a898bc866cb79823bd0022eade0fe5
Parents: 26770ac
Author: AndyGee 
Authored: Thu Dec 3 03:18:10 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:18:10 2015 +0100

--
 .../openejb/server/httpd/HttpResponseImpl.java  | 112 +--
 1 file changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/cf2e1138/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index 180e3e2..cb73dcf 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -33,8 +33,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.URLConnection;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -99,7 +99,7 @@ public class HttpResponseImpl implements HttpResponse {
 private String encoding = "UTF-8";
 private Locale locale = Locale.getDefault();
 
-protected void setRequest(HttpRequestImpl request) {
+protected void setRequest(final HttpRequestImpl request) {
 this.request = request;
 }
 
@@ -109,68 +109,68 @@ public class HttpResponseImpl implements HttpResponse {
  * @param name  the name of the header
  * @param value the value of the header
  */
-public void setHeader(String name, String value) {
+public void setHeader(final String name, final String value) {
 headers.put(name, value);
 }
 
 @Override
-public void setIntHeader(String s, int i) {
+public void setIntHeader(final String s, final int i) {
 headers.put(s, Integer.toString(i));
 }
 
 @Override
-public void setStatus(int i) {
+public void setStatus(final int i) {
 setCode(i);
 }
 
 @Override
-public void setStatus(int i, String s) {
+public void setStatus(final int i, final String s) {
 setCode(i);
 setStatusMessage(s);
 }
 
 @Override
-public void addCookie(Cookie cookie) {
+public void addCookie(final Cookie cookie) {
 headers.put(cookie.getName(), cookie.getValue());
 }
 
 @Override
-public void addDateHeader(String s, long l) {
+public void addDateHeader(final String s, final long l) {
 headers.put(s, Long.toString(l));
 }
 
 @Override
-public void addHeader(String s, String s1) {
+public void addHeader(final String s, final String s1) {
 headers.put(s, s1);
 }
 
 @Override
-public void addIntHeader(String s, int i) {
+public void addIntHeader(final String s, final int i) {
 setIntHeader(s, i);
 }
 
 @Override
-public boolean containsHeader(String s) {
+public boolean containsHeader(final String s) {
 return headers.containsKey(s);
 }
 
 @Override
-public String encodeURL(String s) {
+public String encodeURL(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeRedirectURL(String s) {
+public String encodeRedirectURL(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeUrl(String s) {
+public String encodeUrl(final String s) {
 return toEncoded(s);
 }
 
 @Override
-public String encodeRedirectUrl(String s) {
+public String encodeRedirectUrl(final String s) {
 return encodeRedirectURL(s);
 }
 
@@ -180,7 +180,7 @@ public class HttpResponseImpl implements HttpResponse {
  * @param name The name of the header
  * @return the value of the header
  */
-public String getHeader(String name) {
+public String getHeader(final String name) {
 return headers.get(name);
 }
 
@@ -190,8 +190,8 @@ public class HttpResponseImpl implements HttpResponse {
 }
 
 @Override
-public Collection getHeaders(String s) {
-return Arrays.asList(headers.get(s));
+public Collection getHeaders(final String s) {
+return 

tomee git commit: Fix recursion

[andygumbrecht]

Repository: tomee
Updated Branches:
  refs/heads/master 256e14052 -> 26770ac8b


Fix recursion


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/26770ac8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/26770ac8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/26770ac8

Branch: refs/heads/master
Commit: 26770ac8bc62968e88c55b1b0ca1b383ec3e13d5
Parents: 256e140
Author: AndyGee 
Authored: Thu Dec 3 03:12:52 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:12:52 2015 +0100

--
 .../main/java/org/apache/openejb/monitoring/LocalMBeanServer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/26770ac8/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
index 94b3b2f..2ce5e1a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
@@ -184,7 +184,7 @@ public final class LocalMBeanServer implements MBeanServer {
 
 @Override
 public Set queryMBeans(final ObjectName name, final 
QueryExp query) {
-return queryMBeans(name, query);
+return s().queryMBeans(name, query);
 }
 
 @Override

[jira] [Commented] (TOMEE-1669) blacklist org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan in our custom ObjectInputStream

[Andy Gumbrecht (JIRA)]

[ 
https://issues.apache.org/jira/browse/TOMEE-1669?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15037016#comment-15037016
 ] 

Andy Gumbrecht commented on TOMEE-1669:
---

Applied patch to 1.7.x

> blacklist 
> org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan
>  in our custom ObjectInputStream
> 
>
> Key: TOMEE-1669
> URL: https://issues.apache.org/jira/browse/TOMEE-1669
> Project: TomEE
>  Issue Type: Bug
>Affects Versions: 7.0.0-M1, 1.7.3
>Reporter: Romain Manni-Bucau
>Assignee: Romain Manni-Bucau
> Fix For: 7.0.0-M1
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[2/2] tomee git commit: Deps required after exclude Cannot use body if getWriter fails

[andygumbrecht]

Deps required after exclude
Cannot use body if getWriter fails


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/87beb070
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/87beb070
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/87beb070

Branch: refs/heads/master
Commit: 87beb070daf3421515a74ca51502e136422a92d2
Parents: cf2e113
Author: AndyGee 
Authored: Thu Dec 3 03:33:54 2015 +0100
Committer: AndyGee 
Committed: Thu Dec 3 03:33:54 2015 +0100

--
 container/openejb-core/pom.xml   | 4 
 pom.xml  | 2 +-
 .../org/apache/openejb/server/httpd/HttpResponseImpl.java| 8 
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/87beb070/container/openejb-core/pom.xml
--
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 3be1987..d133463 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -511,6 +511,10 @@
   commons-cli
   commons-cli
 
+
+  commons-collections
+  commons-collections
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/87beb070/pom.xml
--
diff --git a/pom.xml b/pom.xml
index aaa2633..813b364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  3.2
+  3.3
 
 
   org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/tomee/blob/87beb070/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index cb73dcf..f33ad34 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -585,11 +585,11 @@ public class HttpResponseImpl implements HttpResponse {
  */
 protected static HttpResponseImpl createError(String message, final 
Throwable t) {
 final HttpResponseImpl res = new HttpResponseImpl(500, "Internal 
Server Error", "text/html");
-PrintWriter body = null;
+final PrintWriter body;
 try {
 body = res.getWriter();
 } catch (final IOException e) { // impossible normally
-// no-op
+return res;
 }
 
 body.println("");
@@ -644,11 +644,11 @@ public class HttpResponseImpl implements HttpResponse {
  */
 protected static HttpResponseImpl createForbidden(final String ip) {
 final HttpResponseImpl res = new HttpResponseImpl(403, "Forbidden", 
"text/html");
-PrintWriter body = null;
+final PrintWriter body;
 try {
 body = res.getWriter();
 } catch (final IOException e) { // normally impossible
-// no-op
+return res;
 }
 
 body.println("");