13 changed files with 485 additions and 150 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,2 @@
 msv-20050722.tar.gz
 /msv-2009.1.tar.gz
-/msv-2013.2.3.tar.gz
-/msv-parent-2009.1.pom
-/LICENSE-2.0.txt
-/msv-2013.5.1-clean.tar.gz
-/msv-2013.6.1-clean.tar.gz
-/msv-2022.7.tar.gz
--- a/0001-Disable-Apache-XercesImpl.patch
+++ b/0001-Disable-Apache-XercesImpl.patch
@ -1,24 +0,0 @@
-From a580f124197fcc2a62875e43100cd35b1fc4329e Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Thu, 17 Aug 2023 09:30:08 +0200
-Subject: [PATCH] Disable Apache XercesImpl
-
---
- .../main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java  | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
-index 4a4c4be..cdeab93 100644
--- a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
-+++ b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
-@@ -42,7 +42,6 @@ public abstract class RegExpFactory {
-     public static RegExpFactory createFactory() {
-         String[] classList = new String[] {
-             "com.sun.msv.datatype.regexp.InternalImpl",
-            "com.sun.msv.datatype.xsd.regex.XercesImpl",
-             "com.sun.msv.datatype.xsd.regex.JDKImpl"
-         };
- 
-- 
-2.41.0
-
--- a/12
+++ b/12
@ -1,12 +0,0 @@
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
- Package unretired
- Update to upstream version 2022.7
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,8 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_testing
-  - bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@ -1,29 +0,0 @@
-#!/bin/bash
-set -e
-
-name=msv
-version="$(sed -n 's/Version:\s*//p' ./*.spec)"
-
-# RETRIEVE
-wget "https://github.com/xmlark/msv/archive/${name}-${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-pushd tarball-tmp
-tar -xf "../${name}-${version}.orig.tar.gz"
-mv "msv-msv-${version}" "${name}-${version}"
-
-pushd "${name}-${version}"
-mv docs/xsdlib/Apache-LICENSE-1.1.txt .
-mv docs/xsdlib/license.txt .
-mv docs/xsdlib/README.md README-xsdlib.md
-
-# CLEAN TARBALL
-find . -mindepth 1 -maxdepth 1 -type d ! -name 'xsdlib' -exec rm -rf {} +
-rm -rf xsdlib/src/test
-
-popd
-
-tar -czf "../${name}-${version}.tar.gz" ./*
-popd
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
--- a/msv-disable-crimson.patch
+++ b/msv-disable-crimson.patch
@ -0,0 +1,44 @@
+--- relames/pom.xml.orig	2009-03-14 16:03:30.000000000 +0000
+++ relames/pom.xml	2010-09-18 13:55:25.927247417 +0100
+@@ -3,12 +3,12 @@
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>net.java.dev.msv</groupId>
+   <artifactId>msv-relames</artifactId>
+-  <version>2009.1-SNAPSHOT</version>
+  <version>2009.1</version>
+   <name>MSV Schematron Plugin</name>
+   <parent>
+     <groupId>net.java.dev.msv</groupId>
+     <artifactId>msv-parent</artifactId>
+-    <version>2009.1-SNAPSHOT</version>
+    <version>2009.1</version>
+     <relativePath>../parent/pom.xml</relativePath>
+   </parent>
+ 
+@@ -88,10 +88,6 @@
+       <artifactId>isorelax</artifactId>
+     </dependency>
+     <dependency>
+-      <groupId>crimson</groupId>
+-      <artifactId>crimson</artifactId>
+-    </dependency>
+-    <dependency>
+       <groupId>relaxngDatatype</groupId>
+       <artifactId>relaxngDatatype</artifactId>
+     </dependency>
+--- relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java.orig	2010-09-18 14:01:07.461250681 +0100
+++ relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java	2010-09-18 14:01:18.194245268 +0100
+@@ -88,13 +88,6 @@
+                     } catch( Throwable t ) {
+                         // ignore any error. it wasn't Xerces.
+                     }
+-                    try {
+-                        // Crimson?
+-                        ((org.apache.crimson.tree.ElementNode2)super.parent)
+-                            .setIdAttributeName(atts.getQName(i));
+-                    } catch( Throwable t ) {
+-                        // ignore any error. it wasn't Crimson.
+-                    }
+                 }
+             }
+ 		}
--- a/msv-disable-maven-wagon-svn.patch
+++ b/msv-disable-maven-wagon-svn.patch
@ -0,0 +1,24 @@
+--- pom.xml.orig	2009-06-10 19:33:50.000000000 +0100
+++ pom.xml	2010-09-18 13:16:55.901247026 +0100
+@@ -62,6 +62,7 @@
+         <module>msv</module>
+         <module>generator</module>
+         <module>rngconverter</module>
+        <module>relames</module>
+     </modules>
+ 
+     <profiles>
+@@ -188,13 +189,6 @@
+                 </plugin>
+             </plugins>
+         </pluginManagement>
+-        <extensions>
+-            <extension>
+-                <groupId>org.jvnet.wagon-svn</groupId>
+-                <artifactId>wagon-svn</artifactId>
+-                <version>1.8</version>
+-            </extension>
+-        </extensions>
+     </build>
+     <reporting>
+         <plugins>
--- a/msv-link-local-javadoc.patch
+++ b/msv-link-local-javadoc.patch
@ -0,0 +1,14 @@
+--- pom.xml.orig2	2010-09-19 17:34:07.530248002 +0100
+++ pom.xml	2010-09-19 17:41:12.377247570 +0100
+@@ -139,6 +139,11 @@
+                         <bottom>MSV</bottom>
+                         <javadocVersion>1.5</javadocVersion>
+                         <encoding>UTF-8</encoding>
+                        <links>
+                          <link>/usr/share/javadoc/java/</link>
+                          <link>/usr/share/javadoc/isorelax/</link>
+                          <link>/usr/share/javadoc/relaxngDatatype/</link>
+                        </links>
+                     </configuration>
+                 </plugin>
+                 <plugin>
--- a/msv.spec
+++ b/msv.spec
@ -1,81 +1,422 @@
-Name:           msv
-Version:        2022.7
-Release:        %autorelease
-Summary:        Multi-Schema Validator Toolkit
-# License breakdown
-# Apache-1.1
-# * xsdlib/src/main/java/com/sun/msv/datatype/regexp - All files except for InternalImpl.java
-# BSD-3-Clause-Sun
-# * pom.xml
-# * xsdlib/src/main/java/com/sun/msv/datatype/regexp/InternalImpl.java
-# BSD-3-Clause-Sun implied by docs/xsdlib/license.txt of the original tarball
-# * xsdlib/src/main/java/com/sun/msv/datatype/xsd/CommandLineTester.java
-# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages.properties
-# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages_ja.properties
-# BSD-3-Clause - All other .java files
-License:        Apache-1.1 AND BSD-3-Clause AND BSD-3-Clause-Sun
-URL:            https://xmlark.github.io/msv/
-BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
+Name:          msv
+Epoch:         1
+Version:       2009.1
+Release:       4%{?dist}
+Summary:       Multi-Schema Validator
+Group:         Development/Libraries
+License:       BSD
+URL:           https://msv.dev.java.net/

-# ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
-Source1:        generate-tarball.sh
+# To generate tarball from upstream source control:
+# $ svn export https://msv.dev.java.net/svn/msv/tags/msv-2009.1/ --username guest
+# $ tar zcf msv-2009.1.tar.gz msv-2009.1
+Source0:       %{name}-%{version}.tar.gz

-Patch:          0001-Disable-Apache-XercesImpl.patch
+# The "maven-wagon-svn" plug-in is not in Fedora
+Patch0:        %{name}-disable-maven-wagon-svn.patch

-BuildRequires:  maven-local-openjdk25
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
-BuildRequires:  mvn(org.jdom:jdom2)
-BuildRequires:  mvn(relaxngDatatype:relaxngDatatype)
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 2022.7-15
+# There is a build time dependency on crimson which needs to be stripped
+# (We're using xerces-j2 instead)
+Patch1:        %{name}-disable-crimson.patch
+
+# Link to locally installed javadocs
+Patch2:        %{name}-link-local-javadoc.patch
+
+BuildRequires: java-devel
+BuildRequires: java-javadoc
+BuildRequires: jpackage-utils
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-plugin-build-helper
+BuildRequires: isorelax
+BuildRequires: isorelax-javadoc
+BuildRequires: relaxngDatatype
+BuildRequires: relaxngDatatype-javadoc
+BuildRequires: xalan-j2
+BuildRequires: xerces-j2
+BuildRequires: xml-commons-apis
+BuildRequires: xml-commons-resolver >= 0:1.2-4
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 %description
-The Multi Schema Validation toolkit is a Java based toolkit consisting of 8
-different submodules. The core module is the Multi-Schema XML Validator (MSV)
-for the validation of XML documents against several kinds of XML schemata The
-core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a
-subset of XML Schema Part 1.
+The Sun Multi-Schema XML Validator (MSV) is a Java technology tool to validate
+XML documents against several kinds of XML schemata. It supports RELAX NG,
+RELAX Namespace, RELAX Core, TREX, XML DTDs, and a subset of XML Schema Part 1.
+This latest (version 1.2) release includes several bug fixes and adds better
+conformance to RELAX NG/W3C XML standards and JAXP masquerading.

-%package xsdlib
-Summary:        Java implementation of W3C’s XML Schema Part 2
+%package       msv
+Summary:       Multi-Schema Validator Core
+Group:         Development/Libraries
+Requires:      jpackage-utils
+Requires:      java
+Requires:      isorelax
+Requires:      relaxngDatatype
+Requires:      xerces-j2
+Requires:      xml-commons-apis
+Requires:      xml-commons-resolver >= 0:1.2-4
+Requires:      msv-xsdlib

-%description xsdlib
-MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is
-intended for use with applications that incorporate XML Schema Part 2.
+%description   msv
+%{summary}.
+
+%package       relames
+Summary:       Multi-Schema Validator Schematron Plugin
+Group:         Development/Libraries
+Requires:      jpackage-utils
+Requires:      java
+Requires:      isorelax
+Requires:      relaxngDatatype
+Requires:      xalan-j2
+Requires:      xerces-j2
+Requires:      xml-commons-apis
+Requires:      xml-commons-resolver >= 0:1.2-4
+Requires:      msv-msv
+Requires:      msv-xsdlib
+
+%description   relames
+%{summary}.
+
+%package       rngconv
+Summary:       Multi-Schema Validator RNG Converter
+Group:         Development/Libraries
+Requires:      jpackage-utils
+Requires:      java
+Requires:      isorelax
+Requires:      relaxngDatatype
+Requires:      xerces-j2
+Requires:      xml-commons-apis
+Requires:      xml-commons-resolver >= 0:1.2-4
+Requires:      msv-msv
+Requires:      msv-xsdlib
+
+%description   rngconv
+%{summary}.
+
+%package       xmlgen
+Summary:       Multi-Schema Validator Generator
+Group:         Development/Libraries
+Requires:      jpackage-utils
+Requires:      java
+Requires:      isorelax
+Requires:      relaxngDatatype
+Requires:      xerces-j2
+Requires:      xml-commons-apis
+Requires:      xml-commons-resolver >= 0:1.2-4
+Requires:      msv-msv
+Requires:      msv-xsdlib
+
+%description    xmlgen
+%{summary}.
+
+%package       xsdlib
+Summary:       Multi-Schema Validator XML Schema Library
+Group:         Development/Libraries
+Requires:      jpackage-utils
+Requires:      java
+Requires:      isorelax
+Requires:      relaxngDatatype
+Requires:      xerces-j2
+
+# Can remove these obsoletes at Fedora 17 time
+Obsoletes:     xsdlib < %{version}-%{release}
+
+%description   xsdlib
+%{summary}.
+
+%package       javadoc
+Summary:       API documentation for Multi-Schema Validator
+Group:         Documentation
+Requires:      java-javadoc
+Requires:      jpackage-utils
+Requires:      isorelax-javadoc
+Requires:      relaxngDatatype-javadoc
+
+# Can remove these obsoletes at Fedora 17 time
+Obsoletes:     msv-msv-javadoc < %{version}-%{release}
+Obsoletes:     msv-relames-javadoc < %{version}-%{release}
+Obsoletes:     msv-xmlgen-javadoc < %{version}-%{release}
+Obsoletes:     msv-xsdlib-javadoc < %{version}-%{release}
+Obsoletes:     xsdlib-javadoc < %{version}-%{release}
+
+%description   javadoc
+%{summary}.
+
+%package       manual
+Summary:       Manual for Multi-Schema Validator
+Group:         Documentation
+
+%description   manual
+%{summary}.
+
+%package       demo
+Summary:       Samples for Multi-Schema Validator
+Group:         Documentation
+Requires:      msv-msv
+Requires:      msv-xsdlib
+Requires:      jpackage-utils
+
+%description   demo
+%{summary}.

 %prep
-%autosetup -p1 -C
+%setup -q

-# Disable runtime dependency on Apache Xerces
-rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
+# Delete anything pre-compiled
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+find -name '*.zip' -exec rm -f '{}' \;

-%pom_xpath_remove 'pom:project/pom:modules'
-%pom_xpath_inject 'pom:project' '<modules><module>xsdlib</module></modules>'
+# Delete class-path entries from manifests
+for m in $(find . -name MANIFEST.MF) ; do
+  sed --in-place -e '/^[Cc]lass-[Pp]ath:/d' $m
+done

-%pom_xpath_remove 'pom:build/pom:extensions'
+# Apply patches
+%patch0 -p0 -b .orig
+%patch1 -p0 -b .orig
+%patch2 -p0 -b .orig2

-%pom_remove_dep org.apache.maven.scm:maven-scm-provider-gitexe
-%pom_remove_dep xerces:xercesImpl xsdlib
-
-%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
-%pom_remove_plugin -r :maven-javadoc-plugin
-
-# We only build xsdlib
-%mvn_package net.java.dev.msv:msv __noinstall
+# Change encoding of non utf-8 files
+for m in $(find . -name copyright.txt) ; do
+  iconv -f iso-8859-1 -t utf-8 < $m > $m.utf8
+  mv $m.utf8 $m
+done

 %build
-%mvn_build -j -s
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  install javadoc:aggregate

 %install
-%mvn_install
+rm -rf %{buildroot}

-%files xsdlib -f .mfiles-xsdlib
-%doc README.md README-xsdlib.md
-%license Apache-LICENSE-1.1.txt license.txt
+# Jars
+install -pD -T msv/target/%{name}-core-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}-core-%{version}.jar
+install -pD -T relames/target/%{name}-relames-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}-relames-%{version}.jar
+install -pD -T rngconverter/target/%{name}-rngconverter-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}-rngconverter-%{version}.jar
+install -pD -T generator/target/%{name}-generator-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}-generator-%{version}.jar
+install -pD -T xsdlib/target/xsdlib-%{version}.jar \
+  %{buildroot}%{_javadir}/xsdlib-%{version}.jar
+
+# Alternate jar names
+ln -s %{name}-core-%{version}.jar         \
+  %{buildroot}%{_javadir}/%{name}-msv-%{version}.jar
+ln -s %{name}-rngconverter-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}-rngconv-%{version}.jar
+ln -s %{name}-generator-%{version}.jar    \
+  %{buildroot}%{_javadir}/%{name}-xmlgen-%{version}.jar
+ln -s xsdlib-%{version}.jar               \
+  %{buildroot}%{_javadir}/%{name}-xsdlib-%{version}.jar
+
+# Versionless jar names
+(cd %{buildroot}%{_javadir} &&
+for jar in *-%{version}.jar ; do
+  ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+done)
+
+# Poms
+install -pD -T -m 644 pom.xml              %{buildroot}%{_mavenpomdir}/JPP-msv.pom
+install -pD -T -m 644 parent/pom.xml       %{buildroot}%{_mavenpomdir}/JPP-msv-parent.pom
+install -pD -T -m 644 msv/pom.xml          %{buildroot}%{_mavenpomdir}/JPP-msv-core.pom
+install -pD -T -m 644 relames/pom.xml      %{buildroot}%{_mavenpomdir}/JPP-msv-relames.pom
+install -pD -T -m 644 rngconverter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-rngconverter.pom
+install -pD -T -m 644 generator/pom.xml    %{buildroot}%{_mavenpomdir}/JPP-msv-generator.pom
+install -pD -T -m 644 xsdlib/pom.xml       %{buildroot}%{_mavenpomdir}/JPP-xsdlib.pom
+%add_to_maven_depmap net.java.dev.msv msv              %{version} JPP msv
+%add_to_maven_depmap net.java.dev.msv msv-parent       %{version} JPP msv-parent
+%add_to_maven_depmap net.java.dev.msv msv-core         %{version} JPP msv-core
+%add_to_maven_depmap net.java.dev.msv msv-relames      %{version} JPP msv-relames
+%add_to_maven_depmap net.java.dev.msv msv-rngconverter %{version} JPP msv-rngconverter
+%add_to_maven_depmap net.java.dev.msv msv-generator    %{version} JPP msv-generator
+%add_to_maven_depmap net.java.dev.msv xsdlib           %{version} JPP xsdlib
+
+# Javadocs
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+
+# Manuals
+install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/msv
+install -m 644 msv/doc/*.html     %{buildroot}%{_docdir}/%{name}-%{version}/msv
+install -m 644 msv/doc/*.gif      %{buildroot}%{_docdir}/%{name}-%{version}/msv
+install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/msv
+
+install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/relames
+install -m 644 relames/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/relames
+
+install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter
+install -m 644 rngconverter/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter
+
+install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/generator
+install -m 644 generator/doc/*.html     %{buildroot}%{_docdir}/%{name}-%{version}/generator
+install -m 644 generator/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/generator
+
+install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib
+install -m 644 xsdlib/doc/*.html     %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib
+install -m 644 xsdlib/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib
+
+# Examples
+install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/msv
+cp -pr msv/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/msv
+install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
+cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
+
+%clean
+rm -rf %{buildroot}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files msv
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-core.pom
+%{_javadir}/%{name}-core-%{version}.jar
+%{_javadir}/%{name}-core.jar
+%{_javadir}/%{name}-msv-%{version}.jar
+%{_javadir}/%{name}-msv.jar
+%doc msv/doc/license.txt
+
+%files relames
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-relames.pom
+%{_javadir}/%{name}-relames-%{version}.jar
+%{_javadir}/%{name}-relames.jar
+%doc relames/doc/copyright.txt
+
+%files rngconv
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-rngconverter.pom
+%{_javadir}/%{name}-rngconverter-%{version}.jar
+%{_javadir}/%{name}-rngconverter.jar
+%{_javadir}/%{name}-rngconv-%{version}.jar
+%{_javadir}/%{name}-rngconv.jar
+%doc rngconverter/doc/license.txt
+%doc rngconverter/doc/copyright.txt
+
+%files xmlgen
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-generator.pom
+%{_javadir}/%{name}-generator-%{version}.jar
+%{_javadir}/%{name}-generator.jar
+%{_javadir}/%{name}-xmlgen-%{version}.jar
+%{_javadir}/%{name}-xmlgen.jar
+%doc generator/doc/license.txt
+%doc generator/doc/copyright.txt
+
+%files xsdlib
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-xsdlib.pom
+%{_javadir}/xsdlib-%{version}.jar
+%{_javadir}/xsdlib.jar
+%{_javadir}/%{name}-xsdlib-%{version}.jar
+%{_javadir}/%{name}-xsdlib.jar
+%doc xsdlib/doc/license.txt
+%doc xsdlib/doc/copyright.txt
+
+# This subpackage wins the parent poms and the depmap because all the other
+# subpackages require this one
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}-parent.pom
+%{_mavendepmapfragdir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+
+%files manual
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}
+
+%files demo
+%defattr(-,root,root,-)
+%{_datadir}/%{name}-%{version}

 %changelog
-%autochangelog
+* Fri Sep 24 2010 Mat Booth <fedora@matbooth.co.uk> - 1:2009.1-4
+- Really require a version of xml-commons-resolver that provides the necessary
+  maven pom and depmap.
+
+* Sun Sep 19 2010 Mat Booth <fedora@matbooth.co.uk> - 1:2009.1-3
+- Require a version of xml-commons-resolver that provides the necessary maven
+  pom and depmap.
+
+* Sun Sep 19 2010 Mat Booth <fedora@matbooth.co.uk> - 1:2009.1-2
+- Re-patch build to link to local javadocs.
+- Install maven poms/depmap.
+
+* Thu Sep 16 2010 Mat Booth <fedora@matbooth.co.uk> - 1:2009.1-1
+- Update to latest tagged release.
+- Drop support for GCJ ahead of time compilation.
+- Fix RHBZ #627688, RHBZ #631076
+- This project now builds with maven instead of ant.
+- The new build in this release aggregates javadocs, so now we have one javadoc
+  package that obsoletes the many javadoc packages we had before.
+- Use new jar names that upstream use, provide the old names.
+- Misc other changes for guideline compliance.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2-0.4.20050722.3.4.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 08 2009 Karsten Hopp <karsten@redhat.com> 1.2-0.3.20050722.3.4.1
+- Specify source and target as 1.4 to make it build
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2-0.3.20050722.3.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:1.2-0.2.20050722.3.4
+- drop repotag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:1.2-0.2.20050722.3jpp.3
+- Autorebuild for GCC 4.3
+
+* Wed Sep 12 2007 Matt Wringe <mwringe@redhat.com> 0:1,2-0.1.20050722.3jpp.3
+- Make package build with new gcj. Remove .class files from demo package and
+  remove demo exclude from aot-compile-rpm 
+
+* Tue Sep 11 2007 Matt Wringe <mwringe@redhat.com> 0:1.2-0.1.20050722.3jpp.2
+- Fix unowned directories
+- Change copyright files to utf-8 format
+- Change license field to BSD (from BSD-Style)
+
+* Fri Feb 16 2007 Andrew Overholt <overholt@redhat.com> 0:1.2-0.1.20050722.3jpp.1
+- Remove postun Requires on jpackage-utils
+- Set gcj_support to 1
+- Fix groups to shut up rpmlint
+- Add versions to the Provides and Obsoletes
+- Add patch to take out Class-Path in MANIFEST.MF
+
+* Thu Feb 15 2007 Matt Wringe <mwringe at redhat.com> - 0:1.2-0.1.20050722.3jpp.1.fc7
+- Extract sources from a fresh CVS export of the given tag and add extra source
+  required to build the package not present in the 20050722 tag anymore
+- Add a patch to remove compile time dependency on crimson
+- Add a patch to enable compression of jar files
+- Add jpackage-utils as a requires for the packages/subpackages
+
+* Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-0.20050722.3jpp
+- Add bootstrap option to build without saxon nor jdom
+- Add gcj_support option
+
+* Mon Feb 17 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.2-0.20050722.2jpp
+- First JPP 1.7 build
+
+* Wed Aug 17 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.2-0.20050722.1jpp
+- First JPP from this code base
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
-execute:
-  how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (msv-2022.7.tar.gz) = 1fb7600af4a589bb68687b17fd7da3bd370362e06450d81509eb343f87a85366d3843f2b42f566560637428fdc8dc4abbd2eb5bc81444ab58ebf48c16d4d353e
+95f8ef46fe810aaa6860d916aeff3cac  msv-2009.1.tar.gz