[mojarra] 06/06: Update build.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Aug 30 16:22:43 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 e4b67803aec462983e947be66a4495e25d6f97d7
Author: Markus Koschany <apo at gambaru.de>
Date: Sat Aug 30 15:18:22 2014 +0200
Update build.patch
---
debian/patches/build.patch | 180 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 176 insertions(+), 4 deletions(-)
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 5adf64e..e5dd7c2 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -3,11 +3,55 @@ Date: Mon, 25 Aug 2014 14:52:44 +0200
Subject: build
---
- common/ant/common.xml | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ build.properties | 1 +
+ build.xml | 6 +++++-
+ common/ant/common.xml | 21 ++++++++++++---------
+ jsf-api/build.xml | 2 +-
+ jsf-api/mojarra-jsf-api.bnd | 2 +-
+ jsf-ri/build.xml | 26 +++++++++++++++++++++-----
+ jsf-ri/mojarra-jsf-impl.bnd | 4 +++-
+ 7 files changed, 44 insertions(+), 18 deletions(-)
+ create mode 100644 build.properties
+diff --git a/build.properties b/build.properties
+new file mode 100644
+index 0000000..2a5ac49
+--- /dev/null
++++ b/build.properties
+@@ -0,0 +1 @@
++container.name=glassfish
+diff --git a/build.xml b/build.xml
+index 6c6f2cb..fba9d3b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -109,8 +109,11 @@
+ <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" />
++ -->
++ <delete dir="target"/>
+ </target>
+
+ <target name="clean.mojarra.only"
+@@ -554,11 +557,12 @@
+ <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 d1f476c..18fb19f 100644
+index d1f476c..81d9d66 100644
--- a/common/ant/common.xml
+++ b/common/ant/common.xml
@@ -43,22 +43,22 @@
@@ -58,9 +102,9 @@ index d1f476c..18fb19f 100644
<isset property="maven.repo.local"/>
</condition>
++ <!--
<artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
-
-+ <!--
<artifact:remoteRepository id="j.n.repo" url="https://maven.java.net/content/repositories/releases/"/>
<artifact:remoteRepository id="j.n.repo.snapshot" url="https://maven.java.net/content/repositories/snapshots/"/>
<artifact:remoteRepository id="codehaus.repo" url="http://repository.codehaus.org/"/>
@@ -78,3 +122,131 @@ index d1f476c..18fb19f 100644
<!-- Intra-project dependency property names -->
+@@ -274,7 +277,7 @@
+ </path>
+
+ <path id="apache.commons.classpath">
+- <path refid="commons.path"/>
++ <!-- <path refid="commons.path"/>-->
+ </path>
+
+ <!-- HtmlUnit client classpath -->
+diff --git a/jsf-api/build.xml b/jsf-api/build.xml
+index cf9b495..451ef23 100644
+--- a/jsf-api/build.xml
++++ b/jsf-api/build.xml
+@@ -844,7 +844,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"/>
+
+ <!--
+diff --git a/jsf-api/mojarra-jsf-api.bnd b/jsf-api/mojarra-jsf-api.bnd
+index 3d09631..344357a 100644
+--- a/jsf-api/mojarra-jsf-api.bnd
++++ b/jsf-api/mojarra-jsf-api.bnd
+@@ -95,6 +95,6 @@ Include-Resource: META-INF=build/classes/META-INF,build/classes
+ Bundle-Version: @spec.version@
+ Bundle-Name: JavaServer Faces API @full.impl.version@
+ Bundle-Description: Mojarra JSF API (javax.faces/@spec.version@) @full.impl.version@
+-Bundle-SymbolicName: javax.faces-api
++Bundle-SymbolicName: javax.faces
+ Bundle-License: http://glassfish.java.net/nonav/public/CDDL+GPL.html
+ Bundle-DocURL: http://download.oracle.com/javaee/6/api/
+diff --git a/jsf-ri/build.xml b/jsf-ri/build.xml
+index ed6b0d9..80fbdd5 100644
+--- a/jsf-ri/build.xml
++++ b/jsf-ri/build.xml
+@@ -61,7 +61,8 @@
+ <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 -->
+@@ -310,9 +311,13 @@
+ description="Compile the classes and unjar the jsf-api-intermediate jar">
+
+ <!-- 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>
+@@ -381,8 +386,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}"/>
++ -->
+ <unzip src="${jsf-api-intermediate.jar}"
+ dest="${build.classes.dir}">
+ <patternset>
+@@ -400,6 +407,15 @@
+ </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"
+@@ -563,7 +579,7 @@
+ </target>
+
+ <target name="test"
+- depends="update,init.test,compile.test,run.systest,run.junit.test,run.systest-per-webapp,run.systest-per-webapp-on-virtual-server"
++ depends="init.test,compile.test,run.systest,run.junit.test,run.systest-per-webapp,run.systest-per-webapp-on-virtual-server"
+ description="Run all unit and system tests"/>
+
+ <target name="test.generate.reports"
+@@ -700,7 +716,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"-->
+diff --git a/jsf-ri/mojarra-jsf-impl.bnd b/jsf-ri/mojarra-jsf-impl.bnd
+index 6273aea..b486b3d 100644
+--- a/jsf-ri/mojarra-jsf-impl.bnd
++++ b/jsf-ri/mojarra-jsf-impl.bnd
+@@ -61,6 +61,8 @@ Import-Package: javax.faces.*,\
+ 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, \
+@@ -70,4 +72,4 @@ Include-Resource: META-INF=build/classes/META-INF,build/classes
+ Bundle-Version: @osgi.version@
+ Bundle-Name: Mojarra JSF Implementation @full.impl.version@
+ Bundle-Description: Mojarra JSF Implementation (javax.faces/@spec.version@) @full.impl.version@
+-Bundle-SymbolicName: org.glassfish.javax.faces
++Bundle-SymbolicName: com.sun.faces.mojarra-jsf-impl
--
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