rpms/ws-jaxme/devel ws-jaxme-0.5.1-create_sql.patch, NONE, 1.1 ws-jaxme-ant-scripts.patch, NONE, 1.1 ws-jaxme-use-commons-codec.patch, NONE, 1.1 ws-jaxme.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Nuno Santos (nsantos) fedora-extras-commits at redhat.com
Mon Mar 12 16:45:13 UTC 2007


Author: nsantos

Update of /cvs/extras/rpms/ws-jaxme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ws-jaxme-0.5.1-create_sql.patch ws-jaxme-ant-scripts.patch 
	ws-jaxme-use-commons-codec.patch ws-jaxme.spec 
Log Message:
auto-import ws-jaxme-0.5.1-2jpp.1.fc7 on branch devel from ws-jaxme-0.5.1-2jpp.1.fc7.src.rpm

ws-jaxme-0.5.1-create_sql.patch:

--- NEW FILE ws-jaxme-0.5.1-create_sql.patch ---
--- src/js/org/apache/ws/jaxme/js/junit/create.sql.sav	2006-05-04 12:51:33.000000000 +0200
+++ src/js/org/apache/ws/jaxme/js/junit/create.sql	2006-05-04 12:51:54.000000000 +0200
@@ -1,3 +1,4 @@
 CREATE CACHED TABLE MAIN (  ID BIGINT NOT NULL,  NAME VARCHAR(60) NOT NULL,  VER INT NOT NULL,  SIG BINARY(16) NOT NULL,  DATE DATE NOT NULL,  PRIMARY KEY (ID, VER));
 CREATE CACHED TABLE SUB (  MTID BIGINT NOT NULL,  MTVER INT NOT NULL,  ADDRESS VARCHAR(60) NOT NULL,  ID VARCHAR(32) NOT NULL,  EMAIL VARCHAR(60),  PRIMARY KEY (ID),  FOREIGN KEY (MTID, MTVER) REFERENCES MAIN (ID, VER));
 CREATE CACHED TABLE SUBSUB (  ID VARCHAR(32) NOT NULL,  MTID BIGINT NOT NULL,  MTVER INT NOT NULL,  SSTID VARCHAR(32) NOT NULL,  MTTS TIMESTAMP NOT NULL,  PRIMARY KEY (ID),  FOREIGN KEY (MTID, MTVER) REFERENCES MAIN (ID, VER),  FOREIGN KEY (SSTID) REFERENCES SUB (ID));
+SHUTDOWN;

ws-jaxme-ant-scripts.patch:

--- NEW FILE ws-jaxme-ant-scripts.patch ---
--- ./ant/js.xml.sav	2005-08-12 03:39:29.000000000 -0400
+++ ./ant/js.xml	2007-02-12 12:31:25.000000000 -0500
@@ -34,15 +34,15 @@
     <property name="src.js" location="${basedir}/src/js"/>
 
     <path id="js.class.path">
-      <pathelement location="${preqs}/log4j-1.2.8.jar"/>
-      <pathelement location="${preqs}/ant-1.5.4.jar"/>
+      <pathelement location="${preqs}/log4j.jar"/>
+      <pathelement location="${preqs}/ant.jar"/>
       <pathelement location="${preqs}/junit.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
     </path>
 
     <path id="js.test.path">
         <path refid="js.class.path"/>
-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+        <pathelement location="${preqs}/hsqldb.jar"/>
         <pathelement location="${dist}/jaxmejs-${version}.jar"/>
         <pathelement location="${build.js.test.classes}"/>
     </path>
@@ -129,6 +129,7 @@
     </target>
 
     <target name="JS.generate.version" depends="JS.generate.db">
+        
         <versionGenerator
                    driver="${jdbc.driver}"
                       url="${jdbc.url}"
