[Jpackage-commits] dist/sun-jsf-1.2/devel .cvsignore, 1.1, 1.2 jsf-api-1.2_04.pom, NONE, 1.1 jsf-impl-1.2_04.pom, NONE, 1.1 sources, 1.1, 1.2 sun-jsf-1.2.spec, NONE, 1.1 sun-jsf-api-build.patch, NONE, 1.1 sun-jsf-common-ant-common.patch, NONE, 1.1 sun-jsf-common-ant-dependencies.patch, NONE, 1.1 sun-jsf-ri-build.patch, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 21:58:33 CEST 2008


Update of /home/projects/jpackage/cvs/dist/sun-jsf-1.2/devel
In directory ryu.zarb.org:/tmp/cvs-serv4734/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jsf-api-1.2_04.pom jsf-impl-1.2_04.pom sun-jsf-1.2.spec 
	sun-jsf-api-build.patch sun-jsf-common-ant-common.patch 
	sun-jsf-common-ant-dependencies.patch sun-jsf-ri-build.patch 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jsf-1.2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:57:49 -0000	1.1
--- .cvsignore	28 May 2008 19:58:30 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ sun-jsf-1.2.04-src.tar.gz

--- NEW FILE: sun-jsf-common-ant-common.patch ---
--- common/ant/common.xml.sav1	2007-05-16 19:38:57.000000000 +0200
+++ common/ant/common.xml	2008-01-31 18:09:03.000000000 +0100
@@ -36,12 +36,14 @@
         </classpath>
     </taskdef>
 
+<!--
     <taskdef name="installerBuilder" classname="org.jvnet.poormans_installer.builder.BuilderTask">
         <classpath>
             <pathelement location="${jsf.build.home}/common/lib/installer-builder.jar"/>
             <pathelement location="${jsf.build.home}/common/lib/sfx4j-1.0.jar"/>
         </classpath>
     </taskdef>
+-->
     
     <!-- Setup the time properties for use with the project -->
     <tstamp/>
@@ -122,6 +124,7 @@
     <path id="compile.classpath">
         <pathelement location="${servlet.jar}"/>
         <pathelement location="${jsp.jar}"/>
+        <pathelement location="${el.jar}"/>
         <pathelement location="${portlet.jar}"/>
         <pathelement location="${jstl.jar}"/>
         <pathelement location="${annotation.jar}"/>

--- NEW FILE: sun-jsf-common-ant-dependencies.patch ---
--- common/ant/dependencies.xml.sav0	2007-05-16 19:38:56.000000000 +0200
+++ common/ant/dependencies.xml	2008-01-31 18:11:16.000000000 +0100
@@ -45,6 +45,7 @@
     <property name="taglibdoc.version" value="1.3"/>
     <property name="servlet.api.version" value="2.5"/>
     <property name="jsp.api.version" value="2.1"/>
+    <property name="el.api.version" value="1.0"/>
     <property name="jstl.api.version" value="1.2"/>
     <property name="annotation.api.version" value="1.0"/>
     <property name="portlet.api.version" value="1.0"/>
@@ -61,6 +62,7 @@
     <property name="maven.repository.importer.home" value="${dependency.base.dir}/maven-repository-importer-${maven.repository.importer.version}"/>
     <property name="servlet.home" value="${dependency.base.dir}/servlet-${servlet.api.version}"/>
     <property name="jsp.home" value="${dependency.base.dir}/jsp-${jsp.api.version}"/>
+    <property name="el.home" value="${dependency.base.dir}/el-${el.api.version}"/>
     <property name="jstl.home" value="${dependency.base.dir}/jstl-${jstl.api.version}"/>
     <property name="annotation.home" value="${dependency.base.dir}/annotation-${annotation.api.version}"/>
 
