[jboss-svn-commits] JBoss Portal SVN: r5582 - trunk/identity

[jboss-svn-commits at lists.jboss.org]

Author: bdaw
Date: 2006-11-04 06:04:30 -0500 (Sat, 04 Nov 2006)
New Revision: 5582

Modified:
   trunk/identity/build.xml
Log:
enable back jdk1.4 to run testsuite

Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml	2006-11-04 11:03:02 UTC (rev 5581)
+++ trunk/identity/build.xml	2006-11-04 11:04:30 UTC (rev 5582)
@@ -234,35 +234,43 @@
    <target name="output"
            description="Generate all target output."
            depends="compile">
-	      <mkdir dir="${build.lib}"/>
-	      <jar jarfile="${build.lib}/portal-identity-lib.jar">
-	         <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
-	      </jar>      
-	      <copy file="${build.resources}/hibernate/domain.hbm.xml"
-               tofile="${build.resources}/hibernate/domain-single.hbm.xml">
-	         <filterset>
-	            <filtersfile file="../build/etc/single.properties"/>
-	         </filterset>
-	      </copy>
-	      <copy file="${build.resources}/hibernate/domain.hbm.xml"
-               tofile="${build.resources}/hibernate/domain-clustered.hbm.xml">
-	         <filterset>
-	            <filtersfile file="../build/etc/clustered.properties"/>
-	         </filterset>
-	      </copy>
-	   </target>
+      <mkdir dir="${build.lib}"/>
+      <jar jarfile="${build.lib}/portal-identity-lib.jar">
+         <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
+      </jar>
+      <copy file="${build.resources}/hibernate/domain.hbm.xml"
+            tofile="${build.resources}/hibernate/domain-single.hbm.xml">
+         <filterset>
+            <filtersfile file="../build/etc/single.properties"/>
+         </filterset>
+      </copy>
+      <copy file="${build.resources}/hibernate/domain.hbm.xml"
+            tofile="${build.resources}/hibernate/domain-clustered.hbm.xml">
+         <filterset>
+            <filtersfile file="../build/etc/clustered.properties"/>
+         </filterset>
+      </copy>
+   </target>
 
    <!-- generates artifacts used for tests, requires output to be previously run
          -->
    <target name="package-tests" depends="init,
 	                                         output">
-	       <jar jarfile="${build.lib}/portal-identity-test-lib.jar">
-	           <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
-	           <fileset dir="${build.resources}/portal-identity-test-jar"/>
-	       </jar>   
-	   </target>
+      <jar jarfile="${build.lib}/portal-identity-test-lib.jar">
+         <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+         <fileset dir="${build.resources}/portal-identity-test-jar"/>
+      </jar>
 
+      <!--test-identity.sar -->
+      <jar jarfile="${build.lib}/test-identity.sar">
+         <fileset dir="${build.resources}/test-identity-sar"/>
+         <fileset dir="../test/output/lib" includes="portal-test-agent-lib.jar"/>
+         <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/>
+         <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/>
+      </jar>
+   </target>
 
+
    <!-- ================================================================== -->
    <!-- Cleaning                                                           -->
    <!-- ================================================================== -->
@@ -291,15 +299,23 @@
    <target name="most" depends="_default:most"/>
    <target name="help" depends="_default:help"/>
 
-   <target name="tests" depends="init">
 
-      <fail unless="HAVE_JDK_1.5">
-           Unsupported Java version: You need at least JDK1.5 to run tests in identity module
-      </fail>
+   <target name="deploy-ldap" depends="init">
+      <mkdir dir="${jboss.home}/server/default/conf/opends"/>
+      <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true">
+         <fileset dir="../test/output/etc/opends"/>
+      </copy>
+      <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+   </target>
 
+   <!-- Undeployment of agent -->
+   <target name="undeploy-ldap" depends="init">
+      <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar"/>
+      <delete dir="${jboss.home}/server/default/conf/opends"/>
+   </target>
+
+   <target name="tests" depends="init" if="HAVE_JDK_1.5">
       <property name="proto-libs" value="${project.root}/proto-libs"/>
-
-
       <execute-tests>
 <!--