svn commit: r1735110 - in /tomee/site/trunk/content: properties-listing.mdtext security/index.mdtext

[rmannibucau]

Author: rmannibucau
Date: Tue Mar 15 15:39:37 2016
New Revision: 1735110

URL: http://svn.apache.org/viewvc?rev=1735110=rev
Log:
TOMEE-1734 new patch from Robert panzer to enhance properties-listings and 
security-index navigation for the last CVE we got

Modified:
tomee/site/trunk/content/properties-listing.mdtext
tomee/site/trunk/content/security/index.mdtext

Modified: tomee/site/trunk/content/properties-listing.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/properties-listing.mdtext?rev=1735110=1735109=1735110=diff
==
--- tomee/site/trunk/content/properties-listing.mdtext (original)
+++ tomee/site/trunk/content/properties-listing.mdtext Tue Mar 15 15:39:37 2016
@@ -49,8 +49,8 @@ Title: System Properties Listing
 openejb.log.color bool  activate or not the color in 
the console in embedded mode 
 openejb.log.color.level in lowercase color in 
uppercase  set a color
 for a particular level. Color are BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, 
CYAN, WHITE, DEFAULT.  
-tomee.serialization.class.blacklist string  default 
list of packages/classnames excluded for EJBd deserialization (needs to be set 
on server and client sides). Please see the description of [Ejbd 
Transport](ejbd-transport.html) for details.
-tomee.serialization.class.whitelist string  default 
list of packages/classnames allowed for EJBd deserialization (blacklist wins 
over whitelist, needs to be set on server and client sides). Please see the 
description of [Ejbd Transport](ejbd-transport.html) for details.
+tomee.serialization.class.blacklist string  default 
list of packages/classnames excluded for EJBd deserialization (needs to be set 
on server and client sides). Please see the description of http://tomee.apache.org/ejbd-transport.html;>Ejbd Transport for 
details.
+tomee.serialization.class.whitelist string  default 
list of packages/classnames allowed for EJBd deserialization (blacklist wins 
over whitelist, needs to be set on server and client sides). Please see the 
description of http://tomee.apache.org/ejbd-transport.html;>Ejbd 
Transport for details.
 tomee.remote.support boolean  if true /tomee webapp 
is auto-deployed and EJBd is active (true by default for 1.x, false for 7.x 
excepted for tomee maven plugin and arquillian)
 
 

Modified: tomee/site/trunk/content/security/index.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/security/index.mdtext?rev=1735110=1735109=1735110=diff
==
--- tomee/site/trunk/content/security/index.mdtext (original)
+++ tomee/site/trunk/content/security/index.mdtext Tue Mar 15 15:39:37 2016
@@ -16,6 +16,7 @@ Lists of security problems fixed in rele
 
 * [Apache TomEE 1.5 Security Vulnerabilities](tomee.html)
 * [Apache TomEE 1.6 Security Vulnerabilities](tomee.html)
+* [Apache TomEE 1.7 Security Vulnerabilities](tomee.html)
 
 
 ## Reporting New Security Problems with Apache TomEE

svn commit: r1735051 - in /tomee/site/trunk/content: ejbd-transport.mdtext properties-listing.mdtext security/tomee.mdtext

[rmannibucau]

Author: rmannibucau
Date: Tue Mar 15 10:08:06 2016
New Revision: 1735051

URL: http://svn.apache.org/viewvc?rev=1735051=rev
Log:
TOMEE-1733 Robert Panzer updates on the doc on how to go back on 1.7.3 behavior 
with ejbd serialization config

Modified:
tomee/site/trunk/content/ejbd-transport.mdtext
tomee/site/trunk/content/properties-listing.mdtext
tomee/site/trunk/content/security/tomee.mdtext

Modified: tomee/site/trunk/content/ejbd-transport.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/ejbd-transport.mdtext?rev=1735051=1735050=1735051=diff
==
--- tomee/site/trunk/content/ejbd-transport.mdtext (original)
+++ tomee/site/trunk/content/ejbd-transport.mdtext Tue Mar 15 10:08:06 2016
@@ -29,7 +29,7 @@ using the "activated" init parameter of
 Finally you can move this servlet in your own webapp if you want to use a 
provider url
 containing your webapp context. Simply copy paste the servlet definition in 
