Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-143
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.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/0f33038d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f33038d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f33038d
Branch: refs/heads/ignite-143
Commit: 0f33038d436abce46db959825026e189db2e888b
Parents: 1181520 c0f872e
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Wed Feb 11 10:37:55 2015 -0800
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Wed Feb 11 10:37:55 2015 -0800
----------------------------------------------------------------------
modules/clients/src/test/keystore/generate.sh | 25 ++--
.../src/main/java/org/apache/ignite/Ignite.java | 11 +-
.../java/org/apache/ignite/IgniteServices.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 15 +-
.../ignite/events/AuthorizationEvent.java | 2 +-
.../org/apache/ignite/events/CacheEvent.java | 2 +-
.../apache/ignite/events/CheckpointEvent.java | 2 +-
.../apache/ignite/events/DeploymentEvent.java | 2 +-
.../java/org/apache/ignite/events/JobEvent.java | 2 +-
.../ignite/internal/GridJobContextImpl.java | 3 -
.../ignite/internal/GridKernalContext.java | 5 -
.../ignite/internal/GridKernalContextImpl.java | 13 +-
.../apache/ignite/internal/GridProductImpl.java | 11 +-
.../apache/ignite/internal/IgniteKernal.java | 61 +-------
.../internal/managers/GridManagerAdapter.java | 14 +-
.../managers/security/GridSecurityImpl.java | 95 -------------
.../processors/cache/CacheEntryImpl.java | 6 +-
.../processors/cache/CacheEntryImpl0.java | 6 +-
.../processors/cache/CacheInvokeEntry.java | 8 +-
.../processors/cache/GridCacheStoreManager.java | 3 +-
.../processors/cache/GridCacheUtils.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../continuous/CacheContinuousQueryEvent.java | 7 +-
.../processors/rest/GridRestProcessor.java | 2 +-
.../ignite/internal/product/IgniteProduct.java | 8 ++
.../apache/ignite/internal/visor/VisorJob.java | 8 +-
.../ignite/internal/visor/cache/VisorCache.java | 10 +-
.../visor/cache/VisorCacheClearTask.java | 140 +++++++++++++++----
.../visor/cache/VisorCacheCompactTask.java | 2 +-
.../visor/cache/VisorCacheLoadTask.java | 2 +-
.../visor/cache/VisorCacheMetadataTask.java | 2 +-
.../cache/VisorCacheMetricsCollectorTask.java | 2 +-
.../visor/cache/VisorCachePreloadTask.java | 2 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../compute/VisorComputeCancelSessionsTask.java | 4 +-
.../compute/VisorComputeMonitoringHolder.java | 16 +--
.../compute/VisorComputeResetMetricsTask.java | 2 +-
.../VisorComputeToggleMonitoringTask.java | 10 +-
.../visor/ggfs/VisorGgfsFormatTask.java | 2 +-
.../visor/ggfs/VisorGgfsProfilerClearTask.java | 4 +-
.../visor/ggfs/VisorGgfsProfilerTask.java | 4 +-
.../visor/ggfs/VisorGgfsResetMetricsTask.java | 2 +-
.../visor/ggfs/VisorGgfsSamplingStateTask.java | 2 +-
.../internal/visor/log/VisorLogSearchTask.java | 10 +-
.../internal/visor/misc/VisorAckTask.java | 2 +-
.../visor/misc/VisorLatestVersionTask.java | 2 +-
.../visor/node/VisorGridConfiguration.java | 10 +-
.../VisorNodeConfigurationCollectorJob.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 49 ++++---
.../node/VisorNodeEventsCollectorTask.java | 16 +--
.../internal/visor/node/VisorNodeGcTask.java | 2 +-
.../internal/visor/node/VisorNodePingTask.java | 2 +-
.../visor/query/VisorQueryCleanupTask.java | 2 +-
.../visor/query/VisorQueryNextPageTask.java | 4 +-
.../internal/visor/query/VisorQueryTask.java | 18 +--
.../streamer/VisorStreamerMetricsResetTask.java | 4 +-
.../visor/streamer/VisorStreamerResetTask.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 18 +--
.../optimized/optimized-classnames.properties | 2 +-
.../ignite/plugin/security/GridSecurity.java | 97 -------------
.../plugin/security/GridSecuritySubject.java | 1 -
modules/core/src/test/config/tests.properties | 6 +-
.../junits/GridTestKernalContext.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 6 -
.../http/jetty/GridJettyRestHandler.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 -
.../visor/commands/ack/VisorAckCommand.scala | 4 +-
.../commands/alert/VisorAlertCommand.scala | 24 ++--
.../commands/cache/VisorCacheClearCommand.scala | 17 +--
.../commands/cache/VisorCacheCommand.scala | 8 +-
.../cache/VisorCacheCompactCommand.scala | 4 +-
.../commands/cache/VisorCacheScanCommand.scala | 8 +-
.../commands/cache/VisorCacheSwapCommand.scala | 4 +-
.../config/VisorConfigurationCommand.scala | 4 +-
.../commands/disco/VisorDiscoveryCommand.scala | 6 +-
.../commands/events/VisorEventsCommand.scala | 4 +-
.../visor/commands/gc/VisorGcCommand.scala | 6 +-
.../visor/commands/kill/VisorKillCommand.scala | 10 +-
.../visor/commands/node/VisorNodeCommand.scala | 2 +-
.../visor/commands/ping/VisorPingCommand.scala | 4 +-
.../commands/start/VisorStartCommand.scala | 4 +-
.../commands/tasks/VisorTasksCommand.scala | 22 +--
.../commands/top/VisorTopologyCommand.scala | 8 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 68 ++++-----
.../commands/tasks/VisorTasksCommandSpec.scala | 2 +-
.../cache/websession/GridWebSessionFilter.java | 2 +-
88 files changed, 427 insertions(+), 592 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33038d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33038d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
index b284ef2,0000000..5a844b5
mode 100644,000000..100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
@@@ -1,81 -1,0 +1,84 @@@
+/*
+ * 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.processors.cache.query.continuous;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import javax.cache.*;
+import javax.cache.event.*;
+
+/**
+ * Continuous query event.
+ */
+class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> {
+ /** Entry. */
+ private final CacheContinuousQueryEntry<K, V> e;
+
+ /**
+ * @param source Source cache.
+ * @param eventType Event type.
+ * @param e Entry.
+ */
+ CacheContinuousQueryEvent(Cache source, EventType eventType,
CacheContinuousQueryEntry<K, V> e) {
+ super(source, eventType);
+
+ assert e != null;
+
+ this.e = e;
+ }
+
+ /**
+ * @return Entry.
+ */
+ CacheContinuousQueryEntry<K, V> entry() {
+ return e;
+ }
+
+ /** {@inheritDoc} */
+ @Override public K getKey() {
+ return e.key();
+ }
+
+ /** {@inheritDoc} */
+ @Override public V getValue() {
+ return e.value();
+ }
+
+ /** {@inheritDoc} */
+ @Override public V getOldValue() {
+ return e.oldValue();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isOldValueAvailable() {
+ return e.oldValue() != null;
+ }
+
+ /** {@inheritDoc} */
- @Override public <T> T unwrap(Class<T> clazz) {
- throw new UnsupportedOperationException();
++ @Override public <T> T unwrap(Class<T> cls) {
++ if(cls.isAssignableFrom(getClass()))
++ return cls.cast(this);
++
++ throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(CacheContinuousQueryEvent.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33038d/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33038d/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------
