ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [36/46] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-226
Date Fri, 13 Feb 2015 14:12:05 GMT
Merge branch 'sprint-1' into ignite-226

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
	modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/039afc89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/039afc89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/039afc89

Branch: refs/heads/ignite-226
Commit: 039afc89bdb97dcb0784ddcccf615cc7b0b210f5
Parents: 9cf92dd 0f08d41
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 16:31:45 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 16:31:45 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   2 +-
 examples/pom-standalone.xml                     |  28 ++-
 .../apache/ignite/cache/CacheProjection.java    |   4 +-
 .../ignite/cache/cloner/CacheBasicCloner.java   |  34 ---
 .../apache/ignite/cache/cloner/CacheCloner.java |  57 -----
 .../ignite/cache/cloner/CacheDeepCloner.java    |  87 --------
 .../org/apache/ignite/cache/cloner/package.html |  24 ---
 .../configuration/CacheConfiguration.java       |  34 ---
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../org/apache/ignite/events/EventType.java     |   2 -
 .../ignite/internal/ClusterMetricsSnapshot.java |  79 ++++++-
 .../managers/deployment/GridDeployment.java     |   3 -
 .../deployment/GridDeploymentManager.java       |   3 -
 .../GridDeploymentPerLoaderStore.java           |   3 -
 .../GridDeploymentPerVersionStore.java          |   3 -
 .../processors/cache/GridCacheAdapter.java      |  66 ++++--
 .../processors/cache/GridCacheAttributes.java   |  13 --
 .../processors/cache/GridCacheContext.java      |  11 +-
 .../processors/cache/GridCacheEntryEx.java      |   7 +-
 .../processors/cache/GridCacheMapEntry.java     |  36 +++-
 .../processors/cache/GridCacheProcessor.java    |   8 +-
 .../cache/GridCacheProjectionImpl.java          |   8 +-
 .../processors/cache/GridCacheProxyImpl.java    |   8 +-
 .../cache/IgniteCacheExpiryPolicy.java          |   6 +
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/GridDistributedCacheEntry.java  |   3 -
 .../distributed/dht/GridDhtCacheAdapter.java    |  27 ++-
 .../distributed/dht/GridDhtCacheEntry.java      |   3 -
 .../dht/atomic/GridDhtAtomicCache.java          |  96 +--------
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   3 -
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   3 -
 .../distributed/near/GridNearCacheAdapter.java  |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   3 -
 .../cache/distributed/near/GridNearTxLocal.java |  19 +-
 .../cache/local/GridLocalCacheEntry.java        |   3 -
 .../local/atomic/GridLocalAtomicCache.java      |   7 +-
 .../cache/query/GridCacheQueryManager.java      | 112 +++++++---
 .../cache/transactions/IgniteTxAdapter.java     |   3 -
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   7 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   3 -
 .../ignite/internal/visor/cache/VisorCache.java |  51 -----
 .../visor/cache/VisorCacheConfiguration.java    | 170 ++++++---------
 .../visor/cache/VisorCacheTypeMetadata.java     |  16 ++
 .../visor/node/VisorGridConfiguration.java      |   4 +-
 .../apache/ignite/logger/java/JavaLogger.java   |   3 -
 .../optimized/optimized-classnames.properties   |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   3 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |  15 ++
 ...idCacheConfigurationConsistencySelfTest.java |  12 --
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  23 --
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../cache/GridCacheVersionMultinodeTest.java    | 208 +++++++++++++++++++
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  20 ++
 .../junits/logger/GridTestLog4jLogger.java      |   3 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 .../igfs/hadoop/IgfsHadoopJclLogger.java        |   3 -
 .../GridHadoopExternalCommunication.java        |   3 +-
 .../ignite/logger/jcl/IgniteJclLogger.java      |   3 -
 .../IgniteLog4jDailyRollingFileAppender.java    |  77 -------
 ...IgniteLog4jExternallyRolledFileAppender.java |  63 ------
 .../logger/log4j/IgniteLog4jFileAppender.java   | 107 ----------
 .../logger/log4j/IgniteLog4jFileAware.java      |  32 ---
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |  64 ------
 .../log4j/IgniteLog4jRollingFileAppender.java   |  90 --------
 .../log4j/Log4JDailyRollingFileAppender.java    |  77 +++++++
 .../Log4JExternallyRolledFileAppender.java      |  63 ++++++
 .../ignite/logger/log4j/Log4JFileAppender.java  | 107 ++++++++++
 .../apache/ignite/logger/log4j/Log4JLogger.java |  12 +-
 .../ignite/logger/log4j/Log4jFileAware.java     |  32 +++
 .../logger/log4j/Log4jNodeIdFilePath.java       |  64 ++++++
 .../logger/log4j/Log4jRollingFileAppender.java  |  90 ++++++++
 .../log4j/GridLog4jCorrectFileNameTest.java     |  12 +-
 .../processors/schedule/ScheduleFutureImpl.java |   3 -
 .../ignite/logger/slf4j/GridSlf4jLogger.java    |   3 -
 .../commands/cache/VisorCacheCommand.scala      |  11 +-
 pom.xml                                         |  29 +--
 78 files changed, 1107 insertions(+), 1207 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index ed33415,764950f..13b315a
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@@ -107,8 -107,8 +107,8 @@@ public class VisorGridConfiguration imp
          includeEventTypes(c.getIncludeEventTypes());
          rest(VisorRestConfiguration.from(c));
          userAttributes(c.getUserAttributes());
