You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2004/11/03 17:23:42 UTC
cvs commit: incubator-myfaces/build build.xml build.default.properties
svieujot 2004/11/03 08:23:42
Modified: lib .cvsignore
doc release-notes.txt
build build.xml build.default.properties
Log:
Change the jar files scheme :
- myfaces-jsf-api.jar contains the api classes (no change)
- myfaces-impl.jar contains the standard jsf implementation, without the extensions (same as jsf-impl.jar from the RI)
- myfaces-extensions.jar contains the myfaces extensions
- myfaces.jar containes all the myfaces code, and can be used in place of the 3 above
Revision Changes Path
1.5 +8 -6 incubator-myfaces/lib/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/incubator-myfaces/lib/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Jul 2004 04:33:43 -0000 1.4
+++ .cvsignore 3 Nov 2004 16:23:42 -0000 1.5
@@ -1,6 +1,8 @@
-myfaces.jar
-velocity-1.3.1.jar
-velocity-dep-1.3.1.jar
-junit.jar
-myfaces-components.jar
-myfaces-jsf-api.jar
+myfaces.jar
+velocity-1.3.1.jar
+velocity-dep-1.3.1.jar
+junit.jar
+myfaces-components.jar
+myfaces-jsf-api.jar
+myfaces-impl.jar
+myfaces-extensions.jar
1.134 +5 -0 incubator-myfaces/doc/release-notes.txt
Index: release-notes.txt
===================================================================
RCS file: /home/cvs/incubator-myfaces/doc/release-notes.txt,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- release-notes.txt 29 Oct 2004 15:50:59 -0000 1.133
+++ release-notes.txt 3 Nov 2004 16:23:42 -0000 1.134
@@ -8,6 +8,11 @@
the 'old' sf-URI name for backward compatibility
* i18n support for Brazilian Portuguese; thanks to Rogerio Pereira
* bug fix #1045363 New <br> and 'feature'
+* refactor the jar files :
+ - myfaces-jsf-api.jar contains the api classes (no change)
+ - myfaces-impl.jar contains the standard jsf implementation
+ - myfaces-extensions.jar contains the myfaces extensions
+ - myfaces.jar containes all the myfaces code, and can be used in place of the 3 above
----------------------------------------------------------------------
Changes in Release 1.0.7 beta
* new custom component: HtmlPanelStack
1.60 +84 -26 incubator-myfaces/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 2 Nov 2004 01:20:49 -0000 1.59
+++ build.xml 3 Nov 2004 16:23:42 -0000 1.60
@@ -98,8 +98,36 @@
<pathelement location="${commons-digester.jar}"/>
</path>
- <target name="myfaces-jar"
- description="builds the myfaces.jar file"
+ <target name="myfaces-jsf-api-jar"
+ description="builds the myfaces-jsf-api.jar file"
+ depends="-compile-api">
+ <!-- timestamp for the manifest -->
+ <tstamp>
+ <format property="TODAY" pattern="yyyy-MM-dd HH:mm z"/>
+ </tstamp>
+
+ <!-- build the jar -->
+ <jar destfile="${myfaces-jsf-api.jar}">
+ <!-- manifest -->
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <section name="myfaces.apache.org">
+ <attribute name="Implementation-Title" value="${manifest.impl.title}"/>
+ <attribute name="Implementation-Version" value="${manifest.impl.version} (${TODAY})"/>
+ <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+ </section>
+ </manifest>
+
+ <!-- classes -->
+ <fileset dir="${api.classes}"
+ includes="**"
+ excludes=".dependency-info/**/*"/>
+ </jar>
+
+ </target>
+
+ <target name="myfaces-impl-jar"
+ description="builds the myfaces-impl.jar file"
depends="-compile-share,-compile-impl,-compile-components,myfaces-jsf-api-jar,resolve-tld-entities" >
<!-- timestamp for the manifest -->
<tstamp>
@@ -107,7 +135,7 @@
</tstamp>
<!-- build the jar -->
- <jar destfile="${myfaces.jar}">
+ <jar destfile="${myfaces-impl.jar}">
<!-- manifest -->
<manifest>
<attribute name="Built-By" value="${user.name}"/>
@@ -125,9 +153,6 @@
<fileset dir="${impl.classes}"
includes="**"
excludes=".dependency-info/**/*"/>
- <fileset dir="${components.classes}"
- includes="**"
- excludes=".dependency-info/**/*"/>
<!-- properties, DTDs, XMLs -->
<fileset dir="${myfaces.src}"
includes="**"
@@ -145,66 +170,93 @@
</target>
- <target name="myfaces-jsf-api-jar"
- description="builds the myfaces-jsf-api.jar file"
- depends="-compile-api">
+ <target name="myfaces-extensions-jar"
+ description="builds the myfaces-extensions.jar file"
+ depends="-compile-share,
+ -compile-components,
+ resolve-tld-entities" >
<!-- timestamp for the manifest -->
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm z"/>
</tstamp>
<!-- build the jar -->
- <jar destfile="${myfaces-jsf-api.jar}">
+ <jar destfile="${myfaces-extensions.jar}">
<!-- manifest -->
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<section name="myfaces.apache.org">
- <attribute name="Implementation-Title" value="${manifest.impl.title}"/>
+ <attribute name="Implementation-Title" value="${manifest.impl.title.components}"/>
<attribute name="Implementation-Version" value="${manifest.impl.version} (${TODAY})"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
</section>
</manifest>
<!-- classes -->
- <fileset dir="${api.classes}"
+ <fileset dir="${share.classes}"
includes="**"
excludes=".dependency-info/**/*"/>
+ <fileset dir="${components.classes}"
+ includes="**"
+ excludes=".dependency-info/**/*"/>
+ <!-- TLDs -->
+ <zipfileset dir="${resolved-tlds.dir}"
+ includes="myfaces_ext.tld,myfaces_ext_sf.tld"
+ prefix="META-INF/"/>
+ <!-- faces-config.xml -->
+ <zipfileset dir="${project.dir}/conf"
+ includes="faces-config.xml"
+ prefix="META-INF/"/>
+ <!-- components_resources -->
+ <zipfileset dir="${components_resource.src}"
+ includes="**"
+ prefix="resource"/>
+
</jar>
</target>
-
- <target name="myfaces-components-jar"
- description="builds the myfaces-components.jar file"
- depends="-compile-share,
- -compile-components,
- resolve-tld-entities" >
+
+ <target name="myfaces-jar"
+ description="builds the myfaces.jar file with the complete myfaces libraries"
+ depends="-compile-share,-compile-impl,-compile-components,myfaces-jsf-api-jar,resolve-tld-entities" >
<!-- timestamp for the manifest -->
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm z"/>
</tstamp>
<!-- build the jar -->
- <jar destfile="${myfaces-components.jar}">
+ <jar destfile="${myfaces.jar}">
<!-- manifest -->
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<section name="myfaces.apache.org">
- <attribute name="Implementation-Title" value="${manifest.impl.title.components}"/>
+ <attribute name="Implementation-Title" value="${manifest.impl.title}"/>
<attribute name="Implementation-Version" value="${manifest.impl.version} (${TODAY})"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
</section>
</manifest>
<!-- classes -->
+ <fileset dir="${api.classes}"
+ includes="**"
+ excludes=".dependency-info/**/*"/>
<fileset dir="${share.classes}"
includes="**"
excludes=".dependency-info/**/*"/>
+ <fileset dir="${impl.classes}"
+ includes="**"
+ excludes=".dependency-info/**/*"/>
<fileset dir="${components.classes}"
includes="**"
excludes=".dependency-info/**/*"/>
+ <!-- properties, DTDs, XMLs -->
+ <fileset dir="${myfaces.src}"
+ includes="**"
+ excludes="**/*.java
+ **/package.html"/>
<!-- TLDs -->
<zipfileset dir="${resolved-tlds.dir}"
- includes="myfaces_ext.tld,myfaces_ext_sf.tld"
+ includes="*.tld"
prefix="META-INF/"/>
<!-- faces-config.xml -->
<zipfileset dir="${project.dir}/conf"
@@ -214,7 +266,7 @@
<zipfileset dir="${components_resource.src}"
includes="**"
prefix="resource"/>
-
+
</jar>
</target>
@@ -243,7 +295,7 @@
<target name="bin-release"
- depends="myfaces-jar, myfaces-jsf-api-jar, myfaces-components-jar, javadoc, tlddoc"
+ depends="myfaces-jsf-api-jar, myfaces-impl-jar, myfaces-extensions-jar, myfaces-jar, javadoc, tlddoc"
description="creates the binary release file myfaces-x.x.x.tgz (don't forget to adjust manifest.properties!)">
<tar destfile="${project.dir}/myfaces-${manifest.impl.version}.tgz"
@@ -277,10 +329,14 @@
prefix="myfaces-${manifest.impl.version}/lib"/>
<tarfileset file="${commons-collections.jar}"
prefix="myfaces-${manifest.impl.version}/lib"/>
- <tarfileset file="${myfaces-components.jar}"
- prefix="myfaces-${manifest.impl.version}/lib" />
<tarfileset file="${myfaces-jsf-api.jar}"
prefix="myfaces-${manifest.impl.version}/lib" />
+ <tarfileset file="${myfaces-impl.jar}"
+ prefix="myfaces-${manifest.impl.version}/lib" />
+ <tarfileset file="${myfaces-extensions.jar}"
+ prefix="myfaces-${manifest.impl.version}/lib" />
+ <tarfileset file="${myfaces.jar}"
+ prefix="myfaces-${manifest.impl.version}/lib" />
</tar>
</target>
@@ -359,8 +415,10 @@
<target name="clean"
description="deletes all files that were built (including examples and tagunit)">
<delete quiet="true" failonerror="false" includeEmptyDirs="true">
+ <fileset file="${myfaces-jsf-api.jar}" />
+ <fileset file="${myfaces-impl.jar}" />
+ <fileset file="${myfaces-extentions.jar}" />
<fileset file="${myfaces.jar}" />
- <fileset file="${myfaces-components.jar}" />
<fileset file="${project.dir}/myfaces-*.tgz" />
<fileset dir="${doc.dir}/javadoc" />
<fileset dir="${doc.dir}/tlddoc" />
1.19 +8 -5 incubator-myfaces/build/build.default.properties
Index: build.default.properties
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/build.default.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.default.properties 1 Nov 2004 16:19:41 -0000 1.18
+++ build.default.properties 3 Nov 2004 16:23:42 -0000 1.19
@@ -44,14 +44,17 @@
# File path to struts file for tile support
struts.jar = ${project.dir}/lib/optional/struts.jar
-# Destination file path of MyFaces implementation archive to be created
-myfaces.jar = ${project.dir}/lib/myfaces.jar
-
# Destination file path of MyFaces JSF-API implementation archive to be created
myfaces-jsf-api.jar = ${project.dir}/lib/myfaces-jsf-api.jar
-# Destination file path of MyFaces components archive to be created
-myfaces-components.jar = ${project.dir}/lib/myfaces-components.jar
+# Destination file path of MyFaces implementation archive to be created
+myfaces-impl.jar = ${project.dir}/lib/myfaces-impl.jar
+
+# Destination file path of MyFaces extensions archive to be created
+myfaces-extensions.jar = ${project.dir}/lib/myfaces-extensions.jar
+
+# Destination file path of MyFaces complete archive to be created
+myfaces.jar = ${project.dir}/lib/myfaces.jar
# Compiler optimize and debug flags
javac.optimize = off