Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87AA0182A6 for ; Wed, 29 Apr 2015 10:23:29 +0000 (UTC) Received: (qmail 42938 invoked by uid 500); 29 Apr 2015 10:11:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42886 invoked by uid 500); 29 Apr 2015 10:11:38 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 42851 invoked by uid 99); 29 Apr 2015 10:11:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 10:11:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 10:11:33 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 6D1AF28442 for ; Wed, 29 Apr 2015 10:09:42 +0000 (UTC) Received: (qmail 88954 invoked by uid 99); 29 Apr 2015 06:29:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 06:29:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9523CE359A; Wed, 29 Apr 2015 06:29:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 06:29:36 -0000 Message-Id: <337b764d916a4e0ea11891b303357950@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] incubator-ignite git commit: * Update javadoc with new class name. * Rename test class name to match the class it's testing. X-Virus-Checked: Checked by ClamAV on apache.org * Update javadoc with new class name. * Rename test class name to match the class it's testing. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d0956ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d0956ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d0956ad Branch: refs/heads/ignite-776 Commit: 0d0956ad74d7be3d493446fbb86bc02a4f1e02fb Parents: 19bd611 Author: Cosmin Stroe Authored: Fri Apr 24 12:26:42 2015 -0500 Committer: avinogradov Committed: Tue Apr 28 12:53:54 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/logger/java/JavaLogger.java | 4 +- .../logger/java/IgniteJavaLoggerTest.java | 65 -------------------- .../ignite/logger/java/JavaLoggerTest.java | 65 ++++++++++++++++++++ .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- 4 files changed, 68 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java index cdfe118..ab9bc61 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java @@ -40,7 +40,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; *
  *      ...
  *      <property name="gridLogger">
- *          <bean class="org.apache.ignite.logger.java.IgniteJavaLogger">
+ *          <bean class="org.apache.ignite.logger.java.JavaLogger">
  *              <constructor-arg type="java.util.logging.Logger">
  *                  <bean class="java.util.logging.Logger">
  *                      <constructor-arg type="java.lang.String" value="global"/>
@@ -54,7 +54,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * 
  *      ...
  *      <property name="gridLogger">
- *          <bean class="org.apache.ignite.logger.java.IgniteJavaLogger"/>
+ *          <bean class="org.apache.ignite.logger.java.JavaLogger"/>
  *      </property>
  *      ...
  * 
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java deleted file mode 100644 index 9895c07..0000000 --- a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.ignite.logger.java; - -import junit.framework.*; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.logger.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; - -/** - * Java logger test. - */ -@GridCommonTest(group = "Logger") -public class IgniteJavaLoggerTest extends TestCase { - /** */ - @SuppressWarnings({"FieldCanBeLocal"}) - private IgniteLogger log; - - /** - * @throws Exception If failed. - */ - public void testLogInitialize() throws Exception { - U.setWorkDirectory(null, U.getIgniteHome()); - - log = new JavaLogger(); - - ((LoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444")); - - if (log.isDebugEnabled()) - log.debug("This is 'debug' message."); - - assert log.isInfoEnabled(); - - log.info("This is 'info' message."); - log.warning("This is 'warning' message."); - log.warning("This is 'warning' message.", new Exception("It's a test warning exception")); - log.error("This is 'error' message."); - log.error("This is 'error' message.", new Exception("It's a test error exception")); - - assert log.getLogger(IgniteJavaLoggerTest.class.getName()) instanceof JavaLogger; - - assert log.fileName() != null; - - // Ensure we don't get pattern, only actual file name is allowed here. - assert !log.fileName().contains("%"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java b/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java new file mode 100644 index 0000000..70d6860 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java @@ -0,0 +1,65 @@ +/* + * 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.ignite.logger.java; + +import junit.framework.*; +import org.apache.ignite.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.logger.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.util.*; + +/** + * Java logger test. + */ +@GridCommonTest(group = "Logger") +public class JavaLoggerTest extends TestCase { + /** */ + @SuppressWarnings({"FieldCanBeLocal"}) + private IgniteLogger log; + + /** + * @throws Exception If failed. + */ + public void testLogInitialize() throws Exception { + U.setWorkDirectory(null, U.getIgniteHome()); + + log = new JavaLogger(); + + ((LoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444")); + + if (log.isDebugEnabled()) + log.debug("This is 'debug' message."); + + assert log.isInfoEnabled(); + + log.info("This is 'info' message."); + log.warning("This is 'warning' message."); + log.warning("This is 'warning' message.", new Exception("It's a test warning exception")); + log.error("This is 'error' message."); + log.error("This is 'error' message.", new Exception("It's a test error exception")); + + assert log.getLogger(JavaLoggerTest.class.getName()) instanceof JavaLogger; + + assert log.fileName() != null; + + // Ensure we don't get pattern, only actual file name is allowed here. + assert !log.fileName().contains("%"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java index 1a80f6b..00ccdd3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java @@ -30,7 +30,7 @@ public class IgniteLoggingSelfTestSuite extends TestSuite { public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Logging Test Suite"); - suite.addTest(new TestSuite(IgniteJavaLoggerTest.class)); + suite.addTest(new TestSuite(JavaLoggerTest.class)); return suite; }