tomee git commit: Fixes #34 patch from Ivan Junckes to remove some unused imports
Repository: tomee Updated Branches: refs/heads/master d2376e186 -> fc14d71df Fixes #34 patch from Ivan Junckes to remove some unused imports Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fc14d71d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fc14d71d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fc14d71d Branch: refs/heads/master Commit: fc14d71dfc5be15a286457b17ec2c7f89779f551 Parents: d2376e1 Author: Romain manni-Bucau Authored: Sat Jul 2 23:30:26 2016 +0200 Committer: Romain manni-Bucau Committed: Sat Jul 2 23:30:26 2016 +0200 -- .../org/apache/openejb/arquillian/common/SetupTest.java | 1 - .../apache/openejb/core/mdb/QuartzMdbContainerTest.java | 3 --- .../apache/openejb/junit/AppComposerAsJUnitRuleTest.java | 2 -- .../openejb/util/proxy/LocalBeanProxyFactoryTest.java | 4 ++-- .../org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java | 10 -- .../org/apache/openejb/junit/TestClassConfigFile.java | 4 .../openejb/junit/TestClassConfigFileAndProperties.java | 5 - .../apache/openejb/junit/TestClassConfigProperties.java | 5 - .../org/apache/openejb/junit/TestDualConfigOverride.java | 5 - .../java/org/apache/openejb/junit/TestEjbSecurity.java| 1 - .../apache/openejb/junit/TestEjbSecurityRunTestAs.java| 1 - .../org/apache/openejb/junit/TestMethodConfigFile.java| 4 .../apache/openejb/junit/TestMethodConfigProperties.java | 5 - .../test/java/org/apache/openejb/junit/TestRunner.java| 3 --- .../openejb/test/entity/bmp/ContextLookupBmpBean.java | 2 +- .../org/apache/openejb/test/entity/bmp/EncBmpBean.java| 2 +- .../openejb/test/entity/cmp/ContextLookupCmpBean.java | 2 +- .../org/apache/openejb/test/entity/cmp/EncCmp2Bean.java | 2 +- .../org/apache/openejb/test/entity/cmp/EncCmpBean.java| 2 +- .../singleton/AnnotatedFieldInjectionSingletonBean.java | 2 +- .../test/singleton/ContextLookupSingletonBean.java| 2 +- .../test/singleton/ContextLookupSingletonPojoBean.java| 2 +- .../apache/openejb/test/singleton/EncSingletonBean.java | 2 +- .../test/singleton/FieldInjectionSingletonBean.java | 2 +- .../test/singleton/SetterInjectionSingletonBean.java | 2 +- .../stateful/AnnotatedFieldInjectionStatefulBean.java | 2 +- .../openejb/test/stateful/ContextLookupStatefulBean.java | 2 +- .../test/stateful/ContextLookupStatefulPojoBean.java | 2 +- .../org/apache/openejb/test/stateful/EncStatefulBean.java | 2 +- .../openejb/test/stateful/FieldInjectionStatefulBean.java | 2 +- .../test/stateful/SetterInjectionStatefulBean.java| 2 +- .../stateless/AnnotatedFieldInjectionStatelessBean.java | 2 +- .../test/stateless/ContextLookupStatelessBean.java| 2 +- .../test/stateless/ContextLookupStatelessPojoBean.java| 2 +- .../apache/openejb/test/stateless/EncStatelessBean.java | 2 +- .../test/stateless/FieldInjectionStatelessBean.java | 2 +- .../test/stateless/SetterInjectionStatelessBean.java | 2 +- .../apache/openejb/test/entity/bmp/BmpRmiIiopTests.java | 4 ++-- .../apache/openejb/test/entity/cmp/CmpRmiIiopTests.java | 4 ++-- .../apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java | 4 ++-- .../openejb/test/singleton/SingletonBeanTxTests.java | 4 ++-- .../openejb/test/singleton/SingletonRmiIiopTests.java | 4 ++-- .../apache/openejb/test/stateful/StatefulBeanTxTests.java | 4 ++-- .../openejb/test/stateful/StatefulRmiIiopTests.java | 4 ++-- .../openejb/test/stateless/StatelessBeanTxTests.java | 4 ++-- .../openejb/test/stateless/StatelessRmiIiopTests.java | 4 ++-- .../cxf/rs/event/ExtensionProviderRegistrationTest.java | 1 - .../openejb/server/cxf/rs/event/ServerCreatedTest.java| 1 - .../org/apache/openejb/server/ServerServiceFilter.java| 2 -- 49 files changed, 43 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java -- diff --git a/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java b/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java index cc3b38e..22fbd68 100644 --- a/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java +++ b/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java @@ -16,7 +16,6 @@ */ package org.apache.openejb.arquillian.common; -import org.apache.openejb.loader.*; import org.apache.openejb.loader
[1/2] tomee git commit: JOHNZON-88 ensuring method and fields are mapped by johnzon by default
Repository: tomee
Updated Branches:
refs/heads/master 3a73f9445 -> d2376e186
JOHNZON-88 ensuring method and fields are mapped by johnzon by default
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6fdfa982
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6fdfa982
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6fdfa982
Branch: refs/heads/master
Commit: 6fdfa98202680be6d574bbf84c87e9d1c2493bb1
Parents: 3a73f94
Author: Romain manni-Bucau
Authored: Sat Jul 2 18:46:51 2016 +0200
Committer: Romain manni-Bucau
Committed: Sat Jul 2 18:46:51 2016 +0200
--
.../server/cxf/rs/JohnzonMappingTest.java | 104 +++
1 file changed, 104 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/6fdfa982/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
--
diff --git
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
new file mode 100644
index 000..f33f2bd
--- /dev/null
+++
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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.server.cxf.rs;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.ContainerProperties;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.RandomPort;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+@EnableServices("jaxrs")
+@Classes(/*cdi = false, */innerClassesAsBean = true)
+@RunWith(ApplicationComposer.class)
+@ContainerProperties(@ContainerProperties.Property(name =
"openejb.cxf.rs.bval.log.level", value = "INFO"))
+public class JohnzonMappingTest {
+@RandomPort("http")
+private URL base;
+
+@Test
+public void passing() {
+final Payload payload = new Payload();
+payload.setName("ok");
+assertEquals(
+"ok",
+
ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE)
+.post(Entity.entity(payload,
MediaType.APPLICATION_JSON_TYPE), Payload.class)
+.getName());
+}
+
+@Test
+public void inFailing() {
+final Payload payload = new Payload();
+assertEquals(
+Response.Status.BAD_REQUEST.getStatusCode(), // thanks to the
mapper
+
ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE)
+.post(Entity.entity(payload,
MediaType.APPLICATION_JSON_TYPE)).getStatus());
+}
+
+@Test
+public void outFailing() {
+final Payload payload = new Payload();
+payload.setName("empty");
+assertEquals(
+Response.Status.BAD_REQUEST.getStatusCode(), // thanks to the
mapper
+
ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE)
+.post(Entity.entity(payload,
MediaType.APPLICATION_JSON_TYPE)).getStatus());
+}
+
+@Path("test")
+public static class ValidateMe {
+@POST
+@Valid
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APP
[2/2] tomee git commit: JOHNZON-88 ensuring method and fields are mapped by johnzon by default
JOHNZON-88 ensuring method and fields are mapped by johnzon by default
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d2376e18
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d2376e18
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d2376e18
Branch: refs/heads/master
Commit: d2376e186e13f5f250248e71f66e1f4e3302a261
Parents: 6fdfa98
Author: Romain manni-Bucau
Authored: Sat Jul 2 18:47:03 2016 +0200
Committer: Romain manni-Bucau
Committed: Sat Jul 2 18:47:03 2016 +0200
--
.../openejb/server/cxf/rs/CxfRSService.java | 5 +++
.../server/cxf/rs/JohnzonMappingTest.java | 45 +---
2 files changed, 16 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2376e18/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 28b318e..f8ff509 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
@@ -23,6 +23,7 @@ import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.johnzon.jaxrs.JohnzonProvider;
import org.apache.johnzon.jaxrs.JsrProvider;
+import org.apache.johnzon.mapper.MapperBuilder;
import org.apache.openejb.cdi.WebBeansContextBeforeDeploy;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.observer.Observes;
@@ -395,6 +396,10 @@ public class CxfRSService extends RESTService {
@Produces({"application/json", "application/*+json"})
@Consumes({"application/json", "application/*+json"})
public static class TomEEJohnzonProvider extends JohnzonProvider {
+public TomEEJohnzonProvider() {
+super(new MapperBuilder().setAccessModeName("both").build(), null);
+}
+
@Override
public boolean isWriteable(final Class rawType, final Type
genericType,
final Annotation[] annotations, final
MediaType mediaType) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2376e18/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
--
diff --git
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
index f33f2bd..a7571f2 100644
---
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
+++
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java
@@ -16,15 +16,14 @@
*/
package org.apache.openejb.server.cxf.rs;
+import org.apache.johnzon.mapper.JohnzonProperty;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.ContainerProperties;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.RandomPort;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
@@ -33,64 +32,42 @@ import javax.ws.rs.Produces;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import java.net.URL;
import static org.junit.Assert.assertEquals;
@EnableServices("jaxrs")
-@Classes(/*cdi = false, */innerClassesAsBean = true)
+@Classes(innerClassesAsBean = true)
@RunWith(ApplicationComposer.class)
-@ContainerProperties(@ContainerProperties.Property(name =
"openejb.cxf.rs.bval.log.level", value = "INFO"))
public class JohnzonMappingTest {
@RandomPort("http")
private URL base;
@Test
-public void passing() {
-final Payload payload = new Payload();
-payload.setName("ok");
+public void mapping() {
assertEquals(
-"ok",
-
ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE)
-.post(Entity.entity(payload,
MediaType.APPLICATION_JSON_TYPE), Payload.class)
+"no",
+
ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/JohnzonMappingTest").request(MediaType.APPLICATION_JSON_TYPE)
+
[jira] [Resolved] (TOMEE-1856) Empty log files from AsyncConsoleHandler
[
https://issues.apache.org/jira/browse/TOMEE-1856?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Romain Manni-Bucau resolved TOMEE-1856.
---
Resolution: Fixed
Assignee: Romain Manni-Bucau
Fix Version/s: 7.0.2
> Empty log files from AsyncConsoleHandler
>
>
> Key: TOMEE-1856
> URL: https://issues.apache.org/jira/browse/TOMEE-1856
> Project: TomEE
> Issue Type: Bug
> Components: TomEE Core Server
>Affects Versions: 7.0.1
>Reporter: Petras
>Assignee: Romain Manni-Bucau
>Priority: Minor
> Fix For: 7.0.2
>
>
> {{org.apache.tomee.jul.formatter.AsyncConsoleHandler}} instantiation triggers
> creation of empty log files, prefixed with "juli." (ex.
> _juli.2016-07-02.log_) in _\{currentDir\}/logs/_, where _\{currentDir\}_ is
> folder from which TomEE was started. Please note, not in
> _$\{catalina.base}/logs_ folder. As this handler is meant for logging to the
> console, it is not supposed to create any log files, is it?
> The issue is that this class indirectly extends
> {{org.apache.juli.FileHandler}}, which constructor invokes
> {{FileHandler#openWriter}} method creating log file for writing. If directory
> is not supplied via constructor parameters it creates _logs/_ folder within
> current folder and new file to for output log. The fix would be to override
> this method with empty body.
> The only workaround is to specify location of this empty file in TomEE
> _logging.properties_ ex.:
> {{org.apache.tomee.jul.formatter.AsyncConsoleHandler.directory =
> $\{catalina.base}/logs}}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
tomee git commit: TOMEE-1856 avoid to create empty log files with AsyncConsoleHandler
Repository: tomee
Updated Branches:
refs/heads/master dc2b7374e -> 3a73f9445
TOMEE-1856 avoid to create empty log files with AsyncConsoleHandler
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3a73f944
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3a73f944
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3a73f944
Branch: refs/heads/master
Commit: 3a73f94458186bef1e8093615d8d8b0e1d998732
Parents: dc2b737
Author: Romain manni-Bucau
Authored: Sat Jul 2 16:26:25 2016 +0200
Committer: Romain manni-Bucau
Committed: Sat Jul 2 16:26:25 2016 +0200
--
.../jul/formatter/AsyncConsoleHandler.java | 25 +++
.../jul/formatter/AsyncConsoleHandlerTest.java | 32
2 files changed, 57 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a73f944/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
--
diff --git
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
index 4dd2554..20b4d60 100644
---
a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
+++
b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/formatter/AsyncConsoleHandler.java
@@ -33,6 +33,31 @@ public class AsyncConsoleHandler extends AsyncFileHandler {
delegate.publish(record);
}
+@Override
+public void close() {
+delegate.close();
+}
+
+@Override
+public void flush() {
+delegate.flush();
+}
+
+@Override
+protected void open() {
+// no-op
+}
+
+@Override
+protected void closeWriter() {
+// no-op
+}
+
+@Override
+protected void openWriter() {
+// no-op
+}
+
// copy cause of classloading
private static class SingleLineFormatter extends Formatter {
private static final String SEP = System.getProperty("line.separator",
"\n");
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a73f944/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/formatter/AsyncConsoleHandlerTest.java
--
diff --git
a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/formatter/AsyncConsoleHandlerTest.java
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/formatter/AsyncConsoleHandlerTest.java
new file mode 100644
index 000..ea60128
--- /dev/null
+++
b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/formatter/AsyncConsoleHandlerTest.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.tomee.jul.formatter;
+
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.assertFalse;
+
+public class AsyncConsoleHandlerTest {
+@Test
+public void dontCreateEmptyFile() {
+assertFalse(new File("logs").isDirectory());
+new AsyncConsoleHandler();
+assertFalse(new File("logs").isDirectory());
+}
+}
[jira] [Created] (TOMEE-1856) Empty log files from AsyncConsoleHandler
Petras created TOMEE-1856:
-
Summary: Empty log files from AsyncConsoleHandler
Key: TOMEE-1856
URL: https://issues.apache.org/jira/browse/TOMEE-1856
Project: TomEE
Issue Type: Bug
Components: TomEE Core Server
Affects Versions: 7.0.1
Reporter: Petras
Priority: Minor
{{org.apache.tomee.jul.formatter.AsyncConsoleHandler}} instantiation triggers
creation of empty log files, prefixed with "juli." (ex. _juli.2016-07-02.log_)
in _\{currentDir\}/logs/_, where _\{currentDir\}_ is folder from which TomEE
was started. Please note, not in _$\{catalina.base}/logs_ folder. As this
handler is meant for logging to the console, it is not supposed to create any
log files, is it?
The issue is that this class indirectly extends
{{org.apache.juli.FileHandler}}, which constructor invokes
{{FileHandler#openWriter}} method creating log file for writing. If directory
is not supplied via constructor parameters it creates _logs/_ folder within
current folder and new file to for output log. The fix would be to override
this method with empty body.
The only workaround is to specify location of this empty file in TomEE
_logging.properties_ ex.:
{{org.apache.tomee.jul.formatter.AsyncConsoleHandler.directory =
$\{catalina.base}/logs}}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
