#506 Merge branch 'dev_xmlplugin'

# Conflicts: # pom.xml
devonfw · Jun 7, 2018 · be81015 · be81015
2 parents 754a9a0 + edc1082
commit be81015
Show file tree

Hide file tree

Showing 33 changed files with 2,052 additions and 543 deletions.
diff --git a/cobigen-documentation/tools-cobigen.wiki b/cobigen-documentation/tools-cobigen.wiki
diff --git a/cobigen/cobigen-xmlplugin/pom.xml b/cobigen/cobigen-xmlplugin/pom.xml
@@ -2,54 +2,53 @@
 <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.1.0</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <description>CobiGen - XML Plug-In</description>
 
   <parent>
-    <groupId>com.capgemini</groupId>
-    <artifactId>cobigen-parent</artifactId>
+    <groupId>com.devonfw.cobigen</groupId>
+    <artifactId>parent</artifactId>
     <version>dev-SNAPSHOT</version>
   </parent>
 
   <properties>
     <skip.deployment>false</skip.deployment>
+    <java.version>1.8</java.version>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core-api</artifactId>
-      <version>4.1.0</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-api</artifactId>
+      <version>5.0.0</version>
     </dependency>
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core-test</artifactId>
-      <version>4.0.0</version>
-      <scope>test</scope>
+      <artifactId>lexeme</artifactId>
+      <groupId>com.github.maybeec</groupId>
+      <version>1.0.0</version>
     </dependency>
-
-    <!-- Just for systemtests to allow usage of CobiGen -->
+
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-core</artifactId>
-      <version>4.1.0</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-test</artifactId>
+      <version>5.0.0</version>
       <scope>test</scope>
     </dependency>
-
+    <!-- Just for systemtests to allow usage of CobiGen -->
     <dependency>
-      <groupId>com.capgemini</groupId>
-      <artifactId>cobigen-tempeng-freemarker</artifactId>
-      <version>1.0.0</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core</artifactId>
+      <version>5.0.0</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <artifactId>lexeme</artifactId>
-      <groupId>com.github.maybeec</groupId>
-      <version>1.0.0</version>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>tempeng-freemarker</artifactId>
+      <version>2.0.0</version>
+      <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>
diff --git a/...n/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java b/...n/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java
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;
@@ -70,4 +70,10 @@ public class ModelConstant {
      */
     public static final String CHILDREN = "Children";
 
+    /** Model key constant "doc" */
+    static final String ROOT_DOC = "doc";
+
+    /** Model key constant for "elemDoc" representing the partial document in a container */
+    public static final String ROOT_ELEMDOC = "elemDoc";
+
 }