raphael 2002/11/07 12:25:17
Modified: build build.xml
Log:
Update build file to include new CapabilityMap unit test
Revision Changes Path
1.166 +50 -49 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- build.xml 23 Oct 2002 22:04:53 -0000 1.165
+++ build.xml 7 Nov 2002 20:25:17 -0000 1.166
@@ -260,8 +260,8 @@
<include
name="org/apache/jetspeed/services/security/RoleManagement.java"/>
<include
name="org/apache/jetspeed/services/security/UserManagement.java"/>
<include name="org/apache/jetspeed/util/MetaData.java"/>
-<!-- <include
name="org/apache/jetspeed/services/security/ldap/UnixCrypt.java"/> -->
- <include
name="org.apache/jetspeed/services/security/ldap/JetspeedLDAPSecurityService"/>
+<!-- <include
name="org/apache/jetspeed/services/security/ldap/UnixCrypt.java"/> -->
+ <include
name="org.apache/jetspeed/services/security/ldap/JetspeedLDAPSecurityService"/>
</patternset>
</fileset>
</checkstyle>
@@ -614,10 +614,10 @@
<exclude name="cactus.properties"/>
</fileset>
</copy>
- <copy todir="${deploy.war}/jetspeed">
- <fileset dir="${webapp.dir}">
- </fileset>
- </copy>
+ <copy todir="${deploy.war}/jetspeed">
+ <fileset dir="${webapp.dir}">
+ </fileset>
+ </copy>
</target>
@@ -967,6 +967,7 @@
<formatter type="plain" usefile="false"/>
<!-- JUnit unit tests -->
+ <test name="org.apache.jetspeed.capability.TestCapabilityMap"/>
<test name="org.apache.jetspeed.services.psmlmanager.TestMarshalPsml"/>
<test
name="org.apache.jetspeed.services.registry.TestMarshallRegistry"/>
<test name="org.apache.jetspeed.services.idgenerator.TestIdGenerator"/>
@@ -1024,7 +1025,7 @@
<!-- Run the client JUnit test cases (non-cactus) -->
<!-- =================================================================== -->
<target name="unittest-security"
- depends="unittest-security-turbine, unittest-security-user,
unittest-security-registry"
+ depends="unittest-security-turbine, unittest-security-user,
unittest-security-registry"
description="Security unit test for all implementations"/>
<!-- =================================================================== -->
@@ -1166,51 +1167,51 @@
</filterset>
</copy>
- <ant antfile="build.xml" dir="./build/torque" target="clean">
- <property name="build.properties" value="build.properties"/>
- </ant>
+ <ant antfile="build.xml" dir="./build/torque" target="clean">
+ <property name="build.properties" value="build.properties"/>
+ </ant>
</target>
- <!-- =================================================================== -->
- <!-- Object Model -->
- <!-- =================================================================== -->
- <target name="check_om">
- <uptodate property="omBuild.notRequired"
targetfile="./src/sql/security-schema.sql">
- <srcfiles dir= "./build/torque/schema"
includes="security-schema.xml"/>
- <srcfiles dir= "./build/torque" includes="build.properties"/>
- </uptodate>
- </target>
-
- <target name="om" depends="check_om"
- unless="omBuild.notRequired"
- description="Generate Object Model sources">
-
- <ant antfile="build.xml" dir="./build/torque">
- <property name="build.properties" value="build.properties"/>
- </ant>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Object Model -->
- <!-- =================================================================== -->
- <target name="check_dbpsml">
- <uptodate property="omBuild.notRequired2"
targetfile="./src/sql/dbpsml-schema.sql">
- <srcfiles dir= "./build/torque/schema"
includes="dbpsml-schema.xml"/>
- <srcfiles dir= "./build/torque" includes="dbpsml.properties"/>
- </uptodate>
- </target>
-
- <target name="dbpsml" depends="check_dbpsml"
- unless="omBuild.notRequired2"
- description="Generate DBPSML Object Model sources">
-
- <ant antfile="build.xml" dir="./build/torque">
- <property name="build.properties" value="dbpsml.properties"/>
- </ant>
-
- </target>
+ <!-- ===================================================================
-->
+ <!-- Object Model
-->
+ <!-- ===================================================================
-->
+ <target name="check_om">
+ <uptodate property="omBuild.notRequired"
targetfile="./src/sql/security-schema.sql">
+ <srcfiles dir= "./build/torque/schema"
includes="security-schema.xml"/>
+ <srcfiles dir= "./build/torque" includes="build.properties"/>
+ </uptodate>
+ </target>
+
+ <target name="om" depends="check_om"
+ unless="omBuild.notRequired"
+ description="Generate Object Model sources">
+
+ <ant antfile="build.xml" dir="./build/torque">
+ <property name="build.properties" value="build.properties"/>
+ </ant>
+
+ </target>
+
+ <!-- ===================================================================
-->
+ <!-- Object Model
-->
+ <!-- ===================================================================
-->
+ <target name="check_dbpsml">
+ <uptodate property="omBuild.notRequired2"
targetfile="./src/sql/dbpsml-schema.sql">
+ <srcfiles dir= "./build/torque/schema"
includes="dbpsml-schema.xml"/>
+ <srcfiles dir= "./build/torque" includes="dbpsml.properties"/>
+ </uptodate>
+ </target>
+
+ <target name="dbpsml" depends="check_dbpsml"
+ unless="omBuild.notRequired2"
+ description="Generate DBPSML Object Model sources">
+
+ <ant antfile="build.xml" dir="./build/torque">
+ <property name="build.properties" value="dbpsml.properties"/>
+ </ant>
+
+ </target>
<!-- =================================================================== -->
<!-- Include the usage target and the test targets for the different -->
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
