dlestrat 2004/02/12 08:35:27 Modified: portal maven.xml Log: Security service maven changes. Revision Changes Path 1.37 +18 -4 jakarta-jetspeed-2/portal/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- maven.xml 5 Feb 2004 05:50:54 -0000 1.36 +++ maven.xml 12 Feb 2004 16:35:27 -0000 1.37 @@ -6,6 +6,21 @@ <!-- Target of maven test:single test --> <property name='testcase' value='org.apache.jetspeed.profiler.TestProfiler'/> + <!-- ================================================================ --> + <!-- Set System properties for junit --> + <!-- ================================================================ --> + <preGoal name="test:single"> + <j:set var="java.security.auth.login.config" value="../services/security/src/webapp/WEB-INF/conf/jaas/login.conf"/> + <j:set var="applicationRoot" value="src/webapp"/> + <j:set var="maven.junit.sysproperties">java.security.auth.login.config applicationRoot</j:set> + </preGoal> + + <preGoal name="test:test"> + <j:set var="java.security.auth.login.config" value="../services/security/src/webapp/WEB-INF/conf/jaas/login.conf"/> + <j:set var="applicationRoot" value="src/webapp"/> + <j:set var="maven.junit.sysproperties">java.security.auth.login.config applicationRoot</j:set> + </preGoal> + <!-- <goal name="jaxb:portlet" description="Generate java classes from protlet API schema"> @@ -79,7 +94,6 @@ <pathelement path="${maven.build.dest}"/> </classpath> <sysproperty key="services.HSQLDBServer.db.path" value="${hsql.deployment.db.path}"/> - <sysproperty key="pam.jetspeed.properties" value="/WEB-INF/conf/jetspeed.properties"/> <arg value="-action" /> <arg value="deploy" /> <arg value="-PortletAppName" /> @@ -105,7 +119,7 @@ <arg value="-PortletAppName" /> <arg value="testsuite" /> <arg value="-warfilename" /> - <arg value="../../SAVE-jakarta-pluto/testsuite/target/testsuite.war" /> + <arg value="../../jakarta-pluto/testsuite/target/testsuite.war" /> <arg value="-webappDir" /> <arg value="${pam.deploy.dir}/" /> <arg value="-PortalName" /> @@ -253,7 +267,6 @@ <copy file="./target/jetspeed.war" tofile="${deploy.war.dir}/${webapp.name}.war"/> <unwar src="${deploy.war.dir}/${webapp.name}.war" dest="${deploy.war.dir}/${webapp.name}"/> <copy file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/jetspeed.xml"/> - <copy file="./src/resources/jetspeed.xml" tofile="${tomcat.root}/conf/Catalina/localhost/jetspeed.xml"/> <attainGoal name="catalina:base-shared" /> <attainGoal name="catalina:shared" /> </goal> @@ -350,7 +363,8 @@ <!-- ================================================================ --> <goal name="ojb.registry"> <copy file="./../services/registry/src/webapp/WEB-INF/conf/ojb/repository_registry.xml" tofile="./src/webapp/WEB-INF/conf/ojb/repository_registry.xml"/> - </goal> + <copy file="./../services/security/src/webapp/WEB-INF/conf/ojb/repository_security.xml" tofile="./src/webapp/WEB-INF/conf/ojb/repository_security.xml"/> + </goal> <goal name="pam.rssdeploy">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]