rpms/ws-jaxme/devel ws-jaxme-system-dtd.patch, NONE, 1.1 ws-jaxme-docs_xml.patch, NONE, 1.1 ws-jaxme-bind-MANIFEST.MF, NONE, 1.1 ws-jaxme-jdk16.patch, NONE, 1.1 ws-jaxme-catalog.patch, NONE, 1.1 ws-jaxme.spec, 1.2, 1.3 sources, 1.2, 1.3
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 22 17:55:06 UTC 2008
Author: akurtakov
Update of /cvs/pkgs/rpms/ws-jaxme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24039/devel
Modified Files:
ws-jaxme.spec sources
Added Files:
ws-jaxme-system-dtd.patch ws-jaxme-docs_xml.patch
ws-jaxme-bind-MANIFEST.MF ws-jaxme-jdk16.patch
ws-jaxme-catalog.patch
Log Message:
- Partial sync with jpackage to get build fixes.
- Add osgi manifest to jaxmeapi.jar.
ws-jaxme-system-dtd.patch:
--- NEW FILE ws-jaxme-system-dtd.patch ---
--- ws-jaxme/src/documentation/manual/jaxme2.xml.orig 2008-08-15 13:21:21.882649810 -0400
+++ ws-jaxme/src/documentation/manual/jaxme2.xml 2008-08-15 13:21:44.684648635 -0400
@@ -17,7 +17,7 @@
-->
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ "@DOCBOOKX_DTD@" [
<!ENTITY address SYSTEM "address.xml">
<!ENTITY addressxsd SYSTEM "addressxsd.xml">
<!ENTITY faq SYSTEM "faq.xml">
ws-jaxme-docs_xml.patch:
--- NEW FILE ws-jaxme-docs_xml.patch ---
--- ./ant/docs.xml.sav 2006-05-19 19:59:02.000000000 -0400
+++ ./ant/docs.xml 2006-05-19 19:59:07.000000000 -0400
@@ -69,7 +69,7 @@
<fail>Missing DocBook, terminating.</fail>
</target>
- <target name="Docs.all" depends="javadoc,docbook.html,old.releases,forrest,replace"
+ <target name="Docs.all" depends="javadoc,docbook.html,old.releases"
description="Generates the documentation"/>
<target name="javadoc" depends="all"
--- NEW FILE ws-jaxme-bind-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-SymbolicName: javax.xml.bind
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-Version: 2.0.0.v20080604-1500
Bundle-Vendor: %providerName
Export-Package: javax.xml.bind;version="2.0.0",javax.xml.bind.annotati
on;version="2.0.0",javax.xml.bind.annotation.adapters;version="2.0.0"
,javax.xml.bind.attachment;version="2.0.0",javax.xml.bind.helpers;ver
sion="2.0.0",javax.xml.bind.util;version="2.0.0"
ws-jaxme-jdk16.patch:
--- NEW FILE ws-jaxme-jdk16.patch ---
--- ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java.orig 2008-07-08 11:31:43.000000000 -0400
+++ ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java 2008-07-09 05:54:23.000000000 -0400
@@ -21,16 +21,22 @@
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.io.File;
import javax.xml.bind.JAXBException;
import javax.xml.bind.MarshalException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.PropertyException;
+import javax.xml.bind.attachment.AttachmentMarshaller;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamResult;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.validation.Schema;
import org.apache.ws.jaxme.*;
import org.apache.ws.jaxme.JMElement;
@@ -430,4 +436,55 @@
public Node getNode(java.lang.Object contentTree) throws JAXBException {
throw new UnsupportedOperationException("JaxMe doesn't support live DOM views");
}
+
+
+// added to support JDK6
+
+ public void marshal(Object jaxbElement, File output) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void marshal(Object jaxbElement, XMLStreamWriter writer) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void marshal(Object jaxbElement, XMLEventWriter writer) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAdapter(XmlAdapter adapter) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAdapter(Class type, XmlAdapter adapter) {
+ throw new UnsupportedOperationException();
+ }
+
+ public XmlAdapter getAdapter(Class type) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAttachmentMarshaller(AttachmentMarshaller am) {
+ throw new UnsupportedOperationException();
+ }
+
+ public AttachmentMarshaller getAttachmentMarshaller() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setSchema(Schema schema) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Schema getSchema() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setListener(Listener listener) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Listener getListener() {
+ throw new UnsupportedOperationException();
+ }
}
--- ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java.orig 2008-07-08 11:34:58.000000000 -0400
+++ ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java 2008-07-09 05:52:39.000000000 -0400
@@ -26,6 +26,10 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshalException;
import javax.xml.bind.UnmarshallerHandler;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.attachment.AttachmentUnmarshaller;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -33,6 +37,9 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.validation.Schema;
import org.apache.ws.jaxme.JMUnmarshaller;
import org.apache.ws.jaxme.util.DOMSerializer;
@@ -177,4 +184,71 @@
public UnmarshallerHandler getUnmarshallerHandler() {
return new JMUnmarshallerHandlerImpl(this);
}
+
+
+// added to support JDK6
+
+ public Object unmarshal(Reader reader) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public JAXBElement unmarshal(Node node, Class declaredType) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public JAXBElement unmarshal(Source source, Class declaredType) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object unmarshal(XMLStreamReader reader) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public JAXBElement unmarshal(XMLStreamReader reader, Class declaredType) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object unmarshal(XMLEventReader reader) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public JAXBElement unmarshal(XMLEventReader reader, Class declaredType) throws JAXBException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setSchema(Schema schema) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Schema getSchema() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAdapter(XmlAdapter adapter) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAdapter(Class type, XmlAdapter adapter) {
+ throw new UnsupportedOperationException();
+ }
+
+ public XmlAdapter getAdapter(Class type) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
+ throw new UnsupportedOperationException();
+ }
+
+ public AttachmentUnmarshaller getAttachmentUnmarshaller() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setListener(Listener listener) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Listener getListener() {
+ throw new UnsupportedOperationException();
+ }
}
ws-jaxme-catalog.patch:
--- NEW FILE ws-jaxme-catalog.patch ---
--- ./ant/docs.xml.sav 2006-05-19 20:00:29.000000000 -0400
+++ ./ant/docs.xml 2006-05-19 20:01:01.000000000 -0400
@@ -165,7 +165,9 @@
force="${force}"
style="${docbookxsl.home}/html/chunk.xsl">
<xmlcatalog>
- <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
+ <catalogpath>
+ <pathelement location="/usr/share/sgml/docbook/xmlcatalog"/>
+ </catalogpath>
</xmlcatalog>
</style>
</target>
@@ -180,10 +182,12 @@
force="${force}"
style="${docbookxsl.home}/html/chunk.xsl">
<xmlcatalog>
- <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
+ <catalogpath>
+ <pathelement location="/usr/share/sgml/docbook/xmlcatalog"/>
+ </catalogpath>
</xmlcatalog>
<factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
</style>
</target>
</project>
-
\ No newline at end of file
+
Index: ws-jaxme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-jaxme/devel/ws-jaxme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ws-jaxme.spec 10 Jul 2008 19:53:59 -0000 1.2
+++ ws-jaxme.spec 22 Oct 2008 17:54:35 -0000 1.3
@@ -32,7 +32,7 @@
Name: ws-jaxme
Version: 0.5.1
-Release: 2.2%{?dist}
+Release: 2.3%{?dist}
Epoch: 0
Summary: Open source implementation of JAXB
@@ -42,11 +42,14 @@
# svn export http://svn.apache.org/repos/asf/webservices/jaxme/tags/R0_5_1/ ws-jaxme-0.5.1
# tar czf ws-jaxme-0.5.1-src.tar.gz ws-jaxme
Source0: ws-jaxme-0.5.1-src.tar.gz
-Source1: ws-jaxme-0.5-docs.tar.gz
+Source1: ws-jaxme-bind-MANIFEST.MF
# generated docs with forrest-0.5.1
-Patch0: ws-jaxme-ant-scripts.patch
-Patch1: ws-jaxme-0.5.1-create_sql.patch
-Patch2: ws-jaxme-use-commons-codec.patch
+Patch0: ws-jaxme-docs_xml.patch
+Patch1: ws-jaxme-catalog.patch
+Patch2: ws-jaxme-system-dtd.patch
+Patch3: ws-jaxme-jdk16.patch
+Patch4: ws-jaxme-ant-scripts.patch
+Patch5: ws-jaxme-use-commons-codec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
@@ -63,6 +66,7 @@
BuildRequires: xmldb-api-sdk
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
+BuildRequires: xml-commons-resolver
Requires: antlr
Requires: jaxp_transform_impl
Requires: jakarta-commons-codec
@@ -108,34 +112,32 @@
%{summary}.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
-mkdir -p build/docs/build/site
-pushd build/docs/build/site
-tar xzf %{SOURCE1}
-popd
-
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%build
-build-jar-repository -s -p prerequisites \
-ant \
-antlr \
-commons-codec \
-junit \
-log4j \
-servletapi5 \
-xerces-j2 \
-xml-commons-apis \
-xmldb-api \
-xmldb-api-sdk \
-hsqldb \
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+DOCBOOKX_DTD=`%{_bindir}/xmlcatalog %{_datadir}/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.1.2//EN" 2>/dev/null`
+%{__perl} -pi -e 's|@DOCBOOKX_DTD@|$DOCBOOKX_DTD|' src/documentation/manual/jaxme2.xml
+%patch3 -p1
+%patch4 -b .sav
+%patch5 -b .sav
-ant all javadoc
+%build
+export OPT_JAR_LIST="xalan-j2 ant/ant-trax xalan-j2-serializer xml-commons-resolver ant/ant-apache-resolver"
+export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xmldb-api xerces-j2 xml-commons-jaxp-1.3-apis)
+ant all Docs.all \
+-Dbuild.sysclasspath=first \
+-Ddocbook.home=%{_datadir}/sgml/docbook \
+-Ddocbookxsl.home=%{_datadir}/sgml/docbook/xsl-stylesheets
+
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u dist/jaxmeapi-%{version}.jar META-INF/MANIFEST.MF
%install
rm -rf $RPM_BUILD_ROOT
@@ -160,11 +162,11 @@
cp -pr build/docs/src/documentation/content/apidocs \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-rm -rf build/docs/build/site/apidocs
+rm -rf build/docs/src/documentation/content/apidocs
#manual
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr build/docs/build/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr build/docs/src/documentation/content/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%clean
@@ -185,6 +187,10 @@
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Wed Oct 22 2008 Alexander Kurtakov <akurtako at redhat.com> - 0:0.5.1-2.3
+- Partial sync with jpackage to get build fixes.
+- Add osgi manifest to jaxmeapi.jar.
+
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:0.5.1-2.2
- drop repotag
- fix license tag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ws-jaxme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Mar 2007 16:44:40 -0000 1.2
+++ sources 22 Oct 2008 17:54:36 -0000 1.3
@@ -1,2 +1,2 @@
c22a1c7267520c7dfab916825a63218b ws-jaxme-0.5-docs.tar.gz
-23c15eb2fd576509822d74d8401cb575 ws-jaxme-0.5.1-src.tar.gz
+9709c7fb68880d494c3c347c3faa74c8 ws-jaxme-0.5.1-src.tar.gz
More information about the fedora-extras-commits
mailing list