Skip to content

Commit

Permalink
AS7-6466 Update JSF based on Mojarra 2.1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
ssilvert committed Feb 6, 2013
1 parent 24642ac commit 32c4bda
Show file tree
Hide file tree
Showing 3 changed files with 281 additions and 1 deletion.
22 changes: 22 additions & 0 deletions build.xml
Expand Up @@ -132,6 +132,28 @@
<ant dir="jsf-ri" target="main" />
</target>

<target name="split-impl" description="Split jsf jars back into jsf-api and jsf-impl">
<delete file="${impl.dir}/build/lib/jboss-jsf-api.jar"/>
<jar destfile="${impl.dir}/build/lib/jboss-jsf-api.jar">
<zipfileset src="${javax.faces.jar}"
excludes="com/**,
META-INF/mojarra*,
META-INF/*.tld,
META-INF/*.xml,
META-INF/*.xhtml,
META-INF/mojarra-jsf-api-probe-provider.xml,
META-INF/resources/**,
META-INF/services/**"/>
</jar>

<delete file="${impl.dir}/build/lib/jboss-jsf-impl.jar"/>
<jar destfile="${impl.dir}/build/lib/jboss-jsf-impl.jar">
<zipfileset src="${javax.faces.jar}"
excludes="javax/**,
META-INF/mojarra-jsf-api-probe-provider.xml"/>
</jar>
</target>

<target name="main.from.source" description="Build Mojarra, including some dependencies">
<subant target="main" inheritAll="false">
<property name="build.source" value="true"/>
Expand Down
258 changes: 258 additions & 0 deletions jsf-impl-2.1.18-jbossorg.pom
@@ -0,0 +1,258 @@
<?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.18-jbossorg-1</version>
<packaging>jar</packaging>
<name>
Oracle's implementation of the JSF 2.1 specification.
</name>
<description>
This is the master POM file for Oracle's Implementation of the JSF 2.1 Specification.
</description>
<url>http://java.sun.com/javaee/javaserverfaces/</url>
<licenses>
<license>
<name>
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL
</name>
<url>https://glassfish.dev.java.net/public/CDDL+GPL.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>http://github.com/jboss/mojarra/</url>
<connection>scm:git://github.com/jboss/mojarra.git</connection>
</scm>
<developers>
<developer>
<id>edburns</id>
<name>Ed Burns</name>
<email>edward.burns@oracle.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@oracle.com</email>
<organization>Oracle America, Inc.</organization>
<roles>
<role>developer</role>
</roles>
<timezone>-9</timezone>
</developer>
<developer>
<id>rogerk</id>
<name>Roger Kitain</name>
<email>Roger.Kitain@oracle.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@oracle.com</email>
<organization>Oracle America, Inc.</organization>
<roles>
<role>project-owner</role>
</roles>
<timezone>-9</timezone>
</developer>
<developer>
<id>sheetalv</id>
<name>Sheetal Vartak</name>
<email>sheetal.vartak@oracle.com</email>
<organization>Oracle America, Inc.</organization>
<roles>
<role>developer</role>
</roles>
<timezone>-9</timezone>
</developer>
</developers>
<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>java.net-maven2-repository</id>
<url>svn:https://svn.java.net/svn/maven2-repository~svn/trunk/repository</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-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.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>target/classes/META-INF/MANIFEST.MF
</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.jvnet.wagon-svn</groupId>
<artifactId>wagon-svn</artifactId>
<version>1.8</version>
</extension>
</extensions>

</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@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>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>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion jsf-ri/build.xml
Expand Up @@ -328,7 +328,7 @@
<!-- Massage the version number into LogStrings.properties -->
<replace dir="${build.classes.dir}/com/sun/faces/"
token="|version.string|"
value="${impl.version.number} (${build.type} ${build.number} ${svn.revision.url})">
value="2.1.18-jbossorg-1 ${build.number}">
<include name="LogStrings*.properties"/>
</replace>

Expand Down

0 comments on commit 32c4bda

Please sign in to comment.