From 0c949e7af5a668830e662a2d53f6abd71cbd4f9d Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Wed, 6 Mar 2024 22:43:19 +0100
Subject: [PATCH] XSD problem 1

---
 KB.md                                         |  5 ++-
 sly-crm-service/pom.xml                       | 40 ++++++++++---------
 .../src/main/resources/NAV/catalog.xml        | 19 +++++++++
 .../main/resources/NAV/schemas/catalog.xml    | 19 ---------
 4 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 sly-crm-service/src/main/resources/NAV/catalog.xml
 delete mode 100644 sly-crm-service/src/main/resources/NAV/schemas/catalog.xml

diff --git a/KB.md b/KB.md
index 03b0fe7..65006bb 100644
--- a/KB.md
+++ b/KB.md
@@ -126,4 +126,7 @@ org.webjars
 
 ##### DEBUG
 
--Djavax.net.debug=ssl:handshake
\ No newline at end of file
+-Djavax.net.debug=ssl:handshake
+
+xjc -p hu.user.lis.service.nav.data schemas\serviceMetrics.xsd -catalog catalog.xml -d C:
+\work\user\sly-crm\sly-crm-service\src\main\java
\ No newline at end of file
diff --git a/sly-crm-service/pom.xml b/sly-crm-service/pom.xml
index 6f84d53..0feb93c 100644
--- a/sly-crm-service/pom.xml
+++ b/sly-crm-service/pom.xml
@@ -10,25 +10,27 @@
     </parent>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>xjc</id>
-                        <goals>
-                            <goal>xjc</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <catalog>src/main/resources/NAV/schemas/catalog.xml</catalog>
-                    <sources>
-                        <source>src/main/resources/NAV/schemas/</source>
-                    </sources>
-                </configuration>
-            </plugin>
+            <!--            <plugin>-->
+            <!--                <groupId>org.codehaus.mojo</groupId>-->
+            <!--                <artifactId>jaxb2-maven-plugin</artifactId>-->
+            <!--                <version>3.1.0</version>-->
+            <!--                <executions>-->
+            <!--                    <execution>-->
+            <!--                        <id>xjc</id>-->
+            <!--                        <goals>-->
+            <!--                            <goal>xjc</goal>-->
+            <!--                        </goals>-->
+            <!--                    </execution>-->
+            <!--                </executions>-->
+            <!--                <configuration>-->
+            <!--                    <catalog>src/main/resources/NAV/catalog.xml</catalog>-->
+            <!--                    <sources>-->
+            <!--                        <source>src/main/resources/NAV/schemas/</source>-->
+            <!--                    </sources>-->
+            <!--                    <clearOutputDir>false</clearOutputDir>-->
+            <!--                    <verbose>true</verbose>-->
+            <!--                </configuration>-->
+            <!--            </plugin>-->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
diff --git a/sly-crm-service/src/main/resources/NAV/catalog.xml b/sly-crm-service/src/main/resources/NAV/catalog.xml
new file mode 100644
index 0000000..e0614b1
--- /dev/null
+++ b/sly-crm-service/src/main/resources/NAV/catalog.xml
@@ -0,0 +1,19 @@
+<!DOCTYPE catalog
+        PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+    <!--    <system-->
+    <!--            systemId="http://schemas.nav.gov.hu/NTCA/1.0/common/common.xsd"-->
+    <!--            uri="common.xsd"/>-->
+    <public
+            publicId="http://schemas.nav.gov.hu/NTCA/1.0/common"
+            uri="schemas/common.xsd"/>
+    <!--    <system-->
+    <!--            systemId="http://schemas.nav.gov.hu/OSA/3.0/base/invoiceBase.xsd"-->
+    <!--            uri="schemas/invoiceBase.xsd"/>-->
+    <public
+            publicId="http://schemas.nav.gov.hu/OSA/3.0/base"
+            uri="schemas/invoiceBase.xsd"/>
+
+</catalog>
diff --git a/sly-crm-service/src/main/resources/NAV/schemas/catalog.xml b/sly-crm-service/src/main/resources/NAV/schemas/catalog.xml
deleted file mode 100644
index 3886fa4..0000000
--- a/sly-crm-service/src/main/resources/NAV/schemas/catalog.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<catalog xmlns='urn:oasis:names:tc:entity:xmlns:xml:catalog' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='urn:oasis:names:tc:entity:xmlns:xml:catalog Catalog.xsd' prefer="public">
-<!--reference as name & filepath-->
-	<uri name="http://schemas.nav.gov.hu/NTCA/1.0/common" uri="./files/NTCA/Common/common.xsd"/>
-	<uri name="http://schemas.nav.gov.hu/OSA/3.0/base" uri="./files/OSA/Invoice/invoiceBase.xsd"/>
-<!--reference as name & URI-->
-	<!--<uri name="http://schemas.nav.gov.hu/NTCA/1.0/common" uri="https://raw.githubusercontent.com/nav-gov-hu/Common/Common-1.0.RC3/src/schemas/nav/gov/hu/NTCA/common.xsd"/>-->
-</catalog>
-
-
-<!--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">-->
-
-<!--reference as publicId & filepath-->
-	<!--<public publicId="http://schemas.nav.gov.hu/NTCA/1.0/common" uri="./files/NTCA/Common/common.xsd"/>-->
-	<!--<public publicId="http://schemas.nav.gov.hu/OSA/3.0/base" uri="./files/OSA/Invoice/invoiceBase.xsd"/>-->
-<!--reference as publicId & URI-->
-	<!--<public publicId="http://schemas.nav.gov.hu/NTCA/1.0/common" uri="https://raw.githubusercontent.com/nav-gov-hu/Common/Common-1.0.RC3/src/schemas/nav/gov/hu/NTCA/common.xsd"/>-->
-<!--</catalog>-->
\ No newline at end of file
-- 
2.54.0