You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/02/25 21:55:58 UTC

cvs commit: jakarta-jetspeed-2 project.xml maven.xml

weaver      2004/02/25 12:55:57

  Modified:    .        project.xml maven.xml
  Log:
  removed HSQl server pregoal that wasnt really working anyway
  
  Revision  Changes    Path
  1.5       +3 -16     jakarta-jetspeed-2/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	24 Feb 2004 15:43:02 -0000	1.4
  +++ project.xml	25 Feb 2004 20:55:57 -0000	1.5
  @@ -97,32 +97,19 @@
       </developers>
   
     <dependencies>
  -  	<!-- Used for pre-starting the DB prior to tests -->
  +   <!-- Used for pre-starting the DB prior to tests -->
       <dependency>
         <id>hsqldb</id>
         <version>1.7.1</version>
         <properties>
           <war.bundle.jar>false</war.bundle.jar>
         </properties>
  -    </dependency> 
  -  	
  +    </dependency>   	
     </dependencies>
   
     <build>
       <nagEmailAddress>david@bluesunrise.com</nagEmailAddress>
   
  -    <sourceDirectory>src/java</sourceDirectory>
  -   <!--
  -    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  -    <aspectSourceDirectory></aspectSourceDirectory>
  -    -->
  -    <unitTest>
  -      <includes>
  -        <include>**/*Test*.java</include>
  -      </includes>
  -      <excludes>
  -        <exclude>**/BaseTestCase.java</exclude>
  -      </excludes>
  -    </unitTest>
  +
     </build>
   </project>
  
  
  
  1.24      +7 -61     jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- maven.xml	24 Feb 2004 16:46:43 -0000	1.23
  +++ maven.xml	25 Feb 2004 20:55:57 -0000	1.24
  @@ -1,6 +1,7 @@
   <project default="java:jar"
            xmlns:j="jelly:core"
  -         xmlns:maven="jelly:maven">
  +         xmlns:maven="jelly:maven"
  +         xmlns:ant="jelly:ant">
   
     <goal name="allClean"
           description="Clean the master project and all subprojects">
  @@ -148,66 +149,11 @@
                  postProcessing="false"
                  ignoreFailures="false"/>  
     </goal>
  -  
  -  <preGoal name="allBuild">
  -  	<!-- Make sure that the org.apache.jetspeed.dbutil.HSQLServer
  -  	   - is compiled.
  -  	  -->
  -  	<attainGoal name="java:compile" />
  -  	<echo message="====================================" />
  -  	<echo message="Starting HSQL server for testing    " />  	
  -  	<echo message="====================================" />
  -  	<!-- Test DB -->
  -  	<java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="true" >
  -       <classpath>
  -         <path refid="maven.dependency.classpath"/>
  -         <pathelement path="${maven.build.dest}"/>
  -        </classpath>
  -         <arg value="-database" />
  -         <arg value="portal/test/db/hsql/Registry" />
  -         <arg value="-port" />
  -         <arg value="9001" />
  -         <arg value="-no_system_exit" />
  -         <arg value="true" />
  -         <arg value="-silent" />
  -         <arg value="true" />
  -         <arg value="-trace" />
  -         <arg value="false" />
  -      </java> 
  -  	
  -  </preGoal>
  -  
  -  <postGoal name="allBuild">
  -  	<echo message="====================================" />
  -  	<echo message="        Stopping HSQL server        " />  	
  -  	<echo message="====================================" />
  -  	<java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="true" >
  -       <classpath>
  -         <path refid="maven.dependency.classpath"/>
  -         <pathelement path="${maven.build.dest}"/>
  -        </classpath>
  -         <arg value="kill" />
  -         <arg value="9001" />     
  -         <arg value="sa" />
  -         <arg value="" />
  -      </java>   	
  -  	
  -  </postGoal>
  -  
  -  <goal name="quick">
  -  	<echo message="====================================" />
  -  	<echo message="        Stopping HSQL server        " />  	
  -  	<echo message="====================================" />
  -  	<java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="true" >
  -       <classpath>
  -         <path refid="maven.dependency.classpath"/>
  -         <pathelement path="${maven.build.dest}"/>
  -        </classpath>
  -         <arg value="kill" />
  -         <arg value="9001" />     
  -         <arg value="sa" />
  -         <arg value=" " />
  -      </java>  
  +
  + 
  +  <goal name="show.maven.props">
  +  	<echo message="maven.home.local = ${maven.home.local}" />
  +  	<echo message="maven.repo.local = ${maven.repo.local}" />
     </goal>
   
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org