@@ -70,6 +72,7 @@
     <property name="maven.repository.importer.jar" value="${dependency.jar.dir}/maven-repository-importer-${maven.repository.importer.version}.jar"/>
     <property name="servlet.jar"                   value="${dependency.jar.dir}/servlet-api-${servlet.api.version}.jar"/>
     <property name="jsp.jar"                       value="${dependency.jar.dir}/jsp-api-${jsp.api.version}.jar"/>
+    <property name="el.jar"                        value="${dependency.jar.dir}/el-api-${el.api.version}.jar"/>
     <property name="jstl.jar"                      value="${dependency.jar.dir}/jstl-${jstl.api.version}.jar"/>
     <property name="annotation.jar"                value="${dependency.jar.dir}/jsr250-api-${annotation.api.version}.jar"/>
     <property name="sun-commons-beanutils.jar"     value="${dependency.jar.dir}/com-sun-commons-beanutils.jar"/>
@@ -289,7 +292,9 @@
         </if>
 
 
+<!--
         <antcall target="update.containers"/>
+-->
     </target>
 
 

--- NEW FILE: jsf-impl-1.2_04.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>javax.faces</groupId>
  <artifactId>jsf-impl</artifactId>
  <name>JSF Implementation</name>
  <version>1.2_04</version>
  <description>This is Sun Microsystems's JSF implementation.  It is product quality.</description>
  <url>https://javaserverfaces.dev.java.net/</url>
  <issueManagement>
    <url>https://javaserverfaces.dev.java.net/servlets/ProjectIssues</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>javaserverfowner at javaserverfaces.dev.java.net</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2005</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Developer Mailing List</name>
      <subscribe>dev at javaserverfaces.dev.java.net</subscribe>
      <unsubscribe>dev at javaserverfaces.dev.java.net</unsubscribe>
      <archive></archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>edburns</id>
      <name>Edward Burns</name>
      <email>ed.burns at sun.com</email>
      <organization>Sun Microsystems Inc.</organization>
      <roles>
        <role>Specification Lead</role>
      </roles>
      <timezone>-5</timezone>
    </developer>
    <developer>
      <id>rlubke</id>
      <name>Ryan Lubke</name>
      <email>Ryan.Lubke at sun.com</email>
      <organization>Sun Microsystems Inc.</organization>
      <roles>
        <role>Implementation Lead</role>
      </roles>
      <timezone>-8</timezone>
    </developer>
    <developer>
      <id>rkitain</id>
      <name>Roger Kitain</name>
      <email>Roger.Kitain at sun.com</email>
      <organization>Sun Microsystems Inc.</organization>
      <roles>
        <role>Implementation Lead</role>
      </roles>
      <timezone>-5</timezone>
    </developer>
  </developers>
  <licenses>
    <license>
      <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
      <url>http://www.opensource.org/licenses/cddl1.php</url>
      <comments></comments>
    </license>
  </licenses>
  <scm>
    <connection>scm:cvs:pserver:guest at cvs.dev.java.net:/cvs:javaserverfaces-sources</connection>
    <developerConnection></developerConnection>
    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
  </scm>
  <organization>
    <name>Sun Microsystems Inc</name>
    <url>https://javaserverfaces.dev.java.net/</url>
  </organization>
  <build />
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///servlets/ProjectDocumentList</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://javaserverfaces.dev.java.net//</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>

