portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/registry project.xml maven.xml
Date Thu, 20 May 2004 23:24:20 GMT
weaver      2004/05/20 16:24:20

  Modified:    components/registry project.xml maven.xml
  Log:
  JS2-41: Removed the build.registry goal.
  JS2-43: Changed to OJB-1.0-RC6
  
  Revision  Changes    Path
  1.14      +6 -1      jakarta-jetspeed-2/components/registry/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	12 May 2004 05:44:28 -0000	1.13
  +++ project.xml	20 May 2004 23:24:20 -0000	1.14
  @@ -118,12 +118,17 @@
       </dependency>
       <dependency>
         <id>ojb:db-ojb</id>
  +      <version>1.0.rc6</version>
  +    </dependency>
  +    <!--
  +    <dependency>
  +      <id>ojb:db-ojb</id>
         <version>1.0.rc5-PATCHED</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  -    <!--
  +    
       <dependency>
         <id>ojb</id>
         <version>1.0.rc4</version>
  
  
  
  1.17      +0 -11     jakarta-jetspeed-2/components/registry/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/maven.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- maven.xml	13 May 2004 16:39:14 -0000	1.16
  +++ maven.xml	20 May 2004 23:24:20 -0000	1.17
  @@ -30,23 +30,12 @@
   <property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryFromPortletDescriptor'/>

   
       
  -   <!-- ================================================================ -->
  -  <!-- Merge OJB desriptor with Jetspeed main OJB descriptor                       
                      -->
  -  <!-- ================================================================ -->
  -  <goal name="ojb.registry">
  -    <copy  file="${basedir}/src/java/repository_registry.xml" tofile="${basedir}/../../portal/src/java/repository_registry.xml"
overwrite="true"/>
  -<!--    <copy  file="${basedir}/src/java/repository_registry.xml" tofile="${basedir}/../../portal/src/test/repository_registry.xml"/>
-->
  -   </goal>
   
     <goal name="deployJar">
     	<attainGoal name="jar:install"/>
     	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
     </goal>
   
  -  <goal name="build.registry">
  -  	<attainGoal name="ojb.registry"/>
  -  	<attainGoal name="jar:install"/>
  - </goal>
   
     <preGoal name="test:test">
       <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
  
  
  

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


Mime
View raw message