Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #167

This commit is contained in:
Martyn Taylor 2015-03-10 09:46:34 +00:00
parent 1fe673429e 0f6d35b324
commit 7edb462e7a
15 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilBundle.java → activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.utils; package org.apache.activemq.logs;
import org.apache.activemq.api.core.ActiveMQIllegalStateException; import org.apache.activemq.api.core.ActiveMQIllegalStateException;

2
activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilLogger.java → activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.utils; package org.apache.activemq.logs;
import org.jboss.logging.BasicLogger; import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;

2
activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java → activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.utils; package org.apache.activemq.logs;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

1
activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java
View File

@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.ActiveMQExceptionType;
import org.apache.activemq.logs.ActiveMQUtilBundle;
/** /**
* A PasswordMarkingUtil * A PasswordMarkingUtil

1
activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java
View File

@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.logs.ActiveMQUtilBundle;
import static org.apache.activemq.utils.DataConstants.BOOLEAN; import static org.apache.activemq.utils.DataConstants.BOOLEAN;
import static org.apache.activemq.utils.DataConstants.BYTE; import static org.apache.activemq.utils.DataConstants.BYTE;

2
activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java
View File

@ -19,6 +19,8 @@ package org.apache.activemq.utils;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.logs.ActiveMQUtilBundle;
import org.apache.activemq.logs.ActiveMQUtilLogger;
/** /**
* *

1
activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java
View File

@ -33,6 +33,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.logs.ActiveMQUtilLogger;
public final class UUIDGenerator public final class UUIDGenerator
{ {

2
activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
View File

@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.apache.activemq.core.deployers.impl.FileConfigurationParser; import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
import org.apache.activemq.utils.AssertionLoggerHandler; import org.apache.activemq.logs.AssertionLoggerHandler;
import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.tests.util.UnitTestCase;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;

2
activemq-server/src/test/resources/logging.properties
View File

@ -45,7 +45,7 @@ handler.FILE.formatter=PATTERN
# Console handler configuration # Console handler configuration
handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
handler.TEST.level=TRACE handler.TEST.level=TRACE
handler.TEST.formatter=PATTERN handler.TEST.formatter=PATTERN

2
tests/config/logging.properties
View File

@ -51,7 +51,7 @@ handler.FILE.fileName=target/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN
# Console handler configuration # Console handler configuration
handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
handler.TEST.level=TRACE handler.TEST.level=TRACE
handler.TEST.formatter=PATTERN handler.TEST.formatter=PATTERN

2
tests/config/logging.properties.trace
View File

@ -53,7 +53,7 @@ handler.FILE.fileName=target/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN
# Console handler configuration # Console handler configuration
handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
handler.TEST.level=TRACE handler.TEST.level=TRACE
handler.TEST.formatter=PATTERN handler.TEST.formatter=PATTERN

2
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
View File

@ -73,7 +73,7 @@ import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.core.settings.impl.AddressSettings; import org.apache.activemq.core.settings.impl.AddressSettings;
import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.apache.activemq.tests.integration.IntegrationTestLogger;
import org.apache.activemq.utils.AssertionLoggerHandler; import org.apache.activemq.logs.AssertionLoggerHandler;
import org.apache.activemq.tests.util.ServiceTestBase; import org.apache.activemq.tests.util.ServiceTestBase;
import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.tests.util.UnitTestCase;
import org.junit.Assert; import org.junit.Assert;

2
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
View File

@ -33,7 +33,7 @@ import org.apache.activemq.api.core.client.ServerLocator;
import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.core.settings.impl.AddressSettings; import org.apache.activemq.core.settings.impl.AddressSettings;
import org.apache.activemq.utils.AssertionLoggerHandler; import org.apache.activemq.logs.AssertionLoggerHandler;
import org.apache.activemq.tests.util.ServiceTestBase; import org.apache.activemq.tests.util.ServiceTestBase;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;

2
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
View File

@ -27,7 +27,7 @@ import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.core.server.JournalType; import org.apache.activemq.core.server.JournalType;
import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.apache.activemq.tests.integration.IntegrationTestLogger;
import org.apache.activemq.utils.AssertionLoggerHandler; import org.apache.activemq.logs.AssertionLoggerHandler;
import org.apache.activemq.tests.util.ServiceTestBase; import org.apache.activemq.tests.util.ServiceTestBase;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;

2
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
View File

@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.utils.AssertionLoggerHandler; import org.apache.activemq.logs.AssertionLoggerHandler;
import org.apache.activemq.tests.util.ServiceTestBase; import org.apache.activemq.tests.util.ServiceTestBase;
import org.jboss.logmanager.Level; import org.jboss.logmanager.Level;
import org.junit.Test; import org.junit.Test;