--- NEW FILE: jsf-api-1.2_04.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>javax.faces</groupId>
  <artifactId>jsf-api</artifactId>
  <version>1.2_04</version>
  <description>This is the master POM file for Sun's Implementation of
  the JSF 1.2 Specification.</description>
  <url>http://java.sun.com/javaee/javaserverfaces/</url>
  <issueManagement>
    <system>issueZilla</system>
    <url>https://javaserverfaces-spec-public.dev.java.net/servlets/ProjectIssues</url>
  </issueManagement>
  <mailingLists>
    <mailingList>
      <name>JSF 1.2 Specification Comments</name>
      <post>jsr-252-comments at jcp.org</post>
    </mailingList>
    <mailingList>
      <name>Sun's JavaServer Faces Implementation Dev List</name>
      <post>dev at javaserverfaces.dev.java.net</post>
      <archive>https://javaserverfaces.dev.java.net/servlets/SummarizeList?listName=dev</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>edburns</id>
      <name>Ed Burns</name>
      <email>ed.burns at sun.com</email>
      <organization>Sun Microsystems, Inc.</organization>
      <roles>
        <role>project-owner</role>
      </roles>
      <timezone>-6</timezone>
    </developer>
    <developer>
      <id>rlubke</id>
      <name>Ryan Lubke</name>
      <email>Ryan.Lubke at sun.com</email>
      <organization>Sun Microsystems Inc</organization>
      <roles>
        <role>project-owner</role>
      </roles>
      <timezone>-9</timezone>
    </developer>
    <developer>
      <id>rogerk</id>
      <name>Roger.Kitain</name>
      <email>Roger.Kitain at sun.com</email>
      <organization>Sun Microsystems Inc</organization>
      <roles>
        <role>project-owner</role>
      </roles>
      <timezone>-6</timezone>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Craig McClanahan</name>
    </contributor>
    <contributor>
      <name>Deepak Gothe</name>
    </contributor>
    <contributor>
      <name>Gregory Murray</name>
    </contributor>
    <contributor>
      <name>Justyna Horwat</name>
    </contributor>
    <contributor>
      <name>Jayashri Visvanathan</name>
    </contributor>
    <contributor>
      <name>Jennifer Ball</name>
    </contributor>
    <contributor>
      <name>Jacob Hookom</name>
    </contributor>
    <contributor>
      <name>Raj Premkumar</name>
    </contributor>
    <contributor>
      <name>Stan Silvert</name>
    </contributor>
    <contributor>
      <name>Mike Youngstrom</name>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
      <url>http://www.opensource.org/licenses/cddl1.php</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <organization>
    <name>Sun Microsystems, Inc</name>
    <url>http://www.sun.com/</url>
  </organization>
  <dependencies>
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>servlet-api</artifactId>
      <version>2.5</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>javax.servlet.jsp</groupId>
      <artifactId>jsp-api</artifactId>
      <version>2.1</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>jstl</groupId>
      <artifactId>jstl</artifactId>
      <version>1.2</version>
      <scope>provided</scope>
    </dependency>
  </dependencies>
</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/sun-jsf-1.2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:57:49 -0000	1.1
--- sources	28 May 2008 19:58:30 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 407ad10f789a21170e43bf7cd3ef0d97  sun-jsf-1.2.04-src.tar.gz

--- NEW FILE: sun-jsf-1.2.spec ---
# Copyright (c) 2000-2008, 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 bname jsf
%define namedversion 1.2_04

Name:           sun-jsf-1.2
Version:        1.2.04
Release:        1jpp
Epoch:          0
Summary:        Java Server Pages
License:        CDDL
Url:            https://javaserverfaces.dev.java.net/
Source0:        sun-jsf-1.2.04-src.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 JSF_1_2_04_BRANCH javaserverfaces-sources
#Source1:        sun-jsf-glassfish-appserv-rt.jar
Source2:        jsf-api-1.2_04.pom
Source3:        jsf-impl-1.2_04.pom

Patch0:         sun-jsf-common-ant-dependencies.patch
Patch1:         sun-jsf-common-ant-common.patch
Patch2:         sun-jsf-api-build.patch
Patch3:         sun-jsf-ri-build.patch  

Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-nodeps
BuildRequires:  ant-trax
BuildRequires:  ant-contrib
BuildRequires:  htmlunit
BuildRequires:  junit

BuildRequires:  annotation_1_0_api
BuildRequires:  el_1_0_api
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-taglibs-standard
BuildRequires:  jetty6-annotations
BuildRequires:  jetty6-plus
BuildRequires:  jsp_2_1_api
BuildRequires:  portlet-1.0-api
BuildRequires:  servlet_2_5_api
BuildRequires:  tlddoc
BuildRequires:  tomcat6-lib

Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4

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

