debian/ 0000755 0000000 0000000 00000000000 12264607061 007172 5 ustar debian/build.xml 0000644 0000000 0000000 00000002011 12264607006 011004 0 ustar
debian/libjsf-impl-java.jlibs 0000644 0000000 0000000 00000000036 12264607006 013344 0 ustar jsf-ri/build/lib/jsf-impl.jar
debian/classpath-debian 0000644 0000000 0000000 00000000757 12264607006 012327 0 ustar usr/share/java/el-api-2.1.jar
usr/share/java/jsp-api-2.1.jar
usr/share/java/servlet-api-2.5.jar
usr/share/java/geronimo-validation.jar
usr/share/java/glassfish-javaee.jar
usr/share/java/groovy.jar
usr/share/java/catalina.jar
usr/share/java/commons-digester.jar
usr/share/java/commons-logging.jar
usr/share/java/commons-beanutils.jar
usr/share/java/jetty.jar
usr/share/java/jetty-annotations.jar
usr/share/java/jetty-plus.jar
usr/share/java/jetty-util.jar
usr/share/java/commons-collections3.jar
debian/libjsf-api-java.jlibs 0000644 0000000 0000000 00000000036 12264607006 013154 0 ustar jsf-api/build/lib/jsf-api.jar
debian/README.Debian 0000644 0000000 0000000 00000001410 12264607006 011226 0 ustar ------------------
mojarra for Debian
------------------
*** Removal of functionalities ***
Mojarra Debian package doesn't contain some of the functionalities
of upstream binary releases.
Here is a list of excluded files regarding original content of Mojarra
2.0.2:
* libjsf-impl-java
[not-in-debian] Servlet 3.0 API. Code depending on this software cannot
be compiled and included because it is not available in Debian yet.
com/sun/faces/config/FacesInitializer.class
[not-in-debian] Glassfish Application Server. Code depending on this
software cannot be compiled and included because it is not available
in Debian yet.
com/sun/faces/vendor/GlassFishInjectionProvider*
-- Miguel Landaeta Tue, 15 Jun 2010 23:23:51 -0430
debian/watch 0000644 0000000 0000000 00000000303 12264607006 010216 0 ustar version=3
http://java.net/projects/javaserverfaces/downloads/directory/release \
/projects/javaserverfaces/downloads/download/release/mojarra-([0-9\.]+).*-source\.zip \
debian debian/orig-tar.sh
debian/rules 0000755 0000000 0000000 00000001250 12264607006 010247 0 ustar #!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
%:
dh $@ --with javahelper
override_dh_auto_build:
ant -Djsf.build.home=$$(pwd)
ant -f debian/build.xml injectionprovider
# build command is run twice because in the first run jsf-api.jar
# has some classes missing and they are included in the 2nd run.
ant -Djsf.build.home=$$(pwd)
ant -f debian/build.xml javadoc
override_dh_auto_clean:
-ant -Djsf.build.home=$$(pwd) clean
override_dh_clean:
dh_clean -X.glassfish.orig
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
uscan \
--verbose \
--no-symlink \
--destdir $(CURDIR) \
--watchfile debian/watch \
--force-download
debian/changelog 0000644 0000000 0000000 00000002056 12264607006 011046 0 ustar mojarra (2.0.3-3) unstable; urgency=low
* Team upload.
* Update Vcs-Git URL in debian/control
* Add commons-collections3 to build-dep and classpath.
- Thanks to Roddy Shuler. (Closes: #733012)
* Bump Standards-Version to 3.9.5 (no changes)
* Depend on DH 9.
-- tony mancill Sun, 12 Jan 2014 13:45:59 -0800
mojarra (2.0.3-2) unstable; urgency=high
* Fixed critical bug by not allowing the value of UIViewParam to be an
EL Expression: CVE-2011-4358. (Closes: #650430).
* Bump Standards-Version to 3.9.2. No changes were required.
* Update watch file.
-- Miguel Landaeta Tue, 29 Nov 2011 19:45:48 -0430
mojarra (2.0.3-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.9.0. No changes were required.
* Link javadoc to system javadocs.
-- Miguel Landaeta Fri, 09 Jul 2010 20:33:12 -0430
mojarra (2.0.2-1) unstable; urgency=low
* Initial release. (Closes: #575667).
-- Miguel Landaeta Wed, 23 Jun 2010 07:51:02 -0430
debian/patches/ 0000755 0000000 0000000 00000000000 12264607006 010620 5 ustar debian/patches/series 0000644 0000000 0000000 00000000042 12264607006 012031 0 ustar fix_debian_build.diff
650430.diff
debian/patches/650430.diff 0000644 0000000 0000000 00000043462 12264607006 012224 0 ustar Description: Do not allow the value of UIViewParam to be an EL Expression
Author: Ed Burns
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
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"/>
+
--- 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('}'));
+
+
+ }
+
+
+}
debian/patches/fix_debian_build.diff 0000644 0000000 0000000 00000024727 12264607006 014735 0 ustar Description: Needed changes to allow building in Debian
Author: Miguel Landaeta
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 @@
+
+
@@ -361,10 +364,12 @@
basedir="${basedir}/samples"/>
+
--- /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 @@
+ value="../target/generate/conf/share"/>
@@ -80,7 +80,8 @@
-
+
+
@@ -278,9 +279,12 @@
description="Just compile the classes">
-
+ excludes="**/ManagedBeanFactoryImpl.java,**/FacesInitializer.java">
+
@@ -343,8 +347,10 @@
toDir="${build.classes.dir}/com/sun/faces"/>
+
@@ -355,6 +361,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -588,7 +604,7 @@
-
+
--- mojarra-2.0.2.orig/common/ant/common.xml
+++ mojarra-2.0.2/common/ant/common.xml
@@ -39,31 +39,35 @@
-
+
+ location="/usr/share/java/ant-contrib.jar"/>
+ location="/usr/share/java/bnd.jar"/>
+
+
@@ -139,10 +143,11 @@
- -->
+ -->
+
+
-
+ -->
+
+
+
+
+
+
@@ -227,7 +239,7 @@
-
+
--- 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
===================================================================
-->
-