From a71c7e60db5a7d989b159416db7106309a9bf3c1 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 2 Jul 2024 15:33:42 +0200
Subject: [PATCH] [LIC|LOC] Fix `basedOn` attributes and include
 Extension-Point schemata

Fixes https://github.com/eclipse-passage/passage/issues/1397
---
 bundles/org.eclipse.passage.lic.base/build.properties           | 1 +
 bundles/org.eclipse.passage.lic.base/schema/library.exsd        | 2 +-
 bundles/org.eclipse.passage.lic.jetty/build.properties          | 1 +
 bundles/org.eclipse.passage.lic.jetty/schema/commands.exsd      | 2 +-
 bundles/org.eclipse.passage.loc.licenses.core/build.properties  | 1 +
 bundles/org.eclipse.passage.loc.licenses.core/schema/issue.exsd | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.passage.lic.base/build.properties b/bundles/org.eclipse.passage.lic.base/build.properties
index 0adde03a7..a6430d3c8 100644
--- a/bundles/org.eclipse.passage.lic.base/build.properties
+++ b/bundles/org.eclipse.passage.lic.base/build.properties
@@ -18,3 +18,4 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                about.html,\
                plugin.xml
+src.includes = schema/
diff --git a/bundles/org.eclipse.passage.lic.base/schema/library.exsd b/bundles/org.eclipse.passage.lic.base/schema/library.exsd
index 33228a7a6..037d519dc 100644
--- a/bundles/org.eclipse.passage.lic.base/schema/library.exsd
+++ b/bundles/org.eclipse.passage.lic.base/schema/library.exsd
@@ -67,7 +67,7 @@
                   
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.lic.internal.base.access.Library"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.lic.base.access.Library"/>
                </appinfo>
             </annotation>
          </attribute>
diff --git a/bundles/org.eclipse.passage.lic.jetty/build.properties b/bundles/org.eclipse.passage.lic.jetty/build.properties
index b701d1614..09e1f9607 100644
--- a/bundles/org.eclipse.passage.lic.jetty/build.properties
+++ b/bundles/org.eclipse.passage.lic.jetty/build.properties
@@ -22,3 +22,4 @@ bin.includes = META-INF/,\
                about.properties,\
                passage32.png,\
                plugin.xml
+src.includes = schema/
diff --git a/bundles/org.eclipse.passage.lic.jetty/schema/commands.exsd b/bundles/org.eclipse.passage.lic.jetty/schema/commands.exsd
index d705afbc2..e37a0b405 100644
--- a/bundles/org.eclipse.passage.lic.jetty/schema/commands.exsd
+++ b/bundles/org.eclipse.passage.lic.jetty/schema/commands.exsd
@@ -67,7 +67,7 @@
                   
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.lic.internal.jetty.interaction.JettyCommand"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.lic.internal.jetty.interaction.JettyCommands"/>
                </appinfo>
             </annotation>
          </attribute>
diff --git a/bundles/org.eclipse.passage.loc.licenses.core/build.properties b/bundles/org.eclipse.passage.loc.licenses.core/build.properties
index 43e500472..96a8704a4 100644
--- a/bundles/org.eclipse.passage.loc.licenses.core/build.properties
+++ b/bundles/org.eclipse.passage.loc.licenses.core/build.properties
@@ -18,3 +18,4 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                about.html,\
                plugin.xml
+src.includes = schema/
diff --git a/bundles/org.eclipse.passage.loc.licenses.core/schema/issue.exsd b/bundles/org.eclipse.passage.loc.licenses.core/schema/issue.exsd
index e2a93662a..328b5b738 100644
--- a/bundles/org.eclipse.passage.loc.licenses.core/schema/issue.exsd
+++ b/bundles/org.eclipse.passage.loc.licenses.core/schema/issue.exsd
@@ -67,7 +67,7 @@
                   
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.loc.internal.licenses.core.LicensePackPersistenceListener"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.passage.loc.internal.licenses.core.LicensePackIssueListener"/>
                </appinfo>
             </annotation>
          </attribute>