-         caches(VisorCacheConfiguration.list(c.getCacheConfiguration()));
-         ggfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration()));
+         caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration()));
 -        ggfss(VisorGgfsConfiguration.list(c.getGgfsConfiguration()));
++        ggfss(VisorGgfsConfiguration.list(c.getIgfsConfiguration()));
          streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration()));
          env(new HashMap<>(getenv()));
          systemProperties(getProperties());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java
----------------------------------------------------------------------
diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java
index 344ba8f,0000000..e3606ab
mode 100644,000000..100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java
@@@ -1,115 -1,0 +1,112 @@@
 +/*
 + * 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.internal.igfs.hadoop;
 +
 +import org.apache.commons.logging.*;
 +import org.apache.ignite.*;
 +import org.jetbrains.annotations.*;
 +
 +/**
 + * JCL logger wrapper for Hadoop.
 + */
 +public class IgfsHadoopJclLogger implements IgniteLogger {
-     /** */
-     private static final long serialVersionUID = 0L;
- 
 +    /** JCL implementation proxy. */
 +    private Log impl;
 +
 +    /**
 +     * Constructor.
 +     *
 +     * @param impl JCL implementation to use.
 +     */
 +    IgfsHadoopJclLogger(Log impl) {
 +        assert impl != null;
 +
 +        this.impl = impl;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public IgniteLogger getLogger(Object ctgr) {
 +        return new IgfsHadoopJclLogger(LogFactory.getLog(
 +            ctgr instanceof Class ? ((Class)ctgr).getName() : String.valueOf(ctgr)));
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void trace(String msg) {
 +        impl.trace(msg);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void debug(String msg) {
 +        impl.debug(msg);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void info(String msg) {
 +        impl.info(msg);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void warning(String msg) {
 +        impl.warn(msg);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void warning(String msg, @Nullable Throwable e) {
 +        impl.warn(msg, e);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void error(String msg) {
 +        impl.error(msg);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean isQuiet() {
 +        return !isInfoEnabled() && !isDebugEnabled();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void error(String msg, @Nullable Throwable e) {
 +        impl.error(msg, e);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean isTraceEnabled() {
 +        return impl.isTraceEnabled();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean isDebugEnabled() {
 +        return impl.isDebugEnabled();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean isInfoEnabled() {
 +        return impl.isInfoEnabled();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Nullable @Override public String fileName() {
 +        return null;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public String toString() {
 +        return "GridGgfsHadoopJclLogger [impl=" + impl + ']';
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/039afc89/pom.xml
----------------------------------------------------------------------


Mime
View raw message