Author: markt Date: Sun Dec 4 11:24:23 2005 New Revision: 353896 URL: http://svn.apache.org/viewcvs?rev=353896&view=rev Log: Use mx4j license from mx4j distribution rather than a copy in the asf repo
Removed: tomcat/container/branches/tc4.1.x/lib/mx4j.license Modified: tomcat/container/branches/tc4.1.x/build.properties.default tomcat/container/branches/tc4.1.x/catalina/build.xml Modified: tomcat/container/branches/tc4.1.x/build.properties.default URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/build.properties.default?rev=353896&r1=353895&r2=353896&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/build.properties.default (original) +++ tomcat/container/branches/tc4.1.x/build.properties.default Sun Dec 4 11:24:23 2005 @@ -189,6 +189,7 @@ jmx.home=${base.path}/mx4j-1.1.1 jmx.lib=${jmx.home}/lib jmx.jar=${jmx.lib}/mx4j-jmx.jar +jmx.license=${jmx.home}/LICENSE jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/build.xml?rev=353896&r1=353895&r2=353896&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/build.xml (original) +++ tomcat/container/branches/tc4.1.x/catalina/build.xml Sun Dec 4 11:24:23 2005 @@ -705,7 +705,7 @@ </target> <target name="copy-jmx.jar" if="copy.jmx.jar"> <copy todir="${catalina.build}/server/lib" file="${jmx.jar}"/> - <copy todir="${catalina.build}/server/lib" file="../lib/mx4j.license"/> + <copy tofile="${catalina.build}/server/lib/mx4j.license" file="${jmx.license}"/> </target> <target name="copy-jndi.jar" if="copy.jndi.jar"> <copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]