%description
JavaServer(TM) Faces technology simplifies building user 
interfaces for JavaServer applications. Developers of 
various skill levels can quickly build web applications by: 
assembling reusable UI components in a page; connecting 
these components to an application data source; and wiring 
client-generated events to server-side event handlers.

%package api
Summary:        JSF 1.2 API from %{name}
Group:          Development/Java
Provides:       jsf_1_2_api

%description api
%{summary}.

%package impl
Summary:        JSF 1.2 Implementation from %{name}
Group:          Development/Java
Requires:       %{name}-api = %{epoch}:%{version}-%{release}

%description impl
%{summary}.

%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 -n javaserverfaces-sources
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
for j in $(find . -name "*.java" -exec grep -l 'com\.sun\.org\.apache\.commons\.' {} \;); do
    sed -i -e 's:com\.sun\.org\.apache\.commons\.:org\.apache\.commons\.:g' $j
done

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3

ln -sf $(build-classpath ant-contrib) common/lib/
ln -sf $(build-classpath commons-beanutils) common/lib/com-sun-commons-beanutils.jar
ln -sf $(build-classpath commons-digester) common/lib/com-sun-commons-digester.jar
ln -sf $(build-classpath commons-collections) common/lib/com-sun-commons-collections.jar
ln -sf $(build-classpath commons-logging-api) common/lib/com-sun-commons-logging-api.jar

mkdir -p dependencies/jars/
ln -sf $(build-classpath tlddoc) dependencies/jars/tlddoc-1.3.jar
ln -sf $(build-classpath junit) dependencies/jars/junit-3.8.1.jar
ln -sf $(build-classpath htmlunit) dependencies/jars/htmlunit-1.10.jar
ln -sf $(build-classpath servlet_2_5_api) dependencies/jars/servlet-api-2.5.jar
ln -sf $(build-classpath jsp_2_1_api) dependencies/jars/jsp-api-2.1.jar
ln -sf $(build-classpath el_1_0_api) dependencies/jars/el-api-1.0.jar
ln -sf $(build-classpath taglibs-core) dependencies/jars/jstl-1.2.jar
ln -sf $(build-classpath annotation_1_0_api) dependencies/jars/jsr250-api-1.0.jar
ln -sf $(build-classpath portlet-1.0-api) dependencies/jars/portlet-api-1.0.jar

mkdir -p dependencies/apache-tomcat-6.0.10/lib/
ln -sf $(build-classpath tomcat6/catalina) dependencies/apache-tomcat-6.0.10/lib/

mkdir -p dependencies/jetty-6.1.2rc0/lib/annotations
ln -sf $(build-classpath jetty6/annotations/jetty6-annotations) dependencies/jetty-6.1.2rc0/lib/annotations/jetty-annotations-6.1.2rc0.jar
mkdir -p dependencies/jetty-6.1.2rc0/lib/plus
ln -sf $(build-classpath jetty6/plus/jetty6-plus) dependencies/jetty-6.1.2rc0/lib/plus/jetty-plus-6.1.2rc0.jar

# TODO: bring in glassfish-appserv-rt.jar dependency
#mkdir -p dependencies/glassfish/lib/
#cp %{SOURCE1} dependencies/glassfish/lib/appserv-rt.jar
rm jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java

%build
export JAVA_HOME=/usr/lib/jvm/java-1.5.0
export OPT_JAR_LIST="ant/ant-trax"
ant -Djsf.build.home=$(pwd) -Dcontainer.name=template main
ant -f jsf-api/build.xml -Djsf.build.home=$(pwd) -Dcontainer.name=template javadocs
ant -f jsf-ri/build.xml -Djsf.build.home=$(pwd) -Dcontainer.name=template javadocs

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 jsf-api/build/lib/%{bname}-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
install -m 644 jsf-ri/build/lib/%{bname}-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar
%add_to_maven_depmap javax.faces jsf-api %{namedversion} JPP %{name}-api
%add_to_maven_depmap javax.faces jsf-impl %{namedversion} JPP %{name}-impl

