[Jpackage-commits] rpms/free/glassfish-jaxb glassfish-2.1.9-no-22.patch, NONE, 1.1 glassfish-jaxb-build-hack.patch, 1.1, NONE glassfish-jaxb.spec, 1.6, 1.7

jpackage jpackage at ryu.zarb.org
Wed Feb 4 22:48:26 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/glassfish-jaxb
In directory ryu.zarb.org:/tmp/9EXgSFQBMT/rpms/free/glassfish-jaxb

Modified Files:
	glassfish-jaxb.spec 
Added Files:
	glassfish-2.1.9-no-22.patch 
Removed Files:
	glassfish-jaxb-build-hack.patch 
Log Message:
2.1.9-1.jpp6

Index: glassfish-jaxb.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/glassfish-jaxb/glassfish-jaxb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** glassfish-jaxb.spec	5 Oct 2008 13:01:19 -0000	1.6
--- glassfish-jaxb.spec	4 Feb 2009 21:48:24 -0000	1.7
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,36 ****
  #
  
! %define _with_repolib 1
  
! %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
! %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
  
  %define repodir %{_javadir}/repository.jboss.com/sun-jaxb/%{version}-brew
--- 29,38 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
  
  %define repodir %{_javadir}/repository.jboss.com/sun-jaxb/%{version}-brew
***************
*** 39,75 ****
  
  %define section free
! %define jaxbver  2.1.4
  
  Name:           glassfish-jaxb
! Version:        2.1.4
! Release:        7%{?dist}
  Epoch:          0
- 
  Summary:        Java API for XML Web Services API
! License:        CDDL
! Url:            https://jax-ws-sources.dev.java.net/
! #Source1:        http://download.java.net/maven/1/javax.xml.bind/poms/jaxb-api-2.1.pom
! #Source2:        CDDLv1.0.html
! #Source3:        sun-jaxb-2.1-api-manifest.mf
! #Source4:        sun-jaxb-2.1-api-build.properties
! #Source5:        sun-jaxb-2.1-api-build.xml
! Source0:	%{name}-%{version}-src.tar.gz
! Source2:        http://repo1.maven.org/maven2/javax/xml/jaxb-api/2.1/jaxb-api-2.1.pom
! Source6:	%{name}-component-info.xml
! #cvs -d:pserver:guest at cvs.dev.java.net:/cvs export -r jaxb-2_1_4 -d jaxb-ri jaxb2-sources/jaxb-ri; tar cvxf sun-jaxb-2.1.4-src.tar.gz jaxb-ri
! Patch0:	%{name}-build-hack.patch
! 
  Group:          Development/Libraries/Java
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  ant >= 0:1.6.5
! #BuildRequires:  jaf = 1.1
! #BuildRequires:  stax_1_0_api
! #Requires:  jaf = 1.1
! #Requires:  stax_1_0_api
  BuildArch:      noarch
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
! Provides:       jaxb_api = 0:%{jaxbver}
! Provides:       jaxb_2_1_api = 0:%{version}-%{release}
  
  %description
--- 41,75 ----
  
  %define section free
! %define jaxbver  2.1.9
  
  Name:           glassfish-jaxb
! Version:        2.1.9
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Java API for XML Web Services API
! License:        CDDL/GPLv2
  Group:          Development/Libraries/Java
+ URL:            https://jax-ws-sources.dev.java.net/
+ # cvs -Q -d:pserver:guest at cvs.dev.java.net:/cvs export -r jaxb-2_1_9 -d glassfish-jaxb-2.1.9 jaxb2-sources/jaxb-ri && tar cjf glassfish-jaxb-2.1.9-src.tar.bz2 glassfish-jaxb-2.1.9
+ Source0:        glassfish-jaxb-2.1.9-src.tar.bz2
+ Source1:        http://repo1.maven.org/maven2/javax/xml/jaxb-api/2.1/jaxb-api-2.1.pom
+ Source2:        %{name}-component-info.xml
+ Patch0:         glassfish-2.1.9-no-22.patch
+ Provides:       jaxb_api = 0:%{jaxbver}
+ Provides:       jaxb_2_1_api = 0:%{version}-%{release}
+ Obsoletes:      %{name}-javadoc > %{epoch}:%{version}-%{release}
+ %if 0
+ Requires:       jaf = 1.1
+ Requires:       stax_1_0_api
+ %endif
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  ant >= 0:1.6.5
! %if 0
! BuildRequires:  jaf = 1.1
! BuildRequires:  stax_1_0_api
! %endif
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 77,84 ****
  according to JSR-222 MR1.
  
! %if %{with_repolib}
  %package repolib
! Summary:         Artifacts to be uploaded to a repository library
! Group:           Development/Libraries/Java
  
  %description repolib
--- 77,84 ----
  according to JSR-222 MR1.
  
! %if %with repolib
  %package repolib
! Summary:        Artifacts to be uploaded to a repository library
! Group:          Development/Libraries/Java
  
  %description repolib
***************
*** 88,91 ****
--- 88,92 ----
  %endif
  
+ %if 0
  %package javadoc
  Summary:        Javadoc for %{name}
