[mojarra] 03/06: Drop patches. Rebase them for new release if necessary.
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Aug 30 16:22:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch experimental
in repository mojarra.
commit d7badf680abff35f9796769458a80a9287404f87
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Aug 25 13:30:06 2014 +0200
Drop patches. Rebase them for new release if necessary.
---
debian/patches/650430.diff | 365 -----------------------------------
debian/patches/fix_debian_build.diff | 260 -------------------------
debian/patches/series | 2 -
3 files changed, 627 deletions(-)
diff --git a/debian/patches/650430.diff b/debian/patches/650430.diff
deleted file mode 100644
index bbb6c7f..0000000
--- a/debian/patches/650430.diff
+++ /dev/null
@@ -1,365 +0,0 @@
-Description: Do not allow the value of UIViewParam to be an EL Expression
-Author: Ed Burns <ed.burns at sun.com>
-Origin: upstream, http://java.net/projects/mojarra/sources/svn/revision/9468
-Bug: http://java.net/jira/browse/JAVASERVERFACES-2247
-Bug-Debian: http://bugs.debian.org/650430
-Forwarded: http://java.net/projects/mojarra/sources/svn/revision/9468
-Reviewed-By: Ed Burns <ed.burns at sun.com>
-Last-Update: 2011-11-29
-
---- mojarra-2.0.3.orig/jsf-api/build.xml
-+++ mojarra-2.0.3/jsf-api/build.xml
-@@ -308,6 +308,9 @@
- filtering="true"/>
-
- <filter token="package" value="javax.faces.component"/>
-+ <copy file="${tools.dir}/template-src/SharedUtils.java"
-+ todir="${build.generate.dir}/javax/faces/component"
-+ filtering="true"/>
- <copy file="${tools.dir}/template-src/MessageFactory.java"
- todir="${build.generate.dir}/javax/faces/component"
- filtering="true"/>
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_zh_TW.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_zh_TW.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=\
- severe.component.unable_to_process_expression=\u8655\u7406\u5c6c\u6027 {1} \u7684\u8868\u793a\u5f0f {0} \u6642\u767c\u751f\u7570\u5e38\u3002
- severe.component.uiviewroot_error_invoking_phaselistener=\u547c\u53eb UIViewRoot PhaseListener {0} \u6642\u767c\u751f\u7570\u5e38\u3002
- warning.component.uiviewroot_non_serializable_attribute_viewmap=\u5c07\u4e0d\u53ef\u4e32\u5217\u5316\u7684\u5c6c\u6027\u503c\u8a2d\u70ba ViewMap\uff1a(\u6a5f\u78bc: {0}\uff0c\u503c\u985e\u5225: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_fr.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_fr.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=E
- severe.component.unable_to_process_expression=Exception lors du traitement de l''expression {0} de l''attribut {1}.
- severe.component.uiviewroot_error_invoking_phaselistener=Exception invoquant UIViewRoot PhaseListener {0}.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=D\u00e9finition d''une valeur d''attribut non-s\u00e9rialisable dans ViewMap\u00a0: (cl\u00e9\u00a0: {0}, classe de la valeur\u00a0: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_zh_CN.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_zh_CN.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=\
- severe.component.unable_to_process_expression=\u5904\u7406\u5c5e\u6027 {1} \u7684\u8868\u8fbe\u5f0f {0} \u65f6\u51fa\u73b0\u5f02\u5e38\u3002
- severe.component.uiviewroot_error_invoking_phaselistener=\u8c03\u7528 UIViewRoot PhaseListener {0} \u65f6\u51fa\u73b0\u5f02\u5e38\u3002
- warning.component.uiviewroot_non_serializable_attribute_viewmap=\u5c06\u4e0d\u53ef\u5e8f\u5217\u5316\u5c5e\u6027\u503c\u8bbe\u7f6e\u4e3a ViewMap\uff1a\uff08\u5bc6\u94a5\uff1a{0}\uff0c\u503c\u7c7b\uff1a{1}\uff09
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=A
- severe.component.unable_to_process_expression=Exception while processing expression {0} for attribute {1}.
- severe.component.uiviewroot_error_invoking_phaselistener=Exception invoking UIViewRoot PhaseListener {0}.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=Setting non-serializable attribute value into ViewMap: (key: {0}, value class: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_de.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_de.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=A
- severe.component.unable_to_process_expression=Ausnahme beim Verarbeiten von Ausdruck {0} f\u00fcr Attribut {1}.
- severe.component.uiviewroot_error_invoking_phaselistener=Ausnahme ruft UIViewRoot PhaseListener {0} auf.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=Der nicht serialisierbare Attributswert wird in ViewMap eingestellt: (Schl\u00fcssel: {0}, Wertklasse: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_es.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_es.properties
-@@ -54,6 +54,9 @@ error.component.abortprocessing_thrown=S
- severe.component.unable_to_process_expression=Excepci\u00f3n al procesar la expresi\u00f3n {0} para el atributo {1}.
- severe.component.uiviewroot_error_invoking_phaselistener=Excepci\u00f3n al invocar la escucha de fase UIViewRoot {0}.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=Definiendo valor de atributo no serializable en ViewMap: (clave: {0}, clase de valor: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_pt_BR.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_pt_BR.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=A
- severe.component.unable_to_process_expression=Exce\u00e7\u00e3o criada durante o processamento da express\u00e3o {0} para o atributo {1}.
- severe.component.uiviewroot_error_invoking_phaselistener=Exce\u00e7\u00e3o criada ao invocar\u00b7UIViewRoot PhaseListener {0}.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=Definindo valor de atributo n\u00e3o serializ\u00e1vel em ViewMap (chave: {0}, classe do valor: {1}).
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_ko.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_ko.properties
-@@ -54,6 +54,8 @@ error.component.abortprocessing_thrown=I
- severe.component.unable_to_process_expression={1} \uc18d\uc131\uc5d0 \ub300\ud55c \ud45c\ud604\uc2dd {0}\uc744(\ub97c) \ucc98\ub9ac\ud558\ub294 \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
- severe.component.uiviewroot_error_invoking_phaselistener=UIViewRoot PhaseListener {0}\uc744(\ub97c) \ud638\ucd9c\ud558\ub294 \uc911 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
- warning.component.uiviewroot_non_serializable_attribute_viewmap=\uc77c\ub828\ud654\ud560 \uc218 \uc5c6\ub294 \uc18d\uc131 \uac12\uc744 ViewMap\uc5d0 \uc124\uc815\ud558\ub294 \uc911: (\ud0a4: {0}, \uac12 \ud074\ub798\uc2a4: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/LogStrings_ja.properties
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/LogStrings_ja.properties
-@@ -54,6 +54,9 @@ error.component.abortprocessing_thrown=I
- severe.component.unable_to_process_expression=\u5c5e\u6027 {1} \u306e\u5f0f {0} \u306e\u51e6\u7406\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
- severe.component.uiviewroot_error_invoking_phaselistener=UIViewRoot PhaseListener {0} \u306e\u547c\u3073\u51fa\u3057\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
- warning.component.uiviewroot_non_serializable_attribute_viewmap=\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u306a\u3044\u5c5e\u6027\u5024\u3092 ViewMap \u306b\u8a2d\u5b9a\u3057\u3066\u3044\u307e\u3059: (\u30ad\u30fc: {0}\u3001\u5024\u30af\u30e9\u30b9: {1})
-+severe.uiviewparam_value_is_expression=The value of a UIParameter must not be an expression literal. Ignoring expression value {0}.
-+
-+
- # PACKAGE javax.faces.context --------------------------------------------------
-
-
---- mojarra-2.0.3.orig/jsf-api/src/main/java/javax/faces/component/UIViewParameter.java
-+++ mojarra-2.0.3/jsf-api/src/main/java/javax/faces/component/UIViewParameter.java
-@@ -37,6 +37,8 @@
- package javax.faces.component;
-
- import java.io.IOException;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
- import javax.el.ValueExpression;
- import javax.faces.FactoryFinder;
- import javax.faces.application.FacesMessage;
-@@ -71,6 +73,9 @@ import javax.faces.render.Renderer;
- * @since 2.0
- */
- public class UIViewParameter extends UIInput {
-+
-+ private static Logger LOGGER = Logger.getLogger("javax.faces.component",
-+ "javax.faces.LogStrings");
-
-
- // ------------------------------------------------------ Manifest Constants
-@@ -342,7 +347,8 @@ public class UIViewParameter extends UII
- }
-
- Object currentValue = ve.getValue(context.getELContext());
--
-+ String result = null;
-+
- // If there is a converter attribute, use it to to ask application
- // instance for a converter with this identifer.
- Converter c = getConverter();
-@@ -355,23 +361,35 @@ public class UIViewParameter extends UII
- }
- // Do not look for "by-type" converters for Strings
- if (currentValue instanceof String) {
-- return (String) currentValue;
-+ result = (String) currentValue;
-+ } else {
-+ // if converter attribute set, try to acquire a converter
-+ // using its class type.
-+
-+ Class converterType = currentValue.getClass();
-+ c = context.getApplication().createConverter(converterType);
-+
-+ // if there is no default converter available for this identifier,
-+ // assume the model type to be String.
-+ if (c == null) {
-+ result = currentValue.toString();
-+ }
- }
-+ }
-+ if (null == result && null != c) {
-+ result = c.getAsString(context, this, currentValue);
-+ }
-
-- // if converter attribute set, try to acquire a converter
-- // using its class type.
--
-- Class converterType = currentValue.getClass();
-- c = context.getApplication().createConverter(converterType);
--
-- // if there is no default converter available for this identifier,
-- // assume the model type to be String.
-- if (c == null) {
-- return currentValue.toString();
-+ if (SharedUtils.isExpression(result)) {
-+ if (LOGGER.isLoggable(Level.SEVERE)) {
-+ LOGGER.log(Level.SEVERE,
-+ "severe.uiviewparam_value_is_expression",
-+ new Object[] { result });
- }
-+ result = null;
- }
-
-- return c.getAsString(context, this, currentValue);
-+ return result;
- }
-
- /**
---- /dev/null
-+++ mojarra-2.0.3/jsf-tools/template-src/SharedUtils.java
-@@ -0,0 +1,79 @@
-+/*
-+ * 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.
-+ */
-+
-+package @package@;
-+
-+class SharedUtils {
-+
-+ /*
-+ * Determine whether String is a mixed value binding expression or not.
-+ */
-+ public static boolean isMixedExpression(String expression) {
-+
-+ if (null == expression) {
-+ return false;
-+ }
-+
-+ // if it doesn't start and end with delimiters
-+ return (!(expression.startsWith("#{") && expression.endsWith("}")))
-+ && isExpression(expression);
-+
-+ }
-+
-+
-+ /*
-+ * Determine whether String is a value binding expression or not.
-+ */
-+ public static boolean isExpression(String expression) {
-+
-+ if (null == expression) {
-+ return false;
-+ }
-+ int start = expression.indexOf("#{");
-+
-+ //check to see if attribute has an expression
-+ return (expression.indexOf("#{") != -1) &&
-+ (start < expression.indexOf('}'));
-+
-+
-+ }
-+
-+
-+}
---- /dev/null
-+++ mojarra-2.0.3/template-src/SharedUtils.java
-@@ -0,0 +1,79 @@
-+/*
-+ * 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.
-+ */
-+
-+package @package@;
-+
-+class SharedUtils {
-+
-+ /*
-+ * Determine whether String is a mixed value binding expression or not.
-+ */
-+ public static boolean isMixedExpression(String expression) {
-+
-+ if (null == expression) {
-+ return false;
-+ }
-+
-+ // if it doesn't start and end with delimiters
-+ return (!(expression.startsWith("#{") && expression.endsWith("}")))
-+ && isExpression(expression);
-+
-+ }
-+
-+
-+ /*
-+ * Determine whether String is a value binding expression or not.
-+ */
-+ public static boolean isExpression(String expression) {
-+
-+ if (null == expression) {
-+ return false;
-+ }
-+ int start = expression.indexOf("#{");
-+
-+ //check to see if attribute has an expression
-+ return (expression.indexOf("#{") != -1) &&
-+ (start < expression.indexOf('}'));
-+
-+
-+ }
-+
-+
-+}
diff --git a/debian/patches/fix_debian_build.diff b/debian/patches/fix_debian_build.diff
deleted file mode 100644
index fc2a68a..0000000
--- a/debian/patches/fix_debian_build.diff
+++ /dev/null
@@ -1,260 +0,0 @@
-Description: Needed changes to allow building in Debian
-Author: Miguel Landaeta <miguel at miguel.cc>
-Bug-Debian: http://bugs.debian.org/575667
-Forwarded: not-needed
-Last-Update: 2010-06-15
-
---- mojarra-2.0.2.orig/build.xml
-+++ mojarra-2.0.2/build.xml
-@@ -86,9 +86,12 @@
- <delete dir="${basedir}/build"/>
- <delete dir="${dist.dir}"/>
- <call.modules target="clean"/>
-+ <!-- these directories don't exist
- <ant dir="jsf-demo" target="clean" />
- <ant dir="updatecenter2" target="updatecenter2.clean" />
-+ -->
- <antcall target="remove.netbeans.186761.hack" />
-+ <delete dir="target"/>
- </target>
-
- <target name="modules.clean">
-@@ -361,10 +364,12 @@
- 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">
---- /dev/null
-+++ mojarra-2.0.2/build.properties
-@@ -0,0 +1 @@
-+container.name=glassfish
---- mojarra-2.0.2.orig/jsf-ri/mojarra-jsf-impl.bnd
-+++ mojarra-2.0.2/jsf-ri/mojarra-jsf-impl.bnd
-@@ -49,6 +49,8 @@ Import-Package: javax.faces.*,javax.serv
- javax.xml.*,org.w3c.dom.*, \
- com.sun.enterprise.*;resolution:=optional, \
- groovy.*;resolution:=optional,\
-+ org.mortbay.jetty.webapp;resolution:=optional, \
-+ org.mortbay.jetty.handler;resolution:=optional, \
- org.mortbay.jetty.annotations;resolution:=optional, \
- org.mortbay.jetty.plus.annotation;resolution:=optional, \
- org.apache.*;resolution:=optional, \
-@@ -57,4 +59,4 @@ Include-Resource: META-INF=build/classes
- Bundle-Version: @osgi.version@
- Bundle-Name: Mojarra JSF Implementation @impl.version@
- Bundle-Description: Mojarra JSF Implementation (javax.faces/@spec.version@) @impl.version@
--Bundle-SymbolicName: javax.faces/com.sun.faces.mojarra-jsf-impl
-+Bundle-SymbolicName: com.sun.faces.mojarra-jsf-impl
---- mojarra-2.0.2.orig/jsf-ri/build.xml
-+++ mojarra-2.0.2/jsf-ri/build.xml
-@@ -57,7 +57,7 @@
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.generate.dir" value="${build.dir}/generate"/>
- <property name="build.generate.tld.dir"
-- value="${build.generate.dir}/conf/share"/>
-+ value="../target/generate/conf/share"/>
-
- <!-- The base directory for binary dependency libs under local version
- control -->
-@@ -80,7 +80,8 @@
-
- <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="yuicompressor.jar.dir" value="/usr/share/yui-compressor"/>
-+ <property name="yuicompressor.jar" value="${yuicompressor.jar.dir}/yui-compressor.jar"/>
- <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
- <property name="javadoc.private" value="true"/>
- <property name="javadoc.protected" value="false"/>
-@@ -278,9 +279,12 @@
- description="Just compile the classes">
-
- <!-- Run javac through everything -->
-- <jsf.javac srcdir="${source.dir}:${build.generate.dir}"
-+ <jsf.javac srcdir="${source.dir}:${build.generate.dir}:../target/generate"
- destdir="${build.classes.dir}"
-- excludes="**/ManagedBeanFactoryImpl.java">
-+ excludes="**/ManagedBeanFactoryImpl.java,**/FacesInitializer.java">
-+ <!-- src/com/sun/faces/config/FacesInitializer.java is
-+ excluded because it requires Servlet API 3.0 and that is
-+ not available in Debian yet -->
- <classpath>
- <path refid="impl.compile.classpath"/>
- </classpath>
-@@ -343,8 +347,10 @@
- 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"/>
-@@ -355,6 +361,16 @@
- </fileset>
- </copy>
-
-+ <!-- copy missing classes to api build directory to regenerate jsf-api.jar -->
-+ <copy todir="${jsf.build.home}/jsf-api/build/classes/javax/faces/component">
-+ <fileset dir="${build.classes.dir}/javax/faces/component">
-+ <include name="html/*.class"/>
-+ </fileset>
-+ </copy>
-+
-+ <!-- since those classes don't belong in jsf-impl.jar, they are removed -->
-+ <delete dir="${build.classes.dir}/javax"/>
-+
- </target>
-
- <target name="clean"
-@@ -503,7 +519,7 @@
- </target>
-
- <target name="test"
-- depends="update,init.test,run.junit.test,run.cactus.test,run.systest,run.systest-per-webapp"
-+ depends="init.test,run.junit.test,run.cactus.test,run.systest,run.systest-per-webapp"
- description="Run all unit and system tests"/>
-
- <target name="init.test">
-@@ -588,7 +604,7 @@
- <delete file="tmp.bnd"/>
- </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"-->
---- mojarra-2.0.2.orig/common/ant/common.xml
-+++ mojarra-2.0.2/common/ant/common.xml
-@@ -39,31 +39,35 @@
- <project name="JSF Common" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <import file="${jsf.build.home}/common/ant/${container.name}/container.xml"/>
-- <import file="${jsf.build.home}/common/ant/dependencies.xml"/>
-+ <!--<import file="${jsf.build.home}/common/ant/dependencies.xml"/>-->
- <import file="${jsf.build.home}/common/ant/maven.xml"/>
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement
-- location="${jsf.build.home}/common/lib/ant-contrib.jar"/>
-+ location="/usr/share/java/ant-contrib.jar"/>
- </classpath>
- </taskdef>
- <taskdef resource="aQute/bnd/ant/taskdef.properties">
- <classpath>
- <pathelement
-- location="${jsf.build.home}/common/lib/bnd-0.0.249.jar"/>
-+ location="/usr/share/java/bnd.jar"/>
- </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"
- classpathref="maven-ant-tasks.classpath" />
-+ -->
-
-
- <!-- Setup the time properties for use with the project -->
-@@ -139,10 +143,11 @@
- </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="http://repository.jboss.com/maven2/"/>
-@@ -165,9 +170,15 @@
- <remoteRepository refid="j.n.repo"/>
- <remoteRepository refid="gf.repo"/>
- <remoteRepository refid="gf.nexus.repo"/>
-- <remoteRepository refid="jboss.repo"/> <!-- needed for validation-api -->
-+ <remoteRepository refid="jboss.repo"/>
- </artifact:dependencies>
--
-+ -->
-+
-+ <path id="compile.path">
-+ <fileset dir="/" includesfile="${jsf.build.home}/debian/classpath-debian"/>
-+ </path>
-+
-+ <!--
- <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"/>
-@@ -186,6 +197,7 @@
- <localRepository refid="local.repository"/>
- <remoteRepository refid="gf.nexus.repo"/>
- </artifact:dependencies>
-+ -->
-
- <!-- Test classpaths that are used in multiple places within the project -->
- <path id="junit.classpath">
-@@ -227,7 +239,7 @@
- </path>
-
- <path id="apache.commons.classpath">
-- <path refid="commons.path"/>
-+ <!--<path refid="commons.path"/>-->
- </path>
-
- <!-- Common Targets -->
---- mojarra-2.0.2.orig/jsf-api/mojarra-jsf-api.bnd
-+++ mojarra-2.0.2/jsf-api/mojarra-jsf-api.bnd
-@@ -55,4 +55,4 @@ Include-Resource: META-INF=build/classes
- Bundle-Version: @osgi.version@
- Bundle-Name: Mojarra JSF API Implementation @impl.version@
- Bundle-Description: Mojarra JSF API (javax.faces/@spec.version@) @impl.version@
--Bundle-SymbolicName: javax.faces/com.sun.faces.mojarra-jsf-api
-+Bundle-SymbolicName: javax.faces
---- mojarra-2.0.2.orig/jsf-api/build.xml
-+++ mojarra-2.0.2/jsf-api/build.xml
-@@ -769,7 +769,7 @@ javax.faces.level=ALL
- Main target
- ===================================================================
- -->
-- <target name="main" depends="update,jars"
-+ <target name="main" depends="jars"
- description="Compile API classes and build JAR file"/>
-
- <!--
---- mojarra-2.0.2.orig/jsf-tools/conf/HtmlBasicTaglib21.properties
-+++ mojarra-2.0.2/jsf-tools/conf/HtmlBasicTaglib21.properties
-@@ -91,10 +91,10 @@ taglib.uri=http://java.sun.com/jsf/html
- taglib.file.name=html_basic.tld
- target.package=com.sun.faces.taglib.html_basic
- renderkit.id=HTML_BASIC
--base.output.dir=build/generate
-+base.output.dir=../target/generate
-
- #OPTIONAL PROPERTIES
--taglib.include=build/TAG-DEF-21.txt
-+taglib.include=../jsf-tools/conf/TAG-DEF-21.txt
- taglib.description=This tag library contains JavaServer Faces component tags for all\n\
- UIComponent + HTML RenderKit Renderer combinations defined in the\n\
- JavaServer Faces Specification.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 485a252..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_debian_build.diff
-650430.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git
More information about the pkg-java-commits
mailing list