ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [20/50] incubator-ignite git commit: # IGNITE-191: Removed licensing stuff from update notifier.
Date Thu, 12 Feb 2015 13:29:29 GMT
# IGNITE-191: Removed licensing stuff from update notifier.


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

Branch: refs/heads/ignite-189
Commit: 9728459dee3652d8e615e6525dcd3a347b00da66
Parents: e8c1d7c
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Feb 12 11:09:13 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Feb 12 11:09:13 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridUpdateNotifier.java     | 15 ---
 .../apache/ignite/internal/IgniteKernal.java    |  1 -
 .../license/GridLicenseProcessor.java           |  3 +-
 .../ignite/internal/product/IgniteProduct.java  | 97 --------------------
 4 files changed, 1 insertion(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9728459d/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index 738d9ed..d1436a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.license.*;
-import org.apache.ignite.internal.product.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.worker.*;
@@ -82,9 +80,6 @@ class GridUpdateNotifier {
     /** */
     private long lastLog = -1;
 
-    /** */
-    private GridLicenseProcessor licProc;
-
     /**
      * Creates new notifier with default values.
      *
@@ -164,13 +159,6 @@ class GridUpdateNotifier {
     }
 
     /**
-     * @param licProc License processor.
-     */
-    void licenseProcessor(GridLicenseProcessor licProc) {
-        this.licProc = licProc;
-    }
-
-    /**
      * @return Latest version.
      */
     String latestVersion() {
@@ -275,15 +263,12 @@ class GridUpdateNotifier {
         /** {@inheritDoc} */
         @Override protected void body() throws InterruptedException {
             try {
-                IgniteProductLicense lic = licProc != null ? licProc.license() : null;
-
                 String stackTrace = gw != null ? gw.userStackTrace() : null;
 
                 String postParams =
                     "gridName=" + encode(gridName, CHARSET) +
                     (!F.isEmpty(UPD_STATUS_PARAMS) ? "&" + UPD_STATUS_PARAMS : "") +
                     (topSize > 0 ? "&topSize=" + topSize : "") +
-                    (lic != null ? "&licenseId=" + lic.id() : "") +
                     (!F.isEmpty(stackTrace) ? "&stackTrace=" + encode(stackTrace, CHARSET)
: "") +
                     (!F.isEmpty(vmProps) ? "&vmProps=" + encode(vmProps, CHARSET) : "");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9728459d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 44bf72a..f83bdcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -822,7 +822,6 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
             assert verChecker0 != null;
 
             verChecker0.reportOnlyNew(true);
-            verChecker0.licenseProcessor(ctx.license());
 
             updateNtfTimer = new Timer("ignite-update-notifier-timer");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9728459d/modules/core/src/main/java/org/apache/ignite/internal/processors/license/GridLicenseProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/license/GridLicenseProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/license/GridLicenseProcessor.java
index f74aca4..24e3ddb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/license/GridLicenseProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/license/GridLicenseProcessor.java
@@ -29,9 +29,8 @@ public interface GridLicenseProcessor extends GridProcessor {
      * Upload the new license into the current node.
      *
      * @param licTxt The string representation of the license file.
-     * @throws org.apache.ignite.internal.product.IgniteProductLicenseException Thrown if
validation check failed for specified license or
+     * @throws IgniteProductLicenseException Thrown if validation check failed for specified
license or
      *      license can not be updated because configured license URL use non-file scheme.
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getLicenseUrl()
      */
     public void updateLicense(String licTxt) throws IgniteProductLicenseException;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9728459d/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
deleted file mode 100644
index 4c31931..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
+++ /dev/null
@@ -1,97 +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.internal.product;
-
-import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-import java.text.*;
-import java.util.*;
-
-/**
- * Provides information about current release. Note that enterprise users are also
- * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows:
- * <pre name="code" class="java">
- * GridProduct p = Ignition.ignite().product();
- * </pre>
- */
-public abstract class IgniteProduct {
-    /** Ignite version in String form. */
-    public static final String VER_STR;
-
-    /** Ignite version. */
-    public static final IgniteProductVersion VER;
-
-    /** Formatted build date. */
-    public static final String BUILD_TSTAMP_STR;
-
-    /** Build timestamp in seconds. */
-    public static final long BUILD_TSTAMP;
-
-    /** Revision hash. */
-    public static final String REV_HASH_STR;
-
-    /** Release date. */
-    public static final String RELEASE_DATE_STR;
-
-    /** Compound version. */
-    public static final String ACK_VER_STR;
-
-    /** Copyright blurb. */
-    public static final String COPYRIGHT = "2015 Copyright(C) Apache Software Foundation";
-
-    /**
-     *
-     */
-    static {
-        VER_STR = GridProperties.get("ignite.version");
-
-        BUILD_TSTAMP = Long.valueOf(GridProperties.get("ignite.build"));
-        BUILD_TSTAMP_STR = new SimpleDateFormat("yyyyMMdd").format(new Date(BUILD_TSTAMP
* 1000));
-
-        REV_HASH_STR = GridProperties.get("ignite.revision");
-        RELEASE_DATE_STR = GridProperties.get("ignite.rel.date");
-
-        String rev = REV_HASH_STR.length() > 8 ? REV_HASH_STR.substring(0, 8) : REV_HASH_STR;
-
-        ACK_VER_STR = VER_STR + '#' + BUILD_TSTAMP_STR + "-sha1:" + rev;
-
-        VER = IgniteProductVersion.fromString(VER_STR + '-' + BUILD_TSTAMP + '-' + REV_HASH_STR);
-    }
-
-    /**
-     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
-     *
-     * @return License descriptor.
-     */
-    @Nullable public abstract IgniteProductLicense license();
-
-    /**
-     * Updates to a new license in enterprise edition. This method is no-op in open source
edition.
-     *
-     * @param lic The content of the license.
-     * @throws IgniteProductLicenseException If license could not be updated.
-     */
-    public abstract void updateLicense(String lic) throws IgniteProductLicenseException;
-
-    /**
-     * @return Grace period left.
-     */
-    public abstract long gracePeriodLeft();
-}


Mime
View raw message