***************
*** 95,167 ****
  %description javadoc
  %{summary}.
  
  %prep
! %setup -q -n jaxb-ri
! #%setup -q -c 
! #mkdir -p src/java
! #mv javax src/java
! #cp %{SOURCE3} jaxb.mf
! #cp %{SOURCE4} build.properties
! #cp %{SOURCE5} build.xml
  %patch0 -p1
  
  %build
- #export JAVA_HOME=/usr/lib/jvm/java-1.5.0
- #export CLASSPATH=$(build-classpath activation stax_1_0_api)
- #ant -Dbuild.sysclasspath=only release
  export CLASSPATH=`pwd`/tools/lib/rebundle/runtime/xsdlib.jar
  export OPT_JAR_LIST=:
! ant -Dbuild.sysclasspath=first dist
  
  %install
  rm -rf $RPM_BUILD_ROOT
- # jars
  
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  #install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/jaxb-api.jar
! touch $RPM_BUILD_ROOT%{_javadir}/jaxb-api.jar
  #install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
! touch $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/sun-jaxb
! install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/sun-jaxb/
! install -m 644 dist/lib/jaxb-impl.jar $RPM_BUILD_ROOT%{_javadir}/sun-jaxb/
! install -m 644 dist/lib/jaxb-xjc.jar $RPM_BUILD_ROOT%{_javadir}/sun-jaxb/
  
! #Commenting the bellow to fix 4.3 build
! #install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! #install -m 644 jaxb.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! #
! ## add_to_maven_depmap javax.xml.bind jaxb-api %{version} JPP %{name}
! #
! #(cd $RPM_BUILD_ROOT%{_javadir} 
! #ln -s %{name}-%{version}-api.jar jaxb_2_1_api.jar
! #ln -s %{name}-%{version}-api.jar jaxb_api.jar
! #ln -sf %{name}-%{version}-api.jar %{name}.jar)
  
  # poms
! #install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! #install -pm 644 %{SOURCE1} \
! #    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  # poms
! %add_to_maven_depmap javax.xml jaxb-api %{version} JPP/sun-jaxb jaxb-api
! %{__install} -D -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP.sun-jaxb.jaxb-api.pom
  
! %if %{with_repolib}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodir}
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! 	install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
!         sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
!         install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
!         cp -p dist/lib/jaxb-* $RPM_BUILD_ROOT%{repodirlib}/
!         cp -p dist/lib/jsr173_1.0_api.jar $RPM_BUILD_ROOT%{repodirlib}/
  %endif
  
--- 96,170 ----
  %description javadoc
  %{summary}.
+ %endif
  
  %prep
! %setup -q
! /bin/echo FIXME: bundled jars
! %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t /bin/echo
  %patch0 -p1
  
+ mv CDDL+GPLv2.txt CDDL+GPLv2.txt.orig
+ %{_bindir}/iconv -f iso8859-1 -t utf8 -o CDDL+GPLv2.txt CDDL+GPLv2.txt.orig
+ 
  %build
  export CLASSPATH=`pwd`/tools/lib/rebundle/runtime/xsdlib.jar
  export OPT_JAR_LIST=:
! %{ant} -Dbuild.sysclasspath=first dist
  
  %install
  rm -rf $RPM_BUILD_ROOT
  
+ # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
  #install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/jaxb-api.jar
! /bin/touch $RPM_BUILD_ROOT%{_javadir}/jaxb-api.jar
  #install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
! /bin/touch $RPM_BUILD_ROOT%{_javadir}/jaxb_2_1_api.jar
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 dist/lib/jaxb-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 dist/lib/jaxb-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
! install -m 644 dist/lib/jaxb-xjc.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
  
! # Commenting the bellow to fix 4.3 build
! %if 0
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 jaxb.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! 
! %add_to_maven_depmap javax.xml.bind jaxb-api %{version} JPP %{name}
! 
! (cd $RPM_BUILD_ROOT%{_javadir} 
! ln -s %{name}-%{version}-api.jar jaxb_2_1_api.jar
! ln -s %{name}-%{version}-api.jar jaxb_api.jar
! ln -sf %{name}-%{version}-api.jar %{name}.jar)
  
  # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 %{SOURCE1} \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
! %endif
  
+ %if 0
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ %endif
  
  # poms
! %add_to_maven_depmap javax.xml jaxb-api %{version} JPP/%{name} jaxb-api
! %{__install} -D -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
  
! %if %with repolib
! %{__install} -d -m 755 %{buildroot}%{repodir}
! %{__install} -d -m 755 %{buildroot}%{repodirlib}
! %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
! tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
! %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
! %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
! %{__install} -d -m 755 %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
! %{__cp} -p dist/lib/jaxb-* %{buildroot}%{repodirlib}/
! %{__cp} -p dist/lib/jsr173_1.0_api.jar %{buildroot}%{repodirlib}/
  %endif
  
***************
*** 170,203 ****
  
  %post
