[mojarra] First import after review (#800890)
Juan Hernandez
jhernand at fedoraproject.org
Fri Mar 9 08:35:02 UTC 2012
commit 65e6146629f29a91efd7debe5c228b13a5eff2cb
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Fri Mar 9 09:33:45 2012 +0100
First import after review (#800890)
.gitignore | 1 +
jsf-api-2.1.7.pom | 339 +++++++++++++
jsf-impl-2.1.7.pom | 298 ++++++++++++
...d-tomcat7-deploy-test-dependencies-target.patch | 14 +
mojarra-dont-build-injection-providers.patch | 39 ++
mojarra-dont-bundle-api.patch | 17 +
mojarra-dont-download-dependencies.patch | 504 ++++++++++++++++++++
mojarra-dont-use-yuicompressor.patch | 118 +++++
mojarra-fix-ant-gid.patch | 13 +
mojarra-fix-classpaths.patch | 27 +
mojarra-fix-maven-ant-tasks-classpath.patch | 109 +++++
mojarra-jdk7.patch | 25 +
mojarra-remove-installer-builder.patch | 50 ++
mojarra.spec | 222 +++++++++
sources | 1 +
15 files changed, 1777 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..e73951e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/mojarra-2.1.7.tgz
diff --git a/jsf-api-2.1.7.pom b/jsf-api-2.1.7.pom
new file mode 100644
index 0000000..20ecc5a
--- /dev/null
+++ b/jsf-api-2.1.7.pom
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ or packager/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at packager/legal/LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.1.7</version>
+ <packaging>jar</packaging>
+ <name>
+ Oracle's implementation of the JSF 2.2 specification API.
+ </name>
+ <description>
+ This is the master POM file for Oracle's Implementation of the JSF 2.2 Specification.
+ </description>
+ <url>http://java.sun.com/javaee/javaserverfaces/</url>
+ <licenses>
+ <license>
+ <name>
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL
+ </name>
+ <url>http://glassfish.java.net/nonav/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://java.net/projects/mojarra/sources</url>
+ <connection>scm:svn:https://svn.java.net/svn/mojarra~svn/trunk</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>edburns</id>
+ <name>Ed Burns</name>
+ <email>edward.burns at oracle.com</email>
+ <organization>Oracle America, Inc.</organization>
+ <roles>
+ <role>project-owner</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <id>rogerk</id>
+ <name>Roger Kitain</name>
+ <email>roger.kitain at oracle.com</email>
+ <organization>Oracle America, Inc.</organization>
+ <roles>
+ <role>project-owner</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ </developers>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>jvnet-nexus-snapshots</id>
+ <name>Java.net Nexus Snapshots Repository</name>
+ <url>https://maven.java.net/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>jvnet-nexus-staging</id>
+ <name>Java.net Nexus Staging Repository</name>
+ <url>https://maven.java.net/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>**/*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/jsf-api-2.1.7-javadoc.jar</file>
+ <type>jar</type>
+ <classifier>javadoc</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <issueManagement>
+ <system>issueZilla</system>
+ <url>
+ https://javaserverfaces.dev.java.net/servlets/ProjectIssues
+ </url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>JSF 2.2 Specification Comments</name>
+ <post>jsr-314-comments at jcp.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Mojarra 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>
+ <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>
+ <contributor>
+ <name>Jason Lee</name>
+ </contributor>
+ </contributors>
+ <organization>
+ <name>Oracle America, Inc</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>**/*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/jsf-api-2.1.7-javadoc.jar</file>
+ <type>jar</type>
+ <classifier>javadoc</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin> <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/jsf-impl-2.1.7.pom b/jsf-impl-2.1.7.pom
new file mode 100644
index 0000000..1828032
--- /dev/null
+++ b/jsf-impl-2.1.7.pom
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ or packager/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at packager/legal/LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.1.7</version>
+ <packaging>jar</packaging>
+ <name>
+ Oracle's implementation of the JSF 2.2 specification.
+ </name>
+ <description>
+ This is the master POM file for Oracle's Implementation of the JSF 2.2 Specification.
+ </description>
+ <url>http://java.sun.com/javaee/javaserverfaces/</url>
+ <licenses>
+ <license>
+ <name>
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL
+ </name>
+ <url>http://glassfish.java.net/nonav/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://java.net/projects/mojarra/sources</url>
+ <connection>scm:svn:https://svn.java.net/svn/mojarra~svn/trunk</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>edburns</id>
+ <name>Ed Burns</name>
+ <email>ed.burns at sun.com</email>
+ <organization>Oracle America, 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>Oracle America, 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>Oracle America, Inc.</organization>
+ <roles>
+ <role>project-owner</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <id>driscoll</id>
+ <name>Jim Driscoll</name>
+ <email>jim.dirscoll at sun.com</email>
+ <organization>Oracle America, Inc.</organization>
+ <roles>
+ <role>project-owner</role>
+ </roles>
+ <timezone>-9</timezone>
+ </developer>
+ </developers>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>jvnet-nexus-snapshots</id>
+ <name>Java.net Nexus Snapshots Repository</name>
+ <url>https://maven.java.net/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>jvnet-nexus-staging</id>
+ <name>Java.net Nexus Staging Repository</name>
+ <url>https://maven.java.net/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>**/*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/jsf-impl-2.1.7-javadoc.jar</file>
+ <type>jar</type>
+ <classifier>javadoc</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>target/classes/META-INF/MANIFEST.MF
+ </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ <issueManagement>
+ <system>issueZilla</system>
+ <url>
+ https://javaserverfaces.dev.java.net/servlets/ProjectIssues
+ </url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Oracle'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>
+ <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>
+ <contributor>
+ <name>Jason Lee</name>
+ </contributor>
+ </contributors>
+ <organization>
+ <name>Oracle America, Inc</name>
+ <url>http://www.oracle.com/</url>
+ </organization>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/mojarra-add-tomcat7-deploy-test-dependencies-target.patch b/mojarra-add-tomcat7-deploy-test-dependencies-target.patch
new file mode 100644
index 0000000..10b072e
--- /dev/null
+++ b/mojarra-add-tomcat7-deploy-test-dependencies-target.patch
@@ -0,0 +1,14 @@
+diff --git a/common/ant/tomcat7/container.xml b/common/ant/tomcat7/container.xml
+index bc7b40c..04a8c38 100644
+--- a/common/ant/tomcat7/container.xml
++++ b/common/ant/tomcat7/container.xml
+@@ -144,6 +144,9 @@
+ <copy overwrite="true" file="${jstl.jar}" todir="${container.home}/lib"/>
+ </target>
+
++ <target name="container.deploy.test.dependencies"
++ description="Deploy any container level dependencies to the container.">
++ </target>
+
+ <target name="container.start"
+ description="Start the Tomcat container">
diff --git a/mojarra-dont-build-injection-providers.patch b/mojarra-dont-build-injection-providers.patch
new file mode 100644
index 0000000..e79d6ae
--- /dev/null
+++ b/mojarra-dont-build-injection-providers.patch
@@ -0,0 +1,39 @@
+diff --git a/jsf-ri/build-pre-maven-rename.xml b/jsf-ri/build-pre-maven-rename.xml
+index d668084..aac1322 100644
+--- a/jsf-ri/build-pre-maven-rename.xml
++++ b/jsf-ri/build-pre-maven-rename.xml
+@@ -377,8 +377,6 @@
+ toDir="${build.classes.dir}/com/sun/faces"/>
+ <copy file="conf/xslt/facelets1_0-2_0toSchema.xsl"
+ toDir="${build.classes.dir}/com/sun/faces"/>
+- <unzip src="${jsf.build.home}/lib/injectionproviders.jar"
+- dest="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="${conf.share.dir}">
+ <include name="jsf_core.tld"/>
+diff --git a/jsf-ri/build-source.xml b/jsf-ri/build-source.xml
+index c0380a5..5f7195c 100644
+--- a/jsf-ri/build-source.xml
++++ b/jsf-ri/build-source.xml
+@@ -344,8 +344,6 @@
+ toDir="${build.classes.dir}/com/sun/faces"/>
+ <copy file="conf/xslt/facelets1_0-2_0toSchema.xsl"
+ toDir="${build.classes.dir}/com/sun/faces"/>
+- <unzip src="${jsf.build.home}/lib/injectionproviders.jar"
+- dest="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="${conf.share.dir}">
+ <include name="jsf_core.tld"/>
+diff --git a/jsf-ri/build.xml b/jsf-ri/build.xml
+index 50b37be..be5f799 100644
+--- a/jsf-ri/build.xml
++++ b/jsf-ri/build.xml
+@@ -371,8 +371,6 @@
+ toDir="${build.classes.dir}/com/sun/faces"/>
+ <copy file="conf/xslt/facelets1_0-2_0toSchema.xsl"
+ toDir="${build.classes.dir}/com/sun/faces"/>
+- <unzip src="${jsf.build.home}/lib/injectionproviders.jar"
+- dest="${build.classes.dir}"/>
+ <unzip src="${jsf-api-intermediate.jar}"
+ dest="${build.classes.dir}">
+ <patternset>
diff --git a/mojarra-dont-bundle-api.patch b/mojarra-dont-bundle-api.patch
new file mode 100644
index 0000000..20e99b6
--- /dev/null
+++ b/mojarra-dont-bundle-api.patch
@@ -0,0 +1,17 @@
+diff --git a/jsf-ri/build.xml b/jsf-ri/build.xml
+index be5f799..e387429 100644
+--- a/jsf-ri/build.xml
++++ b/jsf-ri/build.xml
+@@ -371,12 +371,6 @@
+ toDir="${build.classes.dir}/com/sun/faces"/>
+ <copy file="conf/xslt/facelets1_0-2_0toSchema.xsl"
+ toDir="${build.classes.dir}/com/sun/faces"/>
+- <unzip src="${jsf-api-intermediate.jar}"
+- dest="${build.classes.dir}">
+- <patternset>
+- <exclude name="META-INF/MANIFEST.MF" />
+- </patternset>
+- </unzip>
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="${conf.share.dir}">
+ <include name="jsf_core.tld"/>
diff --git a/mojarra-dont-download-dependencies.patch b/mojarra-dont-download-dependencies.patch
new file mode 100644
index 0000000..60f485a
--- /dev/null
+++ b/mojarra-dont-download-dependencies.patch
@@ -0,0 +1,504 @@
+diff --git a/common/ant/dependencies.xml b/common/ant/dependencies.xml
+index f7de676..f0cdbce 100644
+--- a/common/ant/dependencies.xml
++++ b/common/ant/dependencies.xml
+@@ -160,499 +160,6 @@
+
+
+ <target name="update" description="Download project dependencies">
+-
+- <if>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- <then>
+- <mkdir dir="${dependency.base.dir}/downloads"/>
+- <mkdir dir="${dependency.jar.dir}"/>
+- </then>
+- </if>
+-
+- <!-- setup the proxy if necessary -->
+- <if>
+- <and>
+- <length string="${http.proxy.host}" when="greater" length="0"/>
+- <length string="${http.proxy.port}" when="greater" length="0"/>
+- </and>
+- <then>
+- <setproxy proxyhost="${http.proxy.host}"
+- proxyport="${http.proxy.port}"/>
+- </then>
+- </if>
+-
+- <!-- GLASSFISH ANT JAR -->
+- <if>
+- <not>
+- <available file="${gf-ant.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="http://download.java.net/maven/glassfish/org/glassfish/ant-tasks/${gf-ant.version}/ant-tasks-${gf-ant.version}.jar"
+- dest="${gf-ant.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+-
+- <!-- JUNIT -->
+- <if>
+- <and>
+- <not>
+- <available file="${junit.jar}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="${java.net.maven2}/junit/junit/${junit.version}/junit-${junit.version}.jar"
+- dest="${junit.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+-
+- <!-- HTMLUNIT -->
+- <!--
+- This one needs a ton of extras, so we have to do this one like this or
+- add a bunch more deps. Maybe another day... :)
+- -->
+- <if>
+- <and>
+- <not>
+- <available file="${htmlunit.home}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="http://downloads.sourceforge.net/htmlunit/htmlunit-${htmlunit.version}.zip"
+- dest="${dependency.base.dir}/downloads/htmlunit-${htmlunit.version}.zip"
+- usetimestamp="true"/>
+- <unzip
+- src="${dependency.base.dir}/downloads/htmlunit-${htmlunit.version}.zip"
+- dest="${dependency.base.dir}"/>
+- </then>
+- </if>
+-
+- <!-- YUI Compressor -->
+- <if>
+- <and>
+- <not>
+- <available file="${yuicompressor.home}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="http://www.julienlecomte.net/yuicompressor/yuicompressor-${yuicompressor.version}.zip"
+- dest="${dependency.base.dir}/downloads/yuicompressor-${yuicompressor.version}.zip"
+- usetimestamp="true"/>
+- <unzip
+- src="${dependency.base.dir}/downloads/yuicompressor-${yuicompressor.version}.zip"
+- dest="${dependency.base.dir}"/>
+- <copy tofile="${yuicompressor.jar}"
+- file="${yuicompressor.home}/build/yuicompressor-${yuicompressor.version}.jar"/>
+- </then>
+- </if>
+-
+- <!-- CACTUS -->
+- <!-- Is this not in a maven repo somewhere? -->
+- <if>
+- <and>
+- <not>
+- <available file="${cactus.home}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="http://archive.apache.org/dist/jakarta/cactus/binaries/jakarta-cactus-${cactus.version}.zip"
+- dest="${dependency.base.dir}/downloads/jakarta-cactus-${cactus.version}.zip"
+- usetimestamp="true"/>
+- <unzip
+- src="${dependency.base.dir}/downloads/jakarta-cactus-${cactus.version}.zip"
+- dest="${dependency.base.dir}"/>
+- </then>
+- </if>
+-
+- <!-- TAGLIBDOC -->
+- <if>
+- <and>
+- <not>
+- <available file="${tlddoc.jar}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="${central.maven2}/taglibrarydoc/tlddoc/${taglibdoc.version}/tlddoc-${taglibdoc.version}.jar"
+- dest="${tlddoc.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+-
+- <!-- JSDOC -->
+- <if>
+- <and>
+- <not>
+- <available file="${jsdoc.home}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="http://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-${jsdoc.version}.zip"
+- dest="${dependency.base.dir}/downloads/jsdoc_toolkit-${jsdoc.version}.zip"
+- usetimestamp="true"/>
+- <unzip
+- src="${dependency.base.dir}/downloads/jsdoc_toolkit-${jsdoc.version}.zip"
+- dest="${dependency.base.dir}"/>
+- </then>
+- </if>
+-
+-
+- <!-- MAVEN REPOSITORY IMPORTER -->
+- <if>
+- <and>
+- <not>
+- <available file="${maven.repository.importer.jar}" property="ignored"/>
+- </not>
+- <not>
+- <isset property="build.source"/>
+- </not>
+- </and>
+- <then>
+- <get src="${java.net.maven}/com.sun.wts.tools.mri/jars/maven-repository-importer-${maven.repository.importer.version}.jar"
+- dest="${maven.repository.importer.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+-
+- <!-- JAVAEE API -->
+- <if>
+- <not>
+- <available file="${javaee-api.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven2}/javax/javaee-api/${javaee-api.version}/javaee-api-${javaee-api.version}.jar"
+- dest="${javaee-api.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- <!-- SERVLET API -->
+- <if>
+- <not>
+- <available file="${servlet.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/javax.servlet/jars/servlet-api-${servlet.api.version}.jar"
+- dest="${servlet.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+-
+- <if>
+- <not>
+- <available file="${servlet3.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${central.maven2}/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar"
+- dest="${servlet3.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+-
+-
+- <!-- JSP API -->
+- <!--
+- <if>
+- <not>
+- <available file="${jsp.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/javax.servlet.jsp/jars/jsp-api-${jsp.api.version}.jar"
+- dest="${jsp.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- -->
+- <!-- EL API and IMPL -->
+- <!--
+- <if>
+- <not>
+- <available file="${el-api.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/javax.el/jars/el-api-${el.version}.jar"
+- dest="${el-api.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- <if>
+- <not>
+- <available file="${el-impl.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/el-impl/jars/el-impl-${el.version}.jar"
+- dest="${el-impl.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- -->
+- <!-- JSTL API -->
+- <if>
+- <not>
+- <available file="${jstl.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/jstl/jars/jstl-${jstl.api.version}.jar"
+- dest="${jstl.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- <!-- ANNOTATION API -->
+- <!--
+- <if>
+- <not>
+- <available file="${annotation.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${java.net.maven}/javax.annotation/jars/jsr250-api-${annotation.api.version}.jar"
+- dest="${annotation.jar}"
+- usetimestamp="true"/>
+-
+- </then>
+- </if>
+- -->
+- <!-- Portlet -->
+- <!--
+- <if>
+- <not>
+- <available file="${portlet.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${maven2.mirror}/javax/portlet/portlet-api/${portlet.api.version}/portlet-api-${portlet.api.version}.jar"
+- dest="${portlet.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- Groovy -->
+- <if>
+- <not>
+- <available file="${groovy.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${codehaus.maven}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar"
+- dest="${groovy.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+-
+- <!-- Trinidad -->
+- <echo>${trinidad.zip}</echo>
+-
+- <if>
+- <not>
+- <available file="${trinidad.zip}" property="ignored"/>
+- </not>
+- <then>
+- <get src="http://myfaces.apache.org/dist/binaries/trinidad-${trinidad.version}-dist.zip"
+- dest="${trinidad.zip}"
+- usetimestamp="true"/>
+-
+- <unzip
+- src="${dependency.base.dir}/downloads/trinidad-${trinidad.version}-dist.zip"
+- dest="${dependency.base.dir}"/>
+- </then>
+- </if>
+-
+- <!-- JSR 330 -->
+- <if>
+- <not>
+- <available file="${javax-inject.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${redhat.maven2}/javax/inject/javax.inject/${javax-inject.version}/javax.inject-${javax-inject.version}.jar"
+- dest="${javax-inject.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- <!-- JSR 299 -->
+- <if>
+- <not>
+- <available file="${javax-enterprise.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${central.maven2}/javax/enterprise/cdi-api/${javax-enterprise.version}/cdi-api-${javax-enterprise.version}.jar"
+- dest="${javax-enterprise.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- <!-- JSR 303 -->
+- <!--
+- <if>
+- <not>
+- <available file="${validation-api.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="${redhat.maven2}/javax/validation/validation-api/${validation.version}/validation-api-${validation.version}.jar"
+- dest="${validation-api.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- buid commons from source -->
+-
+- <!-- comment out source build download of sun commons
+-
+- <echo>starting commons and build.source ${build.source}</echo>
+- <if>
+- <equals arg1="${build.source}" arg2="true"/>
+- <then>
+- <echo>build from source</echo>
+- <mkdir dir="${external.dir}"/>
+-
+- <exec executable="svn" dir="${external.dir}" failonerror="true">
+- <arg line="checkout"/>
+- <arg line="${commons.logging.url}"/>
+- <arg line="commons-logging"/>
+- </exec>
+-
+- <exec executable="svn" dir="${external.dir}" failonerror="true">
+- <arg line="checkout"/>
+- <arg line="${commons.collections.url}"/>
+- <arg line="commons-collections"/>
+- </exec>
+-
+- <exec executable="svn" dir="${external.dir}" failonerror="true">
+- <arg line="checkout"/>
+- <arg line="${commons.beanutils.url}"/>
+- <arg line="commons-beanutils"/>
+- </exec>
+-
+- <exec executable="svn" dir="${external.dir}" failonerror="true">
+- <arg line="checkout"/>
+- <arg line="${commons.digester.url}"/>
+- <arg line="commons-digester"/>
+- </exec>
+-
+- <ant antfile="${external.dir}/commons-logging/build.xml"
+- target="dist"
+- dir="${external.dir}/commons-logging"
+- inheritAll="false" />
+-
+- <ant antfile="${external.dir}/commons-collections/build.xml"
+- target="dist"
+- dir="${external.dir}/commons-collections"
+- inheritAll="false">
+- <property name="ant.build.javac.source" value="1.4"/>
+- </ant>
+-
+- <ant antfile="${external.dir}/commons-beanutils/build.xml"
+- target="dist"
+- dir="${external.dir}/commons-beanutils"
+- inheritAll="false">
+- <property name="commons-collections.home"
+- value="${external.dir}/commons-collections/dist"/>
+- <property name="commons-collections.jar" value="${external.dir}/commons-collections/dist/commons-collections.jar"/>
+- <property name="commons-logging.home" value="${external.dir}/commons-logging/dist"/>
+- <property name="commons-logging.jar" value="${external.dir}/commons-logging/dist/commons-logging.jar"/>
+- </ant>
+-
+- <ant antfile="${external.dir}/commons-digester/build.xml"
+- target="dist"
+- dir="${external.dir}/commons-digester"
+- inheritAll="false">
+- <property name="commons-collections.home"
+- value="${external.dir}/commons-collections/dist"/>
+- <property name="commons-collections.jar" value="${external.dir}/commons-collections/dist/commons-collections.jar"/>
+- <property name="commons-logging.home" value="${external.dir}/commons-logging/dist"/>
+- <property name="commons-logging.jar" value="${external.dir}/commons-logging/dist/commons-logging.jar"/>
+- <property name="commons-beanutils.home" value="${external.dir}/commons-beanutils/dist"/>
+- <property name="commons-beanutils.jar" value="${external.dir}/commons-beanutils/dist/commons-beanutils.jar"/>
+- </ant>
+- <copy file="${external.dir}/commons-logging/dist/commons-logging.jar" tofile="${commons.logging.jar}"/>
+- <copy file="${external.dir}/commons-collections/dist/commons-collections.jar" tofile="${commons.collections.jar}"/>
+- <copy file="${external.dir}/commons-beanutils/dist/commons-beanutils.jar" tofile="${commons.beanutils.jar}"/>
+- <copy file="${external.dir}/commons-digester/dist/commons-digester.jar" tofile="${commons.digester.jar}"/>
+-
+- </then>
+- <else>
+- -->
+-
+- <!-- BEANUTILS -->
+- <!--
+- <if>
+- <not>
+- <available file="${commons-beanutils.jar}" property="ignored"/>
+- </not>
+- <then>
+- <echo> get beanutils</echo>
+- <get src="http://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/${beanutils.version}/commons-beanutils-${beanutils.version}.jar"
+- dest="${commons-beanutils.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- DIGESTER -->
+- <!--
+- <if>
+- <not>
+- <available file="${commons-digester.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="http://repo1.maven.org/maven2/commons-digester/commons-digester/${digester.version}/commons-digester-${digester.version}.jar"
+- dest="${commons-digester.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- COLLECTIONS -->
+- <!--
+- <if>
+- <not>
+- <available file="${commons-collections.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/${collections.version}/commons-collections-${collections.version}.jar"
+- dest="${commons-collections.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- LOGGING_API -->
+- <!--
+- <if>
+- <not>
+- <available file="${commons-logging.jar}" property="ignored"/>
+- </not>
+- <then>
+- <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/${logging.version}/commons-logging-${logging.version}.jar"
+- dest="${commons-logging.jar}"
+- usetimestamp="true"/>
+- </then>
+- </if>
+- -->
+- <!-- comment out source build of sun commons
+- </else>
+- </if>
+- -->
+ </target>
+
+
diff --git a/mojarra-dont-use-yuicompressor.patch b/mojarra-dont-use-yuicompressor.patch
new file mode 100644
index 0000000..78a86ef
--- /dev/null
+++ b/mojarra-dont-use-yuicompressor.patch
@@ -0,0 +1,118 @@
+diff --git a/common/ant/dependencies.xml b/common/ant/dependencies.xml
+index f0cdbce..c0d0166 100644
+--- a/common/ant/dependencies.xml
++++ b/common/ant/dependencies.xml
+@@ -80,7 +80,6 @@
+ <property name="javax-inject.version" value="1.0-PFD-1"/>
+ <property name="javax-enterprise.version" value="1.0-SP1"/>
+ <property name="maven.repository.importer.version" value="1.2"/>
+- <property name="yuicompressor.version" value="2.4.2"/>
+
+ <property name="central.maven2" value="http://repo1.maven.org/maven2" />
+ <property name="redhat.maven2" value="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases"/>
+@@ -108,7 +107,6 @@
+ <property name="jsp.home" value="${dependency.base.dir}/jsp-${jsp.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}"/>
+- <property name="yuicompressor.home" value="${dependency.base.dir}/yuicompressor-${yuicompressor.version}"/>
+ <property name="trinidad.home" value="${dependency.base.dir}/trinidad-assembly-${trinidad.version}"/>
+ <property name="trinidad.zip" value="${dependency.base.dir}/downloads/trinidad-${trinidad.version}-dist.zip"/>
+
+@@ -118,7 +116,6 @@
+ <property name="commons-digester.jar" value="${dependency.jar.dir}/commons-digester-${digester.version}.jar"/>
+ <property name="commons-collections.jar" value="${dependency.jar.dir}/commons-collections-${collections.version}.jar"/>
+ <property name="commons-logging.jar" value="${dependency.jar.dir}/commons-logging-${logging.version}.jar"/>
+- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
+ <property name="tlddoc.jar" value="${dependency.jar.dir}/tlddoc-${taglibdoc.version}.jar"/>
+ <property name="jsdoc.jar" value="${dependency.jar.dir}/jsdoc-${jsdoc.version}.jar"/>
+ <property name="maven.repository.importer.jar"
+diff --git a/jsf-ri/build-pre-maven-rename.xml b/jsf-ri/build-pre-maven-rename.xml
+index 473f8e2..d668084 100644
+--- a/jsf-ri/build-pre-maven-rename.xml
++++ b/jsf-ri/build-pre-maven-rename.xml
+@@ -87,7 +87,6 @@
+
+ <property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
+ <property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
+- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
+ <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
+ <property name="javadoc.private" value="true"/>
+ <property name="javadoc.protected" value="false"/>
+@@ -343,7 +342,7 @@
+ </fileset>
+ </copy>
+
+- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
++ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
+ <filelist dir="${api.dir}/src/main/resources">
+ <file name="jsf.js"/>
+ </filelist>
+@@ -352,8 +351,6 @@
+ </filelist>
+ </concat>
+
+- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
+- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
+ <!--
+ RELEASE_PENDING (rlubke,driscoll)
+ For now these are copied to the root of the jsf-impl.jar, but
+diff --git a/jsf-ri/build-source.xml b/jsf-ri/build-source.xml
+index 5eb796a..c0380a5 100644
+--- a/jsf-ri/build-source.xml
++++ b/jsf-ri/build-source.xml
+@@ -83,7 +83,6 @@
+
+ <property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
+ <property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
+- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
+
+ <path id="impl.compile.classpath">
+ <pathelement location="${jsf-api-intermediate.jar}"/>
+@@ -310,7 +309,7 @@
+ </fileset>
+ </copy>
+
+- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
++ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
+ <filelist dir="${api.dir}/src/main/resources">
+ <file name="jsf.js"/>
+ </filelist>
+@@ -319,8 +318,6 @@
+ </filelist>
+ </concat>
+
+- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
+- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
+ <!--
+ RELEASE_PENDING (rlubke,driscoll)
+ For now these are copied to the root of the javax.faces.jar, but
+diff --git a/jsf-ri/build.xml b/jsf-ri/build.xml
+index aa0cdc7..50b37be 100644
+--- a/jsf-ri/build.xml
++++ b/jsf-ri/build.xml
+@@ -84,7 +84,6 @@
+
+ <property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
+ <property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
+- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
+ <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
+ <property name="javadoc.private" value="true"/>
+ <property name="javadoc.protected" value="false"/>
+@@ -337,7 +336,7 @@
+ </fileset>
+ </copy>
+
+- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
++ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
+ <filelist dir="${api.dir}/src/main/resources">
+ <file name="jsf.js"/>
+ </filelist>
+@@ -346,8 +345,6 @@
+ </filelist>
+ </concat>
+
+- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
+- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
+ <!--
+ RELEASE_PENDING (rlubke,driscoll)
+ For now these are copied to the root of the javax.faces.jar, but
diff --git a/mojarra-fix-ant-gid.patch b/mojarra-fix-ant-gid.patch
new file mode 100644
index 0000000..b48cb54
--- /dev/null
+++ b/mojarra-fix-ant-gid.patch
@@ -0,0 +1,13 @@
+diff --git a/jsf-tools/pom.xml b/jsf-tools/pom.xml
+index 3dbc22f..5068b69 100644
+--- a/jsf-tools/pom.xml
++++ b/jsf-tools/pom.xml
+@@ -77,7 +77,7 @@
+ </build>
+ <dependencies>
+ <dependency>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
diff --git a/mojarra-fix-classpaths.patch b/mojarra-fix-classpaths.patch
new file mode 100644
index 0000000..0ef4112
--- /dev/null
+++ b/mojarra-fix-classpaths.patch
@@ -0,0 +1,27 @@
+diff --git a/common/ant/common.xml b/common/ant/common.xml
+index 199e5d3..6629ff5 100644
+--- a/common/ant/common.xml
++++ b/common/ant/common.xml
+@@ -119,7 +119,7 @@
+ <!-- Intra-project dependency property names -->
+
+ <property name="jsf-tools.jar"
+- value="${maven.repo.local}/com/sun/faces/build/jsf-tools/${snapshot.version}/jsf-tools-${snapshot.version}.jar" />
++ value="${jsf.build.home}/jsf-tools/target/jsf-tools-${snapshot.version}.jar" />
+
+ <!-- Test classpaths that are used in multiple places within the project -->
+ <path id="junit.classpath">
+@@ -157,11 +157,11 @@
+ </path>
+
+ <path id="compile.classpath">
+- <path refid="compile.path"/>
++ <fileset dir="${jsf.build.home}/lib/compile"/>
+ </path>
+
+ <path id="apache.commons.classpath">
+- <path refid="commons.path"/>
++ <fileset dir="${jsf.build.home}/lib"/>
+ </path>
+
+ <!-- HtmlUnit client classpath -->
diff --git a/mojarra-fix-maven-ant-tasks-classpath.patch b/mojarra-fix-maven-ant-tasks-classpath.patch
new file mode 100644
index 0000000..b0cd363
--- /dev/null
+++ b/mojarra-fix-maven-ant-tasks-classpath.patch
@@ -0,0 +1,109 @@
+diff --git a/common/ant/common.xml b/common/ant/common.xml
+index 8c18887..199e5d3 100644
+--- a/common/ant/common.xml
++++ b/common/ant/common.xml
+@@ -41,7 +41,7 @@
+
+ -->
+
+-<project name="JSF Common" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
++<project name="JSF Common" basedir=".">
+
+ <import file="${jsf.build.home}/common/ant/dependencies.xml"/>
+ <import file="${jsf.build.home}/common/ant/test-app.xml"/>
+@@ -59,12 +59,6 @@
+ </classpath>
+ </taskdef>
+
+- <path id="maven-ant-tasks.classpath" path="${jsf.build.home}/common/lib/maven-ant-tasks-2.0.10.jar" />
+- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+- uri="antlib:org.apache.maven.artifact.ant"
+- classpathref="maven-ant-tasks.classpath" />
+-
+-
+ <!-- Setup the time properties for use with the project -->
+ <tstamp/>
+
+@@ -122,82 +116,6 @@
+ <!-- Debug args (OVERRIDE IN BUILD.PROPERTIES) -->
+ <property name="debug.jvm.args" value=""/>
+
+- <!-- TODO remove this once maven stuff is complete, it's just here for reference.
+-
+- <target name="mvn-init" unless="compile.classpath" xmlns:artifact="urn:maven-artifact-ant">
+- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
+- classpath="lib/maven-ant-tasks-2.0.9.jar"/>
+- <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository">
+- <isset property="maven.repo.local"/>
+- </condition>
+- <echo>maven.repo.local=${maven.repo.local}</echo>
+- <artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
+- <artifact:pom file="pom.xml" id="maven.project"/>
+- <artifact:dependencies pathId="compile.classpath" filesetId="compile.fileset" useScope="compile">
+- <pom refid="maven.project"/>
+- <localRepository refid="local.repository"/>
+- </artifact:dependencies>
+- <artifact:dependencies pathId="test.classpath" filesetId="test.fileset" useScope="test">
+- <pom refid="maven.project"/>
+- <localRepository refid="local.repository"/>
+- </artifact:dependencies>
+- <artifact:dependencies pathId="runtime.classpath" filesetId="runtime.fileset" useScope="runtime">
+- <pom refid="maven.project"/>
+- <localRepository refid="local.repository"/>
+- </artifact:dependencies>
+- </target>
+-
+- -->
+- <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository">
+- <isset property="maven.repo.local"/>
+- </condition>
+-
+- <artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
+-
+- <artifact:remoteRepository id="jboss.repo" url="https://repository.jboss.org/nexus/"/>
+- <artifact:remoteRepository id="j.n.repo" url="http://download.java.net/maven/2/"/>
+- <artifact:remoteRepository id="gf.repo" url="http://download.java.net/maven/glassfish/"/>
+- <artifact:remoteRepository id="gf.nexus.repo" url="http://maven.glassfish.org/content/groups/glassfish/"/>
+- <artifact:remoteRepository id="codehaus.repo" url="http://repository.codehaus.org/"/>
+- <artifact:remoteRepository id="ibiblio.repo" url="http://mirrors.ibiblio.org/pub/mirrors/maven2/"/>
+-
+- <artifact:dependencies filesetId="compile.filepath" pathId="compile.path">
+- <dependency groupId="javax.el" artifactId="el-api" version="1.0" scope="provided"/>
+- <dependency groupId="org.glassfish" artifactId="javax.servlet" version="3.0-SNAPSHOT" scope="provided"/>
+- <dependency groupId="javax.servlet.jsp" artifactId="jsp-api" version="2.1" scope="provided"/>
+- <dependency groupId="javax.annotation" artifactId="jsr250-api" version="1.0" scope="provided"/>
+- <dependency groupId="org.codehaus.groovy" artifactId="groovy-all" version="1.6.9" scope="provided"/>
+- <dependency groupId="javax.validation" artifactId="validation-api" version="1.0.0.GA" scope="provided"/>
+- <dependency groupId="javax.inject" artifactId="javax.inject" version="1.0-PFD-1" scope="provided"/>
+- <dependency groupId="jstl" artifactId="jstl" version="1.2" scope="provided" />
+- <dependency groupId="com.sun.el" artifactId="el-ri" version="1.0" scope="provided"/>
+- <localRepository refid="local.repository"/>
+- <remoteRepository refid="j.n.repo"/>
+- <remoteRepository refid="gf.repo"/>
+- <remoteRepository refid="gf.nexus.repo"/>
+- <remoteRepository refid="jboss.repo"/> <!-- needed for validation-api -->
+- </artifact:dependencies>
+-
+- <artifact:dependencies filesetId="commons.filepath" pathId="commons.path">
+- <dependency groupId="commons-collections" artifactId="commons-collections" version="2.1.1"/>
+- <dependency groupId="commons-digester" artifactId="commons-digester" version="1.5"/>
+- <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.6.1"/>
+- <dependency groupId="commons-logging" artifactId="commons-logging" version="1.0.4"/>
+- <localRepository refid="local.repository"/>
+- <remoteRepository refid="gf.nexus.repo"/>
+- </artifact:dependencies>
+-
+- <artifact:dependencies filesetId="servlet25test.filepath" pathId="servlet25test.path">
+- <dependency groupId="javax.el" artifactId="el-api" version="1.0" scope="provided"/>
+- <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.5"/>
+- <dependency groupId="javax.servlet.jsp" artifactId="jsp-api" version="2.1" scope="provided"/>
+- <dependency groupId="javax.servlet.jsp.jstl" artifactId="jstl-api" version="1.2" scope="provided"/>
+- <dependency groupId="javax.annotation" artifactId="jsr250-api" version="1.0" scope="provided"/>
+- <localRepository refid="local.repository"/>
+- <remoteRepository refid="gf.nexus.repo"/>
+- </artifact:dependencies>
+-
+-
+ <!-- Intra-project dependency property names -->
+
+ <property name="jsf-tools.jar"
diff --git a/mojarra-jdk7.patch b/mojarra-jdk7.patch
new file mode 100644
index 0000000..0ccd189
--- /dev/null
+++ b/mojarra-jdk7.patch
@@ -0,0 +1,25 @@
+diff --git a/jsf-tools/pom.xml b/jsf-tools/pom.xml
+index 5068b69..06c0c9a 100644
+--- a/jsf-tools/pom.xml
++++ b/jsf-tools/pom.xml
+@@ -101,7 +101,7 @@
+ <activation>
+ <property>
+ <name>java.vendor</name>
+- <value>Sun Microsystems Inc.</value>
++ <value>Oracle Corporation</value>
+ </property>
+ </activation>
+ <dependencies>
+diff --git a/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java b/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java
+index 4113de9..7f00c41 100644
+--- a/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java
++++ b/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java
+@@ -181,7 +181,6 @@ public class StripClassesForApiJar extends AbstractProcessor {
+ com.sun.tools.javac.main.JavaCompiler compiler = com.sun.tools.javac.main.JavaCompiler.instance(task.getContext());
+ ClassReader reader = ClassReader.instance(task.getContext());
+ ClassWriter writer = ClassWriter.instance(task.getContext());
+- Name.Table names = Name.Table.instance(task.getContext());
+ Type.moreInfo = true;
+ Pool pool = new Pool();
+ ClassSymbol cs = null;
diff --git a/mojarra-remove-installer-builder.patch b/mojarra-remove-installer-builder.patch
new file mode 100644
index 0000000..4e4d832
--- /dev/null
+++ b/mojarra-remove-installer-builder.patch
@@ -0,0 +1,50 @@
+diff --git a/build.xml b/build.xml
+index 32b4103..fe990da 100644
+--- a/build.xml
++++ b/build.xml
+@@ -501,11 +501,6 @@
+ <zip destfile="${basedir}/mojarra-samples.zip"
+ basedir="${basedir}/samples"/>
+ <delete dir="samples"/>
+-
+- <installerBuilder
+- classFile="${dist.dir}/mojarra-samples.class"
+- licenseFile="${LICENSEFILE}"
+- zipFile="${basedir}/mojarra-samples.zip"/>
+ </target>
+
+ <target name="updatecenter2" depends="main">
+diff --git a/common/ant/common.xml b/common/ant/common.xml
+index da8e10c..8c18887 100644
+--- a/common/ant/common.xml
++++ b/common/ant/common.xml
+@@ -59,12 +59,6 @@
+ </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>
+ <path id="maven-ant-tasks.classpath" path="${jsf.build.home}/common/lib/maven-ant-tasks-2.0.10.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+diff --git a/common/ant/source-build-setup.xml b/common/ant/source-build-setup.xml
+index f2cfad5..b01d804 100644
+--- a/common/ant/source-build-setup.xml
++++ b/common/ant/source-build-setup.xml
+@@ -59,12 +59,6 @@
+ </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>
+ <path id="maven-ant-tasks.classpath" path="${jsf.build.home}/common/lib/maven-ant-tasks-2.0.10.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
diff --git a/mojarra.spec b/mojarra.spec
new file mode 100644
index 0000000..20fdc38
--- /dev/null
+++ b/mojarra.spec
@@ -0,0 +1,222 @@
+Name: mojarra
+Version: 2.1.7
+Release: 2%{?dist}
+Summary: JSF Reference Implementation
+
+Group: Development/Libraries
+License: CDDL or GPLv2 with exceptions
+URL: http://javaserverfaces.java.net
+
+# svn export https://svn.java.net/svn/mojarra~svn/tags/2.1.7/ mojarra-2.1.7
+# find mojarra-2.1.7/ -name '*.class' -delete
+# find mojarra-2.1.7/ -name '*.jar' -delete
+# tar czf mojarra-2.1.7.tgz mojarra-2.1.7
+Source0: %{name}-%{version}.tgz
+Source1: http://repo1.maven.org/maven2/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.pom
+Source2: http://repo1.maven.org/maven2/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.pom
+
+# Don't use the installer builder as it requires additional dependences and it
+# is only used to build installers, which we don't use:
+Patch0: %{name}-remove-installer-builder.patch
+
+# Fix the classpath for maven ant tasks to include all the needed jar files:
+Patch1: %{name}-fix-maven-ant-tasks-classpath.patch
+
+# Add the target to deploy test dependencies to the Tomcat 7 container
+# configuration:
+Patch2: %{name}-add-tomcat7-deploy-test-dependencies-target.patch
+
+# Don't try to download dependencies:
+Patch3: %{name}-dont-download-dependencies.patch
+
+# Fix the ant group id, it should be org.apache.ant instead of just ant:
+Patch4: %{name}-fix-ant-gid.patch
+
+# Use "Oracle Corporation" as the name of the Java vendor, otherwise the
+# profile that adds tools.jar to the classpath is not activated:
+Patch5: %{name}-jdk7.patch
+
+# The classpaths were calculated using the maven ant tasks, but we removed
+# that, so we need to build fix them:
+Patch6: %{name}-fix-classpaths.patch
+
+# Don't compres JavaScript using YUI compressor, as we don't have it available
+# in the distribution:
+Patch7: %{name}-dont-use-yuicompressor.patch
+
+# Don't build the Tomcat 6, Jetty and Glassfish injection providers:
+Patch8: %{name}-dont-build-injection-providers.patch
+
+# Don't bundle the API inside the implementation:
+Patch9: %{name}-dont-bundle-api.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: ant
+BuildRequires: ant-contrib
+BuildRequires: maven
+BuildRequires: groovy
+BuildRequires: aqute-bnd
+BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-el-2.2-api
+BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: geronimo-annotation
+BuildRequires: geronimo-validation
+
+Requires: jpackage-utils
+Requires: java
+Requires: tomcat-servlet-3.0-api
+Requires: tomcat-el-2.2-api
+Requires: tomcat-jsp-2.2-api
+Requires: geronimo-annotation
+Requires: geronimo-validation
+
+
+%description
+JvaServer(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 javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+
+# Unpack and patch the original sources:
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+# Remove binaries (I know this is already mentinoned in the instructions to
+# build the source tarball above, but it doesn't hurt):
+find . -name '*.class' -delete
+find . -name '*.jar' -delete
+
+# Convert the license file to UTF-8:
+mv LICENSE LICENSE.tmp
+iconv -f ISO-8859-1 -t UTF-8 LICENSE.tmp > LICENSE
+
+
+%build
+
+# Create links for the apache commons jars:
+mkdir -p lib
+names='
+apache-commons-collections
+apache-commons-digester
+apache-commons-beanutils
+apache-commons-logging
+'
+for name in ${names}
+do
+ ln -s `build-classpath ${name}` lib/${name}.jar
+done
+
+# Create links for the jars used for compilation:
+mkdir -p lib/compile
+names='
+taglibs-core
+tomcat-servlet-3.0-api
+tomcat-el-2.2-api
+tomcat-jsp-2.2-api
+geronimo-annotation
+geronimo-validation
+groovy
+'
+for name in ${names}
+do
+ ln -s `build-classpath ${name}` lib/compile/${name}.jar
+done
+
+# Some other jars that require specific version number in the names:
+mkdir -p common/lib
+ln -s `build-classpath aqute-bnd` common/lib/bnd-0.0.249.jar
+
+
+# Build it the binaries:
+ant \
+ -Dbuild.sysclasspath=last \
+ -Djsf.build.home=$PWD \
+ -Dcontainer.name=tomcat7 \
+ -Dmvn.cmd=`which mvn-rpmbuild`
+
+# Generate the javadocs:
+ant \
+ -Dbuild.sysclasspath=last \
+ -Djsf.build.home=$PWD \
+ -Dcontainer.name=tomcat7 \
+ -f jsf-api/build.xml \
+ javadocs
+
+ant \
+ -Dbuild.sysclasspath=last \
+ -Djsf.build.home=$PWD \
+ -Dcontainer.name=tomcat7 \
+ -f jsf-ri/build.xml \
+ javadocs
+
+
+%install
+
+# Jar files:
+install -d -m 755 %{buildroot}%{_javadir}/%{name}
+install -m 644 jsf-api/build/lib/jsf-api-intermediate.jar %{buildroot}%{_javadir}/%{name}/jsf-api.jar
+install -m 644 jsf-ri/build/lib/javax.faces.jar %{buildroot}%{_javadir}/%{name}/jsf-impl.jar
+
+# POM files:
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-api.pom
+install -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-impl.pom
+
+# API javadoc files:
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/jsf-api
+cp -rp jsf-api/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}/jsf-api/.
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/jsf-impl
+cp -rp jsf-api/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}/jsf-impl/.
+
+# Dependencies map:
+%add_maven_depmap JPP.%{name}-jsf-api.pom %{name}/jsf-api.jar
+%add_maven_depmap JPP.%{name}-jsf-impl.pom %{name}/jsf-impl.jar
+
+
+%files
+%{_javadir}/%{name}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%doc LICENSE
+%doc docs/index.html
+%doc docs/releasenotes.html
+%doc docs/community.html
+%doc docs/jsf-2_1-changelog.html
+
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE
+
+
+%changelog
+* Wed Mar 7 2012 Juan Hernandez <juan.hernandez at redhat.com> 2.1.7-2
+- Cleanup of the spec file
+
+* Wed Feb 29 2012 Marek Goldmann <mgoldman at redhat.com> 2.1.7-1
+- Initial packaging
diff --git a/sources b/sources
index e69de29..869a99e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f397cefdd5d6345c1b91a46449db39e0 mojarra-2.1.7.tgz
More information about the scm-commits
mailing list