ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
Date Mon, 09 Feb 2015 06:31:44 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
----------------------------------------------------------------------
diff --cc modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
index a2fdb86,c698a90..0fa6a1c
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java
@@@ -27,10 -27,10 +27,10 @@@ import java.net.*
  
  /**
   * Factory methods to start Ignite with optional Spring application context, this context
can be injected into
 - * grid tasks and grid jobs using {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource
@IgniteSpringApplicationContextResource}
 + * grid tasks and grid jobs using {@link org.apache.ignite.resources.SpringApplicationContextResource
@IgniteSpringApplicationContextResource}
   * annotation.
   * <p>
-  * You can also instantiate grid directly from Spring without using {@code GridGain}.
+  * You can also instantiate grid directly from Spring without using {@code Ignite}.
   * For more information refer to {@link IgniteSpringBean} documentation.
   */
  public class IgniteSpring {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 53ea3dc,b10fb96..27b8506
--- 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
@@@ -26,10 -26,10 +26,10 @@@ import java.util.{HashSet => JHashSet, 
  import org.apache.ignite.IgniteSystemProperties._
  import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
  import org.apache.ignite.configuration.IgniteConfiguration
 -import org.apache.ignite.events.IgniteEventType._
 -import org.apache.ignite.events.{IgniteDiscoveryEvent, IgniteEvent}
 +import org.apache.ignite.events.EventType._
 +import org.apache.ignite.events.{DiscoveryEvent, Event}
  import org.apache.ignite.internal.IgniteComponentType._
- import org.apache.ignite.internal.GridNodeAttributes._
+ import org.apache.ignite.internal.IgniteNodeAttributes._
  import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
  import org.apache.ignite.internal.processors.spring.IgniteSpringProcessor
  import org.apache.ignite.internal.util.lang.{GridFunc => F}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/pom.xml
----------------------------------------------------------------------


Mime
View raw message