--- ./ant/pm.xml.sav	2005-08-12 03:39:29.000000000 -0400
+++ ./ant/pm.xml	2007-02-12 12:31:25.000000000 -0500
@@ -37,11 +37,11 @@
         <pathelement location="${dist}/jaxmexs-${version}.jar"/>
         <pathelement location="${dist}/jaxme2-${version}.jar"/>
         <pathelement location="${preqs}/beaver.jar"/>   
-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+        <pathelement location="${preqs}/hsqldb.jar"/>
         <pathelement location="${preqs}/ant.jar"/>
-        <pathelement location="${preqs}/xml-apis.jar"/>
-        <pathelement location="${preqs}/xercesImpl.jar"/>
-        <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
+        <pathelement location="${preqs}/xml-commons-apis.jar"/>
+        <pathelement location="${preqs}/xerces-j2.jar"/>
+        <pathelement location="${preqs}/xmldb-api.jar"/>
         <!-- These aren't in the CVS and aren't necessary for the build -->
         <pathelement location="${preqs}/TaminoAPI4J.jar"/>
         <pathelement location="${preqs}/TaminoJCA.jar"/>
--- ./ant/jm.xml.sav	2005-08-12 03:39:29.000000000 -0400
+++ ./ant/jm.xml	2007-02-12 12:31:41.000000000 -0500
@@ -34,9 +34,10 @@
       <pathelement location="${dist}/jaxmejs-${version}.jar"/>
       <pathelement location="${dist}/jaxmexs-${version}.jar"/>
       <pathelement location="${preqs}/ant.jar"/>
-      <pathelement location="${preqs}/xml-apis.jar"/>
+      <pathelement location="${preqs}/xml-commons-apis.jar"/>
       <pathelement location="${preqs}/beaver.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
+      <pathelement location="${preqs}/commons-codec.jar"/>
     </path>
 
     <path id="jaxme.test.path">
--- ./ant/xs.xml.sav	2005-08-12 03:39:29.000000000 -0400
+++ ./ant/xs.xml	2007-02-12 12:31:25.000000000 -0500
@@ -23,7 +23,7 @@
     <property name="src.xs" location="${basedir}/src/xs"/>
 
     <path id="xs.class.path">
-        <pathelement location="${preqs}/xml-apis.jar"/>
+        <pathelement location="${preqs}/xml-commons-apis.jar"/>
         <pathelement location="${preqs}/junit.jar"/>
         <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
     </path>
@@ -48,7 +48,7 @@
         <path id="xs.test.path">
             <path refid="xs.class.path"/>
             <pathelement location="${dist}/jaxmexs-${version}.jar"/>
-            <pathelement location="${preqs}/xercesImpl.jar"/>
+            <pathelement location="${preqs}/xerces-j2.jar"/>
         </path>
         <runtests reportsdir="${build.xs.reports}" classpathref="xs.test.path">
             <tests>
--- ./ant/api.xml.sav	2005-08-12 03:39:29.000000000 -0400
+++ ./ant/api.xml	2007-02-12 12:31:25.000000000 -0500
@@ -25,7 +25,7 @@
     </target>
    
     <path id="api.class.path">
-        <pathelement location="${preqs}/xml-apis.jar"/>
+        <pathelement location="${preqs}/xml-commons-apis.jar"/>
     </path>
 
     <target name="API.compile" depends="init">

ws-jaxme-use-commons-codec.patch:

--- NEW FILE ws-jaxme-use-commons-codec.patch ---
--- ./src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.sav	2007-02-12 12:33:45.000000000 -0500
+++ ./src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java	2007-02-12 12:35:20.000000000 -0500
@@ -18,8 +18,7 @@
 
 import java.io.IOException;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
 
 
 /** A utility class for working with base64 encoding.
@@ -37,13 +36,13 @@
 	 * base64 encoded byte array.
 	 */
 	public static byte[] decode(String pValue) throws IOException {
-		return (new BASE64Decoder()).decodeBuffer(pValue);
+		return (new Base64()).decode(pValue.getBytes());
 	}
 
 	/** Converts the base64 encoded byte array <code>pValue</code>
 	 * into a string.
 	 */
 	public static String encode(byte[] pValue) {
-		return (new BASE64Encoder()).encode(pValue);
+		return new String((new Base64()).encodeBase64(pValue));
 	}
 }


