# ignite-188: FIxes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6463e288 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6463e288 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6463e288 Branch: refs/heads/ignite-sql-tests Commit: 6463e2884d437c2579a3971507ee9f840d24a5ae Parents: b08492a Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 6 23:06:42 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 6 23:06:42 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/dataload/package.html | 24 -------------------- .../discovery/GridDiscoveryManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../clock/GridClockSyncProcessor.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../java/org/apache/ignite/jdbc/package.html | 24 -------------------- .../org/apache/ignite/jdbc/typedef/package.html | 24 -------------------- .../org/apache/ignite/jdbc/util/package.html | 24 -------------------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- 11 files changed, 7 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/dataload/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/dataload/package.html b/modules/core/src/main/java/org/apache/ignite/dataload/package.html deleted file mode 100644 index 76e7840..0000000 --- a/modules/core/src/main/java/org/apache/ignite/dataload/package.html +++ /dev/null @@ -1,24 +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. ---> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> - <!-- Package description. --> - Contains <b>Data loader API.</b> -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 72a865d..834e649 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -52,7 +52,7 @@ import java.util.zip.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 3a41989..33a36ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -62,7 +62,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.IgniteComponentType.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java index 41056b7..5beef88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java @@ -34,7 +34,7 @@ import java.net.*; import java.util.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java index c24d6f1..194629b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.ignitefs.IgniteFsMode.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java index 61b110b..d6cae06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java @@ -43,7 +43,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.ignitefs.IgniteFsMode.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index d5aa676..171e0f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -80,7 +80,7 @@ import java.util.zip.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; /** * Collection of utility methods used throughout the system. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/jdbc/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/package.html b/modules/core/src/main/java/org/apache/ignite/jdbc/package.html deleted file mode 100644 index 55fded4..0000000 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/package.html +++ /dev/null @@ -1,24 +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. ---> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> -<!-- Package description. --> - Contains JDBC driver for In-Memory Data Grid. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/jdbc/typedef/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/typedef/package.html b/modules/core/src/main/java/org/apache/ignite/jdbc/typedef/package.html deleted file mode 100644 index 69dd0fa..0000000 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/typedef/package.html +++ /dev/null @@ -1,24 +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. ---> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> -<!-- Package description. --> - JDBC typedefs. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/jdbc/util/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/util/package.html b/modules/core/src/main/java/org/apache/ignite/jdbc/util/package.html deleted file mode 100644 index 0beed7d..0000000 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/util/package.html +++ /dev/null @@ -1,24 +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. ---> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> -<!-- Package description. --> - JDBC utility classes. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6463e288/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 6b5ec9f..359a96d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -46,7 +46,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.spi.IgnitePortProtocol.*; import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*; import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*;
