[Jpackage-commits] dist/sun-jaxws-2.1-impl/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 sun-jaxws-2.1-impl-XmlUtil.patch, NONE, 1.1 sun-jaxws-2.1-impl-build-bundle.patch, NONE, 1.1 sun-jaxws-2.1-impl-build.patch, NONE, 1.1 sun-jaxws-2.1-impl.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 21:57:36 CEST 2008


Update of /home/projects/jpackage/cvs/dist/sun-jaxws-2.1-impl/devel
In directory ryu.zarb.org:/tmp/cvs-serv3804/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sun-jaxws-2.1-impl-XmlUtil.patch 
	sun-jaxws-2.1-impl-build-bundle.patch 
	sun-jaxws-2.1-impl-build.patch sun-jaxws-2.1-impl.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jaxws-2.1-impl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:56:58 -0000	1.1
--- .cvsignore	28 May 2008 19:57:34 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ sun-jaxws-2.1-impl-2.1.3.tar.gz

--- NEW FILE: sun-jaxws-2.1-impl-build.patch ---
--- build.xml.sav0	2007-12-14 05:40:32.000000000 +0100
+++ build.xml	2008-04-08 17:06:30.000000000 +0200
@@ -77,10 +77,12 @@
           <pathelement path="${basedir}/tools/lib/taglets.jar" />
         </classpath>
       </taskdef>
+<!--
       <sequence-diagram
         src="${basedir}/javadoc"
         dest="${build.home}/javadoc"
         includes="**/*.seq" />
+-->
 
       <javadoc
             destdir="${build.home}/javadoc"
@@ -480,6 +482,7 @@
      </target>
 
 
+<!--
     <taskdef name="installerBuilder"
         classname="com.sun.tools.xjc.installer.builder.BuilderTask">
       <classpath>
@@ -507,7 +510,6 @@
         <param name="compile.debug" value="true"/>
       </antcall>
       <tstamp/>
-      <!-- generate the class -->
       <installerBuilder classFile="${build.home}/JAXWS${release.impl.version}${release.impl.version.suffix}_${DSTAMP}.jar"
           licenseFile="${basedir}/CDDL+GPLv2.txt"
           zipFile="${build.home}/jaxws-ri.zip" />
@@ -520,6 +522,7 @@
       </antcall>
       <delete file="${build.home}/jaxws-ri.zip" />
     </target>
+-->
 
 
     <patternset id="src-includes"

--- NEW FILE: sun-jaxws-2.1-impl.spec ---
# Copyright (c) 2000-2007, 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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free
%define jaxwsver  2.1

Name:           sun-jaxws-2.1-impl
Version:        2.1.3
Release:        1jpp
Epoch:          0
Summary:        Java API for XML Web Services API
License:        CDDL
Url:            https://jax-ws-sources.dev.java.net/
Source0:        sun-jaxws-2.1-impl-2.1.3.tar.gz
# cvs -d :pserver:guest at cvs.dev.java.net:/cvs login
#  cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r jaxws213 -d sun-jaxws-2.1-impl-2.1.3 jax-ws-sources/jaxws-ri  

Patch0:          sun-jaxws-2.1-impl-build.patch
Patch1:          sun-jaxws-2.1-impl-XmlUtil.patch
Patch2:          sun-jaxws-2.1-impl-build-bundle.patch

Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  findbugs
BuildRequires:  annotation_1_0_api
BuildRequires:  jaf_1_1_api
BuildRequires:  jaxb_2_1_api
BuildRequires:  jaxws_2_1_api
BuildRequires:  junit
BuildRequires:  saaj_1_3_api
BuildRequires:  servlet_2_5_api
BuildRequires:  stax_1_0_api
BuildRequires:  stax-ex >= 0:1.2
BuildRequires:  sun-codemodel
BuildRequires:  sun-fi >= 0:1.2.2
BuildRequires:  sun-jaxb-2.1-impl >= 0:2.1.6
BuildRequires:  sun-mimepull
BuildRequires:  sun-txw2
BuildRequires:  sun-xmlstreambuffer
BuildRequires:  ws_metadata_2_0_api
BuildRequires:  xml-commons-resolver12

