[jboss-cvs] JBossAS SVN: r76915 - in branches/JBPAPP_4_2_0_GA_CP: testsuite and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 11 09:42:30 EDT 2008
Author: jprindiv
Date: 2008-08-11 09:42:30 -0400 (Mon, 11 Aug 2008)
New Revision: 76915
Modified:
branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP/tomcat/.classpath
branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.ent
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.xml
Log:
Upgrading JSF to 1.2_09, migrating from sun-jsf namespace to glassfish/jsf
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-08-11 13:42:30 UTC (rev 76915)
@@ -84,6 +84,7 @@
<componentref name="cglib" version="2.1.3dep-brew"/>
<componentref name="beanshell" version="1.3.0-brew"/>
<componentref name="dom4j" version="1.6.1-brew"/>
+ <componentref name="glassfish/jsf" version="1.2_09-brew"/>
<componentref name="gnu-getopt" version="1.0.12-brew"/>
<componentref name="hibernate" version="3.2.4.SP1_CP04-brew"/>
<componentref name="hibernate-annotations" version="3.2.1.GA_CP02-brew"/>
@@ -123,7 +124,6 @@
<componentref name="glassfish/jaf" version="1.1.0-brew"/>
<componentref name="sun-javacc" version="3.2-brew"/>
<componentref name="glassfish/javamail" version="1.4.0-brew"/>
- <componentref name="sun-jsf" version="1.2_08-brew"/>
<componentref name="glassfish/jstl" version="1.2.0-brew"/>
<componentref name="sun-servlet" version="2.5-brew"/>
<componentref name="trove" version="1.0.2-brew"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-08-11 13:42:30 UTC (rev 76915)
@@ -132,6 +132,7 @@
<path refid="apache.xerces.classpath"/>
<path refid="apache.xml.commons.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="hibernate3.classpath"/>
<path refid="hsqldb.hsqldb.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
@@ -154,7 +155,6 @@
<path refid="oswego.concurrent.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="glassfish.jaf.classpath"/>
- <path refid="sun.jsf.classpath"/>
<path refid="glassfish.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/.classpath 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/.classpath 2008-08-11 13:42:30 UTC (rev 76915)
@@ -28,8 +28,8 @@
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jbossweb.jar" sourcepath="/thirdparty/jboss/web/lib/jbossweb-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-impl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-impl.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/iiop"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-core.jar"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-08-11 13:42:30 UTC (rev 76915)
@@ -72,7 +72,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.servlet.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="jboss.jbossws.classpath"/>
@@ -256,7 +256,7 @@
file="${glassfish.jstl.lib}/jstl.jar" />
<copy todir="${build.deploy}/jboss-web.deployer/jsf-libs">
- <fileset dir="${sun.jsf.lib}">
+ <fileset dir="${glassfish.jsf.lib}">
<include name="*.jar" />
</fileset>
</copy>
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.ent
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.ent 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.ent 2008-08-11 13:42:30 UTC (rev 76915)
@@ -390,6 +390,14 @@
<pathelement path="${glassfish.jaf.lib}/activation.jar"/>
</path>
+ <!-- Sun Glassfish JavaServer Faces (JSF) -->
+ <property name="glassfish.jsf.root" value="${project.thirdparty}/glassfish/jsf"/>
+ <property name="glassfish.jsf.lib" value="${glassfish.jsf.root}/lib"/>
+ <path id="glassfish.jsf.classpath">
+ <pathelement path="${glassfish.jsf.lib}/jsf-api.jar"/>
+ <pathelement path="${glassfish.jsf.lib}/jsf-impl.jar"/>
+ </path>
+
<!-- Sun JavaBeans Activation Framework (JAF) -->
<property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
<property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.xml 2008-08-11 13:13:30 UTC (rev 76914)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.xml 2008-08-11 13:42:30 UTC (rev 76915)
@@ -7,6 +7,14 @@
<pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
</path>
+ <!-- Sun Glassfish JavaServer Faces (JSF) -->
+ <property name="glassfish.jsf.root" value="${project.thirdparty}/glassfish/jsf"/>
+ <property name="glassfish.jsf.lib" value="${glassfish.jsf.root}/lib"/>
+ <path id="glassfish.jsf.classpath">
+ <pathelement path="${glassfish.jsf.lib}/jsf-api.jar"/>
+ <pathelement path="${glassfish.jsf.lib}/jsf-impl.jar"/>
+ </path>
+
<!-- Javassist -->
<property name="javassist.root" value="${project.thirdparty}/javassist"/>
<property name="javassist.lib" value="${javassist.root}/lib"/>
More information about the jboss-cvs-commits
mailing list