# ignite-164 : rename gridgain.xml -> ignite.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0b071e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0b071e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0b071e0 Branch: refs/heads/sprint-1 Commit: f0b071e0877439e62a850f8262343bf7db36cd7c Parents: 86ab8e2 Author: Artem Shutak <[email protected]> Authored: Thu Feb 5 12:40:00 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu Feb 5 12:40:00 2015 +0300 ---------------------------------------------------------------------- modules/extdata/p2p/META-INF/gridgain.xml | 40 -------------------- modules/extdata/p2p/META-INF/ignite.xml | 40 ++++++++++++++++++++ .../p2p/GridP2PUserVersionChangeSelfTest.java | 12 +++--- .../GridUriDeploymentFileProcessorSelfTest.java | 4 +- .../spi/deployment/uri/META-INF/gridgain.xml | 38 ------------------- .../spi/deployment/uri/META-INF/ignite.xml | 38 +++++++++++++++++++ .../apache/ignite/tools/GridToolsSelfTest.java | 10 ++--- .../ignite/tools/gartask/META-INF/gridgain.xml | 38 ------------------- .../ignite/tools/gartask/META-INF/ignite.xml | 38 +++++++++++++++++++ 9 files changed, 129 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/extdata/p2p/META-INF/gridgain.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/META-INF/gridgain.xml b/modules/extdata/p2p/META-INF/gridgain.xml deleted file mode 100644 index 27f0809..0000000 --- a/modules/extdata/p2p/META-INF/gridgain.xml +++ /dev/null @@ -1,40 +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. - --> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> - - <!-- - Optional test tasks specification. If not provided, then all - tasks found inside GAR will be deployed. - --> - <util:list id="tasks"> - <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value> - <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2</value> - <value>org.apache.ignite.tests.p2p.SingleSplitTestTask</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/extdata/p2p/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/META-INF/ignite.xml b/modules/extdata/p2p/META-INF/ignite.xml new file mode 100644 index 0000000..27f0809 --- /dev/null +++ b/modules/extdata/p2p/META-INF/ignite.xml @@ -0,0 +1,40 @@ +<?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. + --> + +<!-- + Spring configuration file for test classes in gar-file. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> + <description>Gridgain Spring configuration file in gar-file.</description> + + <!-- + Optional test tasks specification. If not provided, then all + tasks found inside GAR will be deployed. + --> + <util:list id="tasks"> + <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value> + <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2</value> + <value>org.apache.ignite.tests.p2p.SingleSplitTestTask</value> + </util:list> +</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java index 0c4d474..7091f07 100644 --- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java @@ -132,7 +132,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { GridTestExternalClassLoader ldr = new GridTestExternalClassLoader( new URL[] { new URL(GridTestProperties.getProperty("p2p.uri.cls")) }, - Collections.singletonMap("META-INF/gridgain.xml", makeUserVersion("1").getBytes())); + Collections.singletonMap("META-INF/ignite.xml", makeUserVersion("1").getBytes())); Class task1 = ldr.loadClass(TEST_TASK_NAME); @@ -152,7 +152,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { stopGrid(1); - ldr.setResourceMap(Collections.singletonMap("META-INF/gridgain.xml", makeUserVersion("2").getBytes())); + ldr.setResourceMap(Collections.singletonMap("META-INF/ignite.xml", makeUserVersion("2").getBytes())); ignite1 = startGrid(1); @@ -285,7 +285,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { GridTestExternalClassLoader ldr = new GridTestExternalClassLoader( new URL[] { new URL(GridTestProperties.getProperty("p2p.uri.cls")) }, - Collections.singletonMap("META-INF/gridgain.xml", makeUserVersion("1").getBytes())); + Collections.singletonMap("META-INF/ignite.xml", makeUserVersion("1").getBytes())); Class rcrsCls = ldr.loadClass(TEST_RCRS_NAME); @@ -311,7 +311,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { stopGrid("testCacheRedeployVersionChangeContinuousMode1"); // Increase the user version of the test class. - ldr.setResourceMap(Collections.singletonMap("META-INF/gridgain.xml", makeUserVersion("2").getBytes())); + ldr.setResourceMap(Collections.singletonMap("META-INF/ignite.xml", makeUserVersion("2").getBytes())); ignite1 = startGrid("testCacheRedeployVersionChangeContinuousMode1"); @@ -337,10 +337,10 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { } /** - * Creates content of META-INF/gridgain.xml for specified user version. + * Creates content of META-INF/ignite.xml for specified user version. * * @param userVer Version to create. - * @return content of META-INF/gridgain.xml. + * @return content of META-INF/ignite.xml. */ private String makeUserVersion(String userVer) { return "<?xml version=\"1.0\" encoding=\"UTF-8\"?> " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java index 78dba7a..b2887b8 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java @@ -35,7 +35,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs * @throws Exception If failed. */ public void testTaskCorrect() throws Exception { - proceedTest("correct.gar", "gridgain.xml", + proceedTest("correct.gar", "ignite.xml", "org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0", true); } @@ -98,7 +98,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs assert mkdir; // Make Gar file - U.copy( new File(garDescDirName), new File(metaDirName + File.separator + "gridgain.xml"), true); + U.copy( new File(garDescDirName), new File(metaDirName + File.separator + "ignite.xml"), true); // Copy files to basedir U.copy(new File(srcDirName), new File(baseDirName), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/gridgain.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/gridgain.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/gridgain.xml deleted file mode 100644 index 3733af0..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/gridgain.xml +++ /dev/null @@ -1,38 +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. - --> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml new file mode 100644 index 0000000..3733af0 --- /dev/null +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.xml @@ -0,0 +1,38 @@ +<?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. + --> + +<!-- + Spring configuration file for test classes in gar-file. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> + <description>Gridgain Spring configuration file in gar-file.</description> + + <!-- + Test tasks specification. + --> + <util:list id="tasks"> + <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0</value> + <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> + </util:list> +</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java index 9d0ffe0..546ea70 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java @@ -43,7 +43,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { String garFileName = baseDirName + ".gar"; String garDescDirName = U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() - + File.separator + "gridgain.xml"; + + File.separator + "ignite.xml"; // Make base and META-INF dir. boolean mkdir = new File(baseDirName).mkdirs(); @@ -55,7 +55,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { assert mkdir; // Make Gar file - U.copy(new File(garDescDirName), new File(metaDirName + File.separator + "gridgain.xml"), true); + U.copy(new File(garDescDirName), new File(metaDirName + File.separator + "ignite.xml"), true); // Copy files to basedir U.copy(new File(srcDirName), new File(baseDirName), true); @@ -90,7 +90,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { private boolean checkStructure(File garFile, boolean hasDescr) throws IOException { ZipFile zip = new ZipFile(garFile); - String descr = "META-INF/gridgain.xml"; + String descr = "META-INF/ignite.xml"; ZipEntry entry = zip.getEntry(descr); @@ -175,7 +175,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { String garFileName = baseDirName + ".gar"; String garDescrDirName = U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath() - + File.separator + "gridgain.xml"; + + File.separator + "ignite.xml"; // Make base and META-INF dir. boolean mkdir = new File(baseDirName).mkdirs(); @@ -187,7 +187,7 @@ public class GridToolsSelfTest extends GridCommonAbstractTest { assert mkdir; // Make Gar file - U.copy(new File(garDescrDirName), new File(metaDirName + File.separator + "gridgain.xml"), true); + U.copy(new File(garDescrDirName), new File(metaDirName + File.separator + "ignite.xml"), true); // Copy files to basedir U.copy(new File(srcDirName), new File(baseDirName), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml deleted file mode 100644 index 869695b..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml +++ /dev/null @@ -1,38 +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. - --> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Gridgain Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.gridgain.grid.tests.p2p.GridP2PTestTask</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b071e0/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml new file mode 100644 index 0000000..869695b --- /dev/null +++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/ignite.xml @@ -0,0 +1,38 @@ +<?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. + --> + +<!-- + Spring configuration file for test classes in gar-file. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> + <description>Gridgain Spring configuration file in gar-file.</description> + + <!-- + Test tasks specification. + --> + <util:list id="tasks"> + <value>org.gridgain.grid.tests.p2p.GridP2PTestTask</value> + <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> + </util:list> +</beans>