Requires:  annotation_1_0_api
Requires:  ant >= 0:1.6.5
Requires:  jaf_1_1_api
Requires:  jaxb_2_1_api
Requires:  jaxws_2_1_api
Requires:  junit
Requires:  saaj_1_3_api
Requires:  stax_1_0_api
Requires:  stax-ex >= 0:1.2
Requires:  sun-codemodel
Requires:  sun-fi >= 0:1.2.2
Requires:  sun-jaxb-2.1-impl >= 0:2.1.6
Requires:  sun-mimepull
Requires:  sun-txw2
Requires:  sun-xmlstreambuffer
Requires:  ws_metadata_2_0_api
Requires:  xml-commons-resolver12

%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif
Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

%description
The Reference Implementation for XML-Based Web Services (JAX-WS) 2.1 
according to JSR-224 MR2

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%prep
%setup -q 
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
mv lib/http.jar.no lib/http.jar
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2

%build
JAVA_HOME=/usr/lib/jvm/java-1.5.0
export CLASSPATH=$(build-classpath \
annotation_1_0_api \
jaf_1_1_api \
jaxb_2_1_api \
jaxws_2_1_api \
saaj_1_3_api \
servlet_2_5_api \
stax_1_0_api \
stax-ex \
sun-codemodel \
sun-fi \
sun-jaxb-2.1-impl \
sun-jaxb-2.1-impl-xjc \
sun-mimepull \
sun-txw2 \
sun-xmlstreambuffer \
ws_metadata_2_0_api \
)
ln -sf $(build-classpath sun-jaxb-2.1-tools/taglets) tools/lib
ant main architecture-document

sed -i -e 's/@VERSION@/%{version}/' \
       -e 's/@API_VERSION@/2.1/' \
       -e 's/@JAXB_VERSION@/2.1.6/' \
       etc/poms/jaxws-rt.pom
sed -i -e 's/@VERSION@/%{version}/' \
       -e 's/@JAXB_VERSION@/2.1.6/' \
       etc/poms/jaxws-tools.pom


%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}

install -m 644 build/lib/http.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-http-%{version}.jar
install -m 644 build/lib/jaxws-rt.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-rt-%{version}.jar
install -m 644 build/lib/jaxws-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar
%add_to_maven_depmap com.sun.xml.ws jaxws-rt %{jaxwsver} JPP %{name}-rt
%add_to_maven_depmap com.sun.xml.ws jaxws-tools %{jaxwsver} JPP %{name}-tools

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 etc/poms/jaxws-rt.pom \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-rt.pom
install -pm 644 etc/poms/jaxws-tools.pom \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-tools.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 CDDL-1.0-license.txt \
           $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 CDDL+GPLv2.html \
           $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 CDDL+GPLv2.txt \
           $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/


%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi


%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}/CDDL*
%{_javadir}/%{name}*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif


%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %{_javadocdir}/%{name}

%changelog
* Wed Apr 09 2008 Ralph Apel <r.apel at r-apel.de> - 0:2.1.3-1jpp
- First release


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jaxws-2.1-impl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:56:58 -0000	1.1
--- sources	28 May 2008 19:57:34 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 7f9cde9883899a4da4eee36b1de77afc  sun-jaxws-2.1-impl-2.1.3.tar.gz

--- NEW FILE: sun-jaxws-2.1-impl-XmlUtil.patch ---
--- rt/src/com/sun/xml/ws/util/xml/XmlUtil.java.sav	2008-04-08 12:37:25.000000000 +0200
+++ rt/src/com/sun/xml/ws/util/xml/XmlUtil.java	2008-04-08 12:38:25.000000000 +0200
@@ -37,8 +37,8 @@
 package com.sun.xml.ws.util.xml;
 
 import com.sun.istack.Nullable;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
 import com.sun.xml.ws.server.ServerRtException;
 import com.sun.xml.ws.util.ByteArrayBuffer;
 import org.w3c.dom.Attr;

--- NEW FILE: sun-jaxws-2.1-impl-build-bundle.patch ---
--- etc/build-bundle.xml.sav	2008-04-08 17:16:53.000000000 +0200
+++ etc/build-bundle.xml	2008-04-08 17:17:12.000000000 +0200
@@ -82,6 +82,7 @@
         <path refid="runtime.compile.classpath"/>
         <pathelement location="${build.home}/lib/jaxws-rt.jar"/>
         <pathelement location="${java.home}/../lib/tools.jar"/>
+        <pathelement path="${java.class.path}"/>
     </path>
 
     <target name="init">




More information about the JPackage-commits mailing list