ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/34] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-556' into ignite-556
Date Mon, 23 Mar 2015 11:58:18 GMT
Merge remote-tracking branch 'origin/ignite-556' into ignite-556


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

Branch: refs/heads/ignite-556
Commit: a1f326ffaa275866063cd0c88fcd5794d5c0478c
Parents: 5f5d8b0 86e7655
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 23 14:57:37 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 23 14:57:37 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/spring/IgniteSpringProcessor.java      | 3 ++-
 .../internal/processors/spring/IgniteSpringProcessorImpl.java  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1f326ff/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java
index 6f607ad,93993df..86e5f78
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java
@@@ -52,11 -52,17 +52,12 @@@ public interface IgniteSpringProcessor 
       *
       * @param cfgUrl Configuration file path or URL. This cannot be {@code null}.
       * @param cl Required type of configuration.
+      * @param excludedProps Properties to exclude.
       * @return Tuple containing all loaded configurations and Spring context used to load
them.
 -     * @throws IgniteCheckedException If configuration could not be
 -     *      read.
 +     * @throws IgniteCheckedException If configuration could not be read.
       */
      public <T> IgniteBiTuple<Collection<T>, ? extends GridSpringResourceContext>
loadConfigurations(
-         URL cfgUrl, Class<T> cl) throws IgniteCheckedException;
+         URL cfgUrl, Class<T> cl, String... excludedProps) throws IgniteCheckedException;
  
      /**
       * Loads bean instances that match the given types from given configuration file.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1f326ff/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java
----------------------------------------------------------------------


Mime
View raw message