Repository: incubator-ignite Updated Branches: refs/heads/nodejs be555fd73 -> 290297753
#nodejs: revert Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29029775 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29029775 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29029775 Branch: refs/heads/nodejs Commit: 290297753e288b6924abaf5d1aa5378060473876 Parents: be555fd Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Jun 4 01:23:18 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Jun 4 01:23:18 2015 +0300 ---------------------------------------------------------------------- examples/config/example-ignite.xml | 26 +++---------- examples/pom.xml | 6 --- .../org/apache/ignite/examples/ClinetTest.java | 39 ------------------- .../src/test/resources/jetty/rest-jetty.xml | 40 ++++++++++++++++---- 4 files changed, 38 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29029775/examples/config/example-ignite.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-ignite.xml b/examples/config/example-ignite.xml index 897ca98..e746e59 100644 --- a/examples/config/example-ignite.xml +++ b/examples/config/example-ignite.xml @@ -31,17 +31,6 @@ <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <!-- Set to true to enable distributed class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> - <property name="cacheConfiguration"> - <list> - <!-- Partitioned cache example configuration (Atomic mode). --> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="mycache"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="backups" value="1"/> - </bean> - </list> - </property> - <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> @@ -50,12 +39,6 @@ </bean> </property> - <property name="connectorConfiguration"> - <bean class="org.apache.ignite.configuration.ConnectorConfiguration"> - <property name="jettyPath" value="modules/clients/src/test/resources/jetty/rest-jetty.xml"/> - </bean> - </property> - <!-- Enable task execution events for examples. --> <property name="includeEventTypes"> <list> @@ -86,9 +69,12 @@ <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> - <constructor-arg> - <value>true</value> - </constructor-arg> + <property name="addresses"> + <list> + <!-- In distributed environment, replace with actual host IP address. --> + <value>127.0.0.1:47500..47509</value> + </list> + </property> </bean> </property> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29029775/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index a7c1c96..2b2bfeb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -45,12 +45,6 @@ <dependency> <groupId>org.apache.ignite</groupId> - <artifactId>ignite-rest-http</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ignite</groupId> <artifactId>ignite-hibernate</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29029775/examples/src/main/java/org/apache/ignite/examples/ClinetTest.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ClinetTest.java b/examples/src/main/java/org/apache/ignite/examples/ClinetTest.java deleted file mode 100644 index cc70ad9..0000000 --- a/examples/src/main/java/org/apache/ignite/examples/ClinetTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.apache.ignite.examples; - -import java.io.*; -import java.net.*; -import java.nio.charset.*; -import java.util.*; - -/** - * Created by GridGain on 03.06.2015. - */ -public class ClinetTest { - private static final String HOST = "127.0.0.1"; - - /** Http port. */ - private static final int HTTP_PORT = 9090; - - /** Url address to send HTTP request. */ - private static final String TEST_URL = "http://"; + HOST + ":" + HTTP_PORT + "/ignite"; - - - /** Used to sent request charset. */ - private static final String CHARSET = StandardCharsets.UTF_8.name(); - - - public static void main(String[] args) throws Exception { - String qry = "cmd=version"; - - URLConnection connection = new URL(TEST_URL + "?" + qry).openConnection(); - - connection.setRequestProperty("Accept-Charset", CHARSET); - - BufferedReader r = new BufferedReader(new InputStreamReader(connection.getInputStream())); - - String res = r.readLine(); - - r.close(); - - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29029775/modules/clients/src/test/resources/jetty/rest-jetty.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/jetty/rest-jetty.xml b/modules/clients/src/test/resources/jetty/rest-jetty.xml index e31304f..bbb68a4 100644 --- a/modules/clients/src/test/resources/jetty/rest-jetty.xml +++ b/modules/clients/src/test/resources/jetty/rest-jetty.xml @@ -1,5 +1,24 @@ <?xml version="1.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 Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> + <Configure id="Server" class="org.eclipse.jetty.server.Server"> <Arg name="threadPool"> <!-- Default queued blocking thread pool --> @@ -8,17 +27,19 @@ <Set name="maxThreads">200</Set> </New> </Arg> + <New id="httpCfg" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme">https</Set> <Set name="securePort">8443</Set> <Set name="sendServerVersion">true</Set> <Set name="sendDateHeader">true</Set> </New> + <Call name="addConnector"> <Arg> <New class="org.eclipse.jetty.server.ServerConnector"> <Arg name="server"><Ref refid="Server"/></Arg> - <Arg name="factories"> + <Arg> <Array type="org.eclipse.jetty.server.ConnectionFactory"> <Item> <New class="org.eclipse.jetty.server.HttpConnectionFactory"> @@ -27,17 +48,19 @@ </Item> </Array> </Arg> - <Set name="host"> - <SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/> - </Set> - <Set name="port"> - <SystemProperty name="IGNITE_JETTY_PORT" default="9090"/> - </Set> + <!-- + Note that in order to override local host and port values, + system properties must have names IGNITE_JETTY_HOST and + IGNITE_JETTY_PORT accordingly. + --> + <Set name="host"><SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/></Set> + <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="11080"/></Set> <Set name="idleTimeout">30000</Set> <Set name="reuseAddress">true</Set> </New> </Arg> </Call> + <Set name="handler"> <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection"> <Set name="handlers"> @@ -49,5 +72,6 @@ </Set> </New> </Set> + <Set name="stopAtShutdown">false</Set> -</Configure> \ No newline at end of file +</Configure>
