You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/23 10:31:52 UTC
tomee git commit: no ehcache by default in tomee+ + dont fixing
unused properties logging logic for resources
Repository: tomee
Updated Branches:
refs/heads/master cc463c3cb -> e493c51ab
no ehcache by default in tomee+ + dont fixing unused properties logging logic for resources
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e493c51a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e493c51a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e493c51a
Branch: refs/heads/master
Commit: e493c51abbb5713c2f828a6b6a6821f0848302f0
Parents: cc463c3
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Apr 23 10:31:41 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Apr 23 10:31:41 2015 +0200
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 29 ++++++++++++++------
.../openejb/core/mdb/MDBCdiInterceptorTest.java | 3 ++
server/openejb-cxf/pom.xml | 14 ++++++++--
3 files changed, 36 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e493c51a/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 77d7fd6..5e50b64 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
@@ -3121,19 +3121,19 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
for (final String property : unsetProperties.keySet()) {
//TODO: DMB: Make more robust later
if (property.equalsIgnoreCase("Definition")) {
- return;
+ continue;
}
if (property.equalsIgnoreCase("SkipImplicitAttributes")) {
- return;
+ continue;
}
if (property.equalsIgnoreCase("JndiName")) {
- return;
+ continue;
}
if (property.equalsIgnoreCase("Origin")) {
- return;
+ continue;
}
if (property.equalsIgnoreCase("DatabaseName")) {
- return;
+ continue;
}
if (property.equalsIgnoreCase("connectionAttributes")) {
return;
@@ -3143,10 +3143,10 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
return;
}
if (property.equalsIgnoreCase("ApplicationWide")) {
- return;
+ continue;
}
- if (property.equalsIgnoreCase("transactionManager")) {
- return;
+ if (isInternalProperty(property)) {
+ continue;
}
if (info.types.contains("javax.mail.Session")) {
return;
@@ -3168,9 +3168,22 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
private static void unusedProperty(final String id, final Logger parentLogger, final String property) {
+ if (isInternalProperty(property)) {
+ return;
+ }
parentLogger.getChildLogger("service").warning("unusedProperty", property, id);
}
+ private static boolean isInternalProperty(String property) {
+ if (property.equalsIgnoreCase("ServiceId")) {
+ return true;
+ }
+ if (property.equalsIgnoreCase("transactionManager")) {
+ return true;
+ }
+ return false;
+ }
+
private static void unusedProperty(final String id, final String property) {
unusedProperty(id, SystemInstance.get().getComponent(Assembler.class).logger, property);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e493c51a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MDBCdiInterceptorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MDBCdiInterceptorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MDBCdiInterceptorTest.java
index b3ce73f..7cab017 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MDBCdiInterceptorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MDBCdiInterceptorTest.java
@@ -19,6 +19,7 @@ package org.apache.openejb.core.mdb;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.SimpleLog;
import org.apache.openejb.testng.PropertiesBuilder;
import org.apache.openejb.util.NetworkUtil;
import org.junit.Test;
@@ -51,6 +52,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+@SimpleLog
@Classes(cdi = true, innerClassesAsBean = true, cdiInterceptors = MDBCdiInterceptorTest.InInterceptor.class)
@RunWith(ApplicationComposer.class)
public class MDBCdiInterceptorTest {
@@ -88,6 +90,7 @@ public class MDBCdiInterceptorTest {
public Properties p() {
return new PropertiesBuilder()
.p("Default JMS Resource Adapter.BrokerXmlConfig", "broker:(tcp://localhost:" + NetworkUtil.getNextAvailablePort() + ")?useJmx=false")
+ .p("target", "new://Resource?type=Queue")
.build();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e493c51a/server/openejb-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 2b02ddc..264844f 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -33,7 +33,7 @@
<name>OpenEJB :: Server :: CXF</name>
<properties>
- <wss4j.version>2.0.2</wss4j.version>
+ <wss4j.version>2.0.3</wss4j.version>
<openejb.osgi.import.pkg>
org.apache.xml.resolver*;resolution:=optional,
*
@@ -69,6 +69,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -80,6 +84,12 @@
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
<version>${wss4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
@@ -136,7 +146,7 @@
<exclusions>
<exclusion>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</exclusion>
</exclusions>
</dependency>