(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 %{SOURCE2} \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-api.pom
install -pm 644 %{SOURCE3} \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-impl.pom

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

%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 api
%update_maven_depmap
update-alternatives --install %{_javadir}/jsf_1_2_api.jar jsf_1_2_api \
    %{_javadir}/%{name}-api.jar 10200
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun api
%update_maven_depmap
if [ "$1" = "0" ]; then
    update-alternatives --remove jsf_1_2_api \
        %{_javadir}/%{name}-api.jar
fi
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

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

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

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

%files impl
%defattr(0644,root,root,0755)
%doc legal/jsf-cddl/*
%{_javadir}/%{name}-impl*.jar
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-impl-%{version}.jar.*
%endif

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

%changelog
* Wed Feb 20 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2.04-1jpp
- First release
- TODO: bring in glassfish-appserv-rt.jar dependency


--- NEW FILE: sun-jsf-ri-build.patch ---
--- jsf-ri/build.xml.sav3	2007-02-08 22:06:55.000000000 +0100
+++ jsf-ri/build.xml	2008-01-31 23:30:59.000000000 +0100
@@ -44,6 +44,7 @@
     <property name="build.dir" value="build"/>
     <property name="build.classes.dir" value="${build.dir}/classes"/>
     <property name="build.generate.dir" value="${build.dir}/generate"/>
+    <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
     <property name="build.generate.tld.dir"
               value="${build.generate.dir}/conf/share"/>
 
@@ -411,7 +412,7 @@
         <delete dir="${build.classes.dir}/com/sun/org"/>
     </target>
 
-    <target name="main" depends="update,jars"/>
+    <target name="main" depends="jars"/>
 
     <target name="create.runtime.config">
 <!--    in="${build.dir}/classes/com/sun/faces/standard-html-renderkit.xml"-->
@@ -507,5 +508,40 @@
 </target>
 
    
+    <target name="javadoc_check">
+        <uptodate property="javadoc.notrequired"
+                  targetfile="${build.javadocs.dir}/packages.html">
+            <srcfiles dir="${src.dir}" includes="**/*.java"/>
+            <srcfiles dir="${build.generate.dir}" includes="**/*.java"/>
+        </uptodate>
+    </target>
+
+    <target name="javadocs"
+            depends="prepare,javadoc_check,generate,generate.javadocs"
+            unless="javadoc.notrequired"
+            description="Create the JavaDoc API documentation">
+
+    </target>
+
+
+    <target name="generate.javadocs">
+        <javadoc packagenames="com.sun.faces.*"
+                 destdir="${build.javadocs.dir}"
+                 private="${javadoc.private}"
+                 protected="${javadoc.protected}"
+                 windowtitle="${Name} (${spec.version})"
+                 source="1.5"
+                 doctitle="${Name} (${spec.version})"
+                 bottom="Copyright © 2002-2006 Sun Microsystems, Inc. All Rights Reserved.">
+            <fileset dir="${source.dir}">
+                <include name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generate.dir}">
+                <include name="**/*.java"/>
+            </fileset>
+            <classpath refid="impl.compile.classpath"/>
+        </javadoc>
+    </target>
+
     
 </project>

--- NEW FILE: sun-jsf-api-build.patch ---
--- jsf-api/build.xml.sav	2008-01-31 17:07:32.000000000 +0100
+++ jsf-api/build.xml	2008-01-31 17:08:10.000000000 +0100
@@ -639,7 +639,7 @@
            Main target
          ===================================================================
     -->
-    <target name="main" depends="update,jars"
+    <target name="main" depends="jars"
             description="Compile API classes and build JAR file"/>
 
     <!--




More information about the JPackage-commits mailing list