From 3fdb757635ac855b7cd43bceadf2874570d9df49fdcfc186dc4be6d5ce33cf1d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:08:23 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=27 --- xalan-j2-MANIFEST.MF | 75 +++++++++++++++++++++++++++++++++ xalan-j2-serializer-MANIFEST.MF | 10 +++++ xalan-j2.changes | 6 +++ xalan-j2.spec | 18 +++++++- xsltc-2.7.2.pom | 13 ++++++ 5 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 xalan-j2-MANIFEST.MF create mode 100644 xalan-j2-serializer-MANIFEST.MF create mode 100644 xsltc-2.7.2.pom diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF new file mode 100644 index 0000000..471b1d8 --- /dev/null +++ b/xalan-j2-MANIFEST.MF @@ -0,0 +1,75 @@ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.8.2 +Created-By: 1.7.0_b147-icedtea (Oracle Corporation) +Main-Class: org.apache.xalan.xslt.Process +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.apache.xalan +Bundle-Version: 2.7.1 +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.apache.regexp;version="2.7.1", + org.apache.xalan;version="2.7.1", + org.apache.xalan.client;version="2.7.1", + org.apache.xalan.extensions;version="2.7.1", + org.apache.xalan.lib;version="2.7.1", + org.apache.xalan.lib.sql;version="2.7.1", + org.apache.xalan.processor;version="2.7.1", + org.apache.xalan.res;version="2.7.1", + org.apache.xalan.serialize;version="2.7.1", + org.apache.xalan.templates;version="2.7.1", + org.apache.xalan.trace;version="2.7.1", + org.apache.xalan.transformer;version="2.7.1", + org.apache.xalan.xslt;version="2.7.1", + org.apache.xalan.xsltc;version="2.7.1", + org.apache.xalan.xsltc.cmdline;version="2.7.1", + org.apache.xalan.xsltc.cmdline.getopt;version="2.7.1", + org.apache.xalan.xsltc.compiler;version="2.7.1", + org.apache.xalan.xsltc.compiler.util;version="2.7.1", + org.apache.xalan.xsltc.dom;version="2.7.1", + org.apache.xalan.xsltc.runtime;version="2.7.1", + org.apache.xalan.xsltc.runtime.output;version="2.7.1", + org.apache.xalan.xsltc.trax;version="2.7.1", + org.apache.xalan.xsltc.util;version="2.7.1", + org.apache.xml.dtm;version="2.7.1", + org.apache.xml.dtm.ref;version="2.7.1", + org.apache.xml.dtm.ref.dom2dtm;version="2.7.1", + org.apache.xml.dtm.ref.sax2dtm;version="2.7.1", + org.apache.xml.res;version="2.7.1", + org.apache.xml.utils;version="2.7.1", + org.apache.xml.utils.res;version="2.7.1", + org.apache.xpath;version="2.7.1", + org.apache.xpath.axes;version="2.7.1", + org.apache.xpath.compiler;version="2.7.1", + org.apache.xpath.domapi;version="2.7.1", + org.apache.xpath.functions;version="2.7.1", + org.apache.xpath.jaxp;version="2.7.1", + org.apache.xpath.objects;version="2.7.1", + org.apache.xpath.operations;version="2.7.1", + org.apache.xpath.patterns;version="2.7.1", + org.apache.xpath.res;version="2.7.1" +Require-Bundle: system.bundle, org.apache.xerces +Eclipse-BuddyPolicy: registered + +Name: org/apache/xalan/ +Comment: Main Xalan engine implementing TrAX/JAXP +Specification-Title: Java API for XML Processing +Specification-Vendor: Sun Microsystems Inc. +Specification-Version: 1.3 +Implementation-Title: org.apache.xalan +Implementation-Version: 2.7.1 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +Name: org/apache/xml/ +Comment: DTM implementation and utilities +Implementation-Title: org.apache.xml +Implementation-Version: 2.7.1 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +Name: org/apache/xpath/ +Comment: XPath engine +Implementation-Title: org.apache.xpath +Implementation-Version: 2.7.1 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ diff --git a/xalan-j2-serializer-MANIFEST.MF b/xalan-j2-serializer-MANIFEST.MF new file mode 100644 index 0000000..2905a55 --- /dev/null +++ b/xalan-j2-serializer-MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.2 +Bundle-SymbolicName: org.apache.xml.serializer +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin +Bundle-Version: 2.7.1.v200806030322 +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.apache.xml.serializer,org.apache.xml.serializer.do + m3 diff --git a/xalan-j2.changes b/xalan-j2.changes index 05629fe..1129361 100644 --- a/xalan-j2.changes +++ b/xalan-j2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 18 21:00:55 UTC 2018 - Fridrich Strba + +- Add maven pom file for xsltc and OSGi manifests for serializer + and xalan-j2 + ------------------------------------------------------------------- Wed Nov 7 13:13:56 UTC 2018 - Fridrich Strba diff --git a/xalan-j2.spec b/xalan-j2.spec index 29f74a8..7e3c200 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -27,6 +27,10 @@ Url: http://xalan.apache.org/index.html Source0: http://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz Source1: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom Source2: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom +Source3: xsltc-%{version}.pom +# OSGi manifests +Source4: %{name}-serializer-MANIFEST.MF +Source5: %{name}-MANIFEST.MF Patch0: %{name}-noxsltcdeps.patch Patch1: %{name}-manifest.patch Patch2: %{name}-crosslink.patch @@ -140,6 +144,10 @@ ant \ samples \ servlet +# inject OSGi manifests +jar ufm build/serializer.jar %{SOURCE4} +jar ufm build/xalan-interpretive.jar %{SOURCE5} + %install # jars install -d -m 755 %{buildroot}%{_javadir} @@ -156,6 +164,8 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-serializer-%{version}.pom %add_maven_depmap %{name}-serializer-%{version}.pom %{name}-serializer-%{version}.jar +install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/xsltc-%{version}.pom +%add_maven_depmap xsltc-%{version}.pom xsltc-%{version}.jar -f xsltc # demo install -d -m 755 %{buildroot}%{_datadir}/%{name} @@ -194,7 +204,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ %config %{_sysconfdir}/ant.d/serializer %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{_javadir}/jaxp_transform_impl.jar -%{_mavenpomdir}/* +%{_mavenpomdir}/%{name}* %if %{defined _maven_repository} %{_mavendepmapfragdir}/%{name} %else @@ -205,6 +215,12 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ %defattr(0644,root,root,0755) %{_javadir}/xsltc-%{version}.jar %{_javadir}/xsltc.jar +%{_mavenpomdir}/xsltc* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name}-xsltc +%else +%{_datadir}/maven-metadata/%{name}-xsltc.xml* +%endif %files manual %defattr(0644,root,root,0755) diff --git a/xsltc-2.7.2.pom b/xsltc-2.7.2.pom new file mode 100644 index 0000000..03d2149 --- /dev/null +++ b/xsltc-2.7.2.pom @@ -0,0 +1,13 @@ + + 4.0.0 + xalan + xsltc + 2.7.2 + + + xalan + xalan + 2.7.2 + + + From ecf7b38a04c90d61058e2058eabf57480ab070ec9314b155cfc65cba74ec58a5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:11:40 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=28 --- xalan-j2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index 7e3c200..00f92e3 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -145,8 +145,8 @@ ant \ servlet # inject OSGi manifests -jar ufm build/serializer.jar %{SOURCE4} -jar ufm build/xalan-interpretive.jar %{SOURCE5} +# jar ufm build/serializer.jar %{SOURCE4} +# jar ufm build/xalan-interpretive.jar %{SOURCE5} %install # jars From a9ec5354f8526ae0caa773b7b9b8d0fc8c734d69067c2b64fdd8b995ad470702 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:21:36 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=29 --- xalan-j2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index 00f92e3..7e3c200 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -145,8 +145,8 @@ ant \ servlet # inject OSGi manifests -# jar ufm build/serializer.jar %{SOURCE4} -# jar ufm build/xalan-interpretive.jar %{SOURCE5} +jar ufm build/serializer.jar %{SOURCE4} +jar ufm build/xalan-interpretive.jar %{SOURCE5} %install # jars From d7f2c91e141e958533153ac84a9241d4b6a6777146cadfe94a1c6f4b95ab3d5e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:28:13 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=30 --- xalan-j2.changes | 3 +-- xalan-j2.spec | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/xalan-j2.changes b/xalan-j2.changes index 1129361..1398c1d 100644 --- a/xalan-j2.changes +++ b/xalan-j2.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Sun Nov 18 21:00:55 UTC 2018 - Fridrich Strba -- Add maven pom file for xsltc and OSGi manifests for serializer - and xalan-j2 +- Add maven pom file for xsltc ------------------------------------------------------------------- Wed Nov 7 13:13:56 UTC 2018 - Fridrich Strba diff --git a/xalan-j2.spec b/xalan-j2.spec index 7e3c200..74ffe82 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -29,8 +29,6 @@ Source1: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{ver Source2: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom Source3: xsltc-%{version}.pom # OSGi manifests -Source4: %{name}-serializer-MANIFEST.MF -Source5: %{name}-MANIFEST.MF Patch0: %{name}-noxsltcdeps.patch Patch1: %{name}-manifest.patch Patch2: %{name}-crosslink.patch @@ -144,10 +142,6 @@ ant \ samples \ servlet -# inject OSGi manifests -jar ufm build/serializer.jar %{SOURCE4} -jar ufm build/xalan-interpretive.jar %{SOURCE5} - %install # jars install -d -m 755 %{buildroot}%{_javadir} From 59d7cfc9516b9173e1eab858d23293e9babff4291b17411ff67f0b5f97fdb747 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:28:31 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=31 --- xalan-j2-MANIFEST.MF | 75 --------------------------------- xalan-j2-serializer-MANIFEST.MF | 10 ----- 2 files changed, 85 deletions(-) delete mode 100644 xalan-j2-MANIFEST.MF delete mode 100644 xalan-j2-serializer-MANIFEST.MF diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF deleted file mode 100644 index 471b1d8..0000000 --- a/xalan-j2-MANIFEST.MF +++ /dev/null @@ -1,75 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.8.2 -Created-By: 1.7.0_b147-icedtea (Oracle Corporation) -Main-Class: org.apache.xalan.xslt.Process -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.apache.xalan -Bundle-Version: 2.7.1 -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.apache.regexp;version="2.7.1", - org.apache.xalan;version="2.7.1", - org.apache.xalan.client;version="2.7.1", - org.apache.xalan.extensions;version="2.7.1", - org.apache.xalan.lib;version="2.7.1", - org.apache.xalan.lib.sql;version="2.7.1", - org.apache.xalan.processor;version="2.7.1", - org.apache.xalan.res;version="2.7.1", - org.apache.xalan.serialize;version="2.7.1", - org.apache.xalan.templates;version="2.7.1", - org.apache.xalan.trace;version="2.7.1", - org.apache.xalan.transformer;version="2.7.1", - org.apache.xalan.xslt;version="2.7.1", - org.apache.xalan.xsltc;version="2.7.1", - org.apache.xalan.xsltc.cmdline;version="2.7.1", - org.apache.xalan.xsltc.cmdline.getopt;version="2.7.1", - org.apache.xalan.xsltc.compiler;version="2.7.1", - org.apache.xalan.xsltc.compiler.util;version="2.7.1", - org.apache.xalan.xsltc.dom;version="2.7.1", - org.apache.xalan.xsltc.runtime;version="2.7.1", - org.apache.xalan.xsltc.runtime.output;version="2.7.1", - org.apache.xalan.xsltc.trax;version="2.7.1", - org.apache.xalan.xsltc.util;version="2.7.1", - org.apache.xml.dtm;version="2.7.1", - org.apache.xml.dtm.ref;version="2.7.1", - org.apache.xml.dtm.ref.dom2dtm;version="2.7.1", - org.apache.xml.dtm.ref.sax2dtm;version="2.7.1", - org.apache.xml.res;version="2.7.1", - org.apache.xml.utils;version="2.7.1", - org.apache.xml.utils.res;version="2.7.1", - org.apache.xpath;version="2.7.1", - org.apache.xpath.axes;version="2.7.1", - org.apache.xpath.compiler;version="2.7.1", - org.apache.xpath.domapi;version="2.7.1", - org.apache.xpath.functions;version="2.7.1", - org.apache.xpath.jaxp;version="2.7.1", - org.apache.xpath.objects;version="2.7.1", - org.apache.xpath.operations;version="2.7.1", - org.apache.xpath.patterns;version="2.7.1", - org.apache.xpath.res;version="2.7.1" -Require-Bundle: system.bundle, org.apache.xerces -Eclipse-BuddyPolicy: registered - -Name: org/apache/xalan/ -Comment: Main Xalan engine implementing TrAX/JAXP -Specification-Title: Java API for XML Processing -Specification-Vendor: Sun Microsystems Inc. -Specification-Version: 1.3 -Implementation-Title: org.apache.xalan -Implementation-Version: 2.7.1 -Implementation-Vendor: Apache Software Foundation -Implementation-URL: http://xml.apache.org/xalan-j/dist/ - -Name: org/apache/xml/ -Comment: DTM implementation and utilities -Implementation-Title: org.apache.xml -Implementation-Version: 2.7.1 -Implementation-Vendor: Apache Software Foundation -Implementation-URL: http://xml.apache.org/xalan-j/dist/ - -Name: org/apache/xpath/ -Comment: XPath engine -Implementation-Title: org.apache.xpath -Implementation-Version: 2.7.1 -Implementation-Vendor: Apache Software Foundation -Implementation-URL: http://xml.apache.org/xalan-j/dist/ diff --git a/xalan-j2-serializer-MANIFEST.MF b/xalan-j2-serializer-MANIFEST.MF deleted file mode 100644 index 2905a55..0000000 --- a/xalan-j2-serializer-MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-RequiredExecutionEnvironment: J2SE-1.2 -Bundle-SymbolicName: org.apache.xml.serializer -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-Localization: plugin -Bundle-Version: 2.7.1.v200806030322 -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.apache.xml.serializer,org.apache.xml.serializer.do - m3