! #%update_maven_depmap
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_2_1_api.jar jaxb_2_1_api %{_javadir}/sun-jaxb/jaxb-api.jar 20100
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_api.jar jaxb_api %{_javadir}/sun-jaxb/jaxb-api.jar 20100
  
  %preun
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove jaxb_2_1_api %{_javadir}/sun-jaxb/jaxb-api.jar
!     %{_sbindir}/update-alternatives --remove jaxb_api %{_javadir}/sun-jaxb/jaxb-api.jar
  fi
  
  %postun
! #%update_maven_depmap
  
  %files
  %defattr(0644,root,root,0755)
! %doc CDDL_ver_1_0.html
! %{_javadir}/sun-jaxb
! #%{_datadir}/maven2/poms/*
! #%{_mavendepmapfragdir}
  %ghost %{_javadir}/jaxb_2_1_api.jar
  %ghost %{_javadir}/jaxb-api.jar
! %{_datadir}/maven2/poms/JPP.sun-jaxb.jaxb-api.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
! %if %{with_repolib}
  %files repolib
  %defattr(0644,root,root,0755)
--- 173,210 ----
  
  %post
! %if 0
! %update_maven_depmap
! %endif
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_2_1_api.jar jaxb_2_1_api %{_javadir}/%{name}/jaxb-api.jar 20100
! %{_sbindir}/update-alternatives --install %{_javadir}/jaxb_api.jar jaxb_api %{_javadir}/%{name}/jaxb-api.jar 20100
  
  %preun
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove jaxb_2_1_api %{_javadir}/%{name}/jaxb-api.jar
!     %{_sbindir}/update-alternatives --remove jaxb_api %{_javadir}/%{name}/jaxb-api.jar
  fi
  
+ %if 0
  %postun
! %update_maven_depmap
! %endif
  
  %files
  %defattr(0644,root,root,0755)
! %doc CDDL+GPLv2.html CDDL+GPLv2.txt HOWTO-build.txt
! %{_javadir}/%{name}
  %ghost %{_javadir}/jaxb_2_1_api.jar
  %ghost %{_javadir}/jaxb-api.jar
! %{_datadir}/maven2/poms/JPP.%{name}.jaxb-api.pom
  %{_mavendepmapfragdir}/%{name}
  
+ %if 0
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
+ %endif
  
! %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
***************
*** 206,209 ****
--- 213,221 ----
  
  %changelog
+ * Tue Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:2.1.9-1
+ - 2.1.9
+ - change jar location from sun-jaxb to %%{name}
+ - License is CDDL and GPLv2
+ 
  * Mon Oct 06 2008 Ralph Apel <r.apel at r-apel.de> 0:2.1.4-7
  - Handle jaxb_2_1_api, jaxb_api as alternatives, avoid conflicts with other codings

--- glassfish-jaxb-build-hack.patch DELETED ---

--- NEW FILE: glassfish-2.1.9-no-22.patch ---
--- glassfish-jaxb-2.1.9/runtime/src/com/sun/xml/bind/v2/model/impl/ReferencePropertyInfoImpl.java.hack	2008-05-23 15:08:06.000000000 -0400
+++ glassfish-jaxb-2.1.9/runtime/src/com/sun/xml/bind/v2/model/impl/ReferencePropertyInfoImpl.java	2009-02-04 15:56:50.840949090 -0500
@@ -219,7 +219,7 @@
         if(!is2_2)  return true;
 
         try {
-            return ref.required();
+            throw new LinkageError();
         } catch(LinkageError e) {
             is2_2 = false;
             return true;    // the value defaults to true
--- glassfish-jaxb-2.1.9/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java.hack	2008-05-20 18:20:46.000000000 -0400
+++ glassfish-jaxb-2.1.9/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java	2009-02-04 15:56:50.841930698 -0500
@@ -1198,7 +1198,7 @@
             }
 
 
-            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children).makeRepeated(rp.isCollection()).makeOptional(!rp.isRequired());
+            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children).makeRepeated(rp.isCollection()).makeOptional(rp.isCollection());
 
             final QName ename = rp.getXmlName();
 
--- glassfish-jaxb-2.1.9/xjc/src/com/sun/tools/xjc/generator/bean/field/AbstractField.java.hack	2008-05-20 18:15:02.000000000 -0400
+++ glassfish-jaxb-2.1.9/xjc/src/com/sun/tools/xjc/generator/bean/field/AbstractField.java	2009-02-04 15:56:50.842929106 -0500
@@ -183,7 +183,7 @@
                 .namespace(e.getElementName().getNamespaceURI())
                 .type(e.getType().toType(outline.parent(),IMPLEMENTATION));
             if(getOptions().target.isLaterThan(SpecVersion.V2_2))
-                refw.required(rp.isRequired());
+                throw new LinkageError();
         } else
         if(elements.size()>1) {
             XmlElementRefsWriter refsw = field.annotate2(XmlElementRefsWriter.class);
@@ -193,7 +193,7 @@
                     .namespace(e.getElementName().getNamespaceURI())
                     .type(e.getType().toType(outline.parent(),IMPLEMENTATION));
                 if(getOptions().target.isLaterThan(SpecVersion.V2_2))
-                    refw.required(rp.isRequired());
+                    throw new LinkageError();
             }
         }
 




More information about the JPackage-commits mailing list