From 7542eec81e5cfa1ce1300daf75ac0999c2a8b56e Mon Sep 17 00:00:00 2001 From: erikgruener Date: Fri, 25 May 2018 15:39:35 +0200 Subject: [PATCH 1/4] capgemin -> devonfw --- cobigen/cobigen-xmlplugin/pom.xml | 22 +++++++++---------- .../cobigen/xmlplugin/XmlPluginActivator.java | 12 +++++----- .../xmlplugin/XmlTriggerInterpreter.java | 12 +++++----- .../xmlplugin/inputreader/ModelConstant.java | 2 +- .../xmlplugin/inputreader/XmlInputReader.java | 6 ++--- .../xmlplugin/matcher/NamespaceResolver.java | 2 +- .../cobigen/xmlplugin/matcher/XmlMatcher.java | 14 ++++++------ .../xmlplugin/merger/delegates/MergeType.java | 2 +- .../merger/delegates/XmlMergerDelegate.java | 6 ++--- ...gen.api.extension.GeneratorPluginActivator | 1 - ...gen.api.extension.GeneratorPluginActivator | 1 + .../UpgradeTestdataConfigurations.java | 8 +++---- .../integrationtest/XPathGenerationTest.java | 12 +++++----- .../XmlPluginIntegrationTest.java | 16 +++++++------- .../XmlPluginMergerIntegrationTest.java | 8 +++---- .../inputreader/XmlInputReaderTest.java | 6 ++--- .../unittest/merger/BaseFile_queries.xml | 2 +- .../unittest/merger/PatchFile_queries.xml | 2 +- 18 files changed, 67 insertions(+), 67 deletions(-) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/XmlPluginActivator.java (74%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/XmlTriggerInterpreter.java (68%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/inputreader/ModelConstant.java (97%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/inputreader/XmlInputReader.java (98%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/matcher/NamespaceResolver.java (95%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/matcher/XmlMatcher.java (95%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/merger/delegates/MergeType.java (96%) rename cobigen/cobigen-xmlplugin/src/main/java/com/{capgemini => devonfw}/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java (92%) delete mode 100644 cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator create mode 100644 cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator diff --git a/cobigen/cobigen-xmlplugin/pom.xml b/cobigen/cobigen-xmlplugin/pom.xml index 75f862027b..641d087ce3 100644 --- a/cobigen/cobigen-xmlplugin/pom.xml +++ b/cobigen/cobigen-xmlplugin/pom.xml @@ -2,14 +2,14 @@ 4.0.0 - cobigen-xmlplugin + xmlplugin CobiGen - XML Plug-In 3.2.0-SNAPSHOT jar - com.capgemini - cobigen-parent + com.devonfw + parent dev-SNAPSHOT @@ -20,28 +20,28 @@ - com.capgemini - cobigen-core-api + com.devonfw + core-api 4.2.0-SNAPSHOT - com.capgemini - cobigen-core-test + com.devonfw + core-test 4.2.0-SNAPSHOT test - com.capgemini - cobigen-core + com.devonfw + core 4.2.0-SNAPSHOT test - com.capgemini - cobigen-tempeng-freemarker + com.devonfw + tempeng-freemarker 1.0.0 test diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlPluginActivator.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlPluginActivator.java similarity index 74% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlPluginActivator.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlPluginActivator.java index 5338500fba..77c1e0f85e 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlPluginActivator.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlPluginActivator.java @@ -1,12 +1,12 @@ -package com.capgemini.cobigen.xmlplugin; +package com.devonfw.cobigen.xmlplugin; import java.util.List; -import com.capgemini.cobigen.api.extension.GeneratorPluginActivator; -import com.capgemini.cobigen.api.extension.Merger; -import com.capgemini.cobigen.api.extension.TriggerInterpreter; -import com.capgemini.cobigen.xmlplugin.merger.delegates.MergeType; -import com.capgemini.cobigen.xmlplugin.merger.delegates.XmlMergerDelegate; +import com.devonfw.cobigen.api.extension.GeneratorPluginActivator; +import com.devonfw.cobigen.api.extension.Merger; +import com.devonfw.cobigen.api.extension.TriggerInterpreter; +import com.devonfw.cobigen.xmlplugin.merger.delegates.MergeType; +import com.devonfw.cobigen.xmlplugin.merger.delegates.XmlMergerDelegate; import com.google.common.collect.Lists; /** diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlTriggerInterpreter.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java similarity index 68% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlTriggerInterpreter.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java index e79ca6954f..b838ba82f2 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/XmlTriggerInterpreter.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java @@ -1,10 +1,10 @@ -package com.capgemini.cobigen.xmlplugin; +package com.devonfw.cobigen.xmlplugin; -import com.capgemini.cobigen.api.extension.InputReader; -import com.capgemini.cobigen.api.extension.MatcherInterpreter; -import com.capgemini.cobigen.api.extension.TriggerInterpreter; -import com.capgemini.cobigen.xmlplugin.inputreader.XmlInputReader; -import com.capgemini.cobigen.xmlplugin.matcher.XmlMatcher; +import com.devonfw.cobigen.api.extension.InputReader; +import com.devonfw.cobigen.api.extension.MatcherInterpreter; +import com.devonfw.cobigen.api.extension.TriggerInterpreter; +import com.devonfw.cobigen.xmlplugin.inputreader.XmlInputReader; +import com.devonfw.cobigen.xmlplugin.matcher.XmlMatcher; /** * {@link TriggerInterpreter} implementation of a Xml Interpreter diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/ModelConstant.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java similarity index 97% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/ModelConstant.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java index b2cceb28ab..07d5fc9ba4 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/ModelConstant.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.inputreader; +package com.devonfw.cobigen.xmlplugin.inputreader; import java.util.List; import java.util.Map; diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/XmlInputReader.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/XmlInputReader.java similarity index 98% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/XmlInputReader.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/XmlInputReader.java index 6c564425d6..0bf7e36cac 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/inputreader/XmlInputReader.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/XmlInputReader.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.inputreader; +package com.devonfw.cobigen.xmlplugin.inputreader; import java.io.IOException; import java.io.InputStream; @@ -25,8 +25,8 @@ import org.w3c.dom.traversal.TreeWalker; import org.xml.sax.SAXException; -import com.capgemini.cobigen.api.exception.InputReaderException; -import com.capgemini.cobigen.api.extension.InputReader; +import com.devonfw.cobigen.api.exception.InputReaderException; +import com.devonfw.cobigen.api.extension.InputReader; /** {@link InputReader} for XML files. */ public class XmlInputReader implements InputReader { diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/NamespaceResolver.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/NamespaceResolver.java similarity index 95% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/NamespaceResolver.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/NamespaceResolver.java index f86c959a63..9b108d59c2 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/NamespaceResolver.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/NamespaceResolver.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.matcher; +package com.devonfw.cobigen.xmlplugin.matcher; import java.util.Iterator; diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/XmlMatcher.java similarity index 95% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/XmlMatcher.java index 06eee2bd4a..b987906989 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/matcher/XmlMatcher.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.matcher; +package com.devonfw.cobigen.xmlplugin.matcher; import java.util.HashMap; import java.util.List; @@ -15,12 +15,12 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.capgemini.cobigen.api.exception.CobiGenRuntimeException; -import com.capgemini.cobigen.api.exception.InvalidConfigurationException; -import com.capgemini.cobigen.api.extension.MatcherInterpreter; -import com.capgemini.cobigen.api.to.MatcherTo; -import com.capgemini.cobigen.api.to.VariableAssignmentTo; -import com.capgemini.cobigen.xmlplugin.inputreader.XmlInputReader; +import com.devonfw.cobigen.api.exception.CobiGenRuntimeException; +import com.devonfw.cobigen.api.exception.InvalidConfigurationException; +import com.devonfw.cobigen.api.extension.MatcherInterpreter; +import com.devonfw.cobigen.api.to.MatcherTo; +import com.devonfw.cobigen.api.to.VariableAssignmentTo; +import com.devonfw.cobigen.xmlplugin.inputreader.XmlInputReader; /** {@link MatcherInterpreter} for XML matcher configurations. */ public class XmlMatcher implements MatcherInterpreter { diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/MergeType.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java similarity index 96% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/MergeType.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java index faefe5f733..73dbb62f1d 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/MergeType.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.merger.delegates; +package com.devonfw.cobigen.xmlplugin.merger.delegates; import com.github.maybeec.lexeme.ConflictHandlingType; diff --git a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java similarity index 92% rename from cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java rename to cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java index 544bb5d2f1..6c636866a9 100644 --- a/cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java +++ b/cobigen/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java @@ -1,10 +1,10 @@ -package com.capgemini.cobigen.xmlplugin.merger.delegates; +package com.devonfw.cobigen.xmlplugin.merger.delegates; import java.io.File; import java.nio.file.Path; -import com.capgemini.cobigen.api.exception.MergeException; -import com.capgemini.cobigen.api.extension.Merger; +import com.devonfw.cobigen.api.exception.MergeException; +import com.devonfw.cobigen.api.extension.Merger; import com.github.maybeec.lexeme.LeXeMerger; import com.github.maybeec.lexeme.common.exception.XMLMergeException; diff --git a/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator b/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator deleted file mode 100644 index a841aac037..0000000000 --- a/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator +++ /dev/null @@ -1 +0,0 @@ -com.capgemini.cobigen.xmlplugin.XmlPluginActivator \ No newline at end of file diff --git a/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator b/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator new file mode 100644 index 0000000000..f593281ec0 --- /dev/null +++ b/cobigen/cobigen-xmlplugin/src/main/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator @@ -0,0 +1 @@ +com.devonfw.cobigen.xmlplugin.XmlPluginActivator \ No newline at end of file diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java index 27ca706564..0551a9f84a 100644 --- a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java +++ b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin; +package com.devonfw.cobigen.xmlplugin; import java.io.File; import java.util.Arrays; @@ -10,9 +10,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.capgemini.cobigen.api.constants.BackupPolicy; -import com.capgemini.cobigen.impl.config.upgrade.ContextConfigurationUpgrader; -import com.capgemini.cobigen.impl.config.upgrade.TemplateConfigurationUpgrader; +import com.devonfw.cobigen.api.constants.BackupPolicy; +import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader; +import com.devonfw.cobigen.impl.config.upgrade.TemplateConfigurationUpgrader; import com.google.common.collect.Lists; /** diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java index 452472b881..6fd11d1016 100644 --- a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java +++ b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java @@ -1,6 +1,6 @@ -package com.capgemini.cobigen.xmlplugin.integrationtest; +package com.devonfw.cobigen.xmlplugin.integrationtest; -import static com.capgemini.cobigen.test.assertj.CobiGenAsserts.assertThat; +import static com.devonfw.cobigen.test.assertj.CobiGenAsserts.assertThat; import static org.assertj.core.api.Assertions.assertThat; import java.io.File; @@ -12,10 +12,10 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.capgemini.cobigen.api.CobiGen; -import com.capgemini.cobigen.api.to.GenerationReportTo; -import com.capgemini.cobigen.api.to.TemplateTo; -import com.capgemini.cobigen.impl.CobiGenFactory; +import com.devonfw.cobigen.api.CobiGen; +import com.devonfw.cobigen.api.to.GenerationReportTo; +import com.devonfw.cobigen.api.to.TemplateTo; +import com.devonfw.cobigen.impl.CobiGenFactory; /** * Test suite for integrating XPath typed matchers and variable assignments diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java index 7353bd446c..0112b99dad 100644 --- a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java +++ b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java @@ -1,6 +1,6 @@ -package com.capgemini.cobigen.xmlplugin.integrationtest; +package com.devonfw.cobigen.xmlplugin.integrationtest; -import static com.capgemini.cobigen.test.assertj.CobiGenAsserts.assertThat; +import static com.devonfw.cobigen.test.assertj.CobiGenAsserts.assertThat; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; @@ -24,12 +24,12 @@ import org.junit.rules.TemporaryFolder; import org.w3c.dom.Document; -import com.capgemini.cobigen.api.CobiGen; -import com.capgemini.cobigen.api.exception.InvalidConfigurationException; -import com.capgemini.cobigen.api.exception.MergeException; -import com.capgemini.cobigen.api.to.GenerationReportTo; -import com.capgemini.cobigen.api.to.TemplateTo; -import com.capgemini.cobigen.impl.CobiGenFactory; +import com.devonfw.cobigen.api.CobiGen; +import com.devonfw.cobigen.api.exception.InvalidConfigurationException; +import com.devonfw.cobigen.api.exception.MergeException; +import com.devonfw.cobigen.api.to.GenerationReportTo; +import com.devonfw.cobigen.api.to.TemplateTo; +import com.devonfw.cobigen.impl.CobiGenFactory; import junit.framework.AssertionFailedError; diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java index dc719a7bee..92e261771a 100644 --- a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java +++ b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.integrationtest.merger; +package com.devonfw.cobigen.xmlplugin.integrationtest.merger; import static org.junit.Assert.assertEquals; @@ -19,9 +19,9 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; -import com.capgemini.cobigen.api.extension.Merger; -import com.capgemini.cobigen.xmlplugin.merger.delegates.MergeType; -import com.capgemini.cobigen.xmlplugin.merger.delegates.XmlMergerDelegate; +import com.devonfw.cobigen.api.extension.Merger; +import com.devonfw.cobigen.xmlplugin.merger.delegates.MergeType; +import com.devonfw.cobigen.xmlplugin.merger.delegates.XmlMergerDelegate; /** * Tests if the used XML patchPreferingMerger behaves as desired. diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java index ae5818b0ab..d61289f95b 100644 --- a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java +++ b/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java @@ -1,4 +1,4 @@ -package com.capgemini.cobigen.xmlplugin.unittest.inputreader; +package com.devonfw.cobigen.xmlplugin.unittest.inputreader; import static org.assertj.core.api.Assertions.assertThat; @@ -19,8 +19,8 @@ import org.w3c.dom.Node; import org.xml.sax.SAXException; -import com.capgemini.cobigen.xmlplugin.inputreader.ModelConstant; -import com.capgemini.cobigen.xmlplugin.inputreader.XmlInputReader; +import com.devonfw.cobigen.xmlplugin.inputreader.ModelConstant; +import com.devonfw.cobigen.xmlplugin.inputreader.XmlInputReader; /** * Unit tests for {@link XmlInputReader} diff --git a/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/BaseFile_queries.xml b/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/BaseFile_queries.xml index d0d5c11a12..d3d0237883 100644 --- a/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/BaseFile_queries.xml +++ b/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/BaseFile_queries.xml @@ -19,7 +19,7 @@ - + diff --git a/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/PatchFile_queries.xml b/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/PatchFile_queries.xml index ebad9286c0..4f47e16b03 100644 --- a/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/PatchFile_queries.xml +++ b/cobigen/cobigen-xmlplugin/src/test/resources/testdata/unittest/merger/PatchFile_queries.xml @@ -19,7 +19,7 @@ - + From 324d620b59db7517c0c479eff765487cc368b402 Mon Sep 17 00:00:00 2001 From: erikgruener Date: Fri, 25 May 2018 16:04:01 +0200 Subject: [PATCH 2/4] forgot eclipse refractoring --- .../cobigen/xmlplugin/UpgradeTestdataConfigurations.java | 0 .../cobigen/xmlplugin/integrationtest/XPathGenerationTest.java | 0 .../xmlplugin/integrationtest/XmlPluginIntegrationTest.java | 0 .../integrationtest/merger/XmlPluginMergerIntegrationTest.java | 0 .../xmlplugin/unittest/inputreader/XmlInputReaderTest.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename cobigen/cobigen-xmlplugin/src/test/java/com/{capgemini => devonfw}/cobigen/xmlplugin/UpgradeTestdataConfigurations.java (100%) rename cobigen/cobigen-xmlplugin/src/test/java/com/{capgemini => devonfw}/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java (100%) rename cobigen/cobigen-xmlplugin/src/test/java/com/{capgemini => devonfw}/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java (100%) rename cobigen/cobigen-xmlplugin/src/test/java/com/{capgemini => devonfw}/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java (100%) rename cobigen/cobigen-xmlplugin/src/test/java/com/{capgemini => devonfw}/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java (100%) diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java b/cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/UpgradeTestdataConfigurations.java similarity index 100% rename from cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/UpgradeTestdataConfigurations.java rename to cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/UpgradeTestdataConfigurations.java diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java similarity index 100% rename from cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java rename to cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java similarity index 100% rename from cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java rename to cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java similarity index 100% rename from cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java rename to cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java diff --git a/cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java b/cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java similarity index 100% rename from cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java rename to cobigen/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/unittest/inputreader/XmlInputReaderTest.java From 3de804bc2b2f8ced2f695e45b7407614a50726db Mon Sep 17 00:00:00 2001 From: erikgruener Date: Fri, 25 May 2018 16:14:30 +0200 Subject: [PATCH 3/4] pom correction --- cobigen/cobigen-xmlplugin/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cobigen/cobigen-xmlplugin/pom.xml b/cobigen/cobigen-xmlplugin/pom.xml index 641d087ce3..f33b123e9d 100644 --- a/cobigen/cobigen-xmlplugin/pom.xml +++ b/cobigen/cobigen-xmlplugin/pom.xml @@ -8,7 +8,7 @@ jar - com.devonfw + com.devonfw.cobigen parent dev-SNAPSHOT @@ -20,12 +20,12 @@ - com.devonfw + com.devonfw.cobigen core-api 4.2.0-SNAPSHOT - com.devonfw + com.devonfw.cobigen core-test 4.2.0-SNAPSHOT test @@ -33,14 +33,14 @@ - com.devonfw + com.devonfw.cobigen core 4.2.0-SNAPSHOT test - com.devonfw + com.devonfw.cobigen tempeng-freemarker 1.0.0 test From 8c7e7bd53cc509025d9a8ab5cb336d5e7cfa5477 Mon Sep 17 00:00:00 2001 From: jdiazgon Date: Mon, 28 May 2018 18:23:43 +0200 Subject: [PATCH 4/4] #603 xmlplugin to Maven refactor core version --- cobigen/cobigen-xmlplugin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cobigen/cobigen-xmlplugin/pom.xml b/cobigen/cobigen-xmlplugin/pom.xml index f33b123e9d..3d7ebc2cfa 100644 --- a/cobigen/cobigen-xmlplugin/pom.xml +++ b/cobigen/cobigen-xmlplugin/pom.xml @@ -22,12 +22,12 @@ com.devonfw.cobigen core-api - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT com.devonfw.cobigen core-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT test @@ -35,7 +35,7 @@ com.devonfw.cobigen core - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT test