[jboss-cvs] JBossAS SVN: r75846 - in branches/JBPAPP_4_2_0_GA_CP: build and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 15 12:58:01 EDT 2008
Author: csaldanh
Date: 2008-07-15 12:58:01 -0400 (Tue, 15 Jul 2008)
New Revision: 75846
Modified:
branches/JBPAPP_4_2_0_GA_CP/aspects/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/aspects/build-test50.xml
branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml
branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
branches/JBPAPP_4_2_0_GA_CP/connector/.classpath
branches/JBPAPP_4_2_0_GA_CP/connector/build.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-from-5.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/deprecated-build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/jbossbuild.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3x/.classpath
branches/JBPAPP_4_2_0_GA_CP/ejb3x/build.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3x/jbossbuild.xml
branches/JBPAPP_4_2_0_GA_CP/j2ee/.classpath
branches/JBPAPP_4_2_0_GA_CP/j2ee/build.xml
branches/JBPAPP_4_2_0_GA_CP/jaxrpc/.classpath
branches/JBPAPP_4_2_0_GA_CP/jaxrpc/build.xml
branches/JBPAPP_4_2_0_GA_CP/security/.classpath
branches/JBPAPP_4_2_0_GA_CP/security/build.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/.classpath
branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/deprecated-build.xml
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/varia/.classpath
branches/JBPAPP_4_2_0_GA_CP/varia/build.xml
Log:
Changing all the sun-* references to glassfish-*
Modified: branches/JBPAPP_4_2_0_GA_CP/aspects/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/aspects/build-test.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/aspects/build-test.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -75,7 +75,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/aspects/build-test50.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/aspects/build-test50.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/aspects/build-test50.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -75,7 +75,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -47,10 +47,10 @@
<fileset dir="${_module.output}/lib">
<include name="jboss-j2ee.jar"/>
</fileset>
- <fileset dir="${sun.jaf.lib}">
+ <fileset dir="${glassfish.jaf.lib}">
<include name="activation.jar"/>
</fileset>
- <fileset dir="${sun.javamail.lib}">
+ <fileset dir="${glassfish.javamail.lib}">
<include name="mail.jar"/>
</fileset>
</copy>
@@ -849,10 +849,10 @@
<!-- Copy thirdparty code -->
<copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${sun.jaf.lib}">
+ <fileset dir="${glassfish.jaf.lib}">
<include name="activation.jar"/>
</fileset>
- <fileset dir="${sun.javamail.lib}">
+ <fileset dir="${glassfish.javamail.lib}">
<include name="mail.jar"/>
</fileset>
</copy>
@@ -1583,7 +1583,7 @@
<fileset dir="${jboss.remoting.lib}">
<include name="jboss-remoting.jar"/>
</fileset>
- <fileset dir="${sun.jaf.lib}">
+ <fileset dir="${glassfish.jaf.lib}">
<include name="activation.jar"/>
</fileset>
<fileset dir="${apache.logging.lib}">
@@ -1601,7 +1601,7 @@
<fileset dir="${jboss.serialization.lib}">
<include name="jboss-serialization.jar"/>
</fileset>
- <fileset dir="${sun.javamail.lib}">
+ <fileset dir="${glassfish.javamail.lib}">
<include name="mail.jar"/>
</fileset>
<fileset dir="${apache.httpclient.lib}">
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -117,11 +117,11 @@
<componentref name="quartz" version="1.5.2-brew"/>
<componentref name="qdox" version="1.6.1-brew"/>
<componentref name="stax-api" version="1.0"/>
- <componentref name="sun-jaf" version="1.1.0-brew"/>
+ <componentref name="glassfish/jaf" version="1.1.0-brew"/>
<componentref name="sun-javacc" version="3.2-brew"/>
- <componentref name="sun-javamail" version="1.4.0-brew"/>
+ <componentref name="glassfish/javamail" version="1.4.0-brew"/>
<componentref name="sun-jsf" version="1.2_08-brew"/>
- <componentref name="sun-jstl" version="1.2"/>
+ <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"/>
<componentref name="woodstox" version="3.1.1-brew"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/connector/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -13,7 +13,7 @@
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xml-commons/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/quartz/lib/quartz-all.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/connector/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -77,7 +77,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="quartz.quartz.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
</path>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -74,7 +74,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/hibernate-entitymanager.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-from-5.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-from-5.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-from-5.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -80,7 +80,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -156,7 +156,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
@@ -175,7 +175,7 @@
<path refid="jgroups.jgroups.classpath"/>
<path refid="apache.httpclient.classpath"/>
<path refid="apache.logging.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="quartz.quartz.classpath"/>
@@ -3871,8 +3871,8 @@
<pathelement location="${resources}/test"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="apache.xerces.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="apache.httpclient.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.naming.classpath"/>
@@ -3972,8 +3972,8 @@
<path refid="${client.run.classpath}"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="apache.xerces.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="apache.httpclient.classpath"/>
<path refid="hsqldb.hsqldb.classpath"/>
<path refid="jboss.aop.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -105,7 +105,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/deprecated-build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/deprecated-build-test.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/deprecated-build-test.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -75,7 +75,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/jbossbuild.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/jbossbuild.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/jbossbuild.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -31,7 +31,7 @@
<!-- ============================================================ -->
<source id="main" requiredJDK="1.5" jvmSource="1.5" jvmTarget="1.5">
- <include component="sun-jaf"/>
+ <include component="glassfish/jaf"/>
<include component="sun-servlet"/>
<include component="javassist"/>
<include component="qdox"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3x/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3x/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3x/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jaf/lib/activation.jar"/>
<classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3x/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3x/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3x/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -73,7 +73,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath" />
+ <path refid="glassfish.jaf.classpath" />
<path refid="sun.servlet.classpath" />
</path>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3x/jbossbuild.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3x/jbossbuild.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3x/jbossbuild.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -31,7 +31,7 @@
<!-- ============================================================ -->
<source id="main" requiredJDK="1.5" jvmSource="1.5" jvmTarget="1.5">
- <include component="sun-jaf"/>
+ <include component="glassfish/jaf"/>
<include component="sun-servlet"/>
<include component="common"/>
<include component="aop"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/j2ee/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/j2ee/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/j2ee/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -4,7 +4,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jaf/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBPAPP_4_2_0_GA_CP/j2ee/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/j2ee/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/j2ee/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -74,7 +74,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="jboss.jbossws.classpath"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/jaxrpc/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/jaxrpc/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/jaxrpc/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -4,7 +4,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
<classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jaf/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-discovery/lib/commons-discovery.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
@@ -12,6 +12,6 @@
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xmlsec/lib/xmlsec.jar"/>
<classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBPAPP_4_2_0_GA_CP/jaxrpc/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/jaxrpc/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/jaxrpc/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -73,8 +73,8 @@
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
</path>
Modified: branches/JBPAPP_4_2_0_GA_CP/security/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/security/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -17,6 +17,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBPAPP_4_2_0_GA_CP/security/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/security/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -76,7 +76,7 @@
<path refid="oswego.concurrent.classpath"/>
<path refid="javassist.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
</path>
<!-- ======= -->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -32,13 +32,13 @@
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
<classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jaf/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -153,9 +153,9 @@
<path refid="odmg.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="sun.jsf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
</path>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/deprecated-build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/deprecated-build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/deprecated-build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -102,7 +102,7 @@
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="javassist.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
<path refid="jboss.remoting.classpath"/>
@@ -1349,8 +1349,8 @@
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jboss.common.classpath"/>
<path refid="jboss.j2ee.classpath"/>
</path>
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -253,7 +253,7 @@
</copy>
<copy todir="${build.deploy}/jboss-web.deployer"
- file="${sun.jstl.lib}/jstl.jar" />
+ file="${glassfish.jstl.lib}/jstl.jar" />
<copy todir="${build.deploy}/jboss-web.deployer/jsf-libs">
<fileset dir="${sun.jsf.lib}">
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-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/libraries.ent 2008-07-15 16:58:01 UTC (rev 75846)
@@ -382,6 +382,14 @@
<pathelement path="${junitejb.junitejb.lib}/junitejb.jar"/>
</path>
+ <!-- glassfish/jaf -->
+ <property name="glassfish.jaf.root" value="${project.thirdparty}/glassfish/jaf"/>
+ <property name="glassfish.jaf.lib" value="${glassfish.jaf.root}/lib/"/>
+ <property name="glassfish.jaf.resources" value="${glassfish.jaf.root}/resources/"/>
+ <path id="glassfish.jaf.classpath">
+ <pathelement path="${glassfish.jaf.lib}/activation.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"/>
@@ -389,6 +397,15 @@
<pathelement path="${sun.jaf.lib}/activation.jar"/>
</path>
+ <!-- glassfish/javamail -->
+ <property name="glassfish.javamail.root" value="${project.thirdparty}/glassfish/javamail"/>
+ <property name="glassfish.javamail.lib" value="${glassfish.javamail.root}/lib/"/>
+ <property name="glassfish.javamail.resources" value="${glassfish.javamail.root}/resources/"/>
+ <path id="glassfish.javamail.classpath">
+ <pathelement path="${glassfish.javamail.lib}/mail.jar"/>
+ </path>
+
+
<!-- Sun JavaMail -->
<property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
<property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/varia/.classpath
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/.classpath 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/.classpath 2008-07-15 16:58:01 UTC (rev 75846)
@@ -16,7 +16,7 @@
<classpathentry kind="lib" path="/thirdparty/apache-bsf/lib/bsf.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
<classpathentry kind="lib" path="/thirdparty/joesnmp/lib/joesnmp.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/varia/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/build.xml 2008-07-15 16:08:08 UTC (rev 75845)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/build.xml 2008-07-15 16:58:01 UTC (rev 75846)
@@ -87,8 +87,8 @@
<path refid="junit.junit.classpath"/>
<path refid="opennms.joesnmp.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
</path>
More information about the jboss-cvs-commits
mailing list