#53: Merge branch 'dev_core'

Conflicts: cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableModelBuilder.java cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/util/ParserUtil.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/AbstractJavaParserTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReaderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilderTest.java cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterTest.java cobigen/cobigen-xmlplugin/pom.xml cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/BasicMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/CompleteMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/action/OverrideMergeAction.java cobigen/cobigen-xmlplugin/src/main/java/com/capgemini/cobigen/xmlplugin/matcher/XmlMatcher.java cobigen/cobigen-xmlplugin/src/test/java/com/capgemini/cobigen/xmlplugin/XmlMergerTest.java cobigen/pom.xml pom.xml
devonfw · Oct 31, 2014 · 308f4bb · 308f4bb
2 parents b4bb850 + 6d3cfab
commit 308f4bb
Show file tree

Hide file tree

Showing 185 changed files with 3,165 additions and 3,950 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /*.settings
 bin
-target
+target
+
+/cobigen-eclipse/.project
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "cobigen-documentation/oasp-docgen"]
+	path = cobigen-documentation/oasp-docgen
+	url = https://github.com/oasp/oasp-docgen
+[submodule "cobigen-documentation/tools-cobigen.wiki"]
+	path = cobigen-documentation/tools-cobigen.wiki
+	url = https://github.com/oasp/tools-cobigen.wiki.git
diff --git a/cobigen-documentation/oasp-docgen b/cobigen-documentation/oasp-docgen
diff --git a/cobigen-documentation/pom.xml b/cobigen-documentation/pom.xml
diff --git a/cobigen-documentation/src/main/ant/build.xml b/cobigen-documentation/src/main/ant/build.xml
diff --git a/cobigen-documentation/src/main/docbook/xsl/Readme.md b/cobigen-documentation/src/main/docbook/xsl/Readme.md
diff --git a/cobigen-documentation/src/main/docbook/xsl/common.xsl b/cobigen-documentation/src/main/docbook/xsl/common.xsl