Refactoring generator/schema2template project

tdf · Nov 28, 2022 · c173363 · c173363
1 parent 9b6affc
commit c173363
Show file tree

Hide file tree

Showing 674 changed files with 2,224 additions and 4,035 deletions.
diff --git a/.gitignore b/.gitignore
@@ -201,4 +201,3 @@ buildNumber.properties
 /xslt-runner/nbproject/private/
 /xslt-runner-task/nbproject/private/
 /xslt-runner/nbproject/
-/generator/schema2template/nbproject/
diff --git a/.project b/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659282302444</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/docs/generator/WorkInProgress-RelaxNGPatterns.html b/docs/generator/WorkInProgress-RelaxNGPatterns.html
diff --git a/...tation/WorkInProgress-RelaxNGPatterns.odt → ...erator/WorkInProgress-RelaxNGPatterns.odt b/...tation/WorkInProgress-RelaxNGPatterns.odt → ...erator/WorkInProgress-RelaxNGPatterns.odt
diff --git a/generator/.project b/generator/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659282302476</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/generator/schema2template-maven-plugin/.project b/generator/schema2template-maven-plugin/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659282302468</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/generator/schema2template-maven-plugin/.settings/org.eclipse.core.resources.prefs b/generator/schema2template-maven-plugin/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/generator/schema2template-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs b/generator/schema2template-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
-org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
+org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
+org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations
diff --git a/generator/schema2template-maven-plugin/pom.xml b/generator/schema2template-maven-plugin/pom.xml
@@ -34,6 +34,7 @@
     <version>0.11.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
     <properties>
+        <maven.version>3.8.6</maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -45,48 +46,57 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- dependencies to annotations
         https://maven.apache.org/plugin-tools/maven-plugin-plugin/examples/using-annotations.html#POM_configuration -->
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.6.4</version>
             <optional>true</optional> <!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin -->
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-tools</artifactId>
+            <version>3.6.4</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>
             <scope>test</scope>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <scope>provided</scope>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/generator/schema2template/.project b/generator/schema2template/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659282302459</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/generator/schema2template/.settings/org.eclipse.core.resources.prefs b/generator/schema2template/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/generator/schema2template/.settings/org.eclipse.jdt.apt.core.prefs b/generator/schema2template/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.aptEnabled=false
 org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
 org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
diff --git a/generator/schema2template/.settings/org.eclipse.jdt.core.prefs b/generator/schema2template/.settings/org.eclipse.jdt.core.prefs
@@ -4,6 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=11
diff --git a/generator/schema2template/pom.xml b/generator/schema2template/pom.xml
@@ -25,6 +25,7 @@
         <groupId>org.odftoolkit</groupId>
         <artifactId>schema2template-pom</artifactId>
         <version>0.11.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <!-- The Basics -->
@@ -35,6 +36,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -75,6 +77,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-webdav-jackrabbit</artifactId>
+                <version>1.0</version>
             </extension>
         </extensions>
         <plugins>
@@ -106,10 +109,14 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <!-- Explizit version required for fix on systemPropertyVariables -->
+                <version>2.22.2</version>
                 <configuration>
+                    <forkCount>0</forkCount>
                     <systemPropertyVariables>
                         <odfdom.version>${project.version}</odfdom.version>
                         <odfdom.timestamp>${build.timestamp}</odfdom.timestamp>
+                        <schema2template.build.dir>${project.build.directory}</schema2template.build.dir>
                     </systemPropertyVariables>
                     <excludes>
                         <exclude>**/integrationtest/**</exclude>
@@ -130,7 +137,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <!-- Workaround: Build the project using the same JDK version as the project is targetting.
+                    <!-- Workaround: Build the project using the same JDK version as the project is targeting.
                         see https://issues.apache.org/jira/browse/MJAVADOC-562
                         see https://bugs.openjdk.java.net/browse/JDK-8212233
                     -->

diff --git a/generator/schema2template/src/main/java/schema2template/example/odf/PathPrinter.java b/generator/schema2template/src/main/java/schema2template/example/odf/PathPrinter.java
@@ -43,7 +43,6 @@
 import schema2template.model.MSVExpressionVisitorType;
 import schema2template.model.MSVNameClassVisitorList;
 import schema2template.model.PuzzlePiece;
-import schema2template.model.PuzzlePieceSet;
 
 /**
  * ODF example class to print the MSV expressions in between a PuzzlePiece parent element and a
@@ -144,7 +143,7 @@ public static List<String> printChildPaths(List<List<Expression>> paths) {
     return retval;
   }
 
-  private static Grammar parseOdfSchema(File rngFile) throws Exception {
+  private static Grammar parseOdfGrammar(File rngFile) throws Exception {
     SAXParserFactory factory = SAXParserFactory.newInstance();
     factory.setNamespaceAware(true);
 
@@ -158,30 +157,26 @@ private static Grammar parseOdfSchema(File rngFile) throws Exception {
     return grammar;
   }
 
+  /* @Svante 2DO: Create a test example instead
   public static void main(String[] args) throws Exception {
-    // originally:
-    // schema2template\src\main\resources\examples\odf\odf-schemas\OpenDocument-v1.2-os-schema.rng
-    //
-    // schema2template\src\main\resources\examples\odf\odf-schemas\OpenDocument-v1.2-os-schema.rng
-    // better via classpath: generator\schema2template\target\classes\examples\odf\odf-schemas
     System.out.println(
         "ODF 1.2 RNG file is located at '"
             + System.getProperty(
                 "user.dir") // E:\GitHub\odf\odftoolkit-latest-0.11.0\generator\schema2template\
             + File.separator
             + "src\\main\\resources"
             + File.separator
-            + SchemaToTemplate
+            + OdfGrammarToTemplate
                 .ODF12_RNG_FILE // examples\odf\odf-schemas\OpenDocument-v1.2-os-schema.rng'
             + "'");
     Grammar grammar =
-        parseOdfSchema(
+        parseOdfGrammar(
             new File(
                 System.getProperty("user.dir")
                     + File.separator
                     + "src\\main\\resources"
                     + File.separator
-                    + SchemaToTemplate.ODF12_RNG_FILE));
+                    + OdfGrammarToTemplate.ODF12_RNG_FILE));
     PuzzlePieceSet elements = new PuzzlePieceSet();
     PuzzlePieceSet attributes = new PuzzlePieceSet();
     PuzzlePiece.extractPuzzlePieces(grammar, elements, attributes, null);
@@ -223,5 +218,5 @@ public static void main(String[] args) throws Exception {
         System.out.println(s);
       }
     }
-  }
+  }*/
 }