| Newsgroups |
gmane.comp.java.mx4j.cvs |
| Message-ID |
<[email protected]> |
Update of /cvsroot/mx4j/mx4j/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27769
Modified Files:
build.xml
Log Message:
Updated the build, removing the old security manager properties and classes
Index: build.xml
===================================================================
RCS file: /cvsroot/mx4j/mx4j/build/build.xml,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** build.xml 6 Dec 2003 21:52:36 -0000 1.92
--- build.xml 1 Mar 2004 17:54:14 -0000 1.93
***************
*** 69,76 ****
<property name="docbook.xsl.zip.file" value="${lib.dir}/docbookx.zip"/>
- <!-- needed for security tests -->
- <property environment="env"/>
- <property name="env.HOSTNAME" value="${env.COMPUTERNAME}"/>
-
<patternset id="jmx.classes">
<include name="javax/management/**"/>
--- 69,72 ----
***************
*** 219,223 ****
<target name="releasing">
! <property name="releasing" value="true" />
</target>
--- 215,219 ----
<target name="releasing">
! <property name="releasing" value="true"/>
</target>
***************
*** 261,265 ****
</target>
! <target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
<javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="rmx4j.classes"/>
--- 257,261 ----
</target>
! <target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
<javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="rmx4j.classes"/>
***************
*** 298,307 ****
<exclude name="mx4j/tools/jython/**" unless="jython.present"/>
<exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
! <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present" />
! <exclude name="mx4j/tools/remote/soap/web/jetty/**" unless="jetty.present" />
! <exclude name="mx4j/tools/heartbeat/**" if="releasing" />
! <exclude name="mx4j/tools/connector/**" if="releasing" />
! <exclude name="mx4j/tools/adaptor/rmi/**" if="releasing" />
! <exclude name="mx4j/tools/adaptor/interceptor/**" if="releasing" />
<classpath>
<path refid="classpath"/>
--- 294,303 ----
<exclude name="mx4j/tools/jython/**" unless="jython.present"/>
<exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
! <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
! <exclude name="mx4j/tools/remote/soap/web/jetty/**" unless="jetty.present"/>
! <exclude name="mx4j/tools/heartbeat/**" if="releasing"/>
! <exclude name="mx4j/tools/connector/**" if="releasing"/>
! <exclude name="mx4j/tools/adaptor/rmi/**" if="releasing"/>
! <exclude name="mx4j/tools/adaptor/interceptor/**" if="releasing"/>
<classpath>
<path refid="classpath"/>
***************
*** 311,322 ****
<rmic base="${tools.classes.dir}" classpathref="classpath" debug="yes" stubversion="1.2">
! <include name="mx4j/tools/adaptor/rmi/RMIAdaptor.*" unless="releasing" />
! <include name="mx4j/tools/connector/rmi/RemoteNotificationListenerImpl.*" unless="releasing" />
! <include name="mx4j/tools/connector/rmi/RemoteNotificationFilterImpl.*" unless="releasing" />
</rmic>
<rmic base="${tools.classes.dir}" classpathref="classpath" debug="yes" iiop="yes">
! <include name="mx4j/tools/adaptor/rmi/RMIAdaptor.*" unless="releasing" />
! <include name="mx4j/tools/connector/rmi/RemoteNotificationListenerImpl.*" unless="releasing" />
! <include name="mx4j/tools/connector/rmi/RemoteNotificationFilterImpl.*" unless="releasing" />
<classpath>
<pathelement location="${core.classes.dir}"/>
--- 307,318 ----
<rmic base="${tools.classes.dir}" classpathref="classpath" debug="yes" stubversion="1.2">
! <include name="mx4j/tools/adaptor/rmi/RMIAdaptor.*" unless="releasing"/>
! <include name="mx4j/tools/connector/rmi/RemoteNotificationListenerImpl.*" unless="releasing"/>
! <include name="mx4j/tools/connector/rmi/RemoteNotificationFilterImpl.*" unless="releasing"/>
</rmic>
<rmic base="${tools.classes.dir}" classpathref="classpath" debug="yes" iiop="yes">
! <include name="mx4j/tools/adaptor/rmi/RMIAdaptor.*" unless="releasing"/>
! <include name="mx4j/tools/connector/rmi/RemoteNotificationListenerImpl.*" unless="releasing"/>
! <include name="mx4j/tools/connector/rmi/RemoteNotificationFilterImpl.*" unless="releasing"/>
<classpath>
<pathelement location="${core.classes.dir}"/>
***************
*** 370,380 ****
<exclude name="test/mx4j/tools/remote/**" unless="jaas.present"/>
<exclude name="test/javax/management/remote/compliance/serialization/support/Optional*"/>
! <exclude name="test/mx4j/tools/jython/**" unless="jython.present" />
! <exclude name="test/mx4j/tools/heartbeat/**" if="releasing" />
! <exclude name="test/mx4j/tools/connector/**" if="releasing" />
! <exclude name="test/mx4j/tools/adaptor/rmi/**" if="releasing" />
! <exclude name="test/mx4j/tools/adaptor/interceptor/**" if="releasing" />
! <exclude name="**/*Jdk13*" unless="jdk13.present"/>
! <exclude name="**/*Jdk14*" unless="jdk14.present"/>
<classpath refid="classpath"/>
</javac>
--- 366,375 ----
<exclude name="test/mx4j/tools/remote/**" unless="jaas.present"/>
<exclude name="test/javax/management/remote/compliance/serialization/support/Optional*"/>
! <exclude name="test/mx4j/tools/jython/**" unless="jython.present"/>
! <exclude name="test/mx4j/tools/heartbeat/**" if="releasing"/>
! <exclude name="test/mx4j/tools/connector/**" if="releasing"/>
! <exclude name="test/mx4j/tools/adaptor/rmi/**" if="releasing"/>
! <exclude name="test/mx4j/tools/adaptor/interceptor/**" if="releasing"/>
! <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
<classpath refid="classpath"/>
</javac>
***************
*** 383,388 ****
<fileset dir="${test.classes.dir}">
<patternset refid="tests.classes"/>
- <exclude name="**/*Jdk13*" unless="jdk13.present"/>
- <exclude name="**/*Jdk14*" unless="jdk14.present"/>
</fileset>
<fileset dir="${test.src.dir}">
--- 378,381 ----
***************
*** 398,402 ****
<classpath refid="classpath"/>
<exclude name="mx4j/examples/tools/xdoclet/**"/>
! <exclude name="mx4j/examples/remote/rmi/ssl/**" unless="jdk14.present" />
</javac>
--- 391,395 ----
<classpath refid="classpath"/>
<exclude name="mx4j/examples/tools/xdoclet/**"/>
! <exclude name="mx4j/examples/remote/rmi/ssl/**" unless="jdk14.present"/>
</javac>
***************
*** 529,536 ****
<!-- Generate the packed files -->
! <zip zipfile="${dist.dir}/${name}-${release}.zip" basedir="${binary.release.dist.dir}" />
! <tar tarfile="${dist.dir}/${name}-${release}.tar" basedir="${binary.release.dist.dir}" />
<gzip zipfile="${dist.dir}/${name}-${release}.tar.gz" src="${dist.dir}/${name}-${release}.tar"/>
! <delete file="${dist.dir}/${name}-${release}.tar" quiet="true" />
<!-- Miscellaneous files -->
--- 522,529 ----
<!-- Generate the packed files -->
! <zip zipfile="${dist.dir}/${name}-${release}.zip" basedir="${binary.release.dist.dir}"/>
! <tar tarfile="${dist.dir}/${name}-${release}.tar" basedir="${binary.release.dist.dir}"/>
<gzip zipfile="${dist.dir}/${name}-${release}.tar.gz" src="${dist.dir}/${name}-${release}.tar"/>
! <delete file="${dist.dir}/${name}-${release}.tar" quiet="true"/>
<!-- Miscellaneous files -->
***************
*** 542,558 ****
<copy todir="${source.release.dist.dir}/src">
<fileset dir="${src.dir}">
! <exclude name="CVS" />
</fileset>
</copy>
<!-- The build file -->
! <copy todir="${source.release.dist.dir}/build" file="${basedir}/build/build.xml" />
<!-- The lib directory -->
<mkdir dir="${source.release.dist.dir}/lib"/>
<!-- Generate the packed files -->
! <zip zipfile="${dist.dir}/${name}-${release}-src.zip" basedir="${source.release.dist.dir}" />
! <tar tarfile="${dist.dir}/${name}-${release}-src.tar" basedir="${source.release.dist.dir}" />
<gzip zipfile="${dist.dir}/${name}-${release}-src.tar.gz" src="${dist.dir}/${name}-${release}-src.tar"/>
! <delete file="${dist.dir}/${name}-${release}-src.tar" quiet="true" />
<delete dir="${release.dist.dir}" quiet="true"/>
--- 535,551 ----
<copy todir="${source.release.dist.dir}/src">
<fileset dir="${src.dir}">
! <exclude name="CVS"/>
</fileset>
</copy>
<!-- The build file -->
! <copy todir="${source.release.dist.dir}/build" file="${basedir}/build/build.xml"/>
<!-- The lib directory -->
<mkdir dir="${source.release.dist.dir}/lib"/>
<!-- Generate the packed files -->
! <zip zipfile="${dist.dir}/${name}-${release}-src.zip" basedir="${source.release.dist.dir}"/>
! <tar tarfile="${dist.dir}/${name}-${release}-src.tar" basedir="${source.release.dist.dir}"/>
<gzip zipfile="${dist.dir}/${name}-${release}-src.tar.gz" src="${dist.dir}/${name}-${release}-src.tar"/>
! <delete file="${dist.dir}/${name}-${release}-src.tar" quiet="true"/>
<delete dir="${release.dist.dir}" quiet="true"/>
***************
*** 634,640 ****
<junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
<sysproperty key="mx4j.log.priority" value="warn"/>
- <sysproperty key="mx4j.test.hostname" value="${env.HOSTNAME}"/>
- <sysproperty key="java.security.policy" value="=${test.src.dir}/test/javax/management/support/test-${ant.java.version}.policy"/>
- <sysproperty key="mx4j.dir" value="${basedir}"/>
<!-- sysproperty key="java.security.debug" value="access.failure"/-->
<formatter type="xml"/>
--- 627,630 ----
***************
*** 642,647 ****
<fileset dir="${test.src.dir}">
<include name="test/**/*Test.java"/>
! <exclude name="**/*Jdk13*" unless="jdk13.present"/>
! <exclude name="**/*Jdk14*" unless="jdk14.present"/>
</fileset>
</batchtest>
--- 632,640 ----
<fileset dir="${test.src.dir}">
<include name="test/**/*Test.java"/>
! <exclude name="test/javax/management/remote/**" unless="jaas.present"/>
! <exclude name="test/mx4j/remote/**" unless="jaas.present"/>
! <exclude name="test/mx4j/tools/remote/**" unless="jaas.present"/>
! <exclude name="test/mx4j/tools/jython/**" unless="jython.present"/>
! <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
</fileset>
</batchtest>
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click