You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/07/07 05:26:46 UTC
svn commit: r1608330 - in
/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms:
appender/ manager/ receiver/
Author: mattsicker
Date: Mon Jul 7 03:26:46 2014
New Revision: 1608330
URL: http://svn.apache.org/r1608330
Log:
Move Jms*Manager classes to manager package.
Added:
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/AbstractJmsManager.java
- copied, changed from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/AbstractJmsManager.java
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsQueueManager.java
- copied, changed from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsQueueManager.java
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsTopicManager.java
- copied, changed from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsTopicManager.java
Removed:
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/AbstractJmsManager.java
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsQueueManager.java
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsTopicManager.java
Modified:
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppender.java
logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicAppender.java
Modified: logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppender.java?rev=1608330&r1=1608329&r2=1608330&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppender.java (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppender.java Mon Jul 7 03:26:46 2014
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.mom.jms.receiver.JmsQueueManager;
+import org.apache.logging.log4j.mom.jms.manager.JmsQueueManager;
import org.apache.logging.log4j.core.util.Booleans;
/**
Modified: logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicAppender.java?rev=1608330&r1=1608329&r2=1608330&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicAppender.java (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicAppender.java Mon Jul 7 03:26:46 2014
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.mom.jms.receiver.JmsTopicManager;
+import org.apache.logging.log4j.mom.jms.manager.JmsTopicManager;
import org.apache.logging.log4j.core.util.Booleans;
/**
Copied: logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/AbstractJmsManager.java (from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/AbstractJmsManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/AbstractJmsManager.java?p2=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/AbstractJmsManager.java&p1=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/AbstractJmsManager.java&r1=1608323&r2=1608330&rev=1608330&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/AbstractJmsManager.java (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/AbstractJmsManager.java Mon Jul 7 03:26:46 2014
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.mom.jms.receiver;
+package org.apache.logging.log4j.mom.jms.manager;
import java.io.Serializable;
import java.util.Properties;
@@ -91,26 +91,27 @@ public abstract class AbstractJmsManager
* @param securityPrincipalName The name of the identity of the Principal.
* @param securityCredentials The security credentials of the Principal.
* @return The Properties.
+ * @see javax.naming.Context
*/
protected static Properties getEnvironment(final String factoryName, final String providerURL,
final String urlPkgPrefixes, final String securityPrincipalName,
final String securityCredentials) {
final Properties props = new Properties();
if (factoryName != null) {
- props.put(Context.INITIAL_CONTEXT_FACTORY, factoryName);
+ props.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName);
if (providerURL != null) {
- props.put(Context.PROVIDER_URL, providerURL);
+ props.setProperty(Context.PROVIDER_URL, providerURL);
} else {
LOGGER.warn("The InitialContext factory name has been provided without a ProviderURL. " +
"This is likely to cause problems");
}
if (urlPkgPrefixes != null) {
- props.put(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
+ props.setProperty(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
}
if (securityPrincipalName != null) {
- props.put(Context.SECURITY_PRINCIPAL, securityPrincipalName);
+ props.setProperty(Context.SECURITY_PRINCIPAL, securityPrincipalName);
if (securityCredentials != null) {
- props.put(Context.SECURITY_CREDENTIALS, securityCredentials);
+ props.setProperty(Context.SECURITY_CREDENTIALS, securityCredentials);
} else {
LOGGER.warn("SecurityPrincipalName has been set without SecurityCredentials. " +
"This is likely to cause problems.");
Copied: logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsQueueManager.java (from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsQueueManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsQueueManager.java?p2=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsQueueManager.java&p1=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsQueueManager.java&r1=1608323&r2=1608330&rev=1608330&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsQueueManager.java (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsQueueManager.java Mon Jul 7 03:26:46 2014
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.mom.jms.receiver;
+package org.apache.logging.log4j.mom.jms.manager;
import java.io.Serializable;
Copied: logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsTopicManager.java (from r1608323, logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsTopicManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsTopicManager.java?p2=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsTopicManager.java&p1=logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsTopicManager.java&r1=1608323&r2=1608330&rev=1608330&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/receiver/JmsTopicManager.java (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/src/main/java/org/apache/logging/log4j/mom/jms/manager/JmsTopicManager.java Mon Jul 7 03:26:46 2014
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.mom.jms.receiver;
+package org.apache.logging.log4j.mom.jms.manager;
import java.io.Serializable;