http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 4675aa8,b694d5b..33c0448 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -46,18 -41,11 +41,15 @@@ import org.apache.ignite.spi.indexing.* import org.apache.ignite.spi.loadbalancing.*; import org.apache.ignite.spi.securesession.*; import org.apache.ignite.spi.swapspace.*; - import org.apache.ignite.internal.util.typedef.internal.*; - import org.jetbrains.annotations.*; + import org.apache.ignite.streamer.*; import javax.management.*; +import javax.cache.processor.*; +import javax.cache.expiry.*; +import javax.cache.integration.*; +import javax.cache.event.*; import java.lang.management.*; - import java.net.*; import java.util.*; - import java.util.concurrent.*; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*; @@@ -530,11 -410,11 +414,14 @@@ public class IgniteConfiguration private IgniteInClosure<IgniteConfiguration> warmupClos; /** */ - private IgniteQueryConfiguration qryCfg; + private QueryConfiguration qryCfg; + + /** */ + private AtomicConfiguration atomicCfg = new AtomicConfiguration(); + /** User's class loader. */ + private ClassLoader classLdr; + /** * Creates valid grid configuration with all default values. */ @@@ -3189,23 -2321,19 +2329,37 @@@ } /** + * @return Atomic data structures configuration. + */ + public AtomicConfiguration getAtomicConfiguration() { + return atomicCfg; + } + + /** + * @param atomicCfg Atomic data structures configuration. + */ + public void setAtomicConfiguration(AtomicConfiguration atomicCfg) { + this.atomicCfg = atomicCfg; + } + ++ /** + * Sets loader which will be used for instantiating execution context ({@link EntryProcessor EntryProcessors}, + * {@link CacheEntryListener CacheEntryListeners}, {@link CacheLoader CacheLoaders} and + * {@link ExpiryPolicy ExpiryPolicys}). + * + * @param classLdr Class loader. + */ + public void setClassLoader(ClassLoader classLdr) { + this.classLdr = classLdr; + } + + /** + * @return User's class loader. + */ + public ClassLoader getClassLoader() { + return classLdr; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgniteConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index dd3bda6,da79ec8..29af665 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@@ -1418,43 -1385,15 +1385,16 @@@ public class IgnitionEx myCfg.setSecurityCredentialsProvider(cfg.getSecurityCredentialsProvider()); myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setWarmupClosure(cfg.getWarmupClosure()); - myCfg.setInteropConfiguration(cfg.getInteropConfiguration()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); + myCfg.setTransactionConfiguration(new TransactionConfiguration(cfg.getTransactionConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); + myCfg.setClassLoader(cfg.getClassLoader()); + myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); - ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); - - if (clientCfg == null) { - // If client config is not provided then create config copying values from GridConfiguration. - if (cfg.isRestEnabled()) { - clientCfg = new ClientConnectionConfiguration(); - - clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor()); - clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders()); - clientCfg.setRestExecutorService(cfg.getRestExecutorService()); - clientCfg.setRestExecutorServiceShutdown(cfg.getRestExecutorServiceShutdown()); - clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout()); - clientCfg.setRestJettyPath(cfg.getRestJettyPath()); - clientCfg.setRestPortRange(cfg.getRestPortRange()); - clientCfg.setRestSecretKey(cfg.getRestSecretKey()); - clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer()); - clientCfg.setRestTcpHost(cfg.getRestTcpHost()); - clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay()); - clientCfg.setRestTcpPort(cfg.getRestTcpPort()); - clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize()); - clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount()); - clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize()); - clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit()); - clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth()); - clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory()); - clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled()); - } - } - else - clientCfg = new ClientConnectionConfiguration(clientCfg); + ConnectorConfiguration clientCfg = cfg.getConnectorConfiguration(); + if (clientCfg != null) + clientCfg = new ConnectorConfiguration(clientCfg); String ntfStr = IgniteSystemProperties.getString(IGNITE_LIFECYCLE_EMAIL_NOTIFY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 44b4e21,1c2499d..8a22daa --- 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 @@@ -26,14 -26,8 +26,13 @@@ import org.apache.ignite.cache.affinity import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; - import org.apache.ignite.fs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; +import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.lifecycle.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 0608852,e076d8d..89c60b6 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@@ -22,14 -22,11 +22,17 @@@ import org.apache.ignite.cache.* import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.portables.*; +import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.dr.*; import org.apache.ignite.internal.processors.cache.query.*; + import org.apache.ignite.internal.processors.cache.transactions.*; + import org.apache.ignite.internal.processors.cache.version.*; + import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java index 59933b7,3207f0a..fa12124 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java @@@ -21,11 -21,11 +21,14 @@@ import org.apache.ignite.* import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.resources.*; + import org.apache.ignite.internal.processors.cache.CacheEntryEvent; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; + import org.apache.ignite.lang.*; + import org.apache.ignite.resources.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5aef92b1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 8368ab0,fdbab73..0644f3c --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@@ -21,13 -21,9 +21,10 @@@ import junit.framework.* import org.apache.ignite.*; import org.apache.ignite.cache.affinity.fair.*; import org.apache.ignite.cache.store.*; + import org.apache.ignite.cache.store.jdbc.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.context.*; import org.apache.ignite.internal.processors.cache.distributed.*; - import org.apache.ignite.internal.processors.cache.distributed.replicated.*; - import org.apache.ignite.internal.processors.cache.expiry.*; - import org.apache.ignite.internal.processors.cache.integration.*; - import org.apache.ignite.cache.store.jdbc.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*;