your web.xml
 and set the url mapping to what you want (let say /foo/*). Then use the 
provider url
-http://host:port/webapp context name/foo
+http://host:port/webapp context name/foo
 
 ### Remote communication and serialization
 
@@ -74,6 +74,20 @@ If you trust all classes in the package
 tomee.serialization.class.whitelist = foo.
 tomee.serialization.class.blacklist = foo.Bar
 
+ Revert to behavior of TomEE 1.7.3
+
+You can configure these properties so that the Ejbd transport will behave in 
the same way it did with TomEE 1.7.3:
+
+tomee.serialization.class.whitelist = 
+tomee.serialization.class.blacklist = 
org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process
+
+Please note that with this configuration your server is vulnerable to Java 
serialization attacks again in particular when the system is exposed to the 
internet.
+
+As Ejbd transport is tunneled over HTTP please make sure that the 
`ServerServlet` is not publicly accessible.
+When the applications running on TomEE do not package the `ServerServlet` 
themselves ensure that the URL http://host:port/tomee/ejb is 
not accessible from untrusted sources.
+
+If your applications package declare it in their own web.xml make sure that 
the respective URL is not accessible from untrusted sources.
+
  Remote communication and Arquillian tests
 
 The mechanism described above principally also works when running Arquillian 
tests.

Modified: tomee/site/trunk/content/properties-listing.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/properties-listing.mdtext?rev=1735051=1735050=1735051=diff
==
--- tomee/site/trunk/content/properties-listing.mdtext (original)
+++ tomee/site/trunk/content/properties-listing.mdtext Tue Mar 15 10:08:06 2016
@@ -49,8 +49,8 @@ Title: System Properties Listing
 openejb.log.color bool  activate or not the color in 
the console in embedded mode 
 openejb.log.color.level in lowercase color in 
uppercase  set a color
 for a particular level. Color are BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, 
CYAN, WHITE, DEFAULT.  
-tomee.serialization.class.blacklist string  default 
list of packages/classnames excluded for EJBd deserialization (needs to be set 
on server and client sides)
-tomee.serialization.class.whitelist string  default 
list of packages/classnames allowed for EJBd deserialization (blacklist wins 
over whitelist, needs to be set on server and client sides)
+tomee.serialization.class.blacklist string  default 
list of packages/classnames excluded for EJBd deserialization (needs to be set 
on server and client sides). Please see the description of [Ejbd 
Transport](ejbd-transport.html) for details.
+tomee.serialization.class.whitelist string  default 
list of packages/classnames allowed for EJBd deserialization (blacklist wins 
over whitelist, needs to be set on server and client sides). Please see the 
description of [Ejbd Transport](ejbd-transport.html) for details.
 tomee.remote.support boolean  if true /tomee webapp 
is auto-deployed and EJBd is active (true by default for 1.x, false for 7.x 
excepted for tomee maven plugin and arquillian)
 
 

Modified: tomee/site/trunk/content/security/tomee.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/security/tomee.mdtext?rev=1735051=1735050=1735051=diff
==
--- tomee/site/trunk/content/security/tomee.mdtext (original)
+++ tomee/site/trunk/content/security/tomee.mdtext Tue Mar 15 10:08:06 2016
@@ -29,10 +29,10 @@ that even if fixed in 7.0.0-M2 we recomm
 This issue only affects you if you rely on EJBd protocol (proprietary remote 
EJB protocol). This one one is not activated by default on the 7.x series
 but it was on the 1.x ones.
 
-The related CVE number is *CVE-2016-0779*: the EJBd protocol provided by 

svn commit: r1735025 - /tomee/site/trunk/content/ejbd-transport.mdtext

[rmannibucau]

Author: rmannibucau
Date: Tue Mar 15 07:48:08 2016
New Revision: 1735025

URL: http://svn.apache.org/viewvc?rev=1735025=rev
Log:
TOMEE-1732 patch from Robert Panzer on ejb protocol, thanks Robert

Modified:
tomee/site/trunk/content/ejbd-transport.mdtext

Modified: tomee/site/trunk/content/ejbd-transport.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/ejbd-transport.mdtext?rev=1735025=1735024=1735025=diff
==
--- tomee/site/trunk/content/ejbd-transport.mdtext (original)
+++ tomee/site/trunk/content/ejbd-transport.mdtext Tue Mar 15 07:48:08 2016
@@ -1,5 +1,8 @@
 Title: Ejbd Transport
 
+The Ejbd Transport allows to remotely access EJBs that have a remote interface.
+Nevertheless it is not based on IIOP.
+
 Ejbd Transport is different using TomEE or OpenEJB.
 
 In OpenEJB it uses openejb http layer and ejbd is configured through ejbd 
service (same for ejbds).
@@ -28,3 +31,58 @@ containing your webapp context. Simply c
 and set the url mapping to what you want (let say /foo/*). Then use the 
provider url
 http://host:port/webapp context name/foo
 
+### Remote communication and serialization
+
+Remotely calling EJBs, independent of using Ejbd or other RMI/IIOP based 
protocols, involves serialization and deserialization of objects.
+Deserializing unknown content coming from an untrusted source imposes a 
security risk as the stream could be manipulated.
+A much publicized [vulnerability](http://www.kb.cert.org/vuls/id/576313) was 
found in the commons-collections library which allowed to remotely execute 
arbitrary code simply by deserializing instances of the class 
`InvokerTransformer`.
+
+To prevent this risk TomEE and the OpenEJB client since 1.7.4 before 
deserializing every object checks its class against a black list and a white 
list.
+The default black list is defined as `*`, meaning that requests cannot be 
deserialized at all and the Ejbd transport in fact cannot be used.
+
+The black list and white list is configured via the system properties:
+
+- `tomee.serialization.class.whitelist`
+- `tomee.serialization.class.blacklist`
+
+You will also find these properties in [System Properties 
Listing](properties-listing.html)
+
+The default for `tomee.serialization.class.whitelist` is empty, the default 
for `tomee.serialization.class.blacklist` is `*`.
+The black list has a higher priority than the white list.
+That means that you have to make sure that you add a required class to the 
white list and at the same time remove it from the black list.
+
+If an EJB request fails because a class is not whitelisted you will find this 
log entry:
+
+WARN - "null OEJP/4.7" FAIL "Security error - foo.Bar is not whitelisted 
as deserialisable, prevented before loading it." - Debug for StackTrace
+
+If you trust this class and want to support serialization in remote 
communication you have to configure these properties appropriately both on 
server side as well as on client side.
+
+If you only want to support serialization of the classes `foo.Bar` and 
`foo.Baz` you can configure the properties like this:
+
+tomee.serialization.class.whitelist = foo.Bar,foo.Baz
+tomee.serialization.class.blacklist = -
+
+If you trust all classes in the package `foo` define the properties like this:
+
+tomee.serialization.class.whitelist = foo.
+tomee.serialization.class.blacklist = -
+
+(Don't forget the trailing `.` after foo, as it will also whitelist all 
classes in the package `foo2` otherwise.)
+
+If you trust all classes in the package `foo` except the class `foo.Bar` you 
have to configure the properties like this:
+
+tomee.serialization.class.whitelist = foo.
+tomee.serialization.class.blacklist = foo.Bar
+
+ Remote communication and Arquillian tests
+
+The mechanism described above principally also works when running Arquillian 
tests.
+As the Ejbd transport is already used for deploying applications all 
Arquillian tests would fail with the default settings.
+
+Therefore the TomEE Arquillian adapter automatically starts the container so 
that all classes except for a set of well-know dangerous classes are 
whitelisted.
+
+As Ejbd is by default disabled since TomEE 7.0.0, the TomEE Arquillian adapter 
automatically activates it when starting starting a remote container.
+
+ Remote communication and the TomEE Maven Plugin
+
+The same mentioned above on Arquillian and TomEE is also valid when using the 
TomEE Maven Plugin.
\ No newline at end of file

tomee git commit: TOMEE-1731 web.xml jaxrs application overrides annotation (we were concatenating both)

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 64e5b4485 -> a329a6e83


TOMEE-1731 web.xml jaxrs application overrides annotation (we were 
concatenating both)


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

Branch: refs/heads/master
Commit: a329a6e835f8171ad2aed15e2140d7615196054b
Parents: 64e5b44
Author: Romain manni-Bucau 
Authored: Tue Mar 15 08:36:43 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 15 08:36:43 2016 +0100

--
 .../tests/jaxrs/webxmloverride/RSApp.java   | 24 
 .../tests/jaxrs/webxmloverride/TheResource.java | 29 +
 .../WebXmlOverrideControlSampleTest.java| 53 
 .../webxmloverride/WebXmlOverrideTest.java  | 65 
 pom.xml | 10 ---
 .../SimpleApplicationWithLongMappingTest.java   |  2 +-
 .../rs/SimpleApplicationWithMappingTest.java|  2 +-
 .../apache/openejb/server/rest/RESTService.java | 12 ++--
 8 files changed, 178 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a329a6e8/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/RSApp.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/RSApp.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/RSApp.java
new file mode 100644
index 000..4775d0a
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/RSApp.java
@@ -0,0 +1,24 @@
+/*
+ * 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.arquillian.tests.jaxrs.webxmloverride;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("annotation")
+public class RSApp extends Application {
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/a329a6e8/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
new file mode 100644
index 000..c15814a
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
@@ -0,0 +1,29 @@
+/*
+ * 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.arquillian.tests.jaxrs.webxmloverride;
+

tomee git commit: using the release until we need a snapshot

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 738f1010a -> 64e5b4485


using the release until we need a snapshot


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

Branch: refs/heads/master
Commit: 64e5b448584578acb9e849d8ba9337da77ee6503
Parents: 738f101
Author: Romain manni-Bucau 
Authored: Sat Mar 12 12:10:13 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sat Mar 12 12:10:13 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/64e5b448/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 941c9dc..bdc933a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
 ${project.version}
 
 
-7.0-1-SNAPSHOT
+7.0
 
 2.4.1
 1.6.3

tomee git commit: TOMEE-1730 /.../* should map /.../.* as regex in openejb embedded http layer

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 1cbdedba7 -> e8eacb5ef


TOMEE-1730 /.../* should map /.../.* as regex in openejb embedded http layer


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

Branch: refs/heads/master
Commit: e8eacb5ef5818217b6744b985ae3b4e4fa696710
Parents: 1cbdedb
Author: Romain manni-Bucau 
Authored: Thu Mar 10 19:01:01 2016 +0100
Committer: Romain manni-Bucau 
Committed: Thu Mar 10 19:01:01 2016 +0100

--
 .../main/java/org/apache/openejb/server/httpd/util/HttpUtil.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/e8eacb5e/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
index 65b8576..9bc31b0 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
@@ -233,7 +233,7 @@ public final class HttpUtil {
 path += mapping.startsWith("*.") ? WILDCARD + "\\" + 
mapping.substring(1) : mapping;
 
 if (path.endsWith("*")) {
-path = path.substring(0, path.length()) + WILDCARD;
+path = path.substring(0, path.length() - 1) + WILDCARD;
 }
 return path;
 }

tomee git commit: fixing 2 tests

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 05a8ed134 -> 1cbdedba7


fixing 2 tests


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

Branch: refs/heads/master
Commit: 1cbdedba7fd6cd076e64cc77019ae4bd2c5d83c7
Parents: 05a8ed1
Author: Romain manni-Bucau 
Authored: Thu Mar 10 10:19:09 2016 +0100
Committer: Romain manni-Bucau 
Committed: Thu Mar 10 10:19:09 2016 +0100

--
 .../apache/openejb/server/cxf/rs/CDIApplicationTest.java  |  2 +-
 .../LoggingJAXRSWebAppModuleClassConfigurationTest.java   | 10 +-
 .../java/org/apache/openejb/server/rest/RESTService.java  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
index 9cdc5f9..06b2ce0 100644
--- 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
+++ 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
@@ -68,7 +68,7 @@ public class CDIApplicationTest {
 
 @Test
 public void isCdi() {
-assertEquals(2, MyCdiRESTApplication.injection.size());
+assertEquals(1, MyCdiRESTApplication.injection.size());
 for (final Boolean b : MyCdiRESTApplication.injection) {
 assertTrue(b);
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
index 6a3853a..7196e4d 100644
--- 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
+++ 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
@@ -22,21 +22,21 @@ import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.server.cxf.rs.logging.LoggingJAXRSCommons;
 import org.apache.openejb.testing.EnableServices;
 import org.apache.openejb.testing.Module;
+import org.apache.openejb.testing.RandomPort;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.net.URL;
+
 import static org.junit.Assert.assertTrue;
 
 
 @EnableServices("jax-rs")
 @RunWith(ApplicationComposer.class)
 public class LoggingJAXRSWebAppModuleClassConfigurationTest extends 
LoggingJAXRSCommons {
-
-@BeforeClass
-public static void beforeClass() throws Exception {
-configurePort();
-}
+@RandomPort("http")
+private URL base;
 
 @Module
 public AppModule service() throws Exception {

http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
--
diff --git 
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
index d7ac5e5..6049263 100644
--- 
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
+++ 
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -203,7 +203,7 @@ public abstract class RESTService implements ServerService, 
SelfManaging {
 
 if (deploymentWithApplication) { // don't do it if we 
detected we should use old deployment
 if (appSkipped || application == null) {
-application = new InternalApplication(application);
+application = 
!InternalApplication.class.isInstance(application) ? new 
InternalApplication(application) : application;
 
 for (final String clazz : webApp.restClass) {
 try {

tomee git commit: TOMEE-1729 ensure CXF rs can set the context of the app even if previous http layer misset it to root

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 93b8c6dbc -> 05a8ed134


TOMEE-1729 ensure CXF rs can set the context of the app even if previous http 
layer misset it to root


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

Branch: refs/heads/master
Commit: 05a8ed1342ec682ce3ec015f67616f0153b3dea1
Parents: 93b8c6d
Author: Romain manni-Bucau 
Authored: Wed Mar 9 22:16:08 2016 +0100
Committer: Romain manni-Bucau 
Committed: Wed Mar 9 22:16:08 2016 +0100

--
 .../openejb/server/httpd/HttpRequestImpl.java   |  7 +++
 .../openejb/server/httpd/HttpRequestImplTest.java   | 16 
 2 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/05a8ed13/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index 28a9f47..a8be406 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -1173,16 +1173,15 @@ public class HttpRequestImpl implements HttpRequest {
 }
 
 public void initPathFromContext(final String context) {
-if (!"/".equals(path)) { // already done
+if (!"/".equals(path) && !"".equals(contextPath)) { // already done
 return;
 }
 
 final String rawPath = requestRawPath();
 if (context != null) {
 if (context.endsWith("/")) {
-final int endIndex = context.length() - 1;
-path = rawPath.substring(endIndex, rawPath.length());
-contextPath = context.substring(0, endIndex);
+path = rawPath.substring(0, rawPath.length());
+contextPath = "";
 } else {
 path = rawPath.substring(context.length(), rawPath.length());
 contextPath = context;

http://git-wip-us.apache.org/repos/asf/tomee/blob/05a8ed13/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpRequestImplTest.java
--
diff --git 
a/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpRequestImplTest.java
 
b/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpRequestImplTest.java
index 54b7373..aa7a086 100644
--- 
a/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpRequestImplTest.java
+++ 
b/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpRequestImplTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -47,4 +48,19 @@ public class HttpRequestImplTest {
 session.invalidate();
 assertNull(req.getSession(false));
 }
+
+@Test
+public void initContext() throws URISyntaxException {
+final HttpRequestImpl req = new HttpRequestImpl(new 
URI("http://localhost:1234/api/foo/bar;));
+req.setUri(req.getSocketURI());
+
+req.initPathFromContext("/");
+assertEquals("/api/foo/bar", req.getServletPath());
+
+req.initPathFromContext("/api"); // reinit, happens with cxf + 
embedded http
+assertEquals("/foo/bar", req.getServletPath());
+
+req.initPathFromContext("/api/bar"); // that's too late we tolerate a 
wrong context only if its value is "/"
+assertEquals("/foo/bar", req.getServletPath());
+}
 }

tomee git commit: TOMEE-1728 don't call twice @PostConstruct in ApplicationComposers.run

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 7f1ee68c3 -> 93b8c6dbc


TOMEE-1728 don't call twice @PostConstruct in ApplicationComposers.run


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

Branch: refs/heads/master
Commit: 93b8c6dbcc3a6afe7e19d56aced13ce9c27b1a28
Parents: 7f1ee68
Author: Romain manni-Bucau 
Authored: Wed Mar 9 16:55:26 2016 +0100
Committer: Romain manni-Bucau 
Committed: Wed Mar 9 16:55:26 2016 +0100

--
 .../openejb/testing/ApplicationComposers.java   | 21 
 .../testing/ApplicationComposersTest.java   |  3 +++
 .../apache/openejb/testing/app/Application.java |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/93b8c6db/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 f9568b1..c645c0e 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
@@ -1515,17 +1515,11 @@ public class ApplicationComposers {
 instance = type.newInstance();
 }
 composer.before(instance);
+composer.testClassFinders.remove(composer); // fix this workaround 
used for tests but breaking standalone mode
 
 final CountDownLatch latch = new CountDownLatch(1);
-composer.handleLifecycle(type, instance);
 
-composer.afterRunnables.add(new Runnable() {
-@Override
-public void run() {
-latch.countDown();
-}
-});
-Runtime.getRuntime().addShutdownHook(new Thread() {
+final Thread hook = new Thread() {
 @Override
 public void run() {
 try {
@@ -1534,8 +1528,19 @@ public class ApplicationComposers {
 // no-op
 }
 }
+};
+Runtime.getRuntime().addShutdownHook(hook);
+composer.afterRunnables.add(new Runnable() {
+@Override
+public void run() {
+Runtime.getRuntime().removeShutdownHook(hook);
+latch.countDown();
+}
 });
 
+// do it after having added the latch countdown hook to avoid to 
block if start and stop very fast
+composer.handleLifecycle(type, instance);
+
 latch.await();
 } catch (final InterruptedException ie) {
 Thread.interrupted();

http://git-wip-us.apache.org/repos/asf/tomee/blob/93b8c6db/container/openejb-core/src/test/java/org/apache/openejb/testing/ApplicationComposersTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/testing/ApplicationComposersTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/testing/ApplicationComposersTest.java
index 9bec2e3..bd45ad9 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/testing/ApplicationComposersTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/testing/ApplicationComposersTest.java
@@ -20,6 +20,7 @@ import org.apache.openejb.testing.app.Application;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class ApplicationComposersTest {
@@ -32,6 +33,7 @@ public class ApplicationComposersTest {
 
 @Test
 public void run() throws InterruptedException {
+Application.startCount = 0;
 final Thread t = new Thread() {
 @Override
 public void run() {
@@ -41,5 +43,6 @@ public class ApplicationComposersTest {
 t.start();
 t.join();
 assertTrue(ok);
+assertEquals(1, Application.startCount);
 }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/93b8c6db/container/openejb-core/src/test/java/org/apache/openejb/testing/app/Application.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/testing/app/Application.java
 

svn commit: r12708 - /release/tomee/tomee-7.0.0-M2/

[rmannibucau]

Author: rmannibucau
Date: Wed Mar  9 08:31:53 2016
New Revision: 12708

Log:
reuploading corrupted files

Modified:
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.sha1
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.zip
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.zip.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.zip.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.zip.sha1
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.tar.gz
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.tar.gz.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.tar.gz.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.tar.gz.sha1
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.zip
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.zip.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.zip.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.zip.sha1
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.sha1
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.asc
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.md5
release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.sha1
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.tar.gz
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.tar.gz.asc
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.tar.gz.md5
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.tar.gz.sha1
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.zip
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.zip.asc
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.zip.md5
release/tomee/tomee-7.0.0-M2/openejb-standalone-7.0.0-M2.zip.sha1
release/tomee/tomee-7.0.0-M2/tomee-plume-webapp-7.0.0-M2.war
release/tomee/tomee-7.0.0-M2/tomee-plume-webapp-7.0.0-M2.war.asc
release/tomee/tomee-7.0.0-M2/tomee-plume-webapp-7.0.0-M2.war.md5
release/tomee/tomee-7.0.0-M2/tomee-plume-webapp-7.0.0-M2.war.sha1
release/tomee/tomee-7.0.0-M2/tomee-plus-webapp-7.0.0-M2.war
release/tomee/tomee-7.0.0-M2/tomee-plus-webapp-7.0.0-M2.war.asc
release/tomee/tomee-7.0.0-M2/tomee-plus-webapp-7.0.0-M2.war.md5
release/tomee/tomee-7.0.0-M2/tomee-plus-webapp-7.0.0-M2.war.sha1
release/tomee/tomee-7.0.0-M2/tomee-webapp-7.0.0-M2.war
release/tomee/tomee-7.0.0-M2/tomee-webapp-7.0.0-M2.war.asc
release/tomee/tomee-7.0.0-M2/tomee-webapp-7.0.0-M2.war.md5
release/tomee/tomee-7.0.0-M2/tomee-webapp-7.0.0-M2.war.sha1

Modified: release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz
==
Binary files - no diff available.

Modified: release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.asc
==
--- release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.asc 
(original)
+++ release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.asc Wed Mar 
 9 08:31:53 2016
@@ -1,7 +1,7 @@
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v1
 
-iF4EABEIAAYFAlbYXMsACgkQamL8jvF9j+/LIQD+ItcXcyBr0fqKHzaEKiizotl6
-2UIGGrzA7vaG9GSqCDgA/jt0cywjwXvXe2tIxtArxhPoiom+y53ZSljuu7wfvaHF
-=1Twe
+iF4EABEIAAYFAlbMKEEACgkQamL8jvF9j++SPgD7B6QfNhW3ocy/LatNDbTESYsd
+bgffqV8FiAUDHnYLG44BAIl9IQ8i7zf289tvIBQdj0WD02Q7MCZwQyNUtSHonkmI
+=+rH2
 -END PGP SIGNATURE-

Modified: release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.md5
==
--- release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.md5 
(original)
+++ release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.md5 Wed Mar 
 9 08:31:53 2016
@@ -1 +1 @@
-d3aadc07e2de7e52a039fc88f7ee11b6
\ No newline at end of file
+b40436c179d52bd4425fb67bc8579d54
\ No newline at end of file

Modified: release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.sha1
==
--- release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.sha1 
(original)
+++ release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plume.tar.gz.sha1 Wed 
Mar  9 08:31:53 2016
@@ -1 +1 @@
-d208e9da79707ef43830b862930dd7944797e233
\ No newline at end of file

[2/2] tomee git commit: TOMEE-1727 caching getSingletons and getClasses calls for jaxrs - fixing test

[rmannibucau]

TOMEE-1727 caching getSingletons and getClasses calls for jaxrs - fixing test


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

Branch: refs/heads/master
Commit: 7f1ee68c30db984d69adb72960d6c16617af6e75
Parents: 84ede0f
Author: Romain manni-Bucau 
Authored: Tue Mar 8 21:41:58 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 8 21:41:58 2016 +0100

--
 .../org/apache/openejb/server/cxf/rs/SingletonProviderTest.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/7f1ee68c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonProviderTest.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonProviderTest.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonProviderTest.java
index 0f7ad6e..4a8f045 100644
--- 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonProviderTest.java
+++ 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonProviderTest.java
@@ -49,6 +49,7 @@ public class SingletonProviderTest {
 final HttpURLConnection conn = HttpURLConnection.class.cast(new 
URL(base.toExternalForm() + "app/need-provider").openConnection());
 assertEquals("ok", IO.slurp(conn.getInputStream()));
 conn.getInputStream().close();
+assertEquals(1, ApplicationSample.count);
 }
 
 @Path("need-provider")
@@ -68,8 +69,11 @@ public class SingletonProviderTest {
 }
 
 public static class ApplicationSample extends Application {
+public static volatile int count = 0;
+
 @Override
 public Set getSingletons() {
+count++;
 return new HashSet() {{
 add(new NeedAProvider());
 add(new DontLetResourcesFail());

[1/2] tomee git commit: TOMEE-1727 caching getSingletons and getClasses calls for jaxrs

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 1c961beea -> 7f1ee68c3


TOMEE-1727 caching getSingletons and getClasses calls for jaxrs


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

Branch: refs/heads/master
Commit: 84ede0f229433d9f8f74a10dcaba7a69afdf12b5
Parents: 1c961be
Author: Romain manni-Bucau 
Authored: Tue Mar 8 21:40:40 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 8 21:40:40 2016 +0100

--
 .../server/cxf/rs/CxfRsHttpListener.java| 68 -
 .../server/cxf/rs/SingletonProviderTest.java| 79 
 .../server/rest/InternalApplication.java|  4 +
 .../apache/openejb/server/rest/RESTService.java | 15 ++--
 4 files changed, 126 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/84ede0f2/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 77a6dd2..1a8d95e 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -41,8 +41,6 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.servlet.BaseUrlHelper;
-import org.apache.johnzon.jaxrs.ConfigurableJohnzonProvider;
-import org.apache.johnzon.jaxrs.JohnzonProvider;
 import org.apache.johnzon.jaxrs.WadlDocumentMessageBodyWriter;
 import org.apache.openejb.AppContext;
 import org.apache.openejb.BeanContext;
@@ -83,6 +81,24 @@ import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
 
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.management.ObjectName;
+import javax.management.openmbean.TabularData;
+import javax.naming.Context;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.ConstrainedTo;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -107,24 +123,6 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.management.ObjectName;
-import javax.management.openmbean.TabularData;
-import javax.naming.Context;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.ConstrainedTo;
-import javax.ws.rs.RuntimeType;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
 
 import static java.util.Arrays.asList;
 import static org.apache.openejb.loader.JarLocation.jarLocation;
@@ -146,7 +144,7 @@ public class CxfRsHttpListener implements RsHttpListener {
 private static final boolean FAIL_ON_CONSTRAINED_TO = 
"true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.jaxrs.fail-on-constrainedto",
 "true"));
 
 private static final Map STATIC_CONTENT_TYPES;
-private static final String[] DEFAULT_WELCOME_FILES = new String[]{ 
"/index.html", "/index.htm" };
+private static final String[] DEFAULT_WELCOME_FILES = new 
String[]{"/index.html", "/index.htm"};
 
 private final DestinationFactory transportFactory;
 private final String wildcard;
@@ -159,7 +157,7 @@ public class CxfRsHttpListener implements 

tomee git commit: TOMEE-1726 StreamingOutput should match even in a Response entity

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master d65c1d68c -> 1c961beea


TOMEE-1726 StreamingOutput should match even in a Response entity


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

Branch: refs/heads/master
Commit: 1c961beea5329c35e288387ce0cac3bdf17624d6
Parents: d65c1d6
Author: Romain manni-Bucau 
Authored: Tue Mar 8 10:32:24 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 8 10:32:24 2016 +0100

--
 .../openejb/server/cxf/rs/CxfRSService.java | 24 +
 .../server/cxf/rs/JSonStreamingOutputTest.java  | 55 
 2 files changed, 79 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/1c961bee/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 7c4c05a..641d8fe 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -44,6 +44,7 @@ import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.PassivationCapable;
 import javax.enterprise.util.AnnotationLiteral;
+import javax.json.JsonStructure;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
@@ -55,8 +56,11 @@ import javax.ws.rs.container.ResourceContext;
 import javax.ws.rs.container.ResourceInfo;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
@@ -65,6 +69,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.io.Writer;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -363,11 +368,30 @@ public class CxfRSService extends RESTService {
 @Produces({"application/json", "application/*+json"})
 @Consumes({"application/json", "application/*+json"})
 public static class TomEEJohnzonProvider extends JohnzonProvider {
+@Override
+public boolean isWriteable(final Class rawType, final Type 
genericType,
+   final Annotation[] annotations, final 
MediaType mediaType) {
+return super.isWriteable(rawType, genericType, annotations, 
mediaType)
+&& !OutputStream.class.isAssignableFrom(rawType)
+&& !StreamingOutput.class.isAssignableFrom(rawType)
+&& !Writer.class.isAssignableFrom(rawType)
+&& !Response.class.isAssignableFrom(rawType)
+&& !JsonStructure.class.isAssignableFrom(rawType);
+}
 }
 
 @Provider
 @Produces({"application/json", "application/*+json"})
 @Consumes({"application/json", "application/*+json"})
 public static class TomEEJsonpProvider extends JsrProvider {
+@Override
+public boolean isWriteable(final Class rawType, final Type 
genericType,
+   final Annotation[] annotations, final 
MediaType mediaType) {
+return super.isWriteable(rawType, genericType, annotations, 
mediaType)
+&& !OutputStream.class.isAssignableFrom(rawType)
+&& !StreamingOutput.class.isAssignableFrom(rawType)
+&& !Writer.class.isAssignableFrom(rawType)
+&& !Response.class.isAssignableFrom(rawType);
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/1c961bee/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JSonStreamingOutputTest.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JSonStreamingOutputTest.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JSonStreamingOutputTest.java
new file mode 100644
index 000..635bdb0
--- /dev/null
+++ 

[tomee] Git Push Summary

[rmannibucau]

Repository: tomee
Updated Tags:  refs/tags/tomee-1.7.4 [created] aa289db58

[tomee] Git Push Summary

[rmannibucau]

Repository: tomee
Updated Tags:  refs/tags/tomee-7.0.0-M3 [created] 8846c3f4d

svn commit: r1733909 - /tomee/site/trunk/content/index.html

[rmannibucau]

Author: rmannibucau
Date: Mon Mar  7 12:01:33 2016
New Revision: 1733909

URL: http://svn.apache.org/viewvc?rev=1733909=rev
Log:
link url

Modified:
tomee/site/trunk/content/index.html

Modified: tomee/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/index.html?rev=1733909=1733908=1733909=diff
==
--- tomee/site/trunk/content/index.html (original)
+++ tomee/site/trunk/content/index.html Mon Mar  7 12:01:33 2016
@@ -26,7 +26,7 @@
 
 
 
-Please note that Apache TomEE releases 1.7.4 and 7.0.0-M3 fix a 
vulnerability issue, please take a look on Security Page
+Please note that Apache TomEE releases 1.7.4 and 7.0.0-M3 fix a 
vulnerability issue, please take a look on Security Page
 for more details about that and upgrade if you are concerned.
 
 

svn commit: r1733908 - /tomee/site/trunk/content/index.html

[rmannibucau]

Author: rmannibucau
Date: Mon Mar  7 12:01:05 2016
New Revision: 1733908

URL: http://svn.apache.org/viewvc?rev=1733908=rev
Log:
link format

Modified:
tomee/site/trunk/content/index.html

Modified: tomee/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/index.html?rev=1733908=1733907=1733908=diff
==
--- tomee/site/trunk/content/index.html (original)
+++ tomee/site/trunk/content/index.html Mon Mar  7 12:01:05 2016
@@ -26,7 +26,7 @@
 
 
 
-Please note that Apache TomEE releases 1.7.4 and 7.0.0-M3 fix a 
vulnerability issue, please take a look on [Security Page](security/tomee.html)
+Please note that Apache TomEE releases 1.7.4 and 7.0.0-M3 fix a 
vulnerability issue, please take a look on Security Page
 for more details about that and upgrade if you are concerned.
 
 

svn commit: r1733907 - in /tomee/site/trunk/content: ./ download/ security/

[rmannibucau]

Author: rmannibucau
Date: Mon Mar  7 11:59:33 2016
New Revision: 1733907

URL: http://svn.apache.org/viewvc?rev=1733907=rev
Log:
1.7.4 and 7.0.0-M3 updates

Added:
tomee/site/trunk/content/download/tomee-7.0.0-M3.html
tomee/site/trunk/content/tomee-1.7.4-release-notes.html
tomee/site/trunk/content/tomee-1.7.4.mdtext
tomee/site/trunk/content/tomee-7.0.0-M3-release-notes.mdtext
tomee/site/trunk/content/tomee-7.0.0-M3.mdtext
Modified:
tomee/site/trunk/content/downloads.html
tomee/site/trunk/content/index.html
tomee/site/trunk/content/properties-listing.mdtext
tomee/site/trunk/content/security/tomee.mdtext

Added: tomee/site/trunk/content/download/tomee-7.0.0-M3.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/download/tomee-7.0.0-M3.html?rev=1733907=auto
==
--- tomee/site/trunk/content/download/tomee-7.0.0-M3.html (added)
+++ tomee/site/trunk/content/download/tomee-7.0.0-M3.html Mon Mar  7 11:59:33 
2016
@@ -0,0 +1,206 @@
+{% extends "basic.html" %}
+
+{% block title %}Apache TomEE 7.0.0-M3{% endblock %}
+{% block content %}
+http://www.w3.org/1999/html;>
+
+
+  Feedback Welcome!
+We use your feedback to focus efforts, develop new features, and to 
make TomEE better for everyone.  mailto:us...@tomee.apache.org?subject=Feedback on TomEE 
7.0.0-M3=We'd%20like%20to%20hear%20about%20anything%20you'd%20like%20to%20tell%20us.%20%20If%20you're%20short%20on%20ideas%2C%20here%20are%20some%3A%0A%0A%20-%20Ways%20we%20can%20speed%20up%20or%20improve%20your%20ability%20to%20evaluate%20TomEE%0A%20-%20Anything%20you%20found%20difficult%20or%20inconvenient%20about%20using%20TomEE%0A%20-%20Documentation%20you%20would%20like%20to%20see%0A%20-%20Features%20you%20would%20like%20to%20have%0A%20-%20Anything%20in%20general%20to%20improve%20TomEE%20or%20help%20us%20grow%0A%0AKeep%20in%20mind%20that%20out%20of%20every%20100%20people%20that%20try%20something%20out%2C%20maybe%20one%20will%20actually%20post%20about%20it.%20%20Feel%20incredibly%20encouraged%20to%20let%20us%20know%20about%20your%20experiences%20with%20TomEE%20even%20if%20you%20think%20we've%20heard%20i
 
t%20a%20hundred%20times.%20%20Odds%20are%20we%20have%20not%20heard%20it%20and%2C%20if%20we%20have%2C%20the%20most%20requested%20things%20are%20done%20first.%20%20So%20definitely%20let%20us%20know!%0A%0AApache%20TomEE%20is%20free%2C%20but%20you%20can%20pay%20us%20with%20feedback%20%3A)%0A%0ABest%20regards%2C%0AThe%20Apache%20TomEE%20community%0A">Help
 us grow!
+
+
+
+Apache TomEE 7.0.0-M3
+December 2015
+
+In order to guard against corrupted downloads/installations, it is 
highly recommended to http://www.apache.org/dev/release-signing#verifying-signature;>verify the 
signature of the release bundles against the public http://www.apache.org/dist/tomee/KEYS;>KEYS used by the Apache TomEE 
developers.
+
+
+
+
+Web Profile
+
+Apache TomEE Web Profile delivers Servlets, JSP, JSF, JTA, JPA, 
CDI, Bean Validation and EJB Lite
+
+Comparison 
+
+Plus
+
+Apache TomEE Plus delivers all that is in the Web Profile and 
JAX-RS, plus EJB Full, Java EE Connector Architecture, JMS and JAX-WS.
+
+Comparison 
+
+Plume
+
+Apache TomEE Plume delivers all that is in the Plus Profile, 
but includes https://javaserverfaces.java.net/;>Mojarra and http://www.eclipse.org/eclipselink/;>EclipseLink support.
+
+Comparison 
+
+
+
+
+Not Java EE7 Certified
+
+
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz;>apache-tomee-7.0.0-M3-webprofile.tar.gz
+(http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.txt;>contents
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.asc;>asc
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.md5;>md5)
+
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip;>apache-tomee-7.0.0-M3-webprofile.zip
+(http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.txt;>contents
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.asc;>asc
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.md5;>md5)
+
+
+
+
+Not Java EE7 Ce

svn commit: r12673 - /release/tomee/tomee-1.7.4/

[rmannibucau]

Author: rmannibucau
Date: Mon Mar  7 11:54:29 2016
New Revision: 12673

Log:
tomee 1.7.4 release

Added:
release/tomee/tomee-1.7.4/
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.zip   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.zip.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.zip.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-jaxrs.zip.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.tar.gz   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.tar.gz.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.tar.gz.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.tar.gz.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.zip   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.zip.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.zip.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plume.zip.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.tar.gz   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.tar.gz.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.tar.gz.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.tar.gz.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.zip   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.zip.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.zip.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-plus.zip.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.tar.gz   (with 
props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.sha1
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.zip   (with props)
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.zip.asc
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.zip.md5
release/tomee/tomee-1.7.4/apache-tomee-1.7.4-webprofile.zip.sha1
release/tomee/tomee-1.7.4/examples-4.7.4-src.tar.gz   (with props)
release/tomee/tomee-1.7.4/examples-4.7.4-src.tar.gz.asc
release/tomee/tomee-1.7.4/examples-4.7.4-src.tar.gz.md5
release/tomee/tomee-1.7.4/examples-4.7.4-src.tar.gz.sha1
release/tomee/tomee-1.7.4/examples-4.7.4-src.zip   (with props)
release/tomee/tomee-1.7.4/examples-4.7.4-src.zip.asc
release/tomee/tomee-1.7.4/examples-4.7.4-src.zip.md5
release/tomee/tomee-1.7.4/examples-4.7.4-src.zip.sha1
release/tomee/tomee-1.7.4/openejb-4.7.4-source-release.zip   (with props)
release/tomee/tomee-1.7.4/openejb-4.7.4-source-release.zip.asc
release/tomee/tomee-1.7.4/openejb-4.7.4-source-release.zip.md5
release/tomee/tomee-1.7.4/openejb-4.7.4-source-release.zip.sha1
release/tomee/tomee-1.7.4/openejb-api-4.7.3-source-release.zip.asc.tmp
release/tomee/tomee-1.7.4/openejb-api-4.7.3-source-release.zip.md5.tmp
release/tomee/tomee-1.7.4/openejb-api-4.7.3-source-release.zip.sha1.tmp
release/tomee/tomee-1.7.4/openejb-api-4.7.3-source-release.zip.tmp

release/tomee/tomee-1.7.4/openejb-common-cli-4.7.3-source-release.zip.asc.tmp

release/tomee/tomee-1.7.4/openejb-common-cli-4.7.3-source-release.zip.md5.tmp

release/tomee/tomee-1.7.4/openejb-common-cli-4.7.3-source-release.zip.sha1.tmp
release/tomee/tomee-1.7.4/openejb-common-cli-4.7.3-source-release.zip.tmp
release/tomee/tomee-1.7.4/openejb-daemon-4.7.3-source-release.zip.asc.tmp
release/tomee/tomee-1.7.4/openejb-daemon-4.7.3-source-release.zip.md5.tmp
release/tomee/tomee-1.7.4/openejb-daemon-4.7.3-source-release.zip.sha1.tmp
release/tomee/tomee-1.7.4/openejb-daemon-4.7.3-source-release.zip.tmp
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.tar.gz   (with props)
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.tar.gz.asc
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.tar.gz.md5
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.tar.gz.sha1
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.zip   (with props)
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.zip.asc
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.zip.md5
release/tomee/tomee-1.7.4/openejb-provisionning-4.7.4.zip.sha1
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.tar.gz   (with props)
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.tar.gz.asc
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.tar.gz.md5
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.tar.gz.sha1
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.zip   (with props)
release/tomee/tomee-1.7.4/openejb-ssh-4.7.4.zip.asc
release/tomee/tomee

svn commit: r12672 - /dev/tomee/1.7.4/

[rmannibucau]

Author: rmannibucau
Date: Mon Mar  7 11:29:48 2016
New Revision: 12672

Log:
1.7.4 vote passed

Removed:
dev/tomee/1.7.4/

svn commit: r12655 - in /release/tomee: tomee-7.0.0-M2/ tomee-7.0.0-M3/

[rmannibucau]

Author: rmannibucau
Date: Sun Mar  6 18:11:14 2016
New Revision: 12655

Log:
7.0.0-M3 release

Added:
release/tomee/tomee-7.0.0-M3/
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz   (with 
props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip   (with props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.sha1
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz   (with 
props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip   (with props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.sha1
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz   
(with props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip   (with 
props)
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.asc
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.md5
release/tomee/tomee-7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.sha1
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.tar.gz   (with props)
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.tar.gz.asc
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.tar.gz.md5
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.zip   (with props)
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.zip.asc
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.zip.md5
release/tomee/tomee-7.0.0-M3/examples-7.0.0-M3-src.zip.sha1
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz   (with 
props)
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.asc
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.md5
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.zip   (with 
props)
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.asc
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.md5
release/tomee/tomee-7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.sha1
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz   (with props)
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.asc
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.md5
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.zip   (with props)
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.zip.asc
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.zip.md5
release/tomee/tomee-7.0.0-M3/openejb-ssh-7.0.0-M3.zip.sha1
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz   (with 
props)
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.asc
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.md5
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.sha1
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.zip   (with props)
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.zip.asc
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.zip.md5
release/tomee/tomee-7.0.0-M3/openejb-standalone-7.0.0-M3.zip.sha1
release/tomee/tomee-7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war   (with props)
release/tomee/tomee-7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.asc
release/tomee/tomee-7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.md5
release/tomee/tomee-7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.sha1
release/tomee/tomee-7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war   (with props)
release/tomee/tomee-7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.asc
release/tomee/tomee-7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.md5
release/tomee/tomee-7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.sha1
release/tomee/tomee-7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip   
(with props)
release/tomee/tomee-7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip.asc
release/tomee/tomee-7.0.0-M3/tomee

svn commit: r1733815 - in /tomee/site/trunk/content: downloads-seven.html downloads.html

[rmannibucau]

Author: rmannibucau
Date: Sun Mar  6 17:43:47 2016
New Revision: 1733815

URL: http://svn.apache.org/viewvc?rev=1733815=rev
Log:
updating 7.0.0-M3 downloads

Modified:
tomee/site/trunk/content/downloads-seven.html
tomee/site/trunk/content/downloads.html

Modified: tomee/site/trunk/content/downloads-seven.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/downloads-seven.html?rev=1733815=1733814=1733815=diff
==
--- tomee/site/trunk/content/downloads-seven.html (original)
+++ tomee/site/trunk/content/downloads-seven.html Sun Mar  6 17:43:47 2016
@@ -7,20 +7,20 @@
 
 Feedback Welcome!
 We use your feedback to focus efforts, develop new features, and to 
make TomEE better for everyone.
-mailto:us...@tomee.apache.org?subject=Feedback%20on%20TomEE%207.0.0-M2=We'd%20like%20to%20hear%20about%20anything%20you'd%20like%20to%20tell%20us.%20%20If%20you're%20short%20on%20ideas%2C%20here%20are%20some%3A%0A%0A%20-%20Ways%20we%20can%20speed%20up%20or%20improve%20your%20ability%20to%20evaluate%20TomEE%0A%20-%20Anything%20you%20found%20difficult%20or%20inconvenient%20about%20using%20TomEE%0A%20-%20Documentation%20you%20would%20like%20to%20see%0A%20-%20Features%20you%20would%20like%20to%20have%0A%20-%20Anything%20in%20general%20to%20improve%20TomEE%20or%20help%20us%20grow%0A%0AKeep%20in%20mind%20that%20out%20of%20every%20100%20people%20that%20try%20something%20out%2C%20maybe%20one%20will%20actually%20post%20about%20it.%20%20Feel%20incredibly%20encouraged%20to%20let%20us%20know%20about%20your%20experiences%20with%20TomEE%20even%20if%20you%20think%20we've%20heard%20it%20a%20hundred%20times.%20%20Odds%20are%20we%20have%20not%20heard%20it%20and%2C%20if%20we%20ha
 
ve%2C%20the%20most%20requested%20things%20are%20done%20first.%20%20So%20definitely%20let%20us%20know!%0A%0AApache%20TomEE%20is%20free%2C%20but%20you%20can%20pay%20us%20with%20feedback%20%3A)%0A%0ABest%20regards%2C%0AThe%20Apache%20TomEE%20community%0A">Help
 us grow!
+mailto:us...@tomee.apache.org?subject=Feedback%20on%20TomEE%207.0.0-M3=We'd%20like%20to%20hear%20about%20anything%20you'd%20like%20to%20tell%20us.%20%20If%20you're%20short%20on%20ideas%2C%20here%20are%20some%3A%0A%0A%20-%20Ways%20we%20can%20speed%20up%20or%20improve%20your%20ability%20to%20evaluate%20TomEE%0A%20-%20Anything%20you%20found%20difficult%20or%20inconvenient%20about%20using%20TomEE%0A%20-%20Documentation%20you%20would%20like%20to%20see%0A%20-%20Features%20you%20would%20like%20to%20have%0A%20-%20Anything%20in%20general%20to%20improve%20TomEE%20or%20help%20us%20grow%0A%0AKeep%20in%20mind%20that%20out%20of%20every%20100%20people%20that%20try%20something%20out%2C%20maybe%20one%20will%20actually%20post%20about%20it.%20%20Feel%20incredibly%20encouraged%20to%20let%20us%20know%20about%20your%20experiences%20with%20TomEE%20even%20if%20you%20think%20we've%20heard%20it%20a%20hundred%20times.%20%20Odds%20are%20we%20have%20not%20heard%20it%20and%2C%20if%20we%20ha
 
ve%2C%20the%20most%20requested%20things%20are%20done%20first.%20%20So%20definitely%20let%20us%20know!%0A%0AApache%20TomEE%20is%20free%2C%20but%20you%20can%20pay%20us%20with%20feedback%20%3A)%0A%0ABest%20regards%2C%0AThe%20Apache%20TomEE%20community%0A">Help
 us grow!
 
 

-Apache TomEE 7.0.0-M2 released! Click 
here to read more...
-Click here to see the 
7.0.0-M2 Release Notes
+Apache TomEE 7.0.0-M3 released! Click 
here to read more...
+Click here to see the 
7.0.0-M3 Release Notes
 
 
 
 See also archived releases for 
older versions
 
 
-Apache TomEE 7.0.0-M2
-December 2015
+Apache TomEE 7.0.0-M3
+March 2016
 
 In order to guard against corrupted downloads/installations, it is 
highly recommended to http://www.apache.org/dev/release-signing#verifying-signature;>verify the 
signature of the release bundles against the public http://www.apache.org/dist/tomee/KEYS;>KEYS used by the Apache TomEE 
developers.
 
@@ -57,13 +57,13 @@
 Not Java EE7 Certified
 
 
-http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz;>apache-tomee-7.0.0-M2-webprofile.tar.gz
-(https://dist.apache.org/repos/dist/release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.asc;>asc
 -
-https://dist.apache.org/repos/dist/release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.md5;>md5)
-
-http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip;>apache-tomee-7.0.0-M2-webprofile.zip
-(https://dist.apache.org/repos/dist/release/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.asc;>asc
 -
-https://dist.apac

svn commit: r12654 - /dev/tomee/7.0.0-M3/

[rmannibucau]

Author: rmannibucau
Date: Sun Mar  6 17:39:02 2016
New Revision: 12654

Log:
7.0.0-M3 passed

Removed:
dev/tomee/7.0.0-M3/

tomee git commit: NPE protection

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 2e6ce35f8 -> d65c1d68c


NPE protection


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

Branch: refs/heads/master
Commit: d65c1d68ccf76afa5fac2e05ee79eb2a29538e54
Parents: 2e6ce35
Author: Romain manni-Bucau 
Authored: Sat Mar 5 20:00:15 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sat Mar 5 20:00:15 2016 +0100

--
 .../openejb/resource/jdbc/managed/local/ManagedConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/d65c1d68/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index beaa9d3..7dca9c8 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -169,7 +169,7 @@ public class ManagedConnection implements InvocationHandler 
{
 }
 
 private Object unwrapIfNeeded(final Object arg) {
-if (!Proxy.isProxyClass(arg.getClass())) {
+if (arg == null || !Proxy.isProxyClass(arg.getClass())) {
 return arg;
 }
 final InvocationHandler handler = Proxy.getInvocationHandler(arg);

tomee git commit: fixing equals in ManagedConnection

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master a71d6ee27 -> 2e6ce35f8


fixing equals in ManagedConnection


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

Branch: refs/heads/master
Commit: 2e6ce35f890fe8f87355ff31afd9757f7060b2d0
Parents: a71d6ee
Author: Romain manni-Bucau 
Authored: Sat Mar 5 19:58:01 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sat Mar 5 19:58:01 2016 +0100

--
 .../jdbc/managed/local/ManagedConnection.java   | 31 ++-
 .../tomee/jdbc/TomcatXADataSourceTest.java  | 42 
 2 files changed, 63 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/2e6ce35f/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index 91dfb61..beaa9d3 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -35,6 +35,7 @@ import javax.transaction.xa.XAResource;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Wrapper;
@@ -77,7 +78,7 @@ public class ManagedConnection implements InvocationHandler {
 return hashCode();
 }
 if ("equals".equals(mtdName)) {
-return args[0] == this || (delegate != null && 
delegate.equals(args[0]));
+return args[0] == this || (delegate != null && 
delegate.equals(unwrapIfNeeded(args[0])));
 }
 
 // allow to get delegate if needed by the underlying program
@@ -137,15 +138,17 @@ public class ManagedConnection implements 
InvocationHandler {
 
 transaction.registerSynchronization(new 
ClosingSynchronization(xaConnection, delegate));
 
-try {
-setAutoCommit(false);
-} catch (final SQLException xae) { // we are alreay in a 
transaction so this can't be called from a user perspective - some XA 
DataSource prevents it in their code
-final String message = "Can't set auto commit to false 
cause the XA datasource doesn't support it, this is likely an issue";
-final Logger logger = 
Logger.getInstance(LogCategory.OPENEJB_RESOURCE_JDBC, ManagedConnection.class);
-if (logger.isDebugEnabled()) { // we don't want to 
print the exception by default
-logger.warning(message, xae);
-} else {
-logger.warning(message);
+if (xaConnection == null) {
+try {
+setAutoCommit(false);
+} catch (final SQLException xae) { // we are alreay in 
a transaction so this can't be called from a user perspective - some XA 
DataSource prevents it in their code
+final String message = "Can't set auto commit to 
false cause the XA datasource doesn't support it, this is likely an issue";
+final Logger logger = 
Logger.getInstance(LogCategory.OPENEJB_RESOURCE_JDBC, ManagedConnection.class);
+if (logger.isDebugEnabled()) { // we don't want to 
print the exception by default
+logger.warning(message, xae);
+} else {
+logger.warning(message);
+}
 }
 }
 } else if (delegate == null) { // shouldn't happen
@@ -165,6 +168,14 @@ public class ManagedConnection implements 
InvocationHandler {
 }
 }
 
+private Object unwrapIfNeeded(final Object arg) {
+if (!Proxy.isProxyClass(arg.getClass())) {
+return arg;
+}
+final InvocationHandler handler = Proxy.getInvocationHandler(arg);
+return ManagedConnection.class.isInstance(handler) ? 
ManagedConnection.class.cast(handler).delegate : arg;
+}
+
 protected Object newConnection() throws 

svn commit: r12612 - /dev/tomee/1.7.4/

[rmannibucau]

Author: rmannibucau
Date: Fri Mar  4 09:53:30 2016
New Revision: 12612

Log:
1.7.4 staged artifacts

Added:
dev/tomee/1.7.4/
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.tar.gz.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.zip   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.zip.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.zip.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-jaxrs.zip.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.tar.gz   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.tar.gz.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.tar.gz.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.tar.gz.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.zip   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.zip.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.zip.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-plume.zip.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.tar.gz   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.tar.gz.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.tar.gz.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.tar.gz.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.zip   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.zip.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.zip.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-plus.zip.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.tar.gz   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.tar.gz.sha1
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.zip   (with props)
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.zip.asc
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.zip.md5
dev/tomee/1.7.4/apache-tomee-1.7.4-webprofile.zip.sha1
dev/tomee/1.7.4/examples-4.7.4-src.tar.gz   (with props)
dev/tomee/1.7.4/examples-4.7.4-src.tar.gz.asc
dev/tomee/1.7.4/examples-4.7.4-src.tar.gz.md5
dev/tomee/1.7.4/examples-4.7.4-src.tar.gz.sha1
dev/tomee/1.7.4/examples-4.7.4-src.zip   (with props)
dev/tomee/1.7.4/examples-4.7.4-src.zip.asc
dev/tomee/1.7.4/examples-4.7.4-src.zip.md5
dev/tomee/1.7.4/examples-4.7.4-src.zip.sha1
dev/tomee/1.7.4/openejb-4.7.4-source-release.zip   (with props)
dev/tomee/1.7.4/openejb-4.7.4-source-release.zip.asc
dev/tomee/1.7.4/openejb-4.7.4-source-release.zip.md5
dev/tomee/1.7.4/openejb-4.7.4-source-release.zip.sha1
dev/tomee/1.7.4/openejb-api-4.7.3-source-release.zip.asc.tmp
dev/tomee/1.7.4/openejb-api-4.7.3-source-release.zip.md5.tmp
dev/tomee/1.7.4/openejb-api-4.7.3-source-release.zip.sha1.tmp
dev/tomee/1.7.4/openejb-api-4.7.3-source-release.zip.tmp
dev/tomee/1.7.4/openejb-common-cli-4.7.3-source-release.zip.asc.tmp
dev/tomee/1.7.4/openejb-common-cli-4.7.3-source-release.zip.md5.tmp
dev/tomee/1.7.4/openejb-common-cli-4.7.3-source-release.zip.sha1.tmp
dev/tomee/1.7.4/openejb-common-cli-4.7.3-source-release.zip.tmp
dev/tomee/1.7.4/openejb-daemon-4.7.3-source-release.zip.asc.tmp
dev/tomee/1.7.4/openejb-daemon-4.7.3-source-release.zip.md5.tmp
dev/tomee/1.7.4/openejb-daemon-4.7.3-source-release.zip.sha1.tmp
dev/tomee/1.7.4/openejb-daemon-4.7.3-source-release.zip.tmp
dev/tomee/1.7.4/openejb-provisionning-4.7.4.tar.gz   (with props)
dev/tomee/1.7.4/openejb-provisionning-4.7.4.tar.gz.asc
dev/tomee/1.7.4/openejb-provisionning-4.7.4.tar.gz.md5
dev/tomee/1.7.4/openejb-provisionning-4.7.4.tar.gz.sha1
dev/tomee/1.7.4/openejb-provisionning-4.7.4.zip   (with props)
dev/tomee/1.7.4/openejb-provisionning-4.7.4.zip.asc
dev/tomee/1.7.4/openejb-provisionning-4.7.4.zip.md5
dev/tomee/1.7.4/openejb-provisionning-4.7.4.zip.sha1
dev/tomee/1.7.4/openejb-ssh-4.7.4.tar.gz   (with props)
dev/tomee/1.7.4/openejb-ssh-4.7.4.tar.gz.asc
dev/tomee/1.7.4/openejb-ssh-4.7.4.tar.gz.md5
dev/tomee/1.7.4/openejb-ssh-4.7.4.tar.gz.sha1
dev/tomee/1.7.4/openejb-ssh-4.7.4.zip   (with props)
dev/tomee/1.7.4/openejb-ssh-4.7.4.zip.asc
dev/tomee/1.7.4/openejb-ssh-4.7.4.zip.md5
dev/tomee/1.7.4/openejb-ssh-4.7.4.zip.sha1
dev/tomee/1.7.4/openejb-standalone-4.7.4.tar.gz   (with props)
dev/tomee/1.7.4/openejb-standalone-4.7.4.tar.gz.asc
dev/tomee/1.7.4/openejb-standalone-4.7.4.tar.gz.md5
dev/tomee/1.7.4/openejb-standalone-4.7.4.tar.gz.sha1
dev/tomee/1.7.4/openejb-standalone-4.7.4.zip   (with props)
dev/tomee/1.7.4/openejb-standalone-4.7.4.zip.asc
dev/tomee/1.7.4/openejb-standalone-4.7.4.zip.md5
dev/tomee/1.7.4/openejb-standalone-4.7.4.zip.sha1
dev/tomee/1.7.4/tomee-jaxrs-webapp-1.7.4.war   (with props)
dev/tomee/1.7.4/tomee-jaxrs-webapp-1.7.4.war.asc
dev/tomee/1.7.4/tomee-jaxrs-webapp-1.7.4.war.md5
dev/tomee

tomee git commit: not using RuntimeException but OpenEJBRuntimeException when possible

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 8107307de -> aa289db58


not using RuntimeException but OpenEJBRuntimeException when possible


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

Branch: refs/heads/tomee-1.7.x
Commit: aa289db587e8b68495609a5f49a90cc8722a6d6b
Parents: 8107307
Author: Romain manni-Bucau 
Authored: Fri Mar 4 08:20:17 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Mar 4 08:20:17 2016 +0100

--
 .../java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java   | 5 +++--
 .../java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/aa289db5/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
index 9f2d0ca..debfde7 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
@@ -21,6 +21,7 @@ import org.apache.openejb.BeanContext;
 import org.apache.openejb.BeanType;
 import org.apache.openejb.InterfaceType;
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.ProxyInfo;
 import org.apache.openejb.RpcContainer;
 import org.apache.openejb.core.ThreadContext;
@@ -286,7 +287,7 @@ public abstract class BaseEjbProxyHandler implements 
InvocationHandler, Serializ
 if (callContext == null && localClientIdentity != null) {
 final SecurityService securityService = 
SystemInstance.get().getComponent(SecurityService.class);
 if(null == securityService){
-throw new RuntimeException("SecurityService has not been 
initialized");
+throw new OpenEJBRuntimeException("SecurityService has not 
been initialized");
 }
 securityService.associate(localClientIdentity);
 }
@@ -674,7 +675,7 @@ public abstract class BaseEjbProxyHandler implements 
InvocationHandler, Serializ
 final ContainerSystem containerSystem = 
SystemInstance.get().getComponent(ContainerSystem.class);
 
 if(null == containerSystem){
-throw new RuntimeException("ContainerSystem has not been 
initialized");
+throw new OpenEJBRuntimeException("ContainerSystem has not been 
initialized");
 }
 
 setBeanContext(containerSystem.getBeanContext(deploymentID));

http://git-wip-us.apache.org/repos/asf/tomee/blob/aa289db5/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
index 0d8549b..fe3935d 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
@@ -253,7 +253,7 @@ public abstract class EjbObjectProxyHandler extends 
BaseEjbProxyHandler {
 final SecurityService securityService = 
SystemInstance.get().getComponent(SecurityService.class);
 
 if(null == securityService){
-throw new RuntimeException("SecurityService has not been 
initialized");
+throw new OpenEJBRuntimeException("SecurityService has not 
been initialized");
 }
 
 Object stateTmp = securityService.currentState();

svn commit: r12602 - /dev/tomee/7.0.0-M3/

[rmannibucau]

Author: rmannibucau
Date: Thu Mar  3 17:13:16 2016
New Revision: 12602

Log:
7.0.0-M3 staged binaries

Added:
dev/tomee/7.0.0-M3/
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz.sha1
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.zip.sha1
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.tar.gz.sha1
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plus.zip.sha1
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.tar.gz.sha1
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip   (with props)
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.asc
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.md5
dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-webprofile.zip.sha1
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.tar.gz   (with props)
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.tar.gz.asc
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.tar.gz.md5
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.tar.gz.sha1
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.zip   (with props)
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.zip.asc
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.zip.md5
dev/tomee/7.0.0-M3/examples-7.0.0-M3-src.zip.sha1
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz   (with props)
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.asc
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.md5
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.tar.gz.sha1
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.zip   (with props)
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.asc
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.md5
dev/tomee/7.0.0-M3/openejb-provisionning-7.0.0-M3.zip.sha1
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz   (with props)
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.asc
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.md5
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.tar.gz.sha1
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.zip   (with props)
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.zip.asc
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.zip.md5
dev/tomee/7.0.0-M3/openejb-ssh-7.0.0-M3.zip.sha1
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz   (with props)
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.asc
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.md5
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.tar.gz.sha1
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.zip   (with props)
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.zip.asc
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.zip.md5
dev/tomee/7.0.0-M3/openejb-standalone-7.0.0-M3.zip.sha1
dev/tomee/7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war   (with props)
dev/tomee/7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.asc
dev/tomee/7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.md5
dev/tomee/7.0.0-M3/tomee-plume-webapp-7.0.0-M3.war.sha1
dev/tomee/7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war   (with props)
dev/tomee/7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.asc
dev/tomee/7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.md5
dev/tomee/7.0.0-M3/tomee-plus-webapp-7.0.0-M3.war.sha1
dev/tomee/7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip   (with props)
dev/tomee/7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip.asc
dev/tomee/7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip.md5
dev/tomee/7.0.0-M3/tomee-project-7.0.0-M3-source-release.zip.sha1
dev/tomee/7.0.0-M3/tomee-webaccess-7.0.0-M3.war   (with props)
dev/tomee/7.0.0-M3/tomee-webaccess-7.0.0-M3.war.asc
dev/tomee/7.0.0-M3/tomee-webaccess-7.0.0-M3.war.md5
dev/tomee/7.0.0-M3/tomee-webaccess-7.0.0-M3.war.sha1
dev/tomee/7.0.0-M3/tomee-webapp-7.0.0-M3.war   (with props)
dev/tomee/7.0.0-M3/tomee-webapp-7.0.0-M3.war.asc
dev/tomee/7.0.0-M3/tomee-webapp-7.0.0-M3.war.md5
dev/tomee/7.0.0-M3/tomee-webapp-7.0.0-M3.war.sha1

Added: dev/tomee/7.0.0-M3/apache-tomee-7.0.0-M3-plume.tar.gz

tomee git commit: style

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 5de0807b8 -> 8107307de


style


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

Branch: refs/heads/tomee-1.7.x
Commit: 8107307de4b5d42dc48ff054f3ac12127e551a58
Parents: 5de0807
Author: Romain manni-Bucau 
Authored: Wed Mar 2 17:39:25 2016 +0100
Committer: Romain manni-Bucau 
Committed: Wed Mar 2 17:39:25 2016 +0100

--
 .../src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/8107307d/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
--
diff --git 
a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
 
b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
index 002cef0..f9e77ed 100644
--- 
a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
+++ 
b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
@@ -131,7 +131,7 @@ public class RemoteTomEEEJBContainer extends EJBContainer {
 
instance.container.setPortStartup(Integer.parseInt(parser.http()));
 
 try {
-  instance.container.start(Arrays.asList(
+   instance.container.start(Arrays.asList(
 "-Dtomee.serialization.class.blacklist=" + 
System.getProperty("tomee.serialization.class.blacklist"),
 "-Dopenejb.system.apps=true", 
"-Dtomee.remote.support=true"),
 "start", true);

tomee git commit: style + serialization config for tck

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x c438f2407 -> 5de0807b8


style + serialization config for tck


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

Branch: refs/heads/tomee-1.7.x
Commit: 5de0807b8b793cd100de6e4496389f24cf9acecc
Parents: c438f24
Author: Romain manni-Bucau 
Authored: Tue Mar 1 21:48:52 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 1 21:48:52 2016 +0100

--
 .../main/java/org/apache/openejb/arquillian/common/Setup.java| 1 -
 tck/cdi-tomee/pom.xml| 1 +
 .../java/org/apache/openejb/tck/impl/ContainersImplTomEE.java| 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/5de0807b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index a4325a1..74dfe35 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -31,7 +31,6 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/tomee/blob/5de0807b/tck/cdi-tomee/pom.xml
--
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index efa7938..1ba77e7 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -246,6 +246,7 @@
   
   
   
+
-
 
false
 
true
 
true

http://git-wip-us.apache.org/repos/asf/tomee/blob/5de0807b/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
--
diff --git 
a/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
 
b/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
index 9515459..74790e1 100644
--- 
a/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
+++ 
b/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
@@ -154,7 +154,9 @@ public class ContainersImplTomEE extends AbstractContainers 
implements Container
 public void setup() throws IOException {
 System.out.println("Setup called");
 try {
-
server.start(Arrays.asList("-Dopenejb.classloader.forced-load=org.apache.openejb.tck"),
 "start", true);
+server.start(Arrays.asList(
+"-Dtomee.serialization.class.blacklist=-", 
"-Dopenejb.classloader.forced-load=org.apache.openejb.tck"),
+"start", true);
 } catch (final Exception e) {
 cleanup();
 e.printStackTrace();

tomee git commit: backporting changes on serialization and system properties ordering

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 0d749467f -> c438f2407


backporting changes on serialization and system properties ordering


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

Branch: refs/heads/tomee-1.7.x
Commit: c438f24073f71f9b3e7978b98536e7b70498637b
Parents: 0d74946
Author: Romain manni-Bucau 
Authored: Tue Mar 1 19:13:22 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 1 19:13:22 2016 +0100

--
 .../apache/openejb/arquillian/common/Setup.java | 16 
 .../arquillian/common/TomEEConfiguration.java   |  9 +++
 .../arquillian/common/TomEEContainer.java   | 11 +
 .../embedded/EmbeddedTomEEConfiguration.java| 11 -
 .../embedded/EmbeddedTomEEContainer.java|  2 ++
 .../arquillian/remote/RemoteTomEEContainer.java |  8 --
 .../arquillian/webapp/TomEEWebappContainer.java |  8 --
 .../core/rmi/BlacklistClassResolver.java|  5 +++-
 .../core/rmi/BlacklistClassResolverTest.java|  8 ++
 .../apache/openejb/loader/SystemInstance.java   | 17 ++---
 pom.xml |  2 +-
 .../openejb/client/EjbObjectInputStream.java| 26 +---
 .../apache/tomee/RemoteTomEEEJBContainer.java   | 16 +++-
 .../org/apache/tomee/installer/Installer.java   |  8 ++
 14 files changed, 126 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c438f240/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index 06708f1..a4325a1 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -31,6 +31,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Collection;
@@ -297,6 +298,13 @@ public class Setup {
 properties.put("openejb.session.manager", 
"org.apache.tomee.catalina.session.QuickSessionManager");
 }
 
+if (configuration.isUnsafeEjbd() && 
"*".equals(properties.getProperty("tomee.serialization.class.blacklist", 
"-").trim())) {
+properties.remove("tomee.serialization.class.blacklist");
+properties.put("tomee.serialization.class.whitelist", "*");
+System.setProperty("tomee.serialization.class.blacklist", 
System.getProperty("tomee.serialization.class.blacklist", "-"));
+reloadClientSerializationConfig();
+}
+
 try {
 IO.writeProperties(file, properties);
 } catch (final IOException e) {
@@ -304,6 +312,14 @@ public class Setup {
 }
 }
 
+public static void reloadClientSerializationConfig() {
+try {
+
Thread.currentThread().getContextClassLoader().loadClass("org.apache.openejb.client.EjbObjectInputStream")
+.getMethod("reloadResolverConfig").invoke(null);
+} catch (final Exception e) {
+// not a pb normally
+}
+}
 
 public static void synchronizeFolder(final File tomeeHome, final String 
src, final String dir) {
 if (src != null && !src.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/c438f240/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
index 230261c..265cb35 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
@@ -45,6 +45,7 @@ public class TomEEConfiguration implements 
ContainerConfiguration {
 protected String portRange = ""; // only used if port < 0, empty means 
whatever, can be "1024-65535"
 protected 

tomee git commit: fixing RemoteTomEEEJBContainer and avoiding to loose some system properties

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 58cdbbef9 -> a71d6ee27


fixing RemoteTomEEEJBContainer and avoiding to loose some system properties


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

Branch: refs/heads/master
Commit: a71d6ee27d1d05331d62960c02bd132f08e06f61
Parents: 58cdbbe
Author: Romain manni-Bucau 
Authored: Tue Mar 1 18:37:04 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 1 18:37:04 2016 +0100

--
 .../apache/openejb/arquillian/common/Setup.java | 12 ++
 .../arquillian/common/TomEEContainer.java   | 11 ++
 .../embedded/EmbeddedTomEEConfiguration.java|  1 +
 .../embedded/EmbeddedTomEEContainer.java|  2 +
 .../arquillian/remote/RemoteTomEEContainer.java |  8 +++-
 .../arquillian/webapp/TomEEWebappContainer.java |  8 +++-
 .../core/rmi/BlacklistClassResolver.java|  3 ++
 .../apache/openejb/loader/SystemInstance.java   | 19 --
 .../openejb/client/EjbObjectInputStream.java| 40 
 .../apache/tomee/RemoteTomEEEJBContainer.java   | 16 +++-
 10 files changed, 95 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a71d6ee2/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index 7db26ba..a369129 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -32,6 +32,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.Socket;
 import java.util.Collection;
@@ -306,6 +307,8 @@ public class Setup {
 if (configuration.isUnsafeEjbd() && 
"*".equals(properties.getProperty("tomee.serialization.class.blacklist", 
"-").trim())) {
 properties.remove("tomee.serialization.class.blacklist");
 properties.put("tomee.serialization.class.whitelist", "*");
+System.setProperty("tomee.serialization.class.blacklist", 
System.getProperty("tomee.serialization.class.blacklist", "-"));
+reloadClientSerializationConfig();
 }
 
 try {
@@ -315,6 +318,15 @@ public class Setup {
 }
 }
 
+public static void reloadClientSerializationConfig() {
+try {
+
Thread.currentThread().getContextClassLoader().loadClass("org.apache.openejb.client.EjbObjectInputStream")
+.getMethod("reloadResolverConfig").invoke(null);
+} catch (final IllegalAccessException | InvocationTargetException | 
ClassNotFoundException | NoSuchMethodException e) {
+// not a pb normally
+}
+}
+
 
 public static void synchronizeFolder(final File tomeeHome, final String 
src, final String dir) {
 if (src != null && !src.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/a71d6ee2/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
index 5ac79d2..944c3f6 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
@@ -77,6 +77,13 @@ public abstract class TomEEContainer i
 this.options = new Options(System.getProperties());
 }
 
+protected void resetSerialization() {
+if (this.configuration.isUnsafeEjbd() && 
"-".equals(System.getProperty("tomee.serialization.class.blacklist"))) {
+System.clearProperty("tomee.serialization.class.blacklist");
+Setup.reloadClientSerializationConfig();
+}
+}
+
 protected boolean isTestable(final Archive archive, final 
DeploymentDescription deploymentDescription) {
 return deploymentDescription != null
 && 

tomee git commit: switching tomee.serialization.class.blacklist defaults to * in our packaged distributions

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 5689b25ac -> 58cdbbef9


switching tomee.serialization.class.blacklist defaults to * in our packaged 
distributions


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

Branch: refs/heads/master
Commit: 58cdbbef9c77ab2b44870f9d606593b49cde76d9
Parents: 5689b25
Author: Romain manni-Bucau 
Authored: Tue Mar 1 16:13:38 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Mar 1 16:13:38 2016 +0100

--
 .../java/org/apache/openejb/arquillian/common/Setup.java  |  5 +
 .../openejb/arquillian/common/TomEEConfiguration.java |  9 +
 .../arquillian/embedded/EmbeddedTomEEConfiguration.java   | 10 +-
 .../apache/openejb/core/rmi/BlacklistClassResolver.java   |  2 +-
 .../openejb/core/rmi/BlacklistClassResolverTest.java  |  8 
 .../org/apache/openejb/client/EjbObjectInputStream.java   |  2 +-
 .../main/java/org/apache/tomee/installer/Installer.java   |  8 
 7 files changed, 41 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/58cdbbef/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index eab496c..7db26ba 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -303,6 +303,11 @@ public class Setup {
 properties.put("openejb.session.manager", 
"org.apache.tomee.catalina.session.QuickSessionManager");
 }
 
+if (configuration.isUnsafeEjbd() && 
"*".equals(properties.getProperty("tomee.serialization.class.blacklist", 
"-").trim())) {
+properties.remove("tomee.serialization.class.blacklist");
+properties.put("tomee.serialization.class.whitelist", "*");
+}
+
 try {
 IO.writeProperties(file, properties);
 } catch (final IOException e) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/58cdbbef/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
index 230261c..265cb35 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
@@ -45,6 +45,7 @@ public class TomEEConfiguration implements 
ContainerConfiguration {
 protected String portRange = ""; // only used if port < 0, empty means 
whatever, can be "1024-65535"
 protected String preloadClasses; // just a client classloader.loadClass(), 
value is comma separated qualified names. Useful with maven resolver for 
instance
 protected boolean quickSession = true;
+protected boolean unsafeEjbd = true;
 protected boolean unpackWars = true;
 
 protected String properties = "";
@@ -53,6 +54,14 @@ public class TomEEConfiguration implements 
ContainerConfiguration {
 protected boolean singleDumpByArchiveName;
 protected Collection singleDeploymentByArchiveName = 
Collections.emptyList();
 
+public boolean isUnsafeEjbd() {
+return unsafeEjbd;
+}
+
+public void setUnsafeEjbd(final boolean unsafeEjbd) {
+this.unsafeEjbd = unsafeEjbd;
+}
+
 public boolean isUnpackWars() {
 return unpackWars;
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/58cdbbef/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
--
diff --git 
a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
 
b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
index 0d18097..ea7ea42 100644
--- 

svn commit: r1733005 - /tomee/site/trunk/content/tomee-7.0.0-M2.mdtext

[rmannibucau]

Author: rmannibucau
Date: Tue Mar  1 07:59:55 2016
New Revision: 1733005

URL: http://svn.apache.org/viewvc?rev=1733005=rev
Log:
right tomcat version for M2

Modified:
tomee/site/trunk/content/tomee-7.0.0-M2.mdtext

Modified: tomee/site/trunk/content/tomee-7.0.0-M2.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/tomee-7.0.0-M2.mdtext?rev=1733005=1733004=1733005=diff
==
--- tomee/site/trunk/content/tomee-7.0.0-M2.mdtext (original)
+++ tomee/site/trunk/content/tomee-7.0.0-M2.mdtext Tue Mar  1 07:59:55 2016
@@ -1,6 +1,6 @@
 # Apache TomEE 7.0.0-M2 released, Feb 29th 2016
 
-The Apache TomEE community is proud to announce the release of [Apache TomEE 
7.0.0-M2](download/tomee-7.0.0-M2.html), which is based on [Apache Tomcat 
8.0.30](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first 
milestone release towards EE7.
+The Apache TomEE community is proud to announce the release of [Apache TomEE 
7.0.0-M2](download/tomee-7.0.0-M2.html), which is based on [Apache Tomcat 
8.0.32](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first 
milestone release towards EE7.
 We know this has been a long time coming, so we thank you for your patience 
and support.
 
 Please feel free to check out and [contribute to the developer 
branch](contribute.html) - We are always interested in any help from the 
community that we can get.

svn commit: r1733004 - /tomee/site/trunk/content/tomee-7.0.0-M2.mdtext

[rmannibucau]

Author: rmannibucau
Date: Tue Mar  1 07:56:10 2016
New Revision: 1733004

URL: http://svn.apache.org/viewvc?rev=1733004=rev
Log:
7.0.0-M2 release day

Modified:
tomee/site/trunk/content/tomee-7.0.0-M2.mdtext

Modified: tomee/site/trunk/content/tomee-7.0.0-M2.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/tomee-7.0.0-M2.mdtext?rev=1733004=1733003=1733004=diff
==
--- tomee/site/trunk/content/tomee-7.0.0-M2.mdtext (original)
+++ tomee/site/trunk/content/tomee-7.0.0-M2.mdtext Tue Mar  1 07:56:10 2016
@@ -1,4 +1,4 @@
-# Apache TomEE 7.0.0-M2 released, Dec 11th 2015
+# Apache TomEE 7.0.0-M2 released, Feb 29th 2016
 
 The Apache TomEE community is proud to announce the release of [Apache TomEE 
7.0.0-M2](download/tomee-7.0.0-M2.html), which is based on [Apache Tomcat 
8.0.30](http://tomcat.apache.org/tomcat-8.0-doc/index.html) and is our first 
milestone release towards EE7.
 We know this has been a long time coming, so we thank you for your patience 
and support.
@@ -38,4 +38,4 @@ A complete [Changelog](tomee-7.0.0-M2-re
 
 [tomee-7.0.0-M2-release-notes.html](tomee-7.0.0-M2-release-notes.html)
 
-Please feel free to jump in feet first and [get started with 
TomEE](documentation.html). You will nearly always find someone to help you on 
one of our [support channels](support.html).
\ No newline at end of file
+Please feel free to jump in feet first and [get started with 
TomEE](documentation.html). You will nearly always find someone to help you on 
one of our [support channels](support.html).

svn commit: r12563 - /dev/tomee/7.0.0-M2/

[rmannibucau]

Author: rmannibucau
Date: Mon Feb 29 09:55:04 2016
New Revision: 12563

Log:
promoting 7.0.0-M2 release

Removed:
dev/tomee/7.0.0-M2/

svn commit: r1732843 - in /tomee/site/trunk/content: download/tomee-7.0.0-M2.html downloads-seven.html downloads.html index.html tomee-7.0.0-M2-release-notes.mdtext tomee-7.0.0-M2.mdtext

[rmannibucau]

Author: rmannibucau
Date: Mon Feb 29 09:54:32 2016
New Revision: 1732843

URL: http://svn.apache.org/viewvc?rev=1732843=rev
Log:
tomee 7.0.0-M2 release pages

Added:
tomee/site/trunk/content/download/tomee-7.0.0-M2.html
tomee/site/trunk/content/tomee-7.0.0-M2-release-notes.mdtext
tomee/site/trunk/content/tomee-7.0.0-M2.mdtext
Modified:
tomee/site/trunk/content/downloads-seven.html
tomee/site/trunk/content/downloads.html
tomee/site/trunk/content/index.html

Added: tomee/site/trunk/content/download/tomee-7.0.0-M2.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/download/tomee-7.0.0-M2.html?rev=1732843=auto
==
--- tomee/site/trunk/content/download/tomee-7.0.0-M2.html (added)
+++ tomee/site/trunk/content/download/tomee-7.0.0-M2.html Mon Feb 29 09:54:32 
2016
@@ -0,0 +1,206 @@
+{% extends "basic.html" %}
+
+{% block title %}Apache TomEE 7.0.0-M2{% endblock %}
+{% block content %}
+http://www.w3.org/1999/html;>
+
+
+  Feedback Welcome!
+We use your feedback to focus efforts, develop new features, and to 
make TomEE better for everyone.  mailto:us...@tomee.apache.org?subject=Feedback on TomEE 
7.0.0-M2=We'd%20like%20to%20hear%20about%20anything%20you'd%20like%20to%20tell%20us.%20%20If%20you're%20short%20on%20ideas%2C%20here%20are%20some%3A%0A%0A%20-%20Ways%20we%20can%20speed%20up%20or%20improve%20your%20ability%20to%20evaluate%20TomEE%0A%20-%20Anything%20you%20found%20difficult%20or%20inconvenient%20about%20using%20TomEE%0A%20-%20Documentation%20you%20would%20like%20to%20see%0A%20-%20Features%20you%20would%20like%20to%20have%0A%20-%20Anything%20in%20general%20to%20improve%20TomEE%20or%20help%20us%20grow%0A%0AKeep%20in%20mind%20that%20out%20of%20every%20100%20people%20that%20try%20something%20out%2C%20maybe%20one%20will%20actually%20post%20about%20it.%20%20Feel%20incredibly%20encouraged%20to%20let%20us%20know%20about%20your%20experiences%20with%20TomEE%20even%20if%20you%20think%20we've%20heard%20i
 
t%20a%20hundred%20times.%20%20Odds%20are%20we%20have%20not%20heard%20it%20and%2C%20if%20we%20have%2C%20the%20most%20requested%20things%20are%20done%20first.%20%20So%20definitely%20let%20us%20know!%0A%0AApache%20TomEE%20is%20free%2C%20but%20you%20can%20pay%20us%20with%20feedback%20%3A)%0A%0ABest%20regards%2C%0AThe%20Apache%20TomEE%20community%0A">Help
 us grow!
+
+
+
+Apache TomEE 7.0.0-M2
+December 2015
+
+In order to guard against corrupted downloads/installations, it is 
highly recommended to http://www.apache.org/dev/release-signing#verifying-signature;>verify the 
signature of the release bundles against the public http://www.apache.org/dist/tomee/KEYS;>KEYS used by the Apache TomEE 
developers.
+
+
+
+
+Web Profile
+
+Apache TomEE Web Profile delivers Servlets, JSP, JSF, JTA, JPA, 
CDI, Bean Validation and EJB Lite
+
+Comparison 
+
+Plus
+
+Apache TomEE Plus delivers all that is in the Web Profile and 
JAX-RS, plus EJB Full, Java EE Connector Architecture, JMS and JAX-WS.
+
+Comparison 
+
+Plume
+
+Apache TomEE Plume delivers all that is in the Plus Profile, 
but includes https://javaserverfaces.java.net/;>Mojarra and http://www.eclipse.org/eclipselink/;>EclipseLink support.
+
+Comparison 
+
+
+
+
+Not Java EE7 Certified
+
+
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz;>apache-tomee-7.0.0-M2-webprofile.tar.gz
+(http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.txt;>contents
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.asc;>asc
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.tar.gz.md5;>md5)
+
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip;>apache-tomee-7.0.0-M2-webprofile.zip
+(http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.txt;>contents
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.asc;>asc
 -
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-webprofile.zip.md5;>md5)
+
+
+
+
+Not Java EE7 Certified
+
+
+http://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.0-M2/apache-tomee-7.0.0-M2-plus.tar.gz;>apache-tomee-7.0.0-M2

tomee git commit: TOMEE-1719 providers can be static

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 4e8c39f40 -> 9505fdc1a


TOMEE-1719 providers can be static


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

Branch: refs/heads/master
Commit: 9505fdc1a817e2533b006b47e66a793f6f1b3a96
Parents: 4e8c39f
Author: Romain manni-Bucau 
Authored: Fri Feb 26 08:51:40 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 26 08:51:40 2016 +0100

--
 .../main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/9505fdc1/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index a5b6290..7c4c05a 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -362,12 +362,12 @@ public class CxfRSService extends RESTService {
 @Provider
 @Produces({"application/json", "application/*+json"})
 @Consumes({"application/json", "application/*+json"})
-public class TomEEJohnzonProvider extends JohnzonProvider {
+public static class TomEEJohnzonProvider extends JohnzonProvider {
 }
 
 @Provider
 @Produces({"application/json", "application/*+json"})
 @Consumes({"application/json", "application/*+json"})
-public class TomEEJsonpProvider extends JsrProvider {
+public static class TomEEJsonpProvider extends JsrProvider {
 }
 }

tomee git commit: TOMEE-1719 support application/*+json by default for jsonp too

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master df2aedadb -> 4e8c39f40


TOMEE-1719 support application/*+json by default for jsonp too


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

Branch: refs/heads/master
Commit: 4e8c39f4004880097cd5e323aece5d7e5bcdf2e6
Parents: df2aeda
Author: Romain manni-Bucau 
Authored: Fri Feb 26 08:50:53 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 26 08:50:53 2016 +0100

--
 .../org/apache/openejb/server/cxf/rs/CxfRSService.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4e8c39f4/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index e4bdf6b..a5b6290 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -201,7 +201,7 @@ public class CxfRSService extends RESTService {
 if (userProviders == null) {
 (all = new ArrayList<>(2)).addAll(asList(
 new TomEEJohnzonProvider<>(),
-new JsrProvider()
+new TomEEJsonpProvider()
 ));
 } else {
 all = new ArrayList<>(4 /* blind guess */);
