You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2016/02/18 17:46:13 UTC
[1/7] tomee git commit: Clean conflicted generated sources
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 652f1b9b0 -> c1f8b3876
Clean conflicted generated sources
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cf05e78d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cf05e78d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cf05e78d
Branch: refs/heads/tomee-1.7.x
Commit: cf05e78d019b03962eaa208790f2408b60f7b12e
Parents: 652f1b9
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 11 14:14:59 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 11 14:14:59 2016 +0100
----------------------------------------------------------------------
tomee/tomee-juli/pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cf05e78d/tomee/tomee-juli/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index dbb0dbe..91fcc3a 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -77,6 +77,28 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>auto-clean</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.build.outputDirectory}/generated-test-sources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
[2/7] tomee git commit: Simple overrides
Posted by an...@apache.org.
Simple overrides
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c1c1f7c5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c1c1f7c5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c1c1f7c5
Branch: refs/heads/tomee-1.7.x
Commit: c1c1f7c59c1c4562e90cfd6b7e62f1e0e9774f4d
Parents: cf05e78
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 11 14:15:42 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 11 14:15:42 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/util/Log4jLogStream.java | 15 +++++++++++++++
.../org/apache/openejb/util/PaxLogStreamFactory.java | 1 +
.../openejb/test/servlet/AnnotatedServletTests.java | 1 +
3 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1c1f7c5/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java
index 875cd66..028fd9b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java
@@ -27,62 +27,77 @@ public class Log4jLogStream implements LogStream {
logger = Logger.getLogger(logCategory.getName());
}
+ @Override
public boolean isFatalEnabled() {
return logger.isEnabledFor(Level.FATAL);
}
+ @Override
public void fatal(final String message) {
logger.fatal(message);
}
+ @Override
public void fatal(final String message, final Throwable t) {
logger.fatal(message, t);
}
+ @Override
public boolean isErrorEnabled() {
return logger.isEnabledFor(Level.ERROR);
}
+ @Override
public void error(final String message) {
logger.error(message);
}
+ @Override
public void error(final String message, final Throwable t) {
logger.error(message, t);
}
+ @Override
public boolean isWarnEnabled() {
return logger.isEnabledFor(Level.WARN);
}
+ @Override
public void warn(final String message) {
logger.warn(message);
}
+ @Override
public void warn(final String message, final Throwable t) {
logger.warn(message, t);
}
+ @Override
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
+ @Override
public void info(final String message) {
logger.info(message);
}
+ @Override
public void info(final String message, final Throwable t) {
logger.info(message, t);
}
+ @Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
+ @Override
public void debug(final String message) {
logger.debug(message);
}
+ @Override
public void debug(final String message, final Throwable t) {
logger.debug(message, t);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1c1f7c5/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
index 76fd0d9..90b45ab 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
@@ -26,6 +26,7 @@ package org.apache.openejb.util;
*/
public class PaxLogStreamFactory implements LogStreamFactory {
+ @Override
public LogStream createLogStream(final LogCategory logCategory) {
return new Log4jLogStream(logCategory);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1c1f7c5/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/AnnotatedServletTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/AnnotatedServletTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/AnnotatedServletTests.java
index d68a8ca..b65df10 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/AnnotatedServletTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/AnnotatedServletTests.java
@@ -23,6 +23,7 @@ public class AnnotatedServletTests extends ServletTestClient {
super("AnnotatedServlet");
}
+ @Override
protected void setUp() throws Exception{
super.setUp();
testServlet = newServletProxy(JndiTestServlet.class);
[6/7] tomee git commit: Fix potential null & optimize methods
Posted by an...@apache.org.
Fix potential null & optimize methods
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f20328dc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f20328dc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f20328dc
Branch: refs/heads/tomee-1.7.x
Commit: f20328dc79d5b376ecd5e917fcd0f0531b238756
Parents: 7f7bdab
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 18 16:45:57 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 18 16:45:57 2016 +0100
----------------------------------------------------------------------
.../apache/openejb/util/SuperProperties.java | 187 +++++++++----------
1 file changed, 91 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f20328dc/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java b/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
index 3587aa5..d2e0360 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
@@ -59,14 +59,23 @@ import java.util.Set;
*/
public class SuperProperties extends Properties {
+ private static final int EOF = -1;
+ private static final int LINE_ENDING = -4200;
+ private static final int ENCODED_EQUALS = -5000;
+ private static final int ENCODED_COLON = -5001;
+ private static final int ENCODED_SPACE = -5002;
+ private static final int ENCODED_TAB = -5003;
+ private static final int ENCODED_NEWLINE = -5004;
+ private static final int ENCODED_CARRIAGE_RETURN = -5005;
+ private static final Class<String> STRING = String.class;
private static final String PROP_DTD_NAME = "http://java.sun.com/dtd/properties.dtd";
private static final String PROP_DTD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + " <!ELEMENT properties (comment?, entry*) >"
- + " <!ATTLIST properties version CDATA #FIXED \"1.0\" >"
- + " <!ELEMENT comment (#PCDATA) >"
- + " <!ELEMENT entry (#PCDATA) >"
- + " <!ATTLIST entry key CDATA #REQUIRED >";
+ + " <!ELEMENT properties (comment?, entry*) >"
+ + " <!ATTLIST properties version CDATA #FIXED \"1.0\" >"
+ + " <!ELEMENT comment (#PCDATA) >"
+ + " <!ELEMENT entry (#PCDATA) >"
+ + " <!ATTLIST entry key CDATA #REQUIRED >";
/**
@@ -298,7 +307,7 @@ public class SuperProperties extends Properties {
@Override
public String getProperty(final String name) {
final Object result = get(name);
- String property = result instanceof String ? (String) result : null;
+ String property = STRING.isInstance(result) ? STRING.cast(result) : null;
if (property == null && defaults != null) {
property = defaults.getProperty(name);
}
@@ -308,7 +317,7 @@ public class SuperProperties extends Properties {
@Override
public String getProperty(final String name, final String defaultValue) {
final Object result = get(name);
- String property = result instanceof String ? (String) result : null;
+ String property = STRING.isInstance(result) ? STRING.cast(result) : null;
if (property == null && defaults != null) {
property = defaults.getProperty(name);
}
@@ -385,19 +394,7 @@ public class SuperProperties extends Properties {
final StringBuilder buffer = new StringBuilder(80);
final Enumeration<?> keys = propertyNames();
while (keys.hasMoreElements()) {
- final String key = (String) keys.nextElement();
- buffer.append(key);
- buffer.append('=');
- String property = (String) get(key);
- if (property == null) {
- property = defaults.getProperty(key);
- }
- if (property.length() > 40) {
- buffer.append(property.substring(0, 37));
- buffer.append("...");
- } else {
- buffer.append(property);
- }
+ appendProperty(buffer, keys);
out.println(buffer.toString());
buffer.setLength(0);
}
@@ -411,24 +408,28 @@ public class SuperProperties extends Properties {
final StringBuilder buffer = new StringBuilder(80);
final Enumeration<?> keys = propertyNames();
while (keys.hasMoreElements()) {
- final String key = (String) keys.nextElement();
- buffer.append(key);
- buffer.append('=');
- String property = (String) get(key);
- while (property == null) {
- property = defaults.getProperty(key);
- }
- if (property.length() > 40) {
- buffer.append(property.substring(0, 37));
- buffer.append("...");
- } else {
- buffer.append(property);
- }
+ appendProperty(buffer, keys);
writer.println(buffer.toString());
buffer.setLength(0);
}
}
+ private void appendProperty(final StringBuilder buffer, final Enumeration<?> keys) {
+ final String key = keys.nextElement().toString();
+ buffer.append(key);
+ buffer.append('=');
+ String property = get(key).toString();
+ if (property == null) {
+ property = defaults.getProperty(key);
+ }
+ if (property.length() > 40) {
+ buffer.append(property.substring(0, 37));
+ buffer.append("...");
+ } else {
+ buffer.append(property);
+ }
+ }
+
@Override
public synchronized void load(final InputStream in) throws IOException {
// never null, when empty we are processing the white space at the beginning of the line
@@ -558,20 +559,7 @@ public class SuperProperties extends Properties {
}
commentLineIndent = Math.min(commentIndent, commentLineIndent);
- if (commentLine.toString().trim().startsWith("@")) {
- // process property attribute
- final String attribute = commentLine.toString().trim().substring(1);
- final String[] parts = attribute.split("=", 2);
- final String attributeName = parts[0].trim();
- final String attributeValue = parts.length == 2 ? parts[1].trim() : "";
- attributes.put(attributeName, attributeValue);
- } else {
- // append comment
- if (comment.length() != 0) {
- comment.append(lineSeparator);
- }
- comment.append(commentLine.toString().substring(commentLineIndent));
- }
+ checkForAttributeOrAppend(comment, attributes, commentLine, commentLineIndent);
continue;
}
break;
@@ -640,14 +628,22 @@ public class SuperProperties extends Properties {
}
}
- private static final int EOF = -1;
- private static final int LINE_ENDING = -4200;
- private static final int ENCODED_EQUALS = -5000;
- private static final int ENCODED_COLON = -5001;
- private static final int ENCODED_SPACE = -5002;
- private static final int ENCODED_TAB = -5003;
- private static final int ENCODED_NEWLINE = -5004;
- private static final int ENCODED_CARRIAGE_RETURN = -5005;
+ private void checkForAttributeOrAppend(final StringBuilder comment, final LinkedHashMap<String, String> attributes, final StringBuilder commentLine, final int commentLineIndent) {
+ if (commentLine.toString().trim().startsWith("@")) {
+ // process property attribute
+ final String attribute = commentLine.toString().trim().substring(1);
+ final String[] parts = attribute.split("=", 2);
+ final String attributeName = parts[0].trim();
+ final String attributeValue = parts.length == 2 ? parts[1].trim() : "";
+ attributes.put(attributeName, attributeValue);
+ } else {
+ // append comment
+ if (comment.length() != 0) {
+ comment.append(lineSeparator);
+ }
+ comment.append(commentLine.toString().substring(commentLineIndent));
+ }
+ }
private int decodeNextCharacter(final InputStream in) throws IOException {
boolean lineContinuation = false;
@@ -824,8 +820,8 @@ public class SuperProperties extends Properties {
boolean firstProperty = true;
final StringBuilder buffer = new StringBuilder(200);
for (final Map.Entry<Object, Object> entry : entrySet()) {
- final String key = (String) entry.getKey();
- final String value = (String) entry.getValue();
+ final String key = entry.getKey().toString();
+ final String value = entry.getValue().toString();
if (!firstProperty && spaceBetweenProperties) {
buffer.append(lineSeparator);
@@ -1019,20 +1015,7 @@ public class SuperProperties extends Properties {
}
commentLineIndent = Math.min(commentIndent, commentLineIndent);
- if (commentLine.toString().trim().startsWith("@")) {
- // process property attribute
- final String attribute = commentLine.toString().trim().substring(1);
- final String[] parts = attribute.split("=", 2);
- final String attributeName = parts[0].trim();
- final String attributeValue = parts.length == 2 ? parts[1].trim() : "";
- attributes.put(attributeName, attributeValue);
- } else {
- // append comment
- if (comment.length() != 0) {
- comment.append(lineSeparator);
- }
- comment.append(commentLine.toString().substring(commentLineIndent));
- }
+ checkForAttributeOrAppend(comment, attributes, commentLine, commentLineIndent);
firstLine = false;
} while (nextByte > 0);
@@ -1133,8 +1116,8 @@ public class SuperProperties extends Properties {
// properties
boolean firstProperty = true;
for (final Map.Entry<Object, Object> entry : entrySet()) {
- final String key = (String) entry.getKey();
- final String value = (String) entry.getValue();
+ final String key = entry.getKey().toString();
+ final String value = entry.getValue().toString();
if (!firstProperty && spaceBetweenProperties) {
buf.append(lineSeparator);
@@ -1149,7 +1132,7 @@ public class SuperProperties extends Properties {
buf.append(lineSeparator);
// comments can't contain "--" so we shrink all sequences of them to a single "-"
- comment = comment.replaceAll("--*", "-");
+ comment = null != comment ? comment.replaceAll("--*", "-") : "";
dumpComment(buf, comment, attributes, "");
buf.append(indent);
@@ -1187,10 +1170,10 @@ public class SuperProperties extends Properties {
* to use them safely in XML
*/
return s.replaceAll("&", "&")
- .replaceAll("<", "<")
- .replaceAll(">", ">")
- .replaceAll("\u0027", "'")
- .replaceAll("\"", """);
+ .replaceAll("<", "<")
+ .replaceAll(">", ">")
+ .replaceAll("\u0027", "'")
+ .replaceAll("\"", """);
}
//
@@ -1216,8 +1199,8 @@ public class SuperProperties extends Properties {
@Override
public Object put(Object key, final Object value) {
key = normalize(key);
- if (key instanceof String) {
- final String name = (String) key;
+ if (STRING.isInstance(key)) {
+ final String name = STRING.cast(key);
if (!attributes.containsKey(name)) {
attributes.put(name, new LinkedHashMap<String, String>());
}
@@ -1343,8 +1326,9 @@ public class SuperProperties extends Properties {
}
private Object normalize(final Object key) {
- if (key instanceof String) {
- return normalize((String) key);
+
+ if (STRING.isInstance(key)) {
+ return normalize(STRING.cast(key));
}
return key;
}
@@ -1358,26 +1342,37 @@ public class SuperProperties extends Properties {
return property;
}
- for (final Object o : keySet()) {
- if (o instanceof String) {
- final String key = (String) o;
- if (key.equalsIgnoreCase(property)) {
- return key;
- }
- }
+ String key = findKey(property, keySet());
+ if (key != null) {
+ return key;
}
if (defaults != null) {
- for (final Object o : defaults.keySet()) {
- if (o instanceof String) {
- final String key = (String) o;
- if (key.equalsIgnoreCase(property)) {
- return key;
- }
- }
+ key = findKey(property, defaults.keySet());
+ if (key != null) {
+ return key;
}
}
return property;
}
+
+ /**
+ * Find property key or null
+ *
+ * @param property String
+ * @param keySet Set
+ * @return String or null
+ */
+ private String findKey(final String property, final Set<Object> keySet) {
+ for (final Object o : keySet) {
+ if (String.class.isInstance(o)) {
+ final String key = String.class.cast(o);
+ if (key.equalsIgnoreCase(property)) {
+ return key;
+ }
+ }
+ }
+ return null;
+ }
}
[7/7] tomee git commit: Log level
Posted by an...@apache.org.
Log level
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c1f8b387
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c1f8b387
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c1f8b387
Branch: refs/heads/tomee-1.7.x
Commit: c1f8b38766bf788ab4860fd25aaedb9bc481186f
Parents: f20328d
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 18 17:45:37 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 18 17:45:37 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/classic/Assembler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c1f8b387/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 98b9194..bb64915 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
@@ -2189,7 +2189,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
Assembler.resetSlf4j(logger);
Logger.configure(true);
- logger.debug("destroyApplication.success", appInfo.path);
+ logger.info("destroyApplication.success", appInfo.path);
} finally {
l.unlock();
}
[4/7] tomee git commit: Reduce log level
Posted by an...@apache.org.
Reduce log level
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/924f3075
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/924f3075
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/924f3075
Branch: refs/heads/tomee-1.7.x
Commit: 924f30759de18a3e7070ba8f0b457ef8a6b4aea3
Parents: 36e25f7
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 18 09:43:44 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 18 09:43:44 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/JndiEncInfoBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/924f3075/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
index d135309..e5d9743 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
@@ -156,9 +156,9 @@ public class JndiEncInfoBuilder {
if (info.ejbDeploymentId == null) {
if (info.link != null) {
- logger.warning("config.noBeanFoundEjbLink", ref.getName(), ejbName, ref.getEjbLink());
+ logger.info("config.noBeanFoundEjbLink", ref.getName(), ejbName, ref.getEjbLink());
} else {
- logger.warning("config.noBeanFound", ref.getName(), ejbName, ref.getEjbLink());
+ logger.info("config.noBeanFound", ref.getName(), ejbName, ref.getEjbLink());
}
} else {
[3/7] tomee git commit: Try a full logging reset after undeploy
Posted by an...@apache.org.
Try a full logging reset after undeploy
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/36e25f79
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/36e25f79
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/36e25f79
Branch: refs/heads/tomee-1.7.x
Commit: 36e25f79f94e34784e56445b656b4f42d1f9081b
Parents: c1c1f7c
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 11 14:29:07 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 11 14:29:07 2016 +0100
----------------------------------------------------------------------
.../apache/openejb/assembler/classic/Assembler.java | 9 +++++----
.../apache/openejb/util/JuliLogStreamFactory.java | 15 ++++++++-------
.../main/java/org/apache/openejb/util/Logger.java | 12 +++++++++++-
3 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/36e25f79/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 6357d94..98b9194 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
@@ -1701,7 +1701,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
removeResourceInfo(boundName);
try {
containerSystem.getJNDIContext().unbind(boundName);
- } catch (NamingException e) {
+ } catch (final NamingException e) {
logger.error("Error unbinding " + boundName, e);
}
} else {
@@ -2186,7 +2186,8 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
throw undeployException;
}
- this.resetSlf4j();
+ Assembler.resetSlf4j(logger);
+ Logger.configure(true);
logger.debug("destroyApplication.success", appInfo.path);
} finally {
@@ -2194,7 +2195,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- private void resetSlf4j() {
+ private static void resetSlf4j(final Logger logger) {
final Method m = Assembler.SLF4J_RESET.get();
@@ -2216,7 +2217,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
try {
object = globalContext.lookup(name);
- } catch (NamingException e) {
+ } catch (final NamingException e) {
// if we catch a NamingException, check to see if the resource is a LaztObjectReference that has not been initialized correctly
final String ctx = name.substring(0, name.lastIndexOf("/"));
final String objName = name.substring(ctx.length() + 1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/36e25f79/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
index 5d3f5b0..ae8276a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
@@ -37,14 +37,10 @@ import java.util.logging.Logger;
public class JuliLogStreamFactory implements LogStreamFactory {
public static final String OPENEJB_LOG_COLOR_PROP = "openejb.log.color";
- private static String consoleHandlerClazz;
- private static boolean useOpenEJBHandler;
+ private static volatile String consoleHandlerClazz;
+ private static volatile boolean useOpenEJBHandler;
- public LogStream createLogStream(final LogCategory logCategory) {
- return new JuliLogStream(logCategory);
- }
-
- static {
+ public JuliLogStreamFactory() {
final boolean tomee = is("org.apache.tomee.catalina.TomcatLoader");
final boolean embedded = is("org.apache.tomee.embedded.Container");
@@ -101,6 +97,11 @@ public class JuliLogStreamFactory implements LogStreamFactory {
}
}
+ @Override
+ public LogStream createLogStream(final LogCategory logCategory) {
+ return new JuliLogStream(logCategory);
+ }
+
private static void setRootLogger(final OpenEJBLogManager value) {
try { // if we don't do it - which is done in static part of the LogManager - we couldn't log user info when force-reload is to true
final Class<?> rootLoggerClass = ClassLoader.getSystemClassLoader().loadClass("java.util.logging.LogManager$RootLogger");
http://git-wip-us.apache.org/repos/asf/tomee/blob/36e25f79/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
index 4a3886f..2e01b65 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
@@ -33,7 +33,7 @@ import java.util.ResourceBundle;
public class Logger {
private static final String SUFFIX = ".Messages";
private static final String OPENEJB = "org.apache.openejb";
- private static LogStreamFactory logStreamFactory;
+ private static volatile LogStreamFactory logStreamFactory;
// don't return the instance since it needs to stay private but export which one is used to allow integration with other libs (as tomcat ;))
@SuppressWarnings("UnusedDeclaration")
@@ -45,10 +45,20 @@ public class Logger {
}
public static synchronized void configure() {
+ configure(false);
+ }
+
+ public static synchronized void configure(final boolean reset) {
+
+ if(reset){
+ logStreamFactory = null;
+ }
+
configure(System.getProperties());
}
public static synchronized void configure(final Properties config) {
+
if (logStreamFactory != null) {
return;
}
[5/7] tomee git commit: Overrides
Posted by an...@apache.org.
Overrides
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7f7bdab9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7f7bdab9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7f7bdab9
Branch: refs/heads/tomee-1.7.x
Commit: 7f7bdab998546eb25817b2e875101263be0e61ff
Parents: 924f307
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 18 16:10:47 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 18 16:10:47 2016 +0100
----------------------------------------------------------------------
.../apache/openejb/util/SuperProperties.java | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7f7bdab9/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java b/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
index 2dacdf6..3587aa5 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
@@ -295,6 +295,7 @@ public class SuperProperties extends Properties {
this.spaceAfterComment = spaceAfterComment;
}
+ @Override
public String getProperty(final String name) {
final Object result = get(name);
String property = result instanceof String ? (String) result : null;
@@ -304,6 +305,7 @@ public class SuperProperties extends Properties {
return property;
}
+ @Override
public String getProperty(final String name, final String defaultValue) {
final Object result = get(name);
String property = result instanceof String ? (String) result : null;
@@ -316,6 +318,7 @@ public class SuperProperties extends Properties {
return property;
}
+ @Override
public synchronized Object setProperty(final String name, final String value) {
return put(name, value);
}
@@ -374,6 +377,7 @@ public class SuperProperties extends Properties {
return attributes;
}
+ @Override
public void list(final PrintStream out) {
if (out == null) {
throw new NullPointerException();
@@ -399,6 +403,7 @@ public class SuperProperties extends Properties {
}
}
+ @Override
public void list(final PrintWriter writer) {
if (writer == null) {
throw new NullPointerException();
@@ -424,6 +429,7 @@ public class SuperProperties extends Properties {
}
}
+ @Override
public synchronized void load(final InputStream in) throws IOException {
// never null, when empty we are processing the white space at the beginning of the line
StringBuilder key = new StringBuilder();
@@ -776,6 +782,7 @@ public class SuperProperties extends Properties {
return (char) unicode;
}
+ @Override
public Enumeration<?> propertyNames() {
if (defaults == null) {
return keys();
@@ -793,6 +800,7 @@ public class SuperProperties extends Properties {
return set.keys();
}
+ @Override
@SuppressWarnings({"deprecation"})
public void save(final OutputStream out, final String comment) {
try {
@@ -802,6 +810,7 @@ public class SuperProperties extends Properties {
}
}
+ @Override
public synchronized void store(final OutputStream out, final String headComment) throws IOException {
final OutputStreamWriter writer = new OutputStreamWriter(out, "ISO8859_1");
if (headComment != null) {
@@ -941,6 +950,7 @@ public class SuperProperties extends Properties {
}
}
+ @Override
public synchronized void loadFromXML(final InputStream in) throws IOException {
if (in == null) {
throw new NullPointerException();
@@ -1054,20 +1064,24 @@ public class SuperProperties extends Properties {
}
builder.setErrorHandler(new ErrorHandler() {
+ @Override
public void warning(final SAXParseException e) throws SAXException {
throw e;
}
+ @Override
public void error(final SAXParseException e) throws SAXException {
throw e;
}
+ @Override
public void fatalError(final SAXParseException e) throws SAXException {
throw e;
}
});
builder.setEntityResolver(new EntityResolver() {
+ @Override
public InputSource resolveEntity(final String publicId,
final String systemId) throws SAXException, IOException {
if (systemId.equals(PROP_DTD_NAME)) {
@@ -1082,10 +1096,12 @@ public class SuperProperties extends Properties {
return builder;
}
+ @Override
public void storeToXML(final OutputStream os, final String comment) throws IOException {
storeToXML(os, comment, "UTF-8");
}
+ @Override
public synchronized void storeToXML(final OutputStream os, final String headComment, final String encoding) throws IOException {
if (os == null || encoding == null) {
throw new NullPointerException();
@@ -1181,19 +1197,23 @@ public class SuperProperties extends Properties {
// Delegate all remaining methods to the properties object
//
+ @Override
public boolean isEmpty() {
return properties.isEmpty();
}
+ @Override
public int size() {
return properties.size();
}
+ @Override
public Object get(Object key) {
key = normalize(key);
return properties.get(key);
}
+ @Override
public Object put(Object key, final Object value) {
key = normalize(key);
if (key instanceof String) {
@@ -1205,6 +1225,7 @@ public class SuperProperties extends Properties {
return properties.put(key, value);
}
+ @Override
public Object remove(Object key) {
key = normalize(key);
comments.remove(key);
@@ -1212,6 +1233,7 @@ public class SuperProperties extends Properties {
return properties.remove(key);
}
+ @Override
public void putAll(final Map<?, ?> t) {
for (final Map.Entry<?, ?> entry : t.entrySet()) {
put(entry.getKey(), entry.getValue());
@@ -1232,10 +1254,12 @@ public class SuperProperties extends Properties {
*
* @return an unmodifiable view of the keys
*/
+ @Override
public Set<Object> keySet() {
return Collections.unmodifiableSet(properties.keySet());
}
+ @Override
public Enumeration<Object> keys() {
return Collections.enumeration(properties.keySet());
}
@@ -1245,6 +1269,7 @@ public class SuperProperties extends Properties {
*
* @return an unmodifiable view of the values
*/
+ @Override
public Collection<Object> values() {
return Collections.unmodifiableCollection(properties.values());
}
@@ -1254,33 +1279,40 @@ public class SuperProperties extends Properties {
*
* @return an unmodifiable view of the entries
*/
+ @Override
public Set<Map.Entry<Object, Object>> entrySet() {
return Collections.unmodifiableSet(properties.entrySet());
}
+ @Override
public Enumeration<Object> elements() {
return Collections.enumeration(properties.values());
}
+ @Override
public boolean containsKey(Object key) {
key = normalize(key);
return properties.containsKey(key);
}
+ @Override
public boolean containsValue(final Object value) {
return properties.containsValue(value);
}
+ @Override
public boolean contains(final Object value) {
return properties.containsValue(value);
}
+ @Override
public void clear() {
properties.clear();
comments.clear();
attributes.clear();
}
+ @Override
@SuppressWarnings({"unchecked"})
public Object clone() {
final SuperProperties clone = (SuperProperties) super.clone();
@@ -1306,6 +1338,7 @@ public class SuperProperties extends Properties {
return properties.toString();
}
+ @Override
protected void rehash() {
}