Merge pull request #618 from jdiazgon/dev_xmlplugin

#603 dev_xmlplugin branch refactoring namespace for Maven
devonfw · May 28, 2018 · 46edefa · 46edefa
2 parents e80c138 + 8c7e7bd
commit 46edefa
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 70 deletions.
diff --git a/cobigen/cobigen-xmlplugin/pom.xml b/cobigen/cobigen-xmlplugin/pom.xml
@@ -2,14 +2,14 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>cobigen-xmlplugin</artifactId>
+  <artifactId>xmlplugin</artifactId>
   <name>CobiGen - XML Plug-In</name>
   <version>3.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
-    <groupId>com.capgemini</groupId>
-    <artifactId>cobigen-parent</artifactId>
+    <groupId>com.devonfw.cobigen</groupId>
+    <artifactId>parent</artifactId>
     <version>dev-SNAPSHOT</version>
   </parent>
 
@@ -20,28 +20,28 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core-api</artifactId>
-      <version>4.2.0-SNAPSHOT</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-api</artifactId>
+      <version>4.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core-test</artifactId>
-      <version>4.2.0-SNAPSHOT</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-test</artifactId>
+      <version>4.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <!-- Just for systemtests to allow usage of CobiGen -->
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core</artifactId>
-      <version>4.2.0-SNAPSHOT</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core</artifactId>
+      <version>4.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-tempeng-freemarker</artifactId>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>tempeng-freemarker</artifactId>
       <version>1.0.0</version>
       <scope>test</scope>
     </dependency>

diff --git a/...cobigen/xmlplugin/XmlPluginActivator.java → ...cobigen/xmlplugin/XmlPluginActivator.java b/...cobigen/xmlplugin/XmlPluginActivator.java → ...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/...igen/xmlplugin/XmlTriggerInterpreter.java → ...igen/xmlplugin/XmlTriggerInterpreter.java b/...igen/xmlplugin/XmlTriggerInterpreter.java → ...igen/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/.../xmlplugin/inputreader/ModelConstant.java → .../xmlplugin/inputreader/ModelConstant.java b/.../xmlplugin/inputreader/ModelConstant.java → .../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/...xmlplugin/inputreader/XmlInputReader.java → ...xmlplugin/inputreader/XmlInputReader.java b/...xmlplugin/inputreader/XmlInputReader.java → ...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/.../xmlplugin/matcher/NamespaceResolver.java → .../xmlplugin/matcher/NamespaceResolver.java b/.../xmlplugin/matcher/NamespaceResolver.java → .../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/xmlplugin/matcher/XmlMatcher.java → ...cobigen/xmlplugin/matcher/XmlMatcher.java b/...cobigen/xmlplugin/matcher/XmlMatcher.java → ...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/...xmlplugin/merger/delegates/MergeType.java → ...xmlplugin/merger/delegates/MergeType.java b/...xmlplugin/merger/delegates/MergeType.java → ...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/...n/merger/delegates/XmlMergerDelegate.java → ...n/merger/delegates/XmlMergerDelegate.java b/...n/merger/delegates/XmlMergerDelegate.java → ...n/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/.../resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator b/.../resources/META-INF/services/com.capgemini.cobigen.api.extension.GeneratorPluginActivator
diff --git a/...in/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator b/...in/resources/META-INF/services/com.devonfw.cobigen.api.extension.GeneratorPluginActivator
@@ -0,0 +1 @@
+com.devonfw.cobigen.xmlplugin.XmlPluginActivator
diff --git a/...plugin/UpgradeTestdataConfigurations.java → ...plugin/UpgradeTestdataConfigurations.java b/...plugin/UpgradeTestdataConfigurations.java → ...plugin/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/.../integrationtest/XPathGenerationTest.java → .../integrationtest/XPathGenerationTest.java b/.../integrationtest/XPathGenerationTest.java → .../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/...grationtest/XmlPluginIntegrationTest.java → ...grationtest/XmlPluginIntegrationTest.java b/...grationtest/XmlPluginIntegrationTest.java → ...grationtest/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/...erger/XmlPluginMergerIntegrationTest.java → ...erger/XmlPluginMergerIntegrationTest.java b/...erger/XmlPluginMergerIntegrationTest.java → ...erger/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/...ttest/inputreader/XmlInputReaderTest.java → ...ttest/inputreader/XmlInputReaderTest.java b/...ttest/inputreader/XmlInputReaderTest.java → ...ttest/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
@@ -19,7 +19,7 @@
     	<![CDATA[SELECT t FROM Table t]]>
 	</query>
 	<query name="get.free.tables">
-    	<![CDATA[SELECT t FROM Table t WHERE t.state IN (com.capgemini.gastronomy.restaurant.common.datatype.TableState.FREE) ]]>
+    	<![CDATA[SELECT t FROM Table t WHERE t.state IN (com.devonfw.gastronomy.restaurant.common.datatype.TableState.FREE) ]]>
 	</query>
 	<query name="get.all.meals">
       <![CDATA[SELECT m FROM Meal m]]>

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
@@ -19,7 +19,7 @@
     	<![CDATA[SELECT t FROM Table t]]>
 	</query>
 	<query name="get.free.tables">
-    	<![CDATA[SELECT t FROM Table t WHERE t.state IN (com.capgemini.gastronomy.restaurant.common.datatype.TableState.FREE) ]]>
+    	<![CDATA[SELECT t FROM Table t WHERE t.state IN (com.devonfw.gastronomy.restaurant.common.datatype.TableState.FREE) ]]>
 	</query>
 	<query name="get.all.meals">
       <![CDATA[SELECT m FROM Meal m]]>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		com.devonfw.cobigen.xmlplugin.XmlPluginActivator