Ignite sp-1 fix for IGNITE-131
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0acd2d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0acd2d41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0acd2d41 Branch: refs/heads/ignite-54-55 Commit: 0acd2d4126dcf705660eea8ce25ec1bd016e63b1 Parents: 55144cf Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 26 17:19:17 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 26 17:19:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteNotPeerDeployable.java | 41 -------------------- .../ignite/lang/IgniteNotPeerDeployable.java | 41 ++++++++++++++++++++ .../scala/org/apache/ignite/visor/visor.scala | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0acd2d41/modules/core/src/main/java/org/apache/ignite/IgniteNotPeerDeployable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteNotPeerDeployable.java b/modules/core/src/main/java/org/apache/ignite/IgniteNotPeerDeployable.java deleted file mode 100644 index 05cf0c8..0000000 --- a/modules/core/src/main/java/org/apache/ignite/IgniteNotPeerDeployable.java +++ /dev/null @@ -1,41 +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; - -import java.lang.annotation.*; - -/** - * This annotations should be used to mark any type that should not be - * peer deployable. Peer deployment will fail for this object as if - * class could not be found. - * <p> - * This annotation is used as <b>non-distribution assertion</b> and should be - * applied to classes and interfaces that should never be distributed via - * peer-to-peer deployment. - * <p> - * Note, however, that if class is already available on the remote node it - * will not be peer-loaded but will simply be locally class loaded. It may appear - * as if it was successfully peer-loaded when in fact it was simply already - * available on the remote node. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface IgniteNotPeerDeployable { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0acd2d41/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java new file mode 100644 index 0000000..1f92ed4 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteNotPeerDeployable.java @@ -0,0 +1,41 @@ +/* + * 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.lang; + +import java.lang.annotation.*; + +/** + * This annotations should be used to mark any type that should not be + * peer deployable. Peer deployment will fail for this object as if + * class could not be found. + * <p> + * This annotation is used as <b>non-distribution assertion</b> and should be + * applied to classes and interfaces that should never be distributed via + * peer-to-peer deployment. + * <p> + * Note, however, that if class is already available on the remote node it + * will not be peer-loaded but will simply be locally class loaded. It may appear + * as if it was successfully peer-loaded when in fact it was simply already + * available on the remote node. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface IgniteNotPeerDeployable { + // No-op. +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0acd2d41/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 028dbdb..b740cb4 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -38,7 +38,7 @@ import org.apache.ignite.internal.visor.VisorTaskArgument import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg import org.apache.ignite.internal.{GridEx, GridProductImpl} -import org.apache.ignite.lang.IgnitePredicate +import org.apache.ignite.lang.{IgniteNotPeerDeployable, IgnitePredicate} import org.apache.ignite.lifecycle.IgniteListener import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi import org.apache.ignite.thread.IgniteThreadPoolExecutor
