You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/10/23 15:01:13 UTC
[09/50] [abbrv] ignite git commit: IGNITE-9918: Restore
default-config.xml in the build. This closes #5014.
IGNITE-9918: Restore default-config.xml in the build. This closes #5014.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3688ddf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3688ddf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3688ddf
Branch: refs/heads/ignite-gg-14206
Commit: b3688ddf482e751e9a5626f0f83bcddf843c6aab
Parents: ce73c9d
Author: Peter Ivanov <mr...@gmail.com>
Authored: Thu Oct 18 10:56:34 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Oct 18 10:56:34 2018 +0300
----------------------------------------------------------------------
config/apache-ignite-lgpl/default-config.xml | 29 ++++++++++++++++++++
config/apache-ignite/default-config.xml | 29 ++++++++++++++++++++
config/fabric-lgpl/default-config.xml | 29 --------------------
config/fabric/default-config.xml | 29 --------------------
.../ignite/internal/GridFactorySelfTest.java | 9 ------
5 files changed, 58 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3688ddf/config/apache-ignite-lgpl/default-config.xml
----------------------------------------------------------------------
diff --git a/config/apache-ignite-lgpl/default-config.xml b/config/apache-ignite-lgpl/default-config.xml
new file mode 100644
index 0000000..5da95ba
--- /dev/null
+++ b/config/apache-ignite-lgpl/default-config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <!--
+ Alter configuration below as needed.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3688ddf/config/apache-ignite/default-config.xml
----------------------------------------------------------------------
diff --git a/config/apache-ignite/default-config.xml b/config/apache-ignite/default-config.xml
new file mode 100644
index 0000000..5da95ba
--- /dev/null
+++ b/config/apache-ignite/default-config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <!--
+ Alter configuration below as needed.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3688ddf/config/fabric-lgpl/default-config.xml
----------------------------------------------------------------------
diff --git a/config/fabric-lgpl/default-config.xml b/config/fabric-lgpl/default-config.xml
deleted file mode 100644
index 5da95ba..0000000
--- a/config/fabric-lgpl/default-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <!--
- Alter configuration below as needed.
- -->
- <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
-</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3688ddf/config/fabric/default-config.xml
----------------------------------------------------------------------
diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml
deleted file mode 100644
index 5da95ba..0000000
--- a/config/fabric/default-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <!--
- Alter configuration below as needed.
- -->
- <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
-</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3688ddf/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index b453858..fd832a0 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -148,15 +148,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testStartFabricDefault() throws Exception {
- try (Ignite ignite = Ignition.start("config/fabric/default-config.xml")) {
- log.info("Started: " + ignite.name());
- }
- }
-
- /**
- * @throws Exception If failed.
- */
public void testStartDefault() throws Exception {
try (Ignite ignite = Ignition.start("config/default-config.xml")) {
log.info("Started: " + ignite.name());