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/persistence project.xml
Date Thu, 04 Mar 2004 21:22:43 GMT
weaver      2004/03/04 13:22:43

  Modified:    components/registry maven.xml project.xml
               components/persistence project.xml
  Log:
  reverting to ojb-Rc4 and PB
  
  Revision  Changes    Path
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maven.xml	29 Feb 2004 18:25:26 -0000	1.10
  +++ maven.xml	4 Mar 2004 21:22:43 -0000	1.11
  @@ -19,7 +19,7 @@
     <!-- 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"/>
  +    <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>
   
  
  
  
  1.6       +17 -2     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	1 Mar 2004 02:04:05 -0000	1.5
  +++ project.xml	4 Mar 2004 21:22:43 -0000	1.6
  @@ -96,6 +96,7 @@
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  +    <!--
       <dependency>
         <id>ojb:db-ojb</id>
         <version>1.0.rc5</version>
  @@ -103,6 +104,14 @@
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  +    -->
  +    <dependency>
  +      <id>ojb</id>
  +      <version>1.0.rc4</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency>
        <dependency>
         <id>commons-pool</id>
         <version>1.1</version>
  @@ -250,11 +259,17 @@
     </dependencies>
     <build>
       <sourceDirectory>src/java</sourceDirectory>
  -    <unitTestSourceDirectory>${basedir}/xsrc/test</unitTestSourceDirectory>
  + 
  +    
  +    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
       <unitTest>
          <includes>
  -        <include>**/Test*.java</include>
  +        <include>**/TestRegistryDirect*.java</include>
         </includes>
  +       <excludes>
  +           <exclude>**/TestRegistry.java</exclude>
  +           <exclude>**/TestRegistryDirectOTM*.java</exclude>
  +      </excludes>
   
         <resources>
           <resource>
  
  
  
  1.5       +19 -0     jakarta-jetspeed-2/components/persistence/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	27 Feb 2004 20:26:58 -0000	1.4
  +++ project.xml	4 Mar 2004 21:22:43 -0000	1.5
  @@ -96,6 +96,7 @@
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  +    <!--
       <dependency>
         <id>ojb:db-ojb</id>
         <version>1.0.rc5</version>
  @@ -103,6 +104,14 @@
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  +    -->
  +    <dependency>
  +      <id>ojb</id>
  +      <version>1.0.rc4</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency>
        <dependency>
         <id>commons-pool</id>
         <version>1.1</version>
  @@ -214,6 +223,16 @@
     </dependencies>
     <build>
       <sourceDirectory>src/java</sourceDirectory>
  +    <sourceModifications >
  +    	
  +    <sourceModification >
  +    	<className>foo.bar</className>
  +      <excludes>
  +         <exclude>**/otm/*.java</exclude>
  +      </excludes>	
  +    </sourceModification>
  +    </sourceModifications>
  +    
       <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
       <unitTest>
          <includes>
  
  
  

---------------------------------------------------------------------
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