--- NEW FILE ws-jaxme.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define base_name jaxme

Name:           ws-jaxme
Version:        0.5.1
Release:        2jpp.1%{?dist}
Epoch:          0
Summary:        Open source implementation of JAXB

Group:          Development/Libraries/Java
License:        Apache Software License
URL:            http://ws.apache.org/jaxme/
# 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
# 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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  ant >= 0:1.6
BuildRequires:  ant-trax >= 0:1.6
BuildRequires:  antlr
BuildRequires:  jaxp_transform_impl
BuildRequires:  jakarta-commons-codec
BuildRequires:  junit
BuildRequires:  hsqldb
BuildRequires:  log4j
BuildRequires:  xalan-j2
BuildRequires:  xmldb-api
BuildRequires:  xmldb-api-sdk
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-apis
Requires:       antlr
Requires:       jaxp_transform_impl
Requires:       jakarta-commons-codec
Requires:       junit
Requires:       hsqldb
Requires:       log4j
Requires:       xalan-j2
Requires:       xmldb-api
Requires:       xmldb-api-sdk
Requires:       xerces-j2
Requires:       xml-commons-apis
Requires:       jpackage-utils
Requires(postun): jpackage-utils

%description
A Java/XML binding compiler takes as input a schema 
description (in most cases an XML schema, but it may 
be a DTD, a RelaxNG schema, a Java class inspected 
via reflection, or a database schema). The output is 
a set of Java classes:
* A Java bean class matching the schema description. 
  (If the schema was obtained via Java reflection, 
  the original Java bean class.)
* Read a conforming XML document and convert it into 
  the equivalent Java bean.
* Vice versa, marshal the Java bean back into the 
  original XML document.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       jpackage-utils
Requires(postun): jpackage-utils

%description    javadoc
%{summary}.

%package        manual
Summary:        Documents for %{name}
Group:          Documentation

%description    manual
%{summary}.

%prep
%setup -q -n %{name}-%{version}
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 \

ant all javadoc

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name}
for jar in dist/*.jar; do
   install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{base_name}/
done
(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && 
    for jar in *-%{version}*; 
        do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; 
    done
)

(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && 
    for jar in *.jar; 
        do ln -sf ${jar} ws-${jar}; 
    done
)

#javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
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

#manual
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/docs/build/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}/LICENSE
%{_javadir}/%{base_name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%files manual
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}

%changelog
* Mon Feb 12 2007 Deepak Bhole <dbhole at redhat.com> - 0:0.5.1-2jpp.1
- Update as per Fedora guidelines.

* Wed May 04 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.5.1-1jpp
- First JPP-1.7 release

* Tue Dec 20 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.5-1jpp
- Upgrade to 0.5

* Thu Sep 09 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3.1-1jpp
- Fix version in changelog
- Upgrade to 0.3.1

* Fri Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.4jpp
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.3jpp
- Void change

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.0-0.b1.2jpp
- Upgrade to Ant 1.6.X

* Fri Mar 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.0-0.b1.1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ws-jaxme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Feb 2007 22:18:57 -0000	1.1
+++ .cvsignore	12 Mar 2007 16:44:40 -0000	1.2
@@ -0,0 +1,2 @@
+ws-jaxme-0.5-docs.tar.gz
+ws-jaxme-0.5.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ws-jaxme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Feb 2007 22:18:57 -0000	1.1
+++ sources	12 Mar 2007 16:44:40 -0000	1.2
@@ -0,0 +1,2 @@
+c22a1c7267520c7dfab916825a63218b  ws-jaxme-0.5-docs.tar.gz
+23c15eb2fd576509822d74d8401cb575  ws-jaxme-0.5.1-src.tar.gz




More information about the fedora-extras-commits mailing list