[jboss-remoting-commits] JBoss Remoting SVN: r3918 - remoting2/branches/2.x.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Wed Apr 9 03:09:09 EDT 2008
Author: ron.sigal at jboss.com
Date: 2008-04-09 03:09:08 -0400 (Wed, 09 Apr 2008)
New Revision: 3918
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-920, JBREM-934: (1) Added security policy for tests.marshall; (2) replaced use of output/classes with jboss-remoting.jar; (3) eliminated some unnecessary dependencies.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-04-09 06:59:23 UTC (rev 3917)
+++ remoting2/branches/2.x/build.xml 2008-04-09 07:09:08 UTC (rev 3918)
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
<!-- $Id$ -->
<project default="most" name="JBossRemoting">
@@ -265,7 +277,8 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <pathelement location="${compile.dir}"/>
+ <pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
+ <!--pathelement location="${compile.dir}"/-->
<pathelement location="${etc.dir}"/>
<path refid="third_party.classpath"/>
</path>
@@ -288,7 +301,8 @@
<!-- The combined library classpath -->
<path id="library.classpath.tomcat">
- <pathelement location="${compile.dir}"/>
+ <!--pathelement location="${compile.dir}"/-->
+ <pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
<pathelement location="${etc.dir}"/>
<path refid="third_party.classpath.tomcat"/>
</path>
@@ -304,7 +318,7 @@
<path id="tests.marshall.classpath">
<path refid="library.classpath"/>
- <pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
+ <!--pathelement path="${output.lib.dir}/jboss-remoting.jar"/-->
</path>
<!--<path id="remoting.version_1_4.classpath">-->
@@ -336,6 +350,7 @@
<!-- set the security manager information for unit tests -->
<property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/>
+ <property name="java.security.policy.marshal" value="${etc.dir}/remoting.security.policy.marshal"/>
<property name="java.security.policy.strict" value="${etc.dir}/remoting.security.policy.strict"/>
<property name="java.security.manager" value=""/>
<!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>-->
@@ -355,6 +370,13 @@
files="remoting.security.policy.core,
remoting.security.policy.tests.minimal"/>
</concat>
+
+ <!-- Create security policy file for tests.marshall -->
+ <concat destfile="${etc.dir}/remoting.security.policy.marshal">
+ <filelist dir="${etc.dir}"
+ files="remoting.security.policy.core,
+ remoting.security.policy.tests.marshal"/>
+ </concat>
</target>
<!-- ================================================================== -->
@@ -534,7 +556,7 @@
</target>
- <target name="tests.jars" description="Creates the tests jar files" depends="tests.compile, manifest">
+ <target name="tests.jars" description="Creates the tests jar files" depends="tests.compile">
<mkdir dir="${output.lib.dir}"/>
@@ -542,6 +564,7 @@
manifest="${manifest.file}">
<fileset dir="${tests.compile.dir}">
<include name="org/jboss/test/remoting/**"/>
+ <include name="org/jboss/ant/taskdefs/**"/>
<include name="org/jboss/test/dtf/**"/>
<exclude name="org/jboss/test/remoting/marshall/dynamic/remote/**/Test*Marshaller*"/>
<exclude name="org/jboss/test/remoting/marshall/dynamic/remote/**/TestWrapper*"/>
@@ -746,7 +769,7 @@
<antcall target="tests.report.quick"/>
</target>
- <target name="tests" description="Runs remoting functional and performance tests." depends="jars, tests.jars">
+ <target name="tests" description="Runs remoting functional and performance tests." depends="tests.jars">
<antcall target="tests.functional.core" inheritrefs="true"/>
<!--<antcall target="tests.versioning" inheritrefs="true"/>-->
<!--<antcall target="tests.performance" inheritrefs="true"/>-->
@@ -786,7 +809,7 @@
</junitreport>
</target>
- <target name="tests.functional.core" depends="configure">
+ <target name="tests.functional.core" depends="tests.jars">
<antcall target="tests.functional.serialization.java.core" inheritrefs="true"/>
<antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
<antcall target="tests.functional.serialization.jboss.core" inheritrefs="true"/>
@@ -939,19 +962,19 @@
</target>
<target name="tests.functional.serialization.java.http.core">
- <antcall target="tests.functional.http.jbossweb.core">
+ <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true">
<param name="serialization" value="java"/>
</antcall>
- <antcall target="tests.functional.http.tomcat.core">
+ <antcall target="tests.functional.http.tomcat.core" inheritrefs="true">
<param name="serialization" value="java"/>
</antcall>
</target>
<target name="tests.functional.serialization.jboss.http.core" if="isJDK5">
- <antcall target="tests.functional.http.jbossweb.core">
+ <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true">
<param name="serialization" value="jboss"/>
</antcall>
- <antcall target="tests.functional.http.tomcat.core">
+ <antcall target="tests.functional.http.tomcat.core" inheritrefs="true">
<param name="serialization" value="jboss"/>
</antcall>
</target>
@@ -1041,7 +1064,7 @@
</junit>
</target>
- <target name="tests.functional.main.core" depends="tests.jars">
+ <target name="tests.functional.main.core">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>bisocket/rmi/socket: ${metadata}</echo>
@@ -1100,7 +1123,7 @@
</junit>
</target>
- <target name="tests.functional.main.security" depends="tests.jars">
+ <target name="tests.functional.main.security">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>bisocket/rmi/socket (strict security): ${metadata}</echo>
@@ -1248,10 +1271,11 @@
</junit>
</target>
- <target name="tests.functional.main.http.security" depends="tests.jars">
+ <target name="tests.functional.main.http.security">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>http (strict security) with ${version}: ${metadata}</echo>
+ <echo>ant.library.dir: ${ant.library.dir}</echo>
<junit
printsummary="true" fork="yes" includeantruntime="true"
tempdir="${output.tests.tmp}" maxmemory="1024m">
@@ -1261,7 +1285,7 @@
<path refid="${classpath}"/>
</classpath>
<sysproperty key="java.security.manager" value="${java.security.manager}"/>
- <sysproperty key="java.security.policy" value="${java.security.policy.strict}}"/>
+ <sysproperty key="java.security.policy" value="${java.security.policy.strict}"/>
<sysproperty key="java.security.debug" value="${java.security.debug}"/>
<sysproperty key="build.home" value="${basedir}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
@@ -1284,7 +1308,7 @@
</junit>
</target>
- <target name="tests.functional.main.http.core" depends="tests.jars">
+ <target name="tests.functional.main.http.core">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>http with ${version}: ${metadata}</echo>
@@ -1337,7 +1361,7 @@
</target>
<!-- tests for sending of non-serializable payloads. -->
- <target name="tests.nonserializable" depends="tests.jars">
+ <target name="tests.nonserializable">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
@@ -1369,7 +1393,7 @@
</junit>
</target>
- <target name="tests.functional.main.serialization.jboss" depends="tests.jars">
+ <target name="tests.functional.main.serialization.jboss">
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
@@ -1462,7 +1486,8 @@
<!-- End of socket serialization smoke tests -->
<!-- Tests dynamic, remote loading of marshaller/unmarshaller -->
- <target name="tests.marshall" depends="tests.jars" if="os.windows">
+ <target name="tests.marshall" if="os.windows">
+ <echo>remote marshalling tests</echo>
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
@@ -1470,10 +1495,9 @@
<!-- THIS IS IMPORTANT THAT USE MARSHALL SPECIFIC CLASSPATH -->
<path refid="tests.marshall.classpath"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
- <!--<path refid="third_party.classpath"/> -->
</classpath>
<sysproperty key="java.security.manager" value="${java.security.manager}"/>
- <sysproperty key="java.security.policy" value="${java.security.policy}"/>
+ <sysproperty key="java.security.policy" value="${java.security.policy.marshal}"/>
<sysproperty key="java.security.debug" value="${java.security.debug}"/>
<sysproperty key="build.home" value="${basedir}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
More information about the jboss-remoting-commits
mailing list