@@ -216,7 +216,7 @@ public class CxfRSService extends RESTService {
 
 all.addAll(asList( // added after to be after in the list 
once sorted
 new TomEEJohnzonProvider<>(),
-new JsrProvider()));
+new TomEEJsonpProvider()));
 }
 bus.setProperty("org.apache.cxf.jaxrs.bus.providers", all);
 } catch (final Exception e) {
@@ -364,4 +364,10 @@ public class CxfRSService extends RESTService {
 @Consumes({"application/json", "application/*+json"})
 public class TomEEJohnzonProvider extends JohnzonProvider {
 }
+
+@Provider
+@Produces({"application/json", "application/*+json"})
+@Consumes({"application/json", "application/*+json"})
+public class TomEEJsonpProvider extends JsrProvider {
+}
 }

svn commit: r12482 - /release/tomee/KEYS

[rmannibucau]

Author: rmannibucau
Date: Sun Feb 21 20:45:14 2016
New Revision: 12482

Log:
adding my key

Modified:
release/tomee/KEYS

Modified: release/tomee/KEYS
==
--- release/tomee/KEYS (original)
+++ release/tomee/KEYS Sun Feb 21 20:45:14 2016
@@ -724,3 +724,48 @@ zWEfFknwaX8QX5Tjwk4px76Eac2ToMvkyiyRanM9
 /2065+H6wqs8XvuxxxjhBDxRezo0WxJt0021Ew==
 =vPAN
 -END PGP PUBLIC KEY BLOCK-
+Romain Manni-Bucau <rmannibu...@apache.org>
+sig 3F17D8FEF 2016-02-03  Romain Manni-Bucau <rmannibu...@apache.org>
+sub   2048g/9E3BD1F7 2016-02-03
+sig  F17D8FEF 2016-02-03  Romain Manni-Bucau <rmannibu...@apache.org>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQMuBFaxtewRCACYl5EoQYSYMX0fvPrKg7nLb8VpgOEq7upLdWXWzGNm2ATQ3HUd
+0SWVYZDee9gD2+gzDFqmE36dfetEu5rkUIaPBQ0hX63RiAW9Q4uZyUGlhLNJiASF
+0U0xKMQl/eirXZ2+EKPPCxOLcM88gZr1Hsh+aGVKeWAgCRE98ildtBGkAZBo7Ceh
+XzEkD7Pon6VbxhL2QZywT6iPWyO/kG2Ukw04gyAKPk68IBHZoqvnymYQ/cN2yJjh
+1ch1/qMImD6SYU3InGp04fwokT5pKMVfe4uEGQqAsPi0mrz7RcMh/0Zpb+I6GHRc
+iR/imegnAWHahswpHO5KU9/DVW5FxUR3tyMzAQCMqFUkE8spXWJlVhx6UmOnKNOd
+gAD1NRCUn06wFtGyXQf+NFkREMFwiX34hxlw9nNIK/qC1md/qva/LX/oT0UOLhyK
+Cpo79z6me82+u6KgMhRgxXse56Ip+p2GTMvGV6qBs2haBayHDVxWh8/6wduh8oE/
+3MmjAdNLhqSPxbWv7/jKqWdC+xG7JCmelyr2ewLlxgskbOj8sG4Q8AiYCDMl8ZfQ
+ncZNYMSVOd08WzxlGHmGnE4VAuBuqxR8oaNPkh58dGZX15BycqsejYVYApLXyNC8
+h3APkooaEQuMz2qaKuHq8jW8qc6MZXk6ql3qD9+dP6UkSKhFCi/yQ49Mn3Eqy8Tm
+E+XtwQZppInhLJdY2a04hII1nJenTEtQZBx3Hixfsgf/a9z3UpDcqdlQryB/yEq8
+w0xNk3qtr9vw6fKJN320eNMw8vMK2mDRuh4BvqlDBFXp9+3yZbkkat7voi1V+p1v
+zJN35UVExG3FV9NieloBzeYGuwT+fTe1oYyDn9m/CaXpmtXcuJYsYryOfS9VDn/U
+do8mFcRwDHCMj0u548Z9LOAXg4q7PM9/PYQeAE53AyPCBlCwgldXFLn3pKsuVODt
+qFZu1/SgFlpw+FBy0AlbXFHECjRJ7P28nU8/oXp+ENrTKXAPM4K6N1vFdUN/xydV
+kifFnR7ThHFM9Vo5QlSSadilKz5Y6vMZQBEus9c5MELolIcs0u+PFc8N/iIG7xqE
+YLQrUm9tYWluIE1hbm5pLUJ1Y2F1IDxybWFubmlidWNhdUBhcGFjaGUub3JnPoh6
+BBMRCAAiBQJWsbXsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqYvyO
+8X2P7+tsAP0dvjplScfrw3mdBK1r1LKRRFO0e6drFsLGHtNfM/6+4gD/TivtcJXc
+UcmpGe3TZgOufQR+DZtRQiQWnv3/pRPg1ue5Ag0EVrG17BAIAIDCQgleAUILQ3K3
+H0MRFI3A/moIOuOcMCW/KFuk7aY+dVQVeXxr6QT3RKm2StZ1D46cRf2heoCmiP70
+UKLN18esaj13paFj93Zqe8+wLLv0FHbo4lE1OwxdlM7BoZ5ZyIWdaFLeQM8RBpVK
+VaOszVK23S9cU2TmhJYKw3Gl5HGSbJeeMq5lMqZBfqyvca9xQoRBCxdBGyTDnzye
+fmFGkICdleLVGkKcda2tmIA7QR7wTvBppqWMvJ1/TMXMaey2DVu0WUbvM9K+tZfZ
+PLdH9pmrSplGge/Yi153CylniEvPijiTGP4KHVNF1ucO2KqPZISHlyq1O5ZGu/Qj
+TJuCpSsAAwUH/iQxEKLcy8A2tzpZfXc34UkpN4tAUM27UIKYO08pYs64IlSXnL3L
+KX1TVaw5ezkjWgzlYSfW31QXxir1YkEo9S3J+zD+x+/GsD7m798oaRHTQsaDa3dd
+yPqZXn917mUwiX0aFmQzZ0UmZSWDaCqilYXmbW74YngkpJ2n/1UaaYSm+6BP2aAX
+wCU3nUEM/zDdl2QkH6c8Ciipx+8ASVks5UyenqbMuSXQ+41LpsoXoADO6m4jaNsT
+QnE4g8NExLsHcYkBjGstgx8PuJYME4KQB2KIhU3nGHLxuLUpH+rHfI90tT9VBnAE
+3o4HOMMsFFMcARRUOdhWzUMtqT31HWblwLSIYQQYEQgACQUCVrG17AIbDAAKCRBq
+YvyO8X2P75I1AQCKkhb3NzcCfXbnGdEegYaXGeI93oWgVC4LpBIGEag+XQD/U7n1
+tHtDxSoMidTDPxG7FCPWjrlQ3KGKtrcmoE+O7pU=
+=8M3x
+-END PGP PUBLIC KEY BLOCK-
+

tomee git commit: TOMEE-1716 openjpa 2.4.1

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master d338bd9bc -> 4289ddfce


TOMEE-1716 openjpa 2.4.1


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

Branch: refs/heads/master
Commit: 4289ddfcebd9b5ad3aeef1dcb65f2245120edf04
Parents: d338bd9
Author: Romain manni-Bucau 
Authored: Sun Feb 21 11:48:49 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sun Feb 21 11:48:49 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4289ddfc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4c707e9..ef101a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
 
 7.0
 
-2.4.0
+2.4.1
 1.6.3
 2.0-M1
 0.9.3-incubating

tomee git commit: removing stagings

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 481fc0516 -> d338bd9bc


removing stagings


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

Branch: refs/heads/master
Commit: d338bd9bc1252d371dfe6c3d9e7f1e5d2dbde7c9
Parents: 481fc05
Author: Romain manni-Bucau 
Authored: Sat Feb 20 19:40:37 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sat Feb 20 19:40:37 2016 +0100

--
 pom.xml | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/d338bd9b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 171cbd6..4c707e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,14 +687,6 @@
   
   
 
-  owb-staging
-  
https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1016/
-
-
-  johnzon-staging
-  
https://repository.apache.org/content/repositories/orgapachejohnzon-1013/
-
-
   apache-snapshots
   Apache Snapshots Repository
   https://repository.apache.org/content/groups/snapshots

tomee git commit: TOMEE-1715 basic Part support in openejb-http

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 3e2fe0af9 -> 481fc0516


TOMEE-1715 basic Part support in openejb-http


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

Branch: refs/heads/master
Commit: 481fc05169a57af8fe52a7f0ed89bf9d77c57d27
Parents: 3e2fe0a
Author: Romain manni-Bucau 
Authored: Fri Feb 19 19:04:22 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 19 19:04:22 2016 +0100

--
 server/openejb-http/pom.xml |   7 ++
 .../openejb/server/httpd/HttpRequestImpl.java   |  27 -
 .../httpd/part/CommonsFileUploadPart.java   | 117 +++
 .../part/CommonsFileUploadPartFactory.java  |  91 +++
 4 files changed, 237 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/481fc051/server/openejb-http/pom.xml
--
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 630220c..a351213 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -139,6 +139,13 @@
   junit
   test
 
+
+
+  commons-fileupload
+  commons-fileupload
+  1.3.1
+  true
+
   
 
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/481fc051/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
--
diff --git 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index fa2428c..28a9f47 100644
--- 
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ 
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -21,6 +21,7 @@ import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.core.WebContext;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.server.httpd.part.CommonsFileUploadPartFactory;
 import org.apache.openejb.server.httpd.session.SessionManager;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.ArrayEnumeration;
@@ -69,6 +70,7 @@ import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.Part;
 
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
 /**
@@ -77,6 +79,7 @@ import static java.util.Collections.singletonList;
  */
 public class HttpRequestImpl implements HttpRequest {
 private static final String FORM_URL_ENCODED = 
"application/x-www-form-urlencoded";
+private static final String MULTIPART_FORM_DATA = "multipart/form-data";
 private static final String TRANSFER_ENCODING = "Transfer-Encoding";
 private static final String CHUNKED = "chunked";
 
@@ -122,7 +125,7 @@ public class HttpRequestImpl implements HttpRequest {
  */
 private final Map parameters = new HashMap<>();
 
-private final Map parts = new HashMap<>();
+private volatile Collection parts;
 
 /**
  * Cookies sent from the client
@@ -217,7 +220,15 @@ public class HttpRequestImpl implements HttpRequest {
 
 @Override
 public Part getPart(String s) throws IOException, ServletException {
-return parts.get(s);
+getParts(); // ensure it is initialized
+if (parts != null) {
+for (final Part p : parts) {
+if (s.equals(p.getName())) {
+return p;
+}
+}
+}
+return null;
 }
 
 @Override
@@ -227,7 +238,10 @@ public class HttpRequestImpl implements HttpRequest {
 
 @Override
 public Collection getParts() throws IOException, ServletException {
-return parts.values();
+if (parts == null) { // assume it is not init
+parts = CommonsFileUploadPartFactory.read(this);
+}
+return parts;
 }
 
 public void noPathInfo() { // todo: enhance it
@@ -662,7 +676,7 @@ public class HttpRequestImpl implements HttpRequest {
 contentType = getHeader(HttpRequest.HEADER_CONTENT_TYPE);
 
 final boolean hasBody = hasBody();
-if (hasBody && contentType != null && 
contentType.startsWith(FORM_URL_ENCODED)) {
+if (hasBody && contentType != null && 
(contentType.startsWith(FORM_URL_ENCODED) || 
contentType.startsWith(MULTIPART_FORM_DATA))) {
 

[2/2] tomee git commit: bad folder

[rmannibucau]

bad folder


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

Branch: refs/heads/master
Commit: 3e2fe0af9caa9bfcdb858bf7bcb48d724843ca33
Parents: 5c40cd9
Author: Romain manni-Bucau 
Authored: Fri Feb 19 08:07:49 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 19 08:07:49 2016 +0100

--
 .../openejb/itest/legacy/LegacyServerTest.java" | 338 --
 .../OpenEJBHttpDestinationFactory.java" |  34 --
 .../server/cxf/transport/event/BusCreated.java" |  33 --
 .../util/CxfContainerClassLoader.java"  | 132 ---
 .../server/cxf/transport/util/CxfUtil.java" | 356 ---
 5 files changed, 893 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/3e2fe0af/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/3e2fe0af/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/3e2fe0af/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/event/BusCreated.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/3e2fe0af/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/3e2fe0af/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java;
--

[1/2] tomee git commit: sync issue in tests

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 2f48d94ab -> 3e2fe0af9


sync issue in tests


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

Branch: refs/heads/master
Commit: 5c40cd9ad2faf36abf3ee0b1670de911ed3d275e
Parents: 2f48d94
Author: Romain manni-Bucau 
Authored: Fri Feb 19 08:06:11 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 19 08:06:11 2016 +0100

--
 .../openejb/itest/legacy/LegacyServerTest.java" | 338 ++
 .../cxf/rs/logging/LoggingJAXRSCommons.java |  10 +-
 .../OpenEJBHttpDestinationFactory.java" |  34 ++
 .../server/cxf/transport/event/BusCreated.java" |  33 ++
 .../util/CxfContainerClassLoader.java"  | 132 +++
 .../server/cxf/transport/util/CxfUtil.java" | 356 +++
 6 files changed, 900 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java
index 64bbe77..9db17af 100644
--- 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java
+++ 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java
@@ -51,7 +51,7 @@ public class LoggingJAXRSCommons {
 protected static int port = -1;
 protected Collection msgs;
 
-protected boolean assertJAXRSConfiguration() {
+protected synchronized boolean assertJAXRSConfiguration() {
 final Iterator iterator = msgs.iterator();
 while (iterator.hasNext()) {
 if (iterator.next().contains("Registered JAX-RS Configuration:")) {
@@ -121,7 +121,9 @@ public class LoggingJAXRSCommons {
 looger.addHandler(new Handler() {
 @Override
 public void publish(final LogRecord record) {
-msgs.add(record.getMessage());
+synchronized (LoggingJAXRSCommons.this) {
+msgs.add(record.getMessage());
+}
 }
 
 @Override
@@ -135,7 +137,9 @@ public class LoggingJAXRSCommons {
 }
 
 public Collection getMsg() {
-return msgs;
+synchronized (LoggingJAXRSCommons.this) {
+return msgs;
+}
 }
 });
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/event/BusCreated.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java;
--

tomee git commit: tolerate johnzon JsonbJaxrsProvider if added + using OWB and johnzon stagings to validate they are compatible with tomee

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master c4a50f3dd -> 2f48d94ab


tolerate johnzon JsonbJaxrsProvider if added + using OWB and johnzon stagings 
to validate they are compatible with tomee


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

Branch: refs/heads/master
Commit: 2f48d94ab18aa7dd2771c0bbfd5acd1dfa1c5e40
Parents: c4a50f3
Author: Romain manni-Bucau 
Authored: Thu Feb 18 23:26:17 2016 +0100
Committer: Romain manni-Bucau 
Committed: Thu Feb 18 23:26:17 2016 +0100

--
 pom.xml | 24 
 server/openejb-cxf-rs/pom.xml   |  8 +++
 .../server/cxf/rs/CxfRsHttpListener.java|  8 ---
 3 files changed, 23 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5711241..171cbd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,9 +97,9 @@
 7.0
 
 2.4.0
-
1.6.3-SNAPSHOT
+1.6.3
 2.0-M1
-0.9.2-incubating
+0.9.3-incubating
 
 
 2.3.7
@@ -686,18 +686,14 @@
 
   
   
-
-
-
-
-
-
-
-
-
-
-
-
+
+  owb-staging
+  
https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1016/
+
+
+  johnzon-staging
+  
https://repository.apache.org/content/repositories/orgapachejohnzon-1013/
+
 
   apache-snapshots
   Apache Snapshots Repository

http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/server/openejb-cxf-rs/pom.xml
--
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 60e2420..881a290 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -119,5 +119,13 @@
   johnzon-jaxrs
   ${johnzon.version}
 
+
   
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 2dfd582..fec5f10 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -656,9 +656,11 @@ public class CxfRsHttpListener implements RsHttpListener {
 
 boolean customJsonProvider = false;
 for (final ProviderInfo o : values) { // using getName to not 
suppose any classloader setup
-if 
(ConfigurableJohnzonProvider.class.getName().equals(o.getResourceClass().getName())
+final String name = o.getResourceClass().getName();
+if 
("org.apache.johnzon.jaxrs.ConfigurableJohnzonProvider".equals(name)
+|| 
"org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider".equals(name)
 // contains in case of proxying
-|| 
o.getResourceClass().getName().contains("com.fasterxml.jackson.jaxrs.json")) {
+|| name.contains("com.fasterxml.jackson.jaxrs.json")) {
 customJsonProvider = true;
 break; //  cause we only handle json for now
 }
@@ -667,7 +669,7 @@ public class CxfRsHttpListener implements RsHttpListener {
 if (customJsonProvider) {
 final Iterator it = values.iterator();
 while (it.hasNext()) {
-if 
(JohnzonProvider.class.getName().equals(it.next().getResourceClass().getName()))
 {
+if 
("org.apache.johnzon.jaxrs.JohnzonProvider".equals(it.next().getResourceClass().getName()))
 {
 it.remove();
 break;
 }

tomee git commit: removing slow listener on testng for cdi tcks

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 2403bcd9b -> c4a50f3dd


removing slow listener on testng for cdi tcks


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

Branch: refs/heads/master
Commit: c4a50f3dd2a91a6ecee96c945a5affcc914fa1ac
Parents: 2403bcd
Author: Romain manni-Bucau 
Authored: Thu Feb 18 23:07:15 2016 +0100
Committer: Romain manni-Bucau 
Committed: Thu Feb 18 23:07:37 2016 +0100

--
 tck/cdi-embedded/src/test/resources/passing.xml | 2 ++
 tck/cdi-tomee/src/test/resources/passing.xml| 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c4a50f3d/tck/cdi-embedded/src/test/resources/passing.xml
--
diff --git a/tck/cdi-embedded/src/test/resources/passing.xml 
b/tck/cdi-embedded/src/test/resources/passing.xml
index cc0b55c..eef1650 100644
--- a/tck/cdi-embedded/src/test/resources/passing.xml
+++ b/tck/cdi-embedded/src/test/resources/passing.xml
@@ -26,11 +26,13 @@
 
 
 
+
   
 
   

http://git-wip-us.apache.org/repos/asf/tomee/blob/c4a50f3d/tck/cdi-tomee/src/test/resources/passing.xml
--
diff --git a/tck/cdi-tomee/src/test/resources/passing.xml 
b/tck/cdi-tomee/src/test/resources/passing.xml
index 9818eff..5c6752e 100644
--- a/tck/cdi-tomee/src/test/resources/passing.xml
+++ b/tck/cdi-tomee/src/test/resources/passing.xml
@@ -26,11 +26,13 @@
 
 
 
+
   
 
   

svn commit: r1730011 - /tomee/site/trunk/content/dev/source-code.mdtext

[rmannibucau]

Author: rmannibucau
Date: Fri Feb 12 12:26:29 2016
New Revision: 1730011

URL: http://svn.apache.org/viewvc?rev=1730011=rev
Log:
removing develop branch references

Modified:
tomee/site/trunk/content/dev/source-code.mdtext

Modified: tomee/site/trunk/content/dev/source-code.mdtext
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/content/dev/source-code.mdtext?rev=1730011=1730010=1730011=diff
==
--- tomee/site/trunk/content/dev/source-code.mdtext (original)
+++ tomee/site/trunk/content/dev/source-code.mdtext Fri Feb 12 12:26:29 2016
@@ -12,10 +12,10 @@ You can browse the source code via the [
 
 If you intend to hack on TomEE then it is recommended that you create a 
[GitHub Account](https://github.com) and 
[fork](https://help.github.com/articles/fork-a-repo/) the TomEE repository so 
that you can submit pull requests (See below).
 
-If you just want to build the source version then you can download (aka clone) 
the sources of Apache TomEE with a GIT client from the following URL 
[https://git-wip-us.apache.org/repos/asf/tomee.git](https://git-wip-us.apache.org/repos/asf/tomee.git)
 - The 'develop' branch is the current development branch.
+If you just want to build the source version then you can download (aka clone) 
the sources of Apache TomEE with a GIT client from the following URL 
[https://git-wip-us.apache.org/repos/asf/tomee.git](https://git-wip-us.apache.org/repos/asf/tomee.git)
 - The 'master' branch is the current development branch.
 
 Performing the checkout from a command line using the GIT client (recommended) 
is as easy as executing the following command:
-> git clone -b develop 
[https://git-wip-us.apache.org/repos/asf/tomee.git](https://git-wip-us.apache.org/repos/asf/tomee.git)
 tomee
+> git clone 
[https://git-wip-us.apache.org/repos/asf/tomee.git](https://git-wip-us.apache.org/repos/asf/tomee.git)
 tomee
 
 If you want to checkout a specific branch then you can just change that in the 
command:
 
@@ -36,11 +36,8 @@ Note: This method does not require the G
 
 We will be using the [Gitflow 
Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
 from day one. Please read and understand how this works.
 
-GIT pull requests will only be accepted on 
the **develop** branch.
 See [here](https://help.github.com/articles/using-pull-requests/) for 
information on pull requests. 
 
-The [Gitflow 
Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
 workflow is basically the same as the [Feature Branch 
Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow)
 but instead of using *master* everyone should work off the *develop* branch.
-
 The official Apache Committer documentation can be found 
[here](https://git-wip-us.apache.org/#committers-getting-started)
 
 

svn commit: r1730014 - /tomee/site/trunk/templates/basic.html

[rmannibucau]

Author: rmannibucau
Date: Fri Feb 12 12:38:26 2016
New Revision: 1730014

URL: http://svn.apache.org/viewvc?rev=1730014=rev
Log:
copyright

Modified:
tomee/site/trunk/templates/basic.html

Modified: tomee/site/trunk/templates/basic.html
URL: 
http://svn.apache.org/viewvc/tomee/site/trunk/templates/basic.html?rev=1730014=1730013=1730014=diff
==
--- tomee/site/trunk/templates/basic.html (original)
+++ tomee/site/trunk/templates/basic.html Fri Feb 12 12:38:26 2016
@@ -154,7 +154,7 @@
 
 
 
-Copyright  1999-2015 The Apache Software Foundation, 
Licensed under the Apache License, Version 2.0.
+Copyright  1999-2016 The Apache Software Foundation, 
Licensed under the Apache License, Version 2.0.
 Apache TomEE, TomEE, Apache, the Apache feather logo, and the 
Apache TomEE project logo are trademarks of The Apache Software Foundation.
 All other marks mentioned may be trademarks or registered 
trademarks of their respective owners.
 

[2/2] tomee git commit: SingleApplicationComposer rule

[rmannibucau]

SingleApplicationComposer rule


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

Branch: refs/heads/master
Commit: 4655c053b4d91046131b47c2f8c3087517e1d2a3
Parents: bf1b5d0
Author: Romain manni-Bucau 
Authored: Fri Feb 12 18:48:00 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 12 18:48:00 2016 +0100

--
 .../SingleApplicationComposerRunner.java| 133 ---
 1 file changed, 83 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4655c053/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
index 1758ec6..dcbfe9a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
@@ -22,6 +22,9 @@ import org.apache.webbeans.inject.OWBInjector;
 import org.apache.xbean.finder.AnnotationFinder;
 import org.apache.xbean.finder.archive.FileArchive;
 import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runner.notification.RunListener;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
@@ -41,6 +44,34 @@ public class SingleApplicationComposerRunner extends 
BlockJUnit4ClassRunner {
 private static final AtomicReference APP = new AtomicReference<>();
 private static final AtomicReference HOOK = new 
AtomicReference<>();
 
+// use when you use another runner like Parameterized of JUnit
+public static class Rule implements TestRule {
+private final Object test;
+
+public Rule(final Object test) {
+this.test = test;
+}
+
+@Override
+public Statement apply(final Statement base, final Description 
description) {
+return new Statement() {
+@Override
+public void evaluate() throws Throwable {
+start(test.getClass());
+composerInject(test);
+base.evaluate();
+}
+};
+}
+}
+
+public static class Start extends RunListener {
+@Override
+public void testStarted(final Description description) throws 
Exception {
+start(null);
+}
+}
+
 public static void setApp(final Object o) {
 APP.set(o);
 }
@@ -57,7 +88,28 @@ public class SingleApplicationComposerRunner extends 
BlockJUnit4ClassRunner {
 
 public SingleApplicationComposerRunner(final Class klass) throws 
InitializationError {
 super(klass);
+}
+
+@Override
+protected List rules(final Object test) {
+final List rules = super.rules(test);
+rules.add(new MethodRule() {
+@Override
+public Statement apply(final Statement base, final FrameworkMethod 
method, final Object target) {
+return new Statement() {
+@Override
+public void evaluate() throws Throwable {
+start(getTestClass().getJavaClass());
+composerInject(target);
+base.evaluate();
+}
+};
+}
+});
+return rules;
+}
 
+private static void start(final Class marker) throws Exception {
 if (APP.get() == null) {
 final Class type;
 final String typeStr = 
System.getProperty("tomee.application-composer.application");
@@ -67,9 +119,11 @@ public class SingleApplicationComposerRunner extends 
BlockJUnit4ClassRunner {
 } catch (final ClassNotFoundException e) {
 throw new IllegalArgumentException(e);
 }
+} else if (marker == null) {
+throw new IllegalArgumentException("set 
tomee.application-composer.application system property or add a marker to the 
rule or runner");
 } else {
 final Iterator descriptors =
-new AnnotationFinder(new 
FileArchive(Thread.currentThread().getContextClassLoader(), 
jarLocation(klass)), false)
+

[1/2] tomee git commit: TOMEE-1711 unwrap http request before initializing the HttpRequest servlet for cxf-rs

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master fcf9c7d37 -> 4655c053b


TOMEE-1711 unwrap http request before initializing the HttpRequest servlet for 
cxf-rs


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

Branch: refs/heads/master
Commit: bf1b5d0d95ff712035b2883bd17f442d0e7764ae
Parents: fcf9c7d
Author: Romain manni-Bucau 
Authored: Fri Feb 12 15:32:40 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 12 15:32:40 2016 +0100

--
 .../openejb/server/cxf/rs/CxfRsHttpListener.java | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/bf1b5d0d/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index f279f09..2dfd582 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -114,7 +114,9 @@ import javax.management.openmbean.TabularData;
 import javax.naming.Context;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.ConstrainedTo;
 import javax.ws.rs.RuntimeType;
@@ -187,10 +189,19 @@ public class CxfRsHttpListener implements RsHttpListener {
 @Override
 public void onMessage(final HttpRequest httpRequest, final HttpResponse 
httpResponse) throws Exception {
 // fix the address (to manage multiple connectors)
-if (HttpRequestImpl.class.isInstance(httpRequest)) {
-final HttpRequestImpl requestImpl = 
HttpRequestImpl.class.cast(httpRequest);
-requestImpl.initPathFromContext((!context.startsWith("/") ? "/" : 
"") + context);
-requestImpl.initServletPath(servlet);
+{
+ServletRequest unwrapped = httpRequest;
+while (ServletRequestAdapter.class.isInstance(unwrapped)) {
+unwrapped = 
ServletRequestAdapter.class.cast(unwrapped).getRequest();
+}
+while (HttpServletRequestWrapper.class.isInstance(unwrapped)) {
+unwrapped = 
HttpServletRequestWrapper.class.cast(unwrapped).getRequest();
+}
+if (HttpRequestImpl.class.isInstance(unwrapped)) {
+final HttpRequestImpl requestImpl = 
HttpRequestImpl.class.cast(unwrapped);
+requestImpl.initPathFromContext((!context.startsWith("/") ? 
"/" : "") + context);
+requestImpl.initServletPath(servlet);
+}
 }
 
 boolean matchedStatic = false;

tomee git commit: TOMEE-1708 use dir instead of arbitrary using target to download tomee

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master c4cccb5a6 -> c4bd8633d


TOMEE-1708 use dir instead of arbitrary using target to download tomee


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

Branch: refs/heads/master
Commit: c4bd8633d96868be061d08390dd03b65cdc90cac
Parents: c4cccb5
Author: Romain manni-Bucau 
Authored: Wed Feb 10 13:54:50 2016 +0100
Committer: Romain manni-Bucau 
Committed: Wed Feb 10 13:54:50 2016 +0100

--
 .../org/apache/openejb/arquillian/common/Setup.java   | 14 --
 .../tomee/arquillian/remote/RemoteTomEEContainer.java |  2 +-
 .../tomee/arquillian/webapp/TomEEWebappContainer.java | 12 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index 1d67531..eab496c 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -145,19 +145,21 @@ public class Setup {
 return null;
 }
 
-public static File downloadAndUnpack(final File dir, final String 
artifactID) throws LifecycleException {
+public static File downloadAndUnpack(final File dir, final String 
artifactID, final String defaultTempDir) throws LifecycleException {
 
-final File zipFile = downloadFile(artifactID, null);
+final File zipFile = downloadFile(artifactID, null, defaultTempDir);
 
 Zips.unzip(zipFile, dir);
 
 return findHome(dir);
 }
 
-public static File downloadFile(final String artifactName, final String 
altUrl) {
-final String cache = 
SystemInstance.get().getOptions().get(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER,
 (String) null);
-if (cache == null) { // let the user override it
-
System.setProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, 
"target");
+public static File downloadFile(final String artifactName, final String 
altUrl, final String defaultTempDir) {
+final String cache = SystemInstance.isInitialized() ?
+
SystemInstance.get().getOptions().get(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER,
 (String) null) :
+
System.getProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER);
+if (cache == null && defaultTempDir != null) { // let the user 
override it
+
System.setProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, 
defaultTempDir);
 }
 
 try {

http://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
--
diff --git 
a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
 
b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
index 1593db2..efdc76e 100644
--- 
a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
+++ 
b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
@@ -215,7 +215,7 @@ public class RemoteTomEEContainer extends 
TomEEContainerhttp://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
--
diff --git 
a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
 
b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
index 152ce0d..53d139a 100644
--- 
a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
+++ 
b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
@@ -83,7 +83,7 @@ public class TomEEWebappContainer extends 
TomEEContainer

tomee git commit: forcing tomcat.unpackWar=false for ears as well

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master fa264b766 -> bccc67be0


forcing tomcat.unpackWar=false for ears as well


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

Branch: refs/heads/master
Commit: bccc67be0bf8381328d5199e6dc0efbbaf2f35ab
Parents: fa264b7
Author: Romain manni-Bucau 
Authored: Tue Feb 9 18:47:15 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 9 18:47:15 2016 +0100

--
 .../src/main/java/org/apache/openejb/assembler/DeployerEjb.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/bccc67be/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
index cc17061..7f51ad0 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
@@ -25,6 +25,7 @@ import org.apache.openejb.UndeployException;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.DeploymentExceptionManager;
+import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.config.DeploymentLoader;
@@ -248,6 +249,9 @@ public class DeployerEjb implements Deployer {
 appInfo.appId = 
properties.getProperty(OPENEJB_DEPLOYER_FORCED_APP_ID_PROP);
 }
 
+if (!appInfo.webApps.isEmpty()) {
+appInfo.properties.setProperty("tomcat.unpackWar", "false");
+}
 assembler.createApplication(appInfo);
 
 saveIfNeeded(properties, file, appInfo);

tomee git commit: useless import

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master bccc67be0 -> 539244bc1


useless import


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

Branch: refs/heads/master
Commit: 539244bc19e6bc1ccd474c8ce0aef0ea780d68ce
Parents: bccc67b
Author: Romain manni-Bucau 
Authored: Tue Feb 9 18:51:57 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 9 18:51:57 2016 +0100

--
 .../apache/openejb/assembler/DeployerEjb.java   |   1 -
 .../openejb/itest/legacy/LegacyServerTest.java" | 338 +++
 2 files changed, 338 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/539244bc/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
index 7f51ad0..b951aac 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
@@ -25,7 +25,6 @@ import org.apache.openejb.UndeployException;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.assembler.classic.DeploymentExceptionManager;
-import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.config.DeploymentLoader;

http://git-wip-us.apache.org/repos/asf/tomee/blob/539244bc/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java;
--

tomee git commit: dirty folder

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 539244bc1 -> c4cccb5a6


dirty folder


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

Branch: refs/heads/master
Commit: c4cccb5a665fab7c657aa8aa24fc3d94d9d58251
Parents: 539244b
Author: Romain manni-Bucau 
Authored: Tue Feb 9 18:52:23 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 9 18:52:23 2016 +0100

--
 .../openejb/itest/legacy/LegacyServerTest.java" | 338 ---
 1 file changed, 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c4cccb5a/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java;
--

tomee git commit: ContainerProperties.Property.IGNORED is almost a noop, cleaning system props in case of

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 936853b56 -> fa264b766


ContainerProperties.Property.IGNORED is almost a noop, cleaning system props in 
case of


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

Branch: refs/heads/master
Commit: fa264b7664ef9f310846ff3a6f06fb569e82c5c5
Parents: 936853b
Author: Romain manni-Bucau 
Authored: Tue Feb 9 08:45:21 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 9 08:45:21 2016 +0100

--
 .../java/org/apache/openejb/testing/ApplicationComposers.java  | 6 +-
 .../apache/openejb/junit/ContainerAndApplicationRulesTest.java | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/fa264b76/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 f9a1247..353d891 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
@@ -1352,8 +1352,12 @@ public class ApplicationComposers {
 if (configAnnot != null) {
 for (final ContainerProperties.Property p : configAnnot.value()) {
 final String value = p.value();
+if (ContainerProperties.Property.IGNORED.equals(value)) {
+System.clearProperty(p.name()); // enforces some clean up 
since we can't set null in a hash table
+continue;
+}
 final String name = p.name();
-configuration.put(name, 
ContainerProperties.Property.IGNORED.equals(value) ? null : value);
+configuration.put(name, value);
 if (value.contains("${")) {
 if (propertiesToSetAgain == null) {
 propertiesToSetAgain = new LinkedList<>();

http://git-wip-us.apache.org/repos/asf/tomee/blob/fa264b76/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 12df385..9ecf92b 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
@@ -17,6 +17,7 @@
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.configuration.PersistenceUnitDefinition;
+import org.apache.openejb.testing.ContainerProperties;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -41,6 +42,7 @@ public class ContainerAndApplicationRulesTest {
 assertNull(instanceContainer.getInstance(Container.class).ignored);
 }
 
+@ContainerProperties(@ContainerProperties.Property(name = 
"openejb.conf.file", value = ContainerProperties.Property.IGNORED))
 @org.apache.openejb.testing.Classes(cdi = true, value = Ignored.class) // 
@Classes invalid for a container
 public static class Container {
 @Inject

tomee git commit: TOMEE-1707 bval 1.1.1

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master f61f413bd -> 936853b56


TOMEE-1707 bval 1.1.1


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

Branch: refs/heads/master
Commit: 936853b569d179a381ad1e123c0c0549afc53cf7
Parents: f61f413
Author: Romain manni-Bucau 
Authored: Mon Feb 8 22:11:40 2016 +0100
Committer: Romain manni-Bucau 
Committed: Mon Feb 8 22:11:40 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/936853b5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f63f94c..8493357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
 2.4
 3.3
 
-1.1.0
+1.1.1
 5.13.0
 3.1.4.RELEASE
 4.12

tomee git commit: tomcat.unpackWar for TomcatWebappDeployer and fixing style

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 68d795781 -> f61f413bd


tomcat.unpackWar for TomcatWebappDeployer and fixing style


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

Branch: refs/heads/master
Commit: f61f413bd87b989dea05d943443b922382eb8071
Parents: 68d7957
Author: Romain manni-Bucau 
Authored: Mon Feb 8 22:10:27 2016 +0100
Committer: Romain manni-Bucau 
Committed: Mon Feb 8 22:10:27 2016 +0100

--
 .../openejb/assembler/classic/Assembler.java|   8 +-
 .../openejb/itest/legacy/LegacyServerTest.java" | 338 ---
 .../tomee/catalina/TomcatWebAppBuilder.java |   1 +
 .../deployment/TomcatWebappDeployer.java|   1 +
 4 files changed, 8 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 01b0d00..af34aa3 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -2370,8 +2370,12 @@ public class Assembler extends AssemblerTool implements 
org.apache.openejb.spi.A
 final NamingEnumeration bindings = 
globalContext.listBindings(ctx);
 while (bindings.hasMoreElements()) {
 final Binding binding = bindings.nextElement();
-if (!binding.getName().equals(objName)) continue;
-if 
(!LazyObjectReference.class.isInstance(binding.getObject())) continue;
+if (!binding.getName().equals(objName)) {
+continue;
+}
+if 
(!LazyObjectReference.class.isInstance(binding.getObject())) {
+continue;
+}
 
 final LazyObjectReference ref = 
LazyObjectReference.class.cast(binding.getObject());
 if (! ref.isInitialized()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java;
--

http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/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 0368459..b889138 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
@@ -492,6 +492,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, 
ContextListener, Pare
 standardContext.setParentClassLoader(containerLoader);
 }
 }
+
standardContext.setUnpackWAR(!"false".equalsIgnoreCase(appInfo.properties.getProperty("tomcat.unpackWar")));
 if (contextXml != null) {
 standardContext.setConfigFile(contextXmlUrl);
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
index a09d8da..de0914d 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
@@ -42,6 +42,7 @@ public class TomcatWebappDeployer implements WebAppDeployer {
 final Collection alreadyDeployed = 
tomcatWebAppBuilder.availableApps();
 
 final AppInfo appInfo = fakeInfo(file, host, context);
+appInfo.properties.setProperty("tomcat.unpackWar", "false");
 try {
 

[1/3] tomee git commit: few test fixes

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master ceaec93f9 -> 68d795781


few test fixes


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

Branch: refs/heads/master
Commit: ed524ec563c88e62bad69ea8b412ddf65cea4bfa
Parents: ceaec93
Author: Romain manni-Bucau 
Authored: Mon Feb 8 20:29:42 2016 +0100
Committer: Romain manni-Bucau 
Committed: Mon Feb 8 20:29:42 2016 +0100

--
 .../appcomposer/AppComposerConfiguration.java   |   4 +-
 .../ejb/OverloadedEjbObserverMethodsTest.java   |   2 +-
 .../tests/cipher/CipherFromAppTest.java |   5 +-
 .../webapp/WebAppClassLoaderTest.java   |   2 +-
 .../openejb/arquillian/tests/ear/EarTest.java   |  15 -
 .../exception/DeploymentExceptionErrorTest.java |   2 +-
 arquillian/arquillian-tomee-tests/pom.xml   |  21 +-
 .../config/ApplicationComposerDeployer.java |  12 +-
 .../openejb/config/PersistenceModule.java   |   2 +-
 .../openejb/core/CoreContainerSystem.java   |   8 +-
 .../tomee/catalina/TomEEWebappClassLoader.java  |   3 +-
 .../apache/tomee/embedded/Configuration.java"   | 346 ---
 .../org/apache/tomee/embedded/Container.java"   | 955 ---
 .../tomee/embedded/EmbeddedTomEEContainer.java" | 214 -
 .../tomee/embedded/LoginConfigBuilder.java" |  65 --
 .../java/org/apache/tomee/embedded/Main.java"   | 134 ---
 .../embedded/SecurityConstaintBuilder.java" |  59 --
 .../internal/StandardContextCustomizer.java"| 111 ---
 .../embedded/junit/TomEEEmbeddedRule.java"  | 136 ---
 .../META-INF/org.apache.tomee/service-jar.xml"  |  53 -
 20 files changed, 38 insertions(+), 2111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/ed524ec5/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerConfiguration.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerConfiguration.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerConfiguration.java
index 39a1872..0375c0a 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerConfiguration.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerConfiguration.java
@@ -26,6 +26,8 @@ import org.apache.openejb.testing.Module;
 public class AppComposerConfiguration {
 @Module
 public static PersistenceUnit unit() {
-return new PersistenceUnit("jpa");
+final PersistenceUnit jpa = new PersistenceUnit("jpa");
+jpa.setExcludeUnlistedClasses(true);
+return jpa;
 }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/ed524ec5/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/ejb/OverloadedEjbObserverMethodsTest.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/ejb/OverloadedEjbObserverMethodsTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/ejb/OverloadedEjbObserverMethodsTest.java
index 828c846..a1b1f05 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/ejb/OverloadedEjbObserverMethodsTest.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/ejb/OverloadedEjbObserverMethodsTest.java
@@ -52,7 +52,7 @@ public class OverloadedEjbObserverMethodsTest {
 
 @Deployment
 public static WebArchive archive() {
-return ShrinkWrap.create(WebArchive.class)
+return ShrinkWrap.create(WebArchive.class, 
"OverloadedEjbObserverMethodsTest.war")
 .addClasses(Painter.class, Orange.class, Green.class)
 .addAsWebInfResource(EmptyAsset.INSTANCE, 
ArchivePaths.create("beans.xml"));
 }

[2/3] tomee git commit: TOMEE-1706 fat war support renaming as well

[rmannibucau]

TOMEE-1706 fat war support renaming as well


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

Branch: refs/heads/master
Commit: 4312a6abd565f12d732c355f8c1782af6108ab0b
Parents: ed524ec
Author: Romain manni-Bucau 
Authored: Mon Feb 8 20:30:21 2016 +0100
Committer: Romain manni-Bucau 
Committed: Mon Feb 8 20:30:21 2016 +0100

--
 .../src/main/java/org/apache/tomee/embedded/Main.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4312a6ab/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
--
diff --git 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
index a2c8d06..04d6458 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
@@ -90,7 +90,7 @@ public class Main {
 if (autoWar) { // nothing deployed check if we are a war and 
deploy ourself then
 final File me = jarLocation(Main.class);
 if (me.getName().endsWith(".war")) {
-container.deploy(contexts == null || i == contexts.length 
? "" : contexts[i], me);
+container.deploy(contexts == null || i == contexts.length 
? "" : contexts[i], me, true);
 }
 }
 

tomee git commit: TOMEE-1684 cxf 3.1.5

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master b6d039d69 -> 10d001eb1


TOMEE-1684 cxf 3.1.5


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

Branch: refs/heads/master
Commit: 10d001eb17930014f1061d509fcc8693a64332b7
Parents: b6d039d
Author: Romain manni-Bucau 
Authored: Sun Feb 7 19:03:22 2016 +0100
Committer: Romain manni-Bucau 
Committed: Sun Feb 7 19:03:22 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/10d001eb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 878a20d..dfa1a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
 
 8.0.30
 
-3.1.4
+3.1.5
 2.9.0
 
 7.5.3.v20111011

tomee git commit: getting rid of weird folders

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 0be458733 -> b6d039d69


getting rid of weird folders


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

Branch: refs/heads/master
Commit: b6d039d69a9011b6dcae4d14b0f2fcc30600fc6b
Parents: 0be4587
Author: Romain manni-Bucau 
Authored: Fri Feb 5 21:25:44 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 5 21:25:44 2016 +0100

--
 .../superbiz/ws/security/CalculatorBean.java"   |   30 -
 .../ws/security/PasswordCallbackHandler.java"   |   44 -
 .../main/resources/META-INF/openejb-jar.xml"|   24 -
 .../OpenEJBHttpDestinationFactory.java" |   34 -
 .../server/cxf/transport/event/BusCreated.java" |   33 -
 .../util/CxfContainerClassLoader.java"  |  132 -
 .../server/cxf/transport/util/CxfUtil.java" |  356 -
 .../apache/tomee/catalina/ContextValue.java"|   61 -
 .../org/apache/tomee/catalina/Contexts.java"|  165 -
 .../tomee/catalina/GlobalListenerSupport.java"  |  435 --
 .../tomee/catalina/IgnoredStandardContext.java" |   43 -
 .../catalina/InjectionFailedException.java" |   26 -
 .../tomee/catalina/JavaeeInstanceManager.java"  |  242 -
 .../apache/tomee/catalina/LazyStopLoader.java"  |  165 -
 .../tomee/catalina/LazyStopStandardRoot.java"   |  337 -
 .../LegacyAnnotationProcessorListener.java" |   54 -
 .../tomee/catalina/LinkageErrorProtection.java" |  187 -
 .../apache/tomee/catalina/OpenEJBContext.java"  |  266 -
 .../tomee/catalina/OpenEJBContextConfig.java"   |  721 --
 .../catalina/OpenEJBNamingContextListener.java" |  319 -
 .../tomee/catalina/OpenEJBNamingResource.java"  |  161 -
 .../catalina/OpenEJBSecurityListener.java"  |   70 -
 .../apache/tomee/catalina/OpenEJBValve.java"|   61 -
 .../ProcessAnnotatedListenersListener.java" |  131 -
 .../ProcessAnnotatedServletsListener.java"  |   55 -
 .../apache/tomee/catalina/ServerListener.java"  |  216 -
 .../tomee/catalina/SimpleTomEETcpCluster.java"  |   68 -
 .../catalina/TomEEClassLoaderEnricher.java" |  229 -
 .../tomee/catalina/TomEEContainerListener.java" |   39 -
 .../org/apache/tomee/catalina/TomEERealm.java"  |  120 -
 .../tomee/catalina/TomEERuntimeException.java"  |   32 -
 .../tomee/catalina/TomEEServiceManager.java"|   34 -
 .../tomee/catalina/TomEEWebappClassLoader.java" |  540 --
 .../tomee/catalina/TomEEWebappLoader.java"  |  121 -
 .../tomee/catalina/TomcatDeploymentLoader.java" |   43 -
 .../tomee/catalina/TomcatJavaJndiBinder.java"   |   35 -
 .../tomee/catalina/TomcatJndiBuilder.java"  |  910 ---
 .../apache/tomee/catalina/TomcatLoader.java"|  450 --
 .../tomee/catalina/TomcatResourceFactory.java"  |   95 -
 .../tomee/catalina/TomcatSecurityService.java"  |  321 -
 .../catalina/TomcatThreadContextListener.java"  |  151 -
 .../tomee/catalina/TomcatWebAppBuilder.java"| 2587 ---
 .../java/org/apache/tomee/catalina/Warmup.java" |  233 -
 .../tomee/catalina/WebDeploymentListener.java"  |   29 -
 .../tomee/catalina/WebDeploymentListeners.java" |   48 -
 .../org/apache/tomee/catalina/WebSockets.java"  |   32 -
 .../catalina/cdi/ServletContextHandler.java"|   64 -
 .../cdi/WebBeansThreadBindingListener.java" |   56 -
 .../catalina/cluster/ClusterObserver.java"  |   66 -
 .../tomee/catalina/cluster/DeployMessage.java"  |   63 -
 .../catalina/cluster/TomEEClusterListener.java" |  190 -
 .../catalina/cluster/UndeployMessage.java"  |   36 -
 .../deployment/TomcatWebappDeployer.java"   |  128 -
 .../tomee/catalina/environment/Hosts.java"  |   58 -
 .../event/AfterApplicationCreated.java" |   49 -
 .../tomee/catalina/realm/CdiEventRealm.java"|  151 -
 .../apache/tomee/catalina/realm/LazyRealm.java" |  328 -
 .../tomee/catalina/realm/LowTypedRealm.java"|  224 -
 .../catalina/realm/TomEEDataSourceRealm.java"   |   89 -
 .../realm/event/BaseAuthenticationEvent.java"   |   32 -
 .../realm/event/DigestAuthenticationEvent.java" |   74 -
 .../event/FindSecurityConstraintsEvent.java"|   64 -
 .../realm/event/GssAuthenticationEvent.java"|   38 -
 .../realm/event/SslAuthenticationEvent.java"|   32 -
 .../event/UserPasswordAuthenticationEvent.java" |   37 -
 .../catalina/registration/Registrations.java"   |   45 -
 .../catalina/remote/TomEERemoteWebapp.java" |  166 -
 .../apache/tomee/catalina/routing/Route.java"   |   98 -
 .../catalina/routing/RouterException.java"  |   24 -
 .../tomee/catalina/routing/RouterValve.java"|  112 -
 .../tomee/catalina/routing/SimpleRouter.java"   |  219 -
 .../tomee/catalina/scan/EmptyScanner.java"  |   44 -
 .../catalina/session/FastNonSecureRandom.java"  |   60 -
 

tomee git commit: TOMEE-1704 support placeholders in activation config properties and move the override algorithm to not be too late to override properties

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 3578ba611 -> bf16cb7d0


TOMEE-1704 support placeholders in activation config properties and move the 
override algorithm to not be too late to override properties


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

Branch: refs/heads/master
Commit: bf16cb7d0f2a906f4af619bb1ee55a1ae6b040ad
Parents: 3578ba6
Author: Romain manni-Bucau 
Authored: Fri Feb 5 16:33:31 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 5 16:33:31 2016 +0100

--
 .../ActivationConfigPropertyOverride.java   |  14 +
 .../openejb/config/ConfigurationFactory.java|   3 +-
 .../openejb/core/mdb/MDBPlaceholderTest.java| 102 ++
 .../apache/openejb/jee/ActivationConfig.java|   2 +-
 .../apache/tomee/embedded/Configuration.java"   | 346 +++
 .../org/apache/tomee/embedded/Container.java"   | 955 +++
 .../tomee/embedded/EmbeddedTomEEContainer.java" | 214 +
 .../tomee/embedded/LoginConfigBuilder.java" |  65 ++
 .../java/org/apache/tomee/embedded/Main.java"   | 134 +++
 .../embedded/SecurityConstaintBuilder.java" |  59 ++
 .../internal/StandardContextCustomizer.java"| 111 +++
 .../embedded/junit/TomEEEmbeddedRule.java"  | 136 +++
 .../META-INF/org.apache.tomee/service-jar.xml"  |  53 +
 13 files changed, 2192 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/bf16cb7d/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
index 3bd5903..73afb18 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
@@ -28,6 +28,7 @@ import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.PropertyPlaceHolderHelper;
 
 import java.util.List;
 import java.util.Map;
@@ -67,12 +68,25 @@ public class ActivationConfigPropertyOverride implements 
DynamicDeployer {
 continue;
 }
 
+
 final Properties properties = new Properties();
 properties.putAll(module);
 properties.putAll(ejbDeployment.getProperties());
 
 final MessageDrivenBean mdb = (MessageDrivenBean) bean;
 
+// override with placeholding
+if (mdb.getActivationConfig() != null) {
+for (final ActivationConfigProperty property : 
mdb.getActivationConfig().getActivationConfigProperty()) {
+final String originalValue = 
property.getActivationConfigPropertyValue();
+final String value = 
PropertyPlaceHolderHelper.simpleValue(originalValue);
+if (value != null && !originalValue.equals(value)) {
+property.setActivationConfigPropertyValue(value);
+}
+}
+}
+
+// now try to use special keys
 final Properties overrides = 
ConfigurationFactory.getOverrides(properties, "mdb.activation", 
"EnterpriseBean");
 overrides.putAll(ConfigurationFactory.getOverrides(properties, 
mdb.getMessagingType() + ".activation", "EnterpriseBean"));
 overrides.putAll(ConfigurationFactory.getOverrides(properties, 
ejbName + ".activation", "EnterpriseBean"));

http://git-wip-us.apache.org/repos/asf/tomee/blob/bf16cb7d/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index c36b67d..c47873f 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -288,6 +288,8 @@ public class ConfigurationFactory implements 
OpenEjbConfigurationFactory {
 

tomee git commit: @XmlAccessorType is inconsistent but jaxb sorts it out

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master bf16cb7d0 -> 0be458733


@XmlAccessorType is inconsistent but jaxb sorts it out


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

Branch: refs/heads/master
Commit: 0be458733730c474def1401b06f7a38348a2d7be
Parents: bf16cb7
Author: Romain manni-Bucau 
Authored: Fri Feb 5 17:23:16 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 5 17:23:16 2016 +0100

--
 .../apache/openejb/jee/ActivationConfig.java|2 +-
 .../java/org/superbiz/quartz/QuartzMdbTest.java |   67 +
 .../OpenEJBHttpDestinationFactory.java" |   34 +
 .../server/cxf/transport/event/BusCreated.java" |   33 +
 .../util/CxfContainerClassLoader.java"  |  132 +
 .../server/cxf/transport/util/CxfUtil.java" |  356 +
 .../apache/tomee/catalina/ContextValue.java"|   61 +
 .../org/apache/tomee/catalina/Contexts.java"|  165 +
 .../tomee/catalina/GlobalListenerSupport.java"  |  435 ++
 .../tomee/catalina/IgnoredStandardContext.java" |   43 +
 .../catalina/InjectionFailedException.java" |   26 +
 .../tomee/catalina/JavaeeInstanceManager.java"  |  242 +
 .../apache/tomee/catalina/LazyStopLoader.java"  |  165 +
 .../tomee/catalina/LazyStopStandardRoot.java"   |  337 +
 .../LegacyAnnotationProcessorListener.java" |   54 +
 .../tomee/catalina/LinkageErrorProtection.java" |  187 +
 .../apache/tomee/catalina/OpenEJBContext.java"  |  266 +
 .../tomee/catalina/OpenEJBContextConfig.java"   |  721 ++
 .../catalina/OpenEJBNamingContextListener.java" |  319 +
 .../tomee/catalina/OpenEJBNamingResource.java"  |  161 +
 .../catalina/OpenEJBSecurityListener.java"  |   70 +
 .../apache/tomee/catalina/OpenEJBValve.java"|   61 +
 .../ProcessAnnotatedListenersListener.java" |  131 +
 .../ProcessAnnotatedServletsListener.java"  |   55 +
 .../apache/tomee/catalina/ServerListener.java"  |  216 +
 .../tomee/catalina/SimpleTomEETcpCluster.java"  |   68 +
 .../catalina/TomEEClassLoaderEnricher.java" |  229 +
 .../tomee/catalina/TomEEContainerListener.java" |   39 +
 .../org/apache/tomee/catalina/TomEERealm.java"  |  120 +
 .../tomee/catalina/TomEERuntimeException.java"  |   32 +
 .../tomee/catalina/TomEEServiceManager.java"|   34 +
 .../tomee/catalina/TomEEWebappClassLoader.java" |  540 ++
 .../tomee/catalina/TomEEWebappLoader.java"  |  121 +
 .../tomee/catalina/TomcatDeploymentLoader.java" |   43 +
 .../tomee/catalina/TomcatJavaJndiBinder.java"   |   35 +
 .../tomee/catalina/TomcatJndiBuilder.java"  |  910 +++
 .../apache/tomee/catalina/TomcatLoader.java"|  450 ++
 .../tomee/catalina/TomcatResourceFactory.java"  |   95 +
 .../tomee/catalina/TomcatSecurityService.java"  |  321 +
 .../catalina/TomcatThreadContextListener.java"  |  151 +
 .../tomee/catalina/TomcatWebAppBuilder.java"| 2587 +++
 .../java/org/apache/tomee/catalina/Warmup.java" |  233 +
 .../tomee/catalina/WebDeploymentListener.java"  |   29 +
 .../tomee/catalina/WebDeploymentListeners.java" |   48 +
 .../org/apache/tomee/catalina/WebSockets.java"  |   32 +
 .../catalina/cdi/ServletContextHandler.java"|   64 +
 .../cdi/WebBeansThreadBindingListener.java" |   56 +
 .../catalina/cluster/ClusterObserver.java"  |   66 +
 .../tomee/catalina/cluster/DeployMessage.java"  |   63 +
 .../catalina/cluster/TomEEClusterListener.java" |  190 +
 .../catalina/cluster/UndeployMessage.java"  |   36 +
 .../deployment/TomcatWebappDeployer.java"   |  128 +
 .../tomee/catalina/environment/Hosts.java"  |   58 +
 .../event/AfterApplicationCreated.java" |   49 +
 .../tomee/catalina/realm/CdiEventRealm.java"|  151 +
 .../apache/tomee/catalina/realm/LazyRealm.java" |  328 +
 .../tomee/catalina/realm/LowTypedRealm.java"|  224 +
 .../catalina/realm/TomEEDataSourceRealm.java"   |   89 +
 .../realm/event/BaseAuthenticationEvent.java"   |   32 +
 .../realm/event/DigestAuthenticationEvent.java" |   74 +
 .../event/FindSecurityConstraintsEvent.java"|   64 +
 .../realm/event/GssAuthenticationEvent.java"|   38 +
 .../realm/event/SslAuthenticationEvent.java"|   32 +
 .../event/UserPasswordAuthenticationEvent.java" |   37 +
 .../catalina/registration/Registrations.java"   |   45 +
 .../catalina/remote/TomEERemoteWebapp.java" |  166 +
 .../apache/tomee/catalina/routing/Route.java"   |   98 +
 .../catalina/routing/RouterException.java"  |   24 +
 .../tomee/catalina/routing/RouterValve.java"|  112 +
 .../tomee/catalina/routing/SimpleRouter.java"   |  219 +
 .../tomee/catalina/scan/EmptyScanner.java"  |   44 +
 .../catalina/session/FastNonSecureRandom.java"  |   60 +
 .../catalina/session/QuickSessionManager.java"  |   25 +
 

tomee git commit: try to not use default AMQ broker port in test as default port but another one to avoid potential conflicts

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 7293b1a5c -> 891f8df58


try to not use default AMQ broker port in test as default port but another one 
to avoid potential conflicts


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

Branch: refs/heads/master
Commit: 891f8df589c31f0d8e1b0dfb83f777ed5b3b31c2
Parents: 7293b1a
Author: Romain manni-Bucau 
Authored: Fri Feb 5 08:01:42 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 5 08:01:42 2016 +0100

--
 .../activemq/OpenEjbBrokerFactoryTest.java  |  2 +-
 .../java/org/superbiz/quartz/QuartzMdbTest.java | 67 
 .../superbiz/ws/security/CalculatorBean.java"   | 30 +
 .../ws/security/PasswordCallbackHandler.java"   | 44 +
 .../main/resources/META-INF/openejb-jar.xml"| 24 +++
 5 files changed, 166 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/891f8df5/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
index 976d539..ea814f4 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
@@ -46,7 +46,7 @@ import java.util.Map;
 import java.util.Properties;
 
 public class OpenEjbBrokerFactoryTest extends TestCase {
-private final int brokerPort = NetworkUtil.getNextAvailablePort(new 
int[]{61616, 0});
+private final int brokerPort = NetworkUtil.getNextAvailablePort(new 
int[]{7272 /* try to not use default AMQ port */, 0});
 
 public void testBrokerUri() throws Exception {
 final String prefix = ActiveMQFactory.getBrokerMetaFile();

http://git-wip-us.apache.org/repos/asf/tomee/blob/891f8df5/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
--
diff --git 
a/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
 
b/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
new file mode 100644
index 000..784f993
--- /dev/null
+++ 
b/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
@@ -0,0 +1,67 @@
+/**
+ * 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.superbiz.quartz;
+
+import org.apache.openejb.config.OutputGeneratedDescriptors;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.Properties;
+
+public class QuartzMdbTest {
+
+private static InitialContext initialContext = null;
+
+@BeforeClass
+public static void beforeClass() throws Exception {
+System.setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, 
"false"); // just to avoid to dump files in /tmp
+if (null == initialContext) {
+Properties properties = new Properties();
+properties.setProperty("openejb.deployments.classpath.include", 
".*quartz-.*");
+properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.core.LocalInitialContextFactory");
+
+initialContext = new InitialContext(properties);
+}
+}
+
+@AfterClass
+public static void afterClass() throws Exception {
+if (null != initialContext) {
+initialContext.close();
+initialContext 

tomee git commit: not sure where this file comes from

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 891f8df58 -> 3578ba611


not sure where this file comes from


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

Branch: refs/heads/master
Commit: 3578ba6119c0104d8784806263a18aa2403ca118
Parents: 891f8df
Author: Romain manni-Bucau 
Authored: Fri Feb 5 08:04:30 2016 +0100
Committer: Romain manni-Bucau 
Committed: Fri Feb 5 08:04:30 2016 +0100

--
 .../java/org/superbiz/quartz/QuartzMdbTest.java | 67 
 1 file changed, 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/3578ba61/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
--
diff --git 
a/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
 
b/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
deleted file mode 100644
index 784f993..000
--- 
a/examples/quartz-app/quartz-beans/src#test/java/org/superbiz/quartz/QuartzMdbTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * 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.superbiz.quartz;
-
-import org.apache.openejb.config.OutputGeneratedDescriptors;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-public class QuartzMdbTest {
-
-private static InitialContext initialContext = null;
-
-@BeforeClass
-public static void beforeClass() throws Exception {
-System.setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, 
"false"); // just to avoid to dump files in /tmp
-if (null == initialContext) {
-Properties properties = new Properties();
-properties.setProperty("openejb.deployments.classpath.include", 
".*quartz-.*");
-properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.core.LocalInitialContextFactory");
-
-initialContext = new InitialContext(properties);
-}
-}
-
-@AfterClass
-public static void afterClass() throws Exception {
-if (null != initialContext) {
-initialContext.close();
-initialContext = null;
-}
-}
-
-@Test
-public void testLookup() throws Exception {
-
-final JobScheduler jbi = (JobScheduler) 
initialContext.lookup("JobBeanLocal");
-final Date d = jbi.createJob();
-Thread.sleep(500);
-System.out.println("Scheduled test job should have run at: " + 
d.toString());
-}
-
-@Test
-public void testMdb() throws Exception {
-// Sleep 3 seconds and give quartz a chance to execute our MDB
-Thread.sleep(3000);
-}
-}

[1/2] tomee git commit: TOMEE-1702 dont store cmp reference globally

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master eb0c2da70 -> 1a3f66df2


TOMEE-1702 dont store cmp reference globally


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

Branch: refs/heads/master
Commit: dac782064fa1b356686a845f385eca1c2a5534fa
Parents: eb0c2da
Author: Romain manni-Bucau 
Authored: Tue Feb 2 12:25:55 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 2 12:25:55 2016 +0100

--
 .../openejb/core/ivm/BaseEjbProxyHandler.java   | 104 ++--
 .../openejb/core/cmp/jpa/SimpleCmpTest.java | 244 +++
 2 files changed, 333 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/dac78206/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
index ac0e1dd..309b359 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
@@ -23,12 +23,31 @@ import org.apache.openejb.InterfaceType;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.ProxyInfo;
 import org.apache.openejb.RpcContainer;
+import org.apache.openejb.core.Operation;
 import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ThreadContextListener;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.ContainerSystem;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
 
+import javax.ejb.AccessLocalException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBTransactionRequiredException;
+import javax.ejb.EJBTransactionRolledbackException;
+import javax.ejb.NoSuchEJBException;
+import javax.ejb.NoSuchObjectLocalException;
+import javax.ejb.TransactionRequiredLocalException;
+import javax.ejb.TransactionRolledbackLocalException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionRequiredException;
+import javax.transaction.TransactionRolledbackException;
+import javax.transaction.TransactionSynchronizationRegistry;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -54,16 +73,6 @@ import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.ejb.AccessLocalException;
-import javax.ejb.EJBException;
-import javax.ejb.EJBTransactionRequiredException;
-import javax.ejb.EJBTransactionRolledbackException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.NoSuchObjectLocalException;
-import javax.ejb.TransactionRequiredLocalException;
-import javax.ejb.TransactionRolledbackLocalException;
-import javax.transaction.TransactionRequiredException;
-import javax.transaction.TransactionRolledbackException;
 
 import static 
org.apache.openejb.core.ivm.IntraVmCopyMonitor.State.CLASSLOADER_COPY;
 import static org.apache.openejb.core.ivm.IntraVmCopyMonitor.State.COPY;
@@ -74,6 +83,25 @@ public abstract class BaseEjbProxyHandler implements 
InvocationHandler, Serializ
 
 private static final String OPENEJB_LOCALCOPY = "openejb.localcopy";
 private static final boolean REMOTE_COPY_ENABLED = 
parseRemoteCopySetting();
+static {
+ThreadContext.addThreadContextListener(new ThreadContextListener() {
+@Override
+public void contextEntered(final ThreadContext oldContext, final 
ThreadContext newContext) {
+// no-op
+}
+
+@Override
+public void contextExited(final ThreadContext exitedContext, final 
ThreadContext reenteredContext) {
+if (exitedContext != null) {
+final ProxyRegistry proxyRegistry = 
exitedContext.get(ProxyRegistry.class);
+if (proxyRegistry != null) {
+proxyRegistry.liveHandleRegistry.clear();
+}
+}
+}
+});
+}
+
 public final Object deploymentID;
 public final Object primaryKey;
 

[2/2] tomee git commit: TOMEE-1703 pushing the finder to webapp deployment to be able to scan even in ear deployment lifecycle - this can need a small rework of the deployment to make module tree avai

[rmannibucau]

TOMEE-1703 pushing the finder to webapp deployment to be able to scan even in 
ear deployment lifecycle - this can need a small rework of the deployment to 
make module tree available in webapp builder somehow in a clear way


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

Branch: refs/heads/master
Commit: 1a3f66df292fb23d095fbab4704d2fa40a935c24
Parents: dac7820
Author: Romain manni-Bucau 
Authored: Tue Feb 2 12:26:54 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 2 12:26:54 2016 +0100

--
 .../openejb/assembler/classic/Assembler.java| 537 ++-
 .../openejb/config/ConfigurationFactory.java|  12 +
 .../tomee/catalina/TomcatWebAppBuilder.java | 274 +-
 3 files changed, 437 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/1a3f66df/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index ef6544b..7546a33 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -696,330 +696,337 @@ public class Assembler extends AssemblerTool implements 
org.apache.openejb.spi.A
 
 private AppContext createApplication(final AppInfo appInfo, ClassLoader 
classLoader, final boolean start) throws OpenEJBException, IOException, 
NamingException {
 try {
-mergeServices(appInfo);
-} catch (final URISyntaxException e) {
-logger.info("Can't merge resources.xml services and 
appInfo.properties");
-}
+try {
+mergeServices(appInfo);
+} catch (final URISyntaxException e) {
+logger.info("Can't merge resources.xml services and 
appInfo.properties");
+}
 
-// The path is used in the UrlCache, command line deployer, JNDI name 
templates, tomcat integration and a few other places
-if (appInfo.appId == null) {
-throw new IllegalArgumentException("AppInfo.appId cannot be null");
-}
-if (appInfo.path == null) {
-appInfo.path = appInfo.appId;
-}
+// The path is used in the UrlCache, command line deployer, JNDI 
name templates, tomcat integration and a few other places
+if (appInfo.appId == null) {
+throw new IllegalArgumentException("AppInfo.appId cannot be 
null");
+}
+if (appInfo.path == null) {
+appInfo.path = appInfo.appId;
+}
 
-Extensions.addExtensions(classLoader, 
appInfo.eventClassesNeedingAppClassloader);
-logger.info("createApplication.start", appInfo.path);
-final Context containerSystemContext = 
containerSystem.getJNDIContext();
-
-// To start out, ensure we don't already have any beans deployed with 
duplicate IDs.  This
-// is a conflict we can't handle.
-final List used = new ArrayList();
-for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
-for (final EnterpriseBeanInfo beanInfo : 
ejbJarInfo.enterpriseBeans) {
-if (containerSystem.getBeanContext(beanInfo.ejbDeploymentId) 
!= null) {
-used.add(beanInfo.ejbDeploymentId);
+Extensions.addExtensions(classLoader, 
appInfo.eventClassesNeedingAppClassloader);
+logger.info("createApplication.start", appInfo.path);
+final Context containerSystemContext = 
containerSystem.getJNDIContext();
+
+// To start out, ensure we don't already have any beans deployed 
with duplicate IDs.  This
+// is a conflict we can't handle.
+final List used = new ArrayList();
+for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
+for (final EnterpriseBeanInfo beanInfo : 
ejbJarInfo.enterpriseBeans) {
+if 
(containerSystem.getBeanContext(beanInfo.ejbDeploymentId) != null) {
+used.add(beanInfo.ejbDeploymentId);
+}
 }
 }
-}
 
-if (used.size() > 0) {
-String message = 
logger.error("createApplication.appFailedDuplicateIds", appInfo.path);
-for (final String id : used) {
-

tomee git commit: completion error

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 1a3f66df2 -> 7293b1a5c


completion error


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

Branch: refs/heads/master
Commit: 7293b1a5c480844c7770d5fe86f88a9663020ef5
Parents: 1a3f66d
Author: Romain manni-Bucau 
Authored: Tue Feb 2 12:33:36 2016 +0100
Committer: Romain manni-Bucau 
Committed: Tue Feb 2 12:33:36 2016 +0100

--
 .../test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/7293b1a5/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java
index 9ff4557..01c9ee4 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/SimpleCmpTest.java
@@ -42,6 +42,7 @@ import java.lang.reflect.Proxy;
 import java.rmi.RemoteException;
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 @SimpleLog
 @RunWith(ApplicationComposer.class)
@@ -162,7 +163,7 @@ public class SimpleCmpTest {
 final Object registry = handler.getBeanContext().get(
 Thread.currentThread().getContextClassLoader() // 
private so use reflection
 
.loadClass("org.apache.openejb.core.ivm.BaseEjbProxyHandler$ProxyRegistry"));
-assertNotNull(registry); // not even instantiated since we 
have a wrapper (stateless)
+assertNull(registry); // not even instantiated since we have a 
wrapper (stateless)
 } catch (final ClassNotFoundException e) {
 throw new IllegalStateException(e);
 }

tomee git commit: TOMEE-1700 johnwon 0.9.2-incubating

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master e18a92244 -> cd1433e0e


TOMEE-1700 johnwon 0.9.2-incubating


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

Branch: refs/heads/master
Commit: cd1433e0e690553d5525ecffe5588be1590a897e
Parents: e18a922
Author: Romain Manni-Bucau 
Authored: Fri Jan 29 09:23:13 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Fri Jan 29 09:23:13 2016 +0100

--
 server/openejb-cxf-rs/pom.xml   |  2 +-
 .../server/cxf/rs/CxfRsHttpListener.java|  2 +-
 .../server/cxf/rs/JndiForPojoEndpointsTest.java | 21 ++--
 3 files changed, 8 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/pom.xml
--
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index a6794d2..acd3fd6 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -117,7 +117,7 @@
  
   org.apache.johnzon
   johnzon-jaxrs
-  0.8-incubating
+  0.9.2-incubating
 
   
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index ec7555f..f279f09 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -1104,7 +1104,7 @@ public class CxfRsHttpListener implements RsHttpListener {
 }
 
 @Override
-protected void setProviders(final boolean custom, final boolean bus, 
final Object... providers) {
+protected void setProviders(final boolean b, final boolean b1, final 
Object... objects) {
 throw new UnsupportedOperationException("not a real inheritance");
 }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
--
diff --git 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
index fabd64e..019dda6 100644
--- 
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
+++ 
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
@@ -24,6 +24,7 @@ import org.apache.openejb.testing.Classes;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.EnableServices;
 import org.apache.openejb.testing.Module;
+import org.apache.openejb.testing.RandomPort;
 import org.apache.openejb.testng.PropertiesBuilder;
 import org.apache.openejb.util.NetworkUtil;
 import org.junit.BeforeClass;
@@ -35,7 +36,9 @@ import javax.validation.Validator;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
@@ -43,21 +46,8 @@ import static org.junit.Assert.assertEquals;
 @EnableServices("jax-rs")
 @RunWith(ApplicationComposer.class)
 public class JndiForPojoEndpointsTest {
-
-private static int port = -1;
-
-@BeforeClass
-public static void beforeClass() {
-port = NetworkUtil.getNextAvailablePort();
-}
-
-@Configuration
-public Properties props() {
-return new PropertiesBuilder()
-.p("httpejbd.port", Integer.toString(port))
-.p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
-.build();
-}
+@RandomPort("http")
+private int port;
 
 @Module
 @Classes(cdi = true, value = {JndiEndpoint.class})
@@ -78,6 +68,7 @@ public class JndiForPojoEndpointsTest {
 private Validator val;
 
 @GET
+@Produces(MediaType.TEXT_PLAIN)
 public int doIt() {
 return val.validate(new ToVal()).size();
 }

tomee git commit: TOMEE-1701 SingleApplicationComposerRunner

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master cd1433e0e -> eb0c2da70


TOMEE-1701 SingleApplicationComposerRunner


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

Branch: refs/heads/master
Commit: eb0c2da7015a191906e3507c677e39d3470e8d8a
Parents: cd1433e
Author: Romain Manni-Bucau 
Authored: Fri Jan 29 23:00:02 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Fri Jan 29 23:00:02 2016 +0100

--
 .../org/apache/openejb/testing/Application.java |  29 
 .../SingleApplicationComposerRunner.java| 171 +++
 2 files changed, 200 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/eb0c2da7/container/openejb-core/src/main/java/org/apache/openejb/testing/Application.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/Application.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/Application.java
new file mode 100644
index 000..568cbf4
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/Application.java
@@ -0,0 +1,29 @@
+/*
+ * 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.testing;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({ FIELD, TYPE })
+@Retention(RUNTIME)
+public @interface Application {
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/eb0c2da7/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
new file mode 100644
index 000..1758ec6
--- /dev/null
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/testing/SingleApplicationComposerRunner.java
@@ -0,0 +1,171 @@
+/*
+ * 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.testing;
+
+import org.apache.openejb.core.ThreadContext;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.inject.OWBInjector;
+import org.apache.xbean.finder.AnnotationFinder;
+import org.apache.xbean.finder.archive.FileArchive;
+import org.junit.rules.MethodRule;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+import java.lang.reflect.Field;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.openejb.loader.JarLocation.jarLocation;
+
+// goal is to share the same container for all embedded tests and hold the 
config 

tomee git commit: TOMEE-1699 if quoted then the system property is considered as the main class

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 009aeb078 -> e18a92244


TOMEE-1699 if quoted then the system property is considered as the main class


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

Branch: refs/heads/master
Commit: e18a92244e34759cd4523df71547bf1a36d5a923
Parents: 009aeb0
Author: Romain Manni-Bucau 
Authored: Wed Jan 27 09:15:34 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Jan 27 09:15:34 2016 +0100

--
 .../java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/e18a9224/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
--
diff --git 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index e4cd0ee..81d5e68 100644
--- 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -1185,8 +1185,6 @@ public abstract class AbstractTomEEMojo extends 
AbstractAddressMojo {
 final String value = entry.getValue();
 if (value == null) {
 strings.add("-D" + key);
-} else if (value.contains(" ")) {
-strings.add(String.format("'-D%s=%s'", key, value));
 } else {
 strings.add(String.format("-D%s=%s", key, value));
 }

tomee git commit: TOMEE-1698 restore bean manager in ServletContext attributes merging the duplicated logic

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 0f8fd20bd -> de0bb45f6


TOMEE-1698 restore bean manager in ServletContext attributes merging the 
duplicated logic


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

Branch: refs/heads/master
Commit: de0bb45f6b6e2b03313a10f0c85a94cea6b52689
Parents: 0f8fd20
Author: Romain Manni-Bucau 
Authored: Tue Jan 26 15:09:01 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Jan 26 15:09:01 2016 +0100

--
 .../apache/openejb/cdi/OpenEJBLifecycle.java|  4 ++
 .../tomee/catalina/TomcatWebAppBuilder.java | 44 
 2 files changed, 21 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/de0bb45f/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
index a718bb8..6b2297a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
@@ -374,6 +374,10 @@ public class OpenEJBLifecycle implements 
ContainerLifecycle {
 }
 
 public static void initializeServletContext(final ServletContext 
servletContext, final WebBeansContext context) {
+if (context == null || !context.getBeanManagerImpl().isInUse()) {
+return;
+}
+
 final ELAdaptor elAdaptor = context.getService(ELAdaptor.class);
 final ELResolver resolver = elAdaptor.getOwbELResolver();
 //Application is configured as JSP

http://git-wip-us.apache.org/repos/asf/tomee/blob/de0bb45f/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 83b8a12..1f0e1cf 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
@@ -131,9 +131,22 @@ import org.apache.tomee.common.UserTransactionFactory;
 import org.apache.tomee.loader.TomcatHelper;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.spi.ContextsService;
-import org.apache.webbeans.spi.adaptor.ELAdaptor;
 import org.omg.CORBA.ORB;
 
+import javax.ejb.spi.HandleDelegate;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.naming.StringRefAddr;
+import javax.servlet.ServletContext;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspFactory;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -157,22 +170,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import javax.ejb.spi.HandleDelegate;
-import javax.el.ELResolver;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import javax.servlet.ServletContext;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspFactory;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
 
 import static java.util.Arrays.asList;
 import static org.apache.tomee.catalina.Contexts.warPath;
@@ -1375,16 +1372,9 @@ public class TomcatWebAppBuilder implements 
WebAppBuilder, ContextListener, Pare
 }
 }
 
-final JspFactory factory = JspFactory.getDefaultFactory();
-if (factory != null) {
-final JspApplicationContext applicationCtx = 

tomee git commit: unused import

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master de0bb45f6 -> 009aeb078


unused import


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

Branch: refs/heads/master
Commit: 009aeb0787b8339229fd038ab0e9d7b91bc76497
Parents: de0bb45
Author: Romain Manni-Bucau 
Authored: Tue Jan 26 15:14:00 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Jan 26 15:14:00 2016 +0100

--
 .../main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/009aeb07/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 1f0e1cf..4756dfb 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
@@ -143,7 +143,6 @@ import javax.naming.StringRefAddr;
 import javax.servlet.ServletContext;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspFactory;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;

tomee git commit: TOMEE-1696 ensure lazy resources use by default container loader (UseAppClassLoader=false or null). Was not the case for auto created resources

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 2b5518c58 -> 0f8fd20bd


TOMEE-1696 ensure lazy resources use by default container loader 
(UseAppClassLoader=false or null). Was not the case for auto created resources


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

Branch: refs/heads/master
Commit: 0f8fd20bd519218f3b9fdeb85b8ca010db353b53
Parents: 2b5518c
Author: Romain Manni-Bucau 
Authored: Thu Jan 21 09:09:26 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Jan 21 09:09:26 2016 +0100

--
 .../openejb/assembler/classic/Assembler.java   | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/0f8fd20b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 4b5ed1f..ef6544b 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -2659,7 +2659,7 @@ public class Assembler extends AssemblerTool implements 
org.apache.openejb.spi.A
 public void createResource(final ResourceInfo serviceInfo) throws 
OpenEJBException {
 final boolean usesCdiPwdCipher = usesCdiPwdCipher(serviceInfo);
 final Object service = 
"true".equalsIgnoreCase(String.valueOf(serviceInfo.properties.remove("Lazy"))) 
|| usesCdiPwdCipher ?
-newLazyResource(serviceInfo) :
+newLazyResource(serviceInfo) :
 doCreateResource(serviceInfo);
 if (usesCdiPwdCipher && 
!serviceInfo.properties.contains("InitializeAfterDeployment")) {
 serviceInfo.properties.put("InitializeAfterDeployment", "true");
@@ -2696,25 +2696,22 @@ public class Assembler extends AssemblerTool implements 
org.apache.openejb.spi.A
 }
 
 private LazyResource newLazyResource(final ResourceInfo serviceInfo) {
-final ClassLoader loader = 
Thread.currentThread().getContextClassLoader();
 return new LazyResource(new Callable() {
 @Override
 public Object call() throws Exception {
 final boolean appClassLoader = 
"true".equals(serviceInfo.properties.remove("UseAppClassLoader"));
 
-ClassLoader old = null;
-
+final Thread thread = Thread.currentThread();
+final ClassLoader old = thread.getContextClassLoader();
 if (!appClassLoader) {
-old = Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader(loader);
-}
+final ClassLoader classLoader = 
Assembler.class.getClassLoader();
+thread.setContextClassLoader(classLoader == null ? 
ClassLoader.getSystemClassLoader() : classLoader);
+} // else contextually we should have the app loader
 
 try {
 return doCreateResource(serviceInfo);
 } finally {
-if (old != null) {
-Thread.currentThread().setContextClassLoader(old);
-}
+thread.setContextClassLoader(old);
 }
 }
 });

tomee git commit: checkstyle

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master ed6331f1d -> 2b5518c58


checkstyle


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

Branch: refs/heads/master
Commit: 2b5518c58d0b0f809cb9e7a34cecd45fbd8b6987
Parents: ed6331f
Author: Romain Manni-Bucau 
Authored: Thu Jan 21 08:18:56 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Jan 21 08:18:56 2016 +0100

--
 .../main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/2b5518c5/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
index 371390c..f4e26d5 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
@@ -208,7 +208,7 @@ public class JavaeeInstanceManager implements 
InstanceManager {
 }
 }
 
-private static class WebSocketTypes { // extracted for lazy loading
+private static final class WebSocketTypes { // extracted for lazy loading
 private static final WebSocketTypes WEB_SOCKET_TYPES = new 
WebSocketTypes();
 private final Method getPojo;
 

tomee git commit: TOMEE-1694 use tomcat destroy hook

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master fbc4b38f2 -> fde16235f


TOMEE-1694 use tomcat destroy hook


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

Branch: refs/heads/master
Commit: fde16235fbf441016a0b44fb4a234cdc2394754f
Parents: fbc4b38
Author: Romain Manni-Bucau 
Authored: Mon Jan 18 19:50:16 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Mon Jan 18 19:50:16 2016 +0100

--
 .../tomee/catalina/JavaeeInstanceManager.java   |  46 -
 .../tomee/catalina/OpenEJBContextConfig.java|  30 
 .../JavaEEDefaultServerEnpointConfigurator.java | 166 +--
 3 files changed, 45 insertions(+), 197 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/fde16235/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
index 3a4540e..27ab0ac 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
@@ -18,6 +18,7 @@ package org.apache.tomee.catalina;
 
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.core.WebContext;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.tomcat.InstanceManager;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansCreationException;
@@ -92,8 +93,17 @@ public class JavaeeInstanceManager implements 
InstanceManager {
 if (o == null) {
 return;
 }
-preDestroy(o, o.getClass());
-webContext.destroy(o);
+final Object unwrapped = unwrap(o);
+preDestroy(unwrapped, unwrapped.getClass());
+webContext.destroy(unwrapped);
+if (unwrapped != o) { // PojoEndpointServer, they create and track a 
cc so release it
+webContext.destroy(o);
+}
+}
+
+private Object unwrap(final Object o) {
+return 
"org.apache.tomcat.websocket.pojo.PojoEndpointServer".equals(o.getClass().getName())
 ?
+WebSocketTypes.unwrapWebSocketPojo(o) : o;
 }
 
 public void inject(final Object o) {
@@ -193,4 +203,36 @@ public class JavaeeInstanceManager implements 
InstanceManager {
 preDestroy.setAccessible(accessibility);
 }
 }
+
+private static class WebSocketTypes { // extracted for lazy loading
+private static final WebSocketTypes WEB_SOCKET_TYPES = new 
WebSocketTypes();
+private final Method getPojo;
+
+private WebSocketTypes() {
+Method tmp;
+try {
+tmp = WebSocketTypes.class.getClassLoader()
+
.loadClass("org.apache.tomcat.websocket.pojo.PojoEndpointBase")
+.getDeclaredMethod("getPojo");
+tmp.setAccessible(true);
+} catch (final NoSuchMethodException e) {
+if 
("true".equals(SystemInstance.get().getProperty("tomee.websocket.skip", 
"false"))) {
+tmp = null;
+} else {
+throw new IllegalStateException(e);
+}
+} catch (final ClassNotFoundException e) {
+tmp = null; // no websocket support
+}
+getPojo = tmp;
+}
+
+private static Object unwrapWebSocketPojo(final Object o) {
+try {
+return WEB_SOCKET_TYPES.getPojo == null ? o : 
WEB_SOCKET_TYPES.getPojo.invoke(o);
+} catch (final IllegalAccessException | InvocationTargetException 
| NullPointerException e) {
+return o;
+}
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/fde16235/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
index 7e2e410..b3d06a4 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
@@ -64,10 +64,6 @@ import 

tomee git commit: TOMEE-1694 use tomcat destroy hook

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master fde16235f -> 1b960482e


TOMEE-1694 use tomcat destroy hook


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

Branch: refs/heads/master
Commit: 1b960482eb84513f220c73cca5a1b86d1770b8d6
Parents: fde1623
Author: Romain Manni-Bucau 
Authored: Mon Jan 18 22:01:49 2016 +0100
Committer: Romain Manni-Bucau 
Committed: Mon Jan 18 22:01:49 2016 +0100

--
 .../java/org/apache/tomee/catalina/JavaeeInstanceManager.java| 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/1b960482/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
--
diff --git 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
index 27ab0ac..371390c 100644
--- 
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
+++ 
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
@@ -49,6 +49,10 @@ public class JavaeeInstanceManager implements 
InstanceManager {
 @Override
 public Object newInstance(final Class clazz) throws 
IllegalAccessException, InvocationTargetException, NamingException, 
InstantiationException {
 try {
+if 
("org.apache.tomcat.websocket.server.WsHttpUpgradeHandler".equals(clazz.getName()))
 {
+return clazz.newInstance();
+}
+
 final Object object = webContext.newInstance(clazz);
 postConstruct(object, clazz);
 return object;

[4/4] tomee git commit: marking the webapp under test in the ear

[rmannibucau]

marking the webapp under test in the ear


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

Branch: refs/heads/master
Commit: 16f874061184877ea1442302974372779db0fa9c
Parents: 89bd801
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 09:48:27 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 09:48:27 2015 +0100

--
 .../org/apache/openejb/arquillian/tests/ear/BaseForEar.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/16f87406/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
index 9350058..195de94 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
@@ -32,7 +32,10 @@ public abstract class BaseForEar {
 public static EnterpriseArchive createDeployment() {
 return ShrinkWrap.create(EnterpriseArchive.class, "red.ear")
 .addAsModule(ShrinkWrap.create(WebArchive.class, "bean.war")
-.addClass(Bean.class).addAsWebInfResource(EmptyAsset.INSTANCE, 
"beans.xml"));
+.addClasses(
+BaseForEar.class, EarNoTestMethodTest.class, // test stack 
and marking the webapp as the module under test
+Bean.class) // the tested instance
+.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"));
 }
 
 @Inject

[1/4] tomee git commit: TOMEE-1689 ensuring ear test files can be found using @RunWith as well

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master c27dbf5d9 -> 16f874061


TOMEE-1689 ensuring ear test files can be found using @RunWith as well


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

Branch: refs/heads/master
Commit: a33a5ca49bf96d835895b4053e81943dcc844865
Parents: c27dbf5
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 09:30:58 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 09:30:58 2015 +0100

--
 .../openejb/arquillian/common/Discover.java | 32 
 .../apache/openejb/arquillian/common/Setup.java |  2 +-
 .../arquillian/common/TestClassDiscoverer.java  | 32 
 3 files changed, 59 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/a33a5ca4/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Discover.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Discover.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Discover.java
new file mode 100644
index 000..5b49912
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Discover.java
@@ -0,0 +1,32 @@
+/*
+ * 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.arquillian.common;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Used to mark a class as a potential test in arquillian.
+ * Useful when the test class is not found by itself (see TestClassDiscover 
logic).
+ */
+@Target(TYPE)
+@Retention(RUNTIME)
+public @interface Discover {
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/a33a5ca4/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
index c390190..1d67531 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
@@ -349,7 +349,7 @@ public class Setup {
 public static void installArquillianBeanDiscoverer(final File home) {
 final File destination = new File(home, TOMEE_BEAN_DISCOVERER_JAR);
 ShrinkWrap.create(JavaArchive.class, destination.getName())
-.addClasses(BeanDicovererInstaller.class, 
TestClassDiscoverer.class, ArquillianFilterRunner.class)
+.addClasses(BeanDicovererInstaller.class, 
TestClassDiscoverer.class, ArquillianFilterRunner.class, Discover.class)
 .addAsManifestResource(new 
StringAsset(BeanDicovererInstaller.class.getName()), 
ArchivePaths.create("org.apache.openejb.extension"))
 .as(ZipExporter.class).exportTo(destination, false);
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/a33a5ca4/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
--
diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
index 12021e1..818b2de 100644
--- 

[2/4] tomee git commit: test for TOMEE-1689

[rmannibucau]

test for TOMEE-1689


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

Branch: refs/heads/master
Commit: 04731787eed66a07eec633be27223f1a5d2e8cbd
Parents: a33a5ca
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 09:32:01 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 09:32:01 2015 +0100

--
 .../tests/ear/EarNoTestMethodTest.java  | 25 
 1 file changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/04731787/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
new file mode 100644
index 000..cf0ccc7
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
@@ -0,0 +1,25 @@
+/*
+ * 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.arquillian.tests.ear;
+
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.runner.RunWith;
+
+// https://issues.apache.org/jira/browse/TOMEE-1689
+@RunWith(Arquillian.class)
+public class EarNoTestMethodTest extends EarTest {
+}

[3/4] tomee git commit: rework test for tomee-1689

[rmannibucau]

rework test for tomee-1689


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

Branch: refs/heads/master
Commit: 89bd80108b227d9d41b53c42d1aabf0fdf99c8f8
Parents: 0473178
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 09:37:48 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 09:37:48 2015 +0100

--
 .../arquillian/tests/ear/BaseForEar.java| 45 
 .../tests/ear/EarNoTestMethodTest.java  |  3 +-
 2 files changed, 47 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/89bd8010/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
new file mode 100644
index 000..9350058
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/BaseForEar.java
@@ -0,0 +1,45 @@
+/*
+ * 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.arquillian.tests.ear;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertEquals;
+
+public abstract class BaseForEar {
+@Deployment
+public static EnterpriseArchive createDeployment() {
+return ShrinkWrap.create(EnterpriseArchive.class, "red.ear")
+.addAsModule(ShrinkWrap.create(WebArchive.class, "bean.war")
+.addClass(Bean.class).addAsWebInfResource(EmptyAsset.INSTANCE, 
"beans.xml"));
+}
+
+@Inject
+private Bean bean;
+
+@Test
+public void run() {
+assertEquals(Test.class.getName(), bean.getMessage());
+}
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/89bd8010/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
--
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
index cf0ccc7..8213cd0 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarNoTestMethodTest.java
@@ -21,5 +21,6 @@ import org.junit.runner.RunWith;
 
 // https://issues.apache.org/jira/browse/TOMEE-1689
 @RunWith(Arquillian.class)
-public class EarNoTestMethodTest extends EarTest {
+public class EarNoTestMethodTest extends BaseForEar {
+// nothing there to ensure we still find it thanks to @RunWith
 }

tomee git commit: TOMEE-1690 adding js and groovy customizers to tomee maven plugin

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 16f874061 -> 697b40673


TOMEE-1690 adding js and groovy customizers to tomee maven plugin


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

Branch: refs/heads/master
Commit: 697b406736d840eaec7bb303145229863055b5d0
Parents: 16f8740
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 12:26:52 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 12:26:52 2015 +0100

--
 .../openejb/maven/plugin/AbstractTomEEMojo.java | 75 +++-
 .../maven/plugin/test/JsCustomizertest.java | 56 +++
 2 files changed, 128 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/697b4067/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
--
diff --git 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 62fe7b5..e4cd0ee 100644
--- 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -49,6 +49,10 @@ import org.apache.tomee.util.QuickServerXmlParser;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.util.FileUtils;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.Closeable;
@@ -60,6 +64,7 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
@@ -235,6 +240,12 @@ public abstract class AbstractTomEEMojo extends 
AbstractAddressMojo {
 @Parameter
 protected List customizers;
 
+@Parameter
+protected List jsCustomizers;
+
+@Parameter
+protected List groovyCustomizers;
+
 @Parameter(defaultValue = "${project}", readonly = true, required = true)
 protected MavenProject project;
 
@@ -498,6 +509,9 @@ public abstract class AbstractTomEEMojo extends 
AbstractAddressMojo {
 thread.setContextClassLoader(currentLoader);
 }
 }
+
+scriptCustomization(jsCustomizers, "js");
+scriptCustomization(groovyCustomizers, "groovy");
 } else {
 alignConfigOnServerXmlCurrentConfig();
 }
@@ -505,6 +519,51 @@ public abstract class AbstractTomEEMojo extends 
AbstractAddressMojo {
 run();
 }
 
+private void scriptCustomization(final List customizers, final 
String ext) throws MojoExecutionException {
+if (customizers != null) {
+final ScriptEngine engine = new 
ScriptEngineManager().getEngineByExtension(ext);
+if (engine == null) {
+throw new IllegalStateException("No engine for " + ext + ". 
Maybe add the JSR223 implementation as plugin dependency.");
+}
+for (final String js : customizers) {
+try {
+final SimpleBindings bindings = new SimpleBindings();
+bindings.put("catalinaBase", 
catalinaBase.getAbsolutePath());
+bindings.put("resolver", new Resolver() {
+@Override
+public File resolve(final String group, final String 
artifact, final String version,
+final String classifier, final 
String type) {
+try {
+return AbstractTomEEMojo.this.resolve(group, 
artifact, version, classifier, type);
+} catch (final ArtifactResolutionException | 
ArtifactNotFoundException e) {
+throw new IllegalArgumentException(e);
+}
+}
+@Override
+public File resolve(final String group, final String 
artifact, final String version) {
+try {
+return AbstractTomEEMojo.this.resolve(group, 
artifact, version, null, "jar");
+} catch (final 

[2/2] tomee git commit: using released javaee-api for examples

[rmannibucau]

using released javaee-api for examples


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

Branch: refs/heads/master
Commit: b9c99d0d048a725de8e37116a0ad0b9f79f81d36
Parents: 697b406
Author: Romain Manni-Bucau 
Authored: Wed Dec 30 15:37:40 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 30 15:37:40 2015 +0100

--
 examples/access-timeout-meta/pom.xml | 2 +-
 examples/access-timeout/pom.xml  | 2 +-
 examples/alternate-descriptors/pom.xml   | 2 +-
 examples/applet/pom.xml  | 4 ++--
 examples/application-composer/pom.xml| 2 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml   | 2 +-
 examples/applicationexception/pom.xml| 2 +-
 examples/arquillian-jpa/pom.xml  | 2 +-
 examples/async-methods/pom.xml   | 2 +-
 examples/async-postconstruct/pom.xml | 2 +-
 examples/bean-validation-design-by-contract/pom.xml  | 2 +-
 examples/bval-evaluation-redeployment/pom.xml| 2 +-
 examples/cdi-alternative-and-stereotypes/pom.xml | 2 +-
 examples/cdi-application-scope/pom.xml   | 2 +-
 examples/cdi-basic/pom.xml   | 2 +-
 examples/cdi-ejbcontext-jaas/pom.xml | 2 +-
 examples/cdi-events/pom.xml  | 2 +-
 examples/cdi-interceptors/pom.xml| 2 +-
 examples/cdi-produces-disposes/pom.xml   | 2 +-
 examples/cdi-produces-field/pom.xml  | 2 +-
 examples/cdi-realm/pom.xml   | 2 +-
 examples/cdi-request-scope/pom.xml   | 2 +-
 examples/cdi-session-scope/pom.xml   | 2 +-
 examples/change-jaxws-url/pom.xml| 2 +-
 examples/client-resource-lookup-preview/pom.xml  | 2 +-
 examples/component-interfaces/pom.xml| 2 +-
 examples/cucumber-jvm/pom.xml| 2 +-
 examples/custom-injection/pom.xml| 2 +-
 examples/datasource-ciphered-password/pom.xml| 2 +-
 examples/datasource-definition/pom.xml   | 2 +-
 examples/datasource-versioning/pom.xml   | 2 +-
 examples/decorators/pom.xml  | 2 +-
 examples/deltaspike-configproperty/pom.xml   | 2 +-
 examples/deltaspike-exception-handling/pom.xml   | 2 +-
 examples/deltaspike-fullstack/pom.xml| 2 +-
 examples/deltaspike-i18n/pom.xml | 2 +-
 examples/dynamic-dao-implementation/pom.xml  | 2 +-
 examples/dynamic-datasource-routing/pom.xml  | 2 +-
 examples/dynamic-implementation/pom.xml  | 2 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml   | 2 +-
 examples/ear-testing/business-logic/pom.xml  | 2 +-
 examples/ear-testing/pom.xml | 2 +-
 examples/ejb-examples/pom.xml| 2 +-
 examples/ejb-webservice/pom.xml  | 2 +-
 examples/groovy-cdi/pom.xml  | 2 +-
 examples/groovy-jpa/pom.xml  | 2 +-
 examples/groovy-spock/pom.xml| 2 +-
 examples/helloworld-weblogic/pom.xml | 2 +-
 examples/injection-of-connectionfactory/pom.xml  | 2 +-
 examples/injection-of-datasource/pom.xml | 2 +-
 examples/injection-of-ejbs/pom.xml   | 2 +-
 examples/injection-of-entitymanager/pom.xml  | 2 +-
 examples/injection-of-env-entry/pom.xml  | 2 +-
 examples/interceptors/pom.xml| 2 +-
 examples/javamail/pom.xml| 2 +-
 examples/jpa-eclipselink/pom.xml | 2 +-
 examples/jpa-enumerated/pom.xml  | 2 +-
 examples/jpa-hibernate/pom.xml   | 2 +-
 examples/jsf-cdi-and-ejb/pom.xml | 2 +-
 examples/jsf-managedBean-and-ejb/pom.xml | 2 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml  | 2 +-
 examples/lookup-of-ejbs/pom.xml  | 2 +-
 examples/mbean-auto-registration/pom.xml | 2 +-
 examples/moviefun-rest/pom.xml   | 2 +-
 examples/moviefun/pom.xml| 2 +-
 examples/movies-complete-meta/pom.xml| 2 +-
 examples/movies-complete/pom.xml | 2 +-
 examples/multi-jpa-provider-testing/pom.xml  | 2 +-
 examples/multiple-arquillian-adapters/pom.xml| 2 +-
 examples/multiple-tomee-arquillian/pom.xml   | 2 +-
 examples/myfaces-codi-demo/pom.xml   | 2 +-
 

[1/2] tomee git commit: using released javaee-api for examples

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 697b40673 -> b9c99d0d0


http://git-wip-us.apache.org/repos/asf/tomee/blob/b9c99d0d/examples/webservice-inheritance/pom.xml
--
diff --git a/examples/webservice-inheritance/pom.xml 
b/examples/webservice-inheritance/pom.xml
index cd7d7f8..e553429 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -55,7 +55,7 @@
 
   org.apache.tomee
   javaee-api
-  7.0-SNAPSHOT
+  7.0
 
 
   junit

http://git-wip-us.apache.org/repos/asf/tomee/blob/b9c99d0d/examples/webservice-security/pom.xml
--
diff --git a/examples/webservice-security/pom.xml 
b/examples/webservice-security/pom.xml
index 6cc856b..a9de493 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -55,7 +55,7 @@
 
   org.apache.tomee
   javaee-api
-  7.0-SNAPSHOT
+  7.0
 
 
   junit

http://git-wip-us.apache.org/repos/asf/tomee/blob/b9c99d0d/examples/webservice-ws-security/pom.xml
--
diff --git a/examples/webservice-ws-security/pom.xml 
b/examples/webservice-ws-security/pom.xml
index 69fa8b0..bbb5aad 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -41,7 +41,7 @@
 
   org.apache.tomee
   javaee-api
-  7.0-SNAPSHOT
+  7.0
 
 
   junit

tomee git commit: TOMEE-1687 firing ApplicationScoped initialized event after webapp start

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master ee551e05d -> b25b8bda8


TOMEE-1687 firing ApplicationScoped initialized event after webapp start


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

Branch: refs/heads/master
Commit: b25b8bda863132382bb9c9c68664fb240bf4e454
Parents: ee551e0
Author: Romain Manni-Bucau 
Authored: Tue Dec 29 10:24:44 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 29 10:24:44 2015 +0100

--
 .../embedded/AppContextStartedTest.java | 73 
 .../openejb/arquillian/embedded/Start.java  | 45 
 .../openejb/cdi/CdiAppContextsService.java  | 24 ---
 .../apache/openejb/cdi/OpenEJBLifecycle.java| 30 +---
 .../java/org/apache/openejb/cdi/Proxys.java | 12 +++-
 .../openejb/cdi/AppScopeInitEventTest.java  | 45 
 .../server/httpd/EmbeddedServletContext.java| 22 ++
 .../server/httpd/AppScopeInitEventTest.java | 72 +++
 .../tomee/catalina/TomcatWebAppBuilder.java | 22 +-
 .../catalina/cdi/ServletContextHandler.java | 21 +-
 10 files changed, 323 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/b25b8bda/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/AppContextStartedTest.java
--
diff --git 
a/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/AppContextStartedTest.java
 
b/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/AppContextStartedTest.java
new file mode 100644
index 000..322255f
--- /dev/null
+++ 
b/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/AppContextStartedTest.java
@@ -0,0 +1,73 @@
+/**
+ * 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.arquillian.embedded;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.webapp31.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon31.WebAppVersionType;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Arquillian.class)
+public class AppContextStartedTest {
+@Deployment
+public static Archive app() {
+return ShrinkWrap.create(WebArchive.class, 
AppContextStartedTest.class.getSimpleName() + ".war")
+.addClass(Start.class)
+.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+.setWebXML(new StringAsset(
+Descriptors.create(WebAppDescriptor.class)
+.version(WebAppVersionType._3_1)
+.getOrCreateContextParam()
+.paramName("test")
+.paramValue("start")
+.up()
+.exportAsString()
+));
+}
+
+@Inject
+private Start start;
+
+@Inject
+private ServletContext context;
+
+@Test
+public void checkAccessAtStartup() {
+assertNotNull(start.getContext());
+assertEquals("start", start.getValue());
+}
+
+@Test
+public void checkAccessAtRuntime() {
+assertEquals("start", start.getContext().getInitParameter("test"));
+

tomee git commit: getting rid of aether dependencies in openejb-provisionning and using shrinkwrap is available - which relies on maven - or our default impl if not. Note: the registration of this enh

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master b25b8bda8 -> c27dbf5d9


getting rid of aether dependencies in openejb-provisionning and using 
shrinkwrap is available - which relies on maven - or our default impl if not. 
Note: the registration of this enhanced mvn resolver is still manual


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

Branch: refs/heads/master
Commit: c27dbf5d9fb3f3c16fdad4e7eb8c8aa42afe1c11
Parents: b25b8bd
Author: Romain Manni-Bucau 
Authored: Tue Dec 29 13:05:24 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 29 13:05:24 2015 +0100

--
 utils/openejb-provisionning/pom.xml | 139 +---
 .../org/apache/openejb/resolver/Resolver.java   |  54 ++-
 .../resolver/maven/AetherBasedResolver.java | 343 ---
 .../openejb/resolver/maven/ConfigHelper.java|  35 --
 .../openejb/resolver/maven/Connection.java  |  47 ---
 .../apache/openejb/resolver/maven/Handler.java  |  29 --
 .../resolver/maven/ManualWagonProvider.java |  38 --
 .../apache/openejb/resolver/maven/Parser.java   | 229 -
 .../resolver/maven/ShrinkwrapBridge.java|  63 
 .../openejb/resolver/maven/VersionResolver.java |  62 
 .../openejb/resolver/maven/package-info.java|  19 -
 .../openejb/resolver/maven/ParserTest.java  | 241 -
 .../resolver/maven/SWMvnResolverTest.java   |  37 ++
 13 files changed, 126 insertions(+), 1210 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/c27dbf5d/utils/openejb-provisionning/pom.xml
--
diff --git a/utils/openejb-provisionning/pom.xml 
b/utils/openejb-provisionning/pom.xml
index e059d51..80b26f7 100644
--- a/utils/openejb-provisionning/pom.xml
+++ b/utils/openejb-provisionning/pom.xml
@@ -30,141 +30,10 @@
   OpenEJB :: Utils :: Provisionning
 
   
-
 
-  org.ops4j.pax.url
-  pax-url-maven-commons
-  ${pax-url.version}
-  
-
-  org.ops4j.pax.swissbox
-  pax-swissbox-optional-jcl
-
-  
-
-
-  org.sonatype.aether
-  aether-api
-  ${aether.version}
-
-
-  org.sonatype.aether
-  aether-spi
-  ${aether.version}
-
-
-  org.sonatype.aether
-  aether-util
-  ${aether.version}
-
-
-  org.sonatype.aether
-  aether-impl
-  ${aether.version}
-
-
-  org.sonatype.aether
-  aether-connector-wagon
-  ${aether.version}
-  
-
-  plexus-utils
-  org.codehaus.plexus
-
-
-  wagon-provider-api
-  org.apache.maven.wagon
-
-  
-
-
-  org.apache.maven
-  maven-aether-provider
-  ${maven.version}
-  
-
-  plexus-utils
-  org.codehaus.plexus
-
-  
-
-
-  org.apache.maven.wagon
-  wagon-provider-api
-  ${wagon.version}
-  
-
-  plexus-utils
-  org.codehaus.plexus
-
-  
-
-
-  org.apache.maven.wagon
-  wagon-file
-  ${wagon.version}
-
-
-  org.apache.maven.wagon
-  wagon-http
-  ${wagon.version}
-  
-
-  commons-logging
-  commons-logging
-
-
-  commons-io
-  commons-io
-
-  
-
-
-  commons-codec
-  commons-codec
-  ${commons-codec.version}
-
-
-  org.codehaus.plexus
-  plexus-container-default
-  ${plexus.version}
-  
-
-  junit
-  junit
-
-
-  log4j
-  log4j
-
-
-  commons-logging
-  commons-logging-api
-
-
-  org.apache.xbean
-  xbean-reflect
-
-
-  plexus-utils
-  org.codehaus.plexus
-
-
-  plexus-classworlds
-  org.codehaus.plexus
-
-  
-
-
-  org.codehaus.plexus
-  plexus-utils
-  ${plexus-utils.version}
-
-
-
-  commons-logging
-  commons-logging
-  1.1.1
+  org.jboss.shrinkwrap.resolver
+  shrinkwrap-resolver-impl-maven
+  ${version.shrinkwrap.resolver.bom}
 
 
 
@@ -180,8 +49,6 @@
   ${project.version}
   provided
 
-
-
   
 
   

http://git-wip-us.apache.org/repos/asf/tomee/blob/c27dbf5d/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
--
diff --git 

tomee git commit: fixing tomee webapp arquillian session test

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master eb630cab8 -> ee551e05d


fixing tomee webapp arquillian session test


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

Branch: refs/heads/master
Commit: ee551e05d340c38387c1e805cd09d10c468d5125
Parents: eb630ca
Author: Romain Manni-Bucau 
Authored: Fri Dec 25 18:44:46 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Fri Dec 25 18:44:46 2015 +0100

--
 .../openejb/arquillian/session/SessionScopeTest.java   | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/ee551e05/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
--
diff --git 
a/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
 
b/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
index aaa331c..c3172e0 100644
--- 
a/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
+++ 
b/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -29,20 +30,21 @@ import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.File;
+import java.net.URL;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
 @RunWith(Arquillian.class)
 public class SessionScopeTest {
-public static final String TEST_SESSION_URL = "http://127.0.0.1:; + 
System.getProperty("tomee.httpPort", "10080") + "/test/session";
+@ArquillianResource
+private URL webappUrl;
 
-@Deployment
+@Deployment(testable = false)
 public static WebArchive createDeployment() {
 return ShrinkWrap.create(WebArchive.class, 
"test.war").addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class).addAsLibraries(new
 
File("target/test-libs/commons-httpclient.jar")).addAsWebInfResource(EmptyAsset.INSTANCE,
 ArchivePaths.create("beans.xml"))
 .setWebXML(new StringAsset(
@@ -54,16 +56,17 @@ public class SessionScopeTest {
 
 @Test
 public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
+final String sessionUrl = webappUrl.toExternalForm() + "session";
 String[] sessionResult = new String[2];
 for (int i = 0; i < sessionResult.length; i++) {
 HttpClient client = new HttpClient();
-HttpMethod get = new GetMethod(TEST_SESSION_URL);
+HttpMethod get = new GetMethod(sessionUrl);
 String[] contents = new String[2];
 try {
 for (int j = 0; j < contents.length; j++) {
 int out = client.executeMethod(get);
 if (out != 200) {
-throw new RuntimeException("get " + TEST_SESSION_URL + 
" returned " + out);
+throw new RuntimeException("get " + sessionUrl + " 
returned " + out);
 }
 contents[j] = get.getResponseBodyAsString();
 }

tomee git commit: ensuring random port are well set in system props in tomee embedded EJBContainer

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 38accaea4 -> eb630cab8


ensuring random port are well set in system props in tomee embedded EJBContainer


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

Branch: refs/heads/master
Commit: eb630cab87b30b0d8a60fc26aa3297466afe1b2f
Parents: 38accae
Author: Romain Manni-Bucau 
Authored: Thu Dec 24 17:56:56 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Dec 24 17:56:56 2015 +0100

--
 .../java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/eb630cab/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
--
diff --git 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
index 13ae2fb..ed300ec 100644
--- 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
+++ 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
@@ -138,7 +138,6 @@ public final class EmbeddedTomEEContainer extends 
EJBContainer {
 }
 configuration.setHttpPort(port);
 }
-System.setProperty(TOMEE_EJBCONTAINER_HTTP_PORT, 
Integer.toString(configuration.getHttpPort()));
 
 for (final Map.Entry entry : properties.entrySet()) {
 final Object key = entry.getKey();
@@ -152,6 +151,9 @@ public final class EmbeddedTomEEContainer extends 
EJBContainer {
 try {
 etc.container.start();
 
+// later to ensure random port are not overwritten
+System.setProperty(TOMEE_EJBCONTAINER_HTTP_PORT, 
Integer.toString(configuration.getHttpPort()));
+
 if (modules instanceof File) {
 etc.deployedIds.add(etc.container.deploy(appId, ((File) 
modules), appId != null).getId());
 } else if (modules instanceof String) {

tomee git commit: TOMEE-1686 dont access args is empty

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x f6130e2c1 -> ee20b46c9


TOMEE-1686 dont access args is empty


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

Branch: refs/heads/tomee-1.7.x
Commit: ee20b46c9d7b7714699fc7a38ea20c25a210889a
Parents: f6130e2
Author: Romain Manni-Bucau 
Authored: Thu Dec 24 17:29:30 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Dec 24 17:29:30 2015 +0100

--
 .../src/main/java/org/apache/openejb/core/cmp/CmpContainer.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/ee20b46c/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
index 79ee5c1..27a9454 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
@@ -731,8 +731,7 @@ public class CmpContainer implements RpcContainer {
 if (results.size() != 1) {
 throw new ObjectNotFoundException("A Enteprise bean with 
deployment_id = " +
 beanContext.getDeploymentID() +
-" and primarykey = " +
-args[0] +
+(args != null && args.length >= 1 ? " and primarykey = 
" + args[0] : "") +
 " Does not exist");
 }
 

tomee git commit: TOMEE-1686 dont access args is empty

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 0b0a8983c -> 38accaea4


TOMEE-1686 dont access args is empty


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

Branch: refs/heads/master
Commit: 38accaea46c04865797f4355dede201aa7a096a4
Parents: 0b0a898
Author: Romain Manni-Bucau 
Authored: Thu Dec 24 16:00:44 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Thu Dec 24 16:00:44 2015 +0100

--
 .../src/main/java/org/apache/openejb/core/cmp/CmpContainer.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/38accaea/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
index 79ee5c1..27a9454 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
@@ -731,8 +731,7 @@ public class CmpContainer implements RpcContainer {
 if (results.size() != 1) {
 throw new ObjectNotFoundException("A Enteprise bean with 
deployment_id = " +
 beanContext.getDeploymentID() +
-" and primarykey = " +
-args[0] +
+(args != null && args.length >= 1 ? " and primarykey = 
" + args[0] : "") +
 " Does not exist");
 }
 

tomee git commit: TOMEE-1685 ignoring persistence modules when enforcing standalone webapp flag

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 0040c793b -> 0b0a8983c


TOMEE-1685 ignoring persistence modules when enforcing standalone webapp flag


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

Branch: refs/heads/master
Commit: 0b0a8983c084b78410efb33c12fac574f5ad7403
Parents: 0040c79
Author: Romain Manni-Bucau 
Authored: Wed Dec 23 22:15:23 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 23 22:15:23 2015 +0100

--
 .../openejb/testing/ApplicationComposers.java   |  4 +-
 .../testing/WebappMultipleModuleTest.java   | 67 
 2 files changed, 69 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/0b0a8983/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 4f54482..f9a1247 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
@@ -561,13 +561,13 @@ public class ApplicationComposers {
 final Persistence persistence = (Persistence) obj;
 appModule.addPersistenceModule(
 new PersistenceModule(appModule, 
implicitRootUrl(method.getAnnotation(PersistenceRootUrl.class)), persistence));
-
+notBusinessModuleNumber++;
 } else if (obj instanceof PersistenceUnit) {
 
 final PersistenceUnit unit = (PersistenceUnit) obj;
 appModule.addPersistenceModule(
 new PersistenceModule(appModule, 
implicitRootUrl(method.getAnnotation(PersistenceRootUrl.class)), new 
Persistence(unit)));
-
+notBusinessModuleNumber++;
 } else if (obj instanceof Beans) {
 
 final Beans beans = (Beans) obj;

http://git-wip-us.apache.org/repos/asf/tomee/blob/0b0a8983/container/openejb-core/src/test/java/org/apache/openejb/testing/WebappMultipleModuleTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/testing/WebappMultipleModuleTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/testing/WebappMultipleModuleTest.java
new file mode 100644
index 000..7a3bd09
--- /dev/null
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/testing/WebappMultipleModuleTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.testing;
+
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@CdiExtensions(WebappMultipleModuleTest.SuperViciousExtension.class)
+@RunWith(ApplicationComposer.class)
+@Classes(cdi = true, innerClassesAsBean = true)
+public class WebappMultipleModuleTest {
+@Module
+@PersistenceRootUrl(value = "")
+public Persistence jpa() throws Exception {
+SuperViciousExtension.CALLED.set(false); // 

tomee git commit: TOMEE-1680 mojarra 2.2.12

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 976a5bde7 -> 533d794cc


TOMEE-1680 mojarra 2.2.12


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

Branch: refs/heads/master
Commit: 533d794cc126453b56a8cecadd33ba67c14c7b0f
Parents: 976a5bd
Author: Romain Manni-Bucau 
Authored: Wed Dec 16 20:06:32 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Wed Dec 16 20:06:32 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/533d794c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ae6b992..57629d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
 1.1
 
1.9.0-alpha-2
 2.2.9
-2.2.9
+2.2.12
 1.7.10
 1.2.17
 2.0.1

[2/3] tomee git commit: using released jcs

[rmannibucau]

using released jcs


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

Branch: refs/heads/master
Commit: 3f29ce1646549ceb2088497456bf53023b8ca6dd
Parents: abd6c8a
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:07:22 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:07:22 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/3f29ce16/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8cdb3d5..c34cc92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 
 2.4.0
 1.6.2
-2.0-SNAPSHOT
+2.0-M1
 
 
 2.3.7

[3/3] tomee git commit: excluding java.lang.Process from default deserializable classes + ensuring openejb-client BlacklistClassResolver uses the same config as server one by default

[rmannibucau]

excluding java.lang.Process from default deserializable classes + ensuring 
openejb-client BlacklistClassResolver uses the same config as server one by 
default


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

Branch: refs/heads/master
Commit: 15c64360f610aac9bd13dd370bc9e0f36417b045
Parents: 3f29ce1
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:07:53 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:07:53 2015 +0100

--
 .../apache/openejb/core/rmi/BlacklistClassResolver.java  |  2 +-
 .../org/apache/openejb/client/EjbObjectInputStream.java  | 11 +++
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/15c64360/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
index 0d3b994..1a07ec8 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
@@ -22,7 +22,7 @@ public class BlacklistClassResolver {
 public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver(
 toArray(System.getProperty(
 "tomee.serialization.class.blacklist",
-
"org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan")),
+
"org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process")),
 toArray(System.getProperty("tomee.serialization.class.whitelist")));
 
 private final String[] blacklist;

http://git-wip-us.apache.org/repos/asf/tomee/blob/15c64360/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
--
diff --git 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
index bb9ea83..1a0abe7 100644
--- 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
+++ 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
@@ -26,9 +26,7 @@ import java.lang.reflect.Proxy;
  * @version $Rev$ $Date$
  */
 public class EjbObjectInputStream extends ObjectInputStream {
-public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver(
-new String[]{"org.codehaus.groovy.runtime.", 
"org.apache.commons.collections.functors.", "org.apache.xalan"},
-null);
+private static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver();
 
 public EjbObjectInputStream(final InputStream in) throws IOException {
 super(in);
@@ -92,11 +90,16 @@ public class EjbObjectInputStream extends ObjectInputStream 
{
 
 public static class BlacklistClassResolver {
 private static final String[] WHITELIST = 
toArray(System.getProperty("tomee.serialization.class.whitelist"));
-private static final String[] BLACKLIST = 
toArray(System.getProperty("tomee.serialization.class.blacklist"));
+private static final String[] BLACKLIST = toArray(System.getProperty(
+"tomee.serialization.class.blacklist", 
"org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process"));
 
 private final String[] blacklist;
 private final String[] whitelist;
 
+protected BlacklistClassResolver() {
+this(BLACKLIST, WHITELIST);
+}
+
 protected BlacklistClassResolver(final String[] blacklist, final 
String[] whitelist) {
 this.whitelist = whitelist;
 this.blacklist = blacklist;

[1/3] tomee git commit: using released jcs

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master f336adb5b -> 15c64360f


using released jcs


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

Branch: refs/heads/master
Commit: abd6c8a72be75f118717c0197edc0cd49e5f175e
Parents: f336adb
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:07:09 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:07:09 2015 +0100

--
 tck/cdi-tomee/pom.xml   | 2 +-
 tomee/tomee-plus-webapp/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/abd6c8a7/tck/cdi-tomee/pom.xml
--
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 3f24efb..672f783 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -134,7 +134,7 @@
 
 
 
-  org.apache.commons
+  org.apache.tomee.patch
   commons-jcs-jcache
   ${jcs.version}
   test

http://git-wip-us.apache.org/repos/asf/tomee/blob/abd6c8a7/tomee/tomee-plus-webapp/pom.xml
--
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 09e5e7a..cfa55fb 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -140,7 +140,7 @@
   runtime
 
 
-  org.apache.commons
+  org.apache.tomee.patch
   commons-jcs-jcache
   ${jcs.version}
   runtime

tomee git commit: released javaee

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 31c5927e8 -> af4c55066


released javaee


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

Branch: refs/heads/master
Commit: af4c55066ca406e40b41e1aa91a9dd28a0b1bfb5
Parents: 31c5927
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:25:26 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:25:26 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/af4c5506/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c34cc92..5f03044 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
 ${project.version}
 
 
-7.0-SNAPSHOT
+7.0
 
 2.4.0
 1.6.2

tomee git commit: TOMEE-1679 myfaces 2.2.9

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 049136d13 -> 976a5bde7


TOMEE-1679 myfaces 2.2.9


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

Branch: refs/heads/master
Commit: 976a5bde7e3e862a931b45ef5cf4d3ebe35c
Parents: 049136d
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 13:21:25 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 13:21:25 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/976a5bde/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5f03044..ae6b992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
 3.1.3
 1.1
 
1.9.0-alpha-2
-2.2.8
+2.2.9
 2.2.9
 1.7.10
 1.2.17

[2/2] tomee git commit: whitelist logic issue

[rmannibucau]

whitelist logic issue


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

Branch: refs/heads/tomee-1.7.x
Commit: f6130e2c19d506defca8a3d963ab32d5fd9e4fda
Parents: 6e8147e
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:16:44 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:16:44 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/tomee/blob/f6130e2c/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
--
diff --git 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
index c1e9eda..50df6ff 100644
--- 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
+++ 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
@@ -106,7 +106,7 @@ public class EjbObjectInputStream extends ObjectInputStream 
{
 }
 
 protected boolean isBlacklisted(final String name) {
-return !contains(whitelist, name) && contains(blacklist, name);
+return (whitelist != null && !contains(whitelist, name)) || 
contains(blacklist, name);
 }
 
 public final String check(final String name) {

[1/2] tomee git commit: backporting blacklisting of unserialization of ava.lang.Process* and alignment of tomee.serialization.class.*list on server and client sides in 1.7.x branch

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 14517a788 -> f6130e2c1


backporting blacklisting of unserialization of ava.lang.Process* and alignment 
of tomee.serialization.class.*list on server and client sides in 1.7.x branch


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

Branch: refs/heads/tomee-1.7.x
Commit: 6e8147e9fe47028aef6f2e11f2ed7fa355a502d7
Parents: 14517a7
Author: Romain Manni-Bucau 
Authored: Tue Dec 15 11:15:59 2015 +0100
Committer: Romain Manni-Bucau 
Committed: Tue Dec 15 11:15:59 2015 +0100

--
 .../core/rmi/BlacklistClassResolver.java| 17 
 .../openejb/client/EjbObjectInputStream.java| 21 +++-
 2 files changed, 20 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/6e8147e9/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
index 6ce1299..1a07ec8 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/rmi/BlacklistClassResolver.java
@@ -19,12 +19,11 @@ package org.apache.openejb.core.rmi;
 import java.io.ObjectStreamClass;
 
 public class BlacklistClassResolver {
-//TODO - private static final String[] WHITELIST = 
toArray(System.getProperty("tomee.serialization.class.whitelist"));
-//TODO - 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.", "org.apache.xalan"},
-null);
+toArray(System.getProperty(
+"tomee.serialization.class.blacklist",
+
"org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process")),
+toArray(System.getProperty("tomee.serialization.class.whitelist")));
 
 private final String[] blacklist;
 private final String[] whitelist;
@@ -35,7 +34,7 @@ public class BlacklistClassResolver {
 }
 
 protected boolean isBlacklisted(final String name) {
-return !contains(whitelist, name) && contains(blacklist, name);
+return (whitelist != null && !contains(whitelist, name)) || 
contains(blacklist, name);
 }
 
 public final ObjectStreamClass check(final ObjectStreamClass classDesc) {
@@ -50,9 +49,9 @@ public class BlacklistClassResolver {
 return name;
 }
 
-//private static String[] toArray(final String property) {
-//return property == null ? null : property.split(" *, *");
-//}
+private static String[] toArray(final String property) {
+return property == null ? null : property.split(" *, *");
+}
 
 private static boolean contains(final String[] list, final String name) {
 if (list != null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/6e8147e9/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
--
diff --git 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
index 4dbf1a3..c1e9eda 100644
--- 
a/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
+++ 
b/server/openejb-client/src/main/java/org/apache/openejb/client/EjbObjectInputStream.java
@@ -26,9 +26,7 @@ import java.lang.reflect.Proxy;
  * @version $Rev$ $Date$
  */
 public class EjbObjectInputStream extends ObjectInputStream {
-public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver(
-new String[]{"org.codehaus.groovy.runtime.", 
"org.apache.commons.collections.functors.", "org.apache.xalan"},
-null);
+public static final BlacklistClassResolver DEFAULT = new 
BlacklistClassResolver();
 
 public EjbObjectInputStream(final InputStream in) throws IOException {
 super(in);
@@ -91,12 +89,17 @@ public class EjbObjectInputStream extends ObjectInputStream 
{
 }
 
 public static class BlacklistClassResolver {
-//TODO- private static final