You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/10/13 18:09:15 UTC

cvs commit: jakarta-turbine-fulcrum/osworkflow/example project.xml

epugh       2004/10/13 09:09:15

  Modified:    security/memory project.xml
               security/api project.xml
               security/nt project.xml
               security/hibernate project.xml
               crypto/impl project.xml
               security/adapters/turbine project.xml
               naming   project.xml
               upload   project.xml
               .        merlin-project.xml project.xml
               security/adapters/opensymphony project.xml
               osworkflow/example project.xml
  Log:
  Fixes suggested by Niclas Hedhman to get compiles working with Gump.
  
  Revision  Changes    Path
  1.8       +2 -14     jakarta-turbine-fulcrum/security/memory/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/memory/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	7 Oct 2004 15:13:15 -0000	1.7
  +++ project.xml	13 Oct 2004 16:09:14 -0000	1.8
  @@ -11,31 +11,19 @@
         <artifactId>fulcrum-security-api</artifactId>
         <version>1.0.7-dev</version>
       </dependency>      
  +    
       <dependency>
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-crypto-api</artifactId>
         <version>1.0.4</version>
       </dependency>
  +    
       <dependency>
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-crypto-impl</artifactId>
         <version>1.0.4</version>
       </dependency>  
   
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  -    </dependency> 
  -    
  -    <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</version>
  -    </dependency>      
  -    <dependency>
  -      <id>commons-lang</id>
  -      <version>2.0</version>
  -    </dependency>  
       <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
  
  
  
  1.8       +3 -26     jakarta-turbine-fulcrum/security/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/api/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	7 Oct 2004 15:11:58 -0000	1.7
  +++ project.xml	13 Oct 2004 16:09:14 -0000	1.8
  @@ -11,6 +11,7 @@
         <artifactId>fulcrum-crypto-api</artifactId>
         <version>1.0.4</version>
       </dependency>
  +    
       <dependency>
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-crypto-impl</artifactId>
  @@ -18,46 +19,22 @@
       </dependency>    
       
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  -    </dependency> 
  -    
  -    <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</version>
  -    </dependency>      
  -    <dependency>
  -      <id>commons-lang</id>
  -      <version>2.0</version>
  -    </dependency>  
  -    <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
         <url>http://www.cryptix.org/</url>
       </dependency>    
  +    
       <dependency>
         <id>commons-codec</id>
         <version>1.1</version>
       </dependency>
  +    
       <dependency>
         <groupId>junit</groupId>    
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
       </dependency> 
           
  -    <!-- testing -->
  -    <dependency>
  -      <groupId>fulcrum</groupId>    
  -      <artifactId>fulcrum-testcontainer</artifactId>
  -      <version>1.0.3</version>
  -    </dependency>    
  -    <!--dependency>
  -      <groupId>merlin</groupId>
  -      <artifactId>merlin-unit</artifactId>
  -      <version>3.2.3-dev</version>
  -    </dependency-->
  -
     </dependencies>
   
   
  
  
  
  1.10      +0 -19     jakarta-turbine-fulcrum/security/nt/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/nt/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	13 Aug 2004 12:59:26 -0000	1.9
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.10
  @@ -23,20 +23,6 @@
       </dependency>  
   
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  -    </dependency> 
  -    
  -    <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</version>
  -    </dependency>      
  -    <dependency>
  -      <id>commons-lang</id>
  -      <version>2.0</version>
  -    </dependency>  
  -    <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
         <url>http://www.cryptix.org/</url>
  @@ -54,11 +40,6 @@
         <artifactId>fulcrum-security-memory</artifactId>
         <version>1.0.6</version>
       </dependency>      
  -    <dependency>
  -      <groupId>fulcrum</groupId>    
  -      <artifactId>fulcrum-testcontainer</artifactId>
  -      <version>1.0.3</version>
  -    </dependency>        
   
     </dependencies>
   
  
  
  
  1.16      +5 -3      jakarta-turbine-fulcrum/security/hibernate/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml	7 Oct 2004 15:13:15 -0000	1.15
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.16
  @@ -58,7 +58,7 @@
        </dependency>    
        <dependency>
          <id>hibernate</id>      
  -       <version>2.1.1</version>
  +       <version>2.1.6</version>
        </dependency>
   	<dependency>
         <groupId>ehcache</groupId>      
  @@ -94,12 +94,14 @@
         <version>1.4.1</version>
         <url>http://www.objectweb.org/asm</url>  
   	</dependency>
  - 	<dependency>
  +<!--    
  +    <dependency>
         <groupId>hibernate</groupId>      
         <artifactId>jta</artifactId>            
         <version>hib2.1</version>
         <url>http://www.hibernate.org</url> 
  -    </dependency>                                 
  +    </dependency>  
  +-->                               
       <dependency>
          <id>dom4j</id>      
          <version>1.4</version>
  
  
  
  1.5       +2 -1      jakarta-turbine-fulcrum/crypto/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/crypto/impl/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	30 Jun 2004 13:00:35 -0000	1.4
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.5
  @@ -31,7 +31,8 @@
       <dependency>
         <id>commons-codec</id>
         <version>1.1</version>
  -    </dependency>  
  +    </dependency> 
  +     
       <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
  
  
  
  1.9       +8 -20     jakarta-turbine-fulcrum/security/adapters/turbine/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/adapters/turbine/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	7 Oct 2004 15:13:32 -0000	1.8
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.9
  @@ -10,12 +10,14 @@
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-security-api</artifactId>
         <version>1.0.7-dev</version>
  -    </dependency>        
  +    </dependency>
  +    
       <dependency>
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-crypto-api</artifactId>
         <version>1.0.4</version>
       </dependency>
  +    
       <dependency>
         <groupId>fulcrum</groupId>   
         <artifactId>fulcrum-crypto-impl</artifactId>
  @@ -23,24 +25,11 @@
       </dependency>  
       
       <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  -    </dependency> 
  -    
  -    <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</version>
  -    </dependency>      
  -    <dependency>
  -      <id>commons-lang</id>
  -      <version>2.0</version>
  -    </dependency>  
  -    <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
         <url>http://www.cryptix.org/</url>
       </dependency>    
  +    
        <dependency>
          <id>commons-beanutils</id>
          <version>1.6.1</version>
  @@ -77,25 +66,24 @@
         <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
         <version>0.09</version>
       </dependency> 
  +    
       <dependency>
         <groupId>mockobjects</groupId>
         <artifactId>mockobjects-core</artifactId>
         <version>0.09</version>
       </dependency>          
  +    
       <dependency>
         <id>commons-codec</id>
         <version>1.1</version>
       </dependency>
  -    <dependency>
  -      <id>cryptix</id>
  -      <version>3.2.0</version>
  -      <url>http://www.cryptix.org/</url>
  -    </dependency>
  +    
       <dependency>
         <id>ecs</id>
         <version>1.4.2</version>
         <url>http://jakarta.apache.org/ecs/</url>
       </dependency>
  +    
       <dependency>
         <id>xml-apis</id>
         <version>2.0.2</version>
  
  
  
  1.3       +0 -12     jakarta-turbine-fulcrum/naming/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/naming/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	30 Jun 2004 13:58:30 -0000	1.2
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.3
  @@ -15,18 +15,6 @@
         <version>1.0.3</version>
       </dependency>
   
  -    <dependency>
  -      <id>xerces:xercesImpl</id>
  -      <version>2.0.2</version>
  -      <url>http://xml.apache.org/xerces2-j/</url>
  -    </dependency>
  -
  -    <dependency>
  -      <id>xerces:xmlParserAPIs</id>
  -      <version>2.0.2</version>
  -      <url>http://xml.apache.org/xerces2-j/</url>
  -    </dependency>
  -
     </dependencies>
   
   
  
  
  
  1.4       +1 -0      jakarta-turbine-fulcrum/upload/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/upload/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Jun 2004 13:56:08 -0000	1.3
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.4
  @@ -29,6 +29,7 @@
         <version>1.0.2</version>
         <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
       </dependency>
  +    
       <dependency>
         <id>javamail</id>
         <version>1.3.1</version>
  
  
  
  1.9       +2 -2      jakarta-turbine-fulcrum/merlin-project.xml
  
  Index: merlin-project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/merlin-project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- merlin-project.xml	30 Jun 2004 13:53:36 -0000	1.8
  +++ merlin-project.xml	13 Oct 2004 16:09:15 -0000	1.9
  @@ -141,7 +141,7 @@
         <version>3.3.0</version>
       </dependency>
       
  -    <!-- PLUGINS -->
  +    <!-- PLUGINS  --> 
       <dependency> 
       	<groupId>avalon-meta</groupId> 
       	<artifactId>avalon-meta-plugin</artifactId> 
  @@ -156,7 +156,7 @@
   	    <url>http://avalon.apache.org</url> 
       	<type>plugin</type>
     	</dependency>   		
  -  
  + 
     </dependencies>
   
     <build>
  
  
  
  1.86      +34 -24    jakarta-turbine-fulcrum/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- project.xml	30 Jun 2004 13:52:55 -0000	1.85
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.86
  @@ -158,22 +158,27 @@
        -->
       
       <dependency>
  -      <id>avalon-framework</id>
  -      <version>4.1.4</version>
  +      <groupId>avalon-framework</groupId>
  +      <artifactId>avalon-framework-api</artifactId>
  +      <version>4.1.5</version>
  +    </dependency>
  +    
  +    <dependency>
  +      <groupId>avalon-framework</groupId>
  +      <artifactId>avalon-framework-impl</artifactId>
  +      <version>4.1.5</version>
       </dependency>
       
       <dependency>
         <id>commons-lang</id>
         <version>2.0</version>
       </dependency> 
  +    
       <!--
        |
        | Common test-time dependencies for all the components.
        |
        -->
  -
  -  
  -    
       <dependency>
         <id>commons-io</id>
         <version>20030203.000550</version>
  @@ -204,33 +209,38 @@
       </dependency>    
   
       <dependency>
  -      <id>excalibur-component</id>
  +      <groupId>excalibur-component</groupId>
  +      <artifactId>excalibur-component</artifactId>
         <version>1.1</version>
  -      <url>http://avalon.apache.org/</url>
  +      <url>http://excalibur.apache.org/</url>
       </dependency>
   
       <dependency>
  -      <id>excalibur-instrument</id>
  +      <groupId>excalibur-instrument</groupId>
  +      <artifactId>excalibur-instrument</artifactId>
         <version>1.0</version>
  -      <url>http://avalon.apache.org/</url>
  +      <url>http://excalibur.apache.org/</url>
       </dependency>
   
       <dependency>
  -      <id>excalibur-logger</id>
  -      <version>1.0.1</version>
  -      <url>http://avalon.apache.org/</url>
  +      <groupId>excalibur-logger</groupId>
  +      <artifactId>excalibur-logger</artifactId>
  +      <version>1.1</version>
  +      <url>http://excalibur.apache.org/</url>
       </dependency>
   
       <dependency>
  -      <id>excalibur-pool</id>
  -      <version>1.2</version>
  -      <url>http://avalon.apache.org/</url>
  +      <groupId>excalibur-pool</groupId>
  +      <artifactId>excalibur-pool-api</artifactId>
  +      <version>2.0.0</version>
  +      <url>http://excalibur.apache.org/</url>
       </dependency>
   
       <dependency>
  -      <id>logkit</id>
  -      <version>1.0.1</version>
  -      <url>http://jakarta.apache.org/avalon/logkit/</url>
  +      <groupId>avalon-logkit</groupId>
  +      <artifactId>avalon-logkit</artifactId>
  +      <version>2.0.0</version>
  +      <url>http://avalon.apache.org</url>
       </dependency>
   
       <!--
  @@ -258,12 +268,12 @@
        -->
   
       <dependency> 
  -    	<groupId>avalon-meta</groupId> 
  -    	<artifactId>avalon-meta-plugin</artifactId> 
  -    	<version>1.3.2</version> 
  -	    <url>http://avalon.apache.org</url> 
  -    	<type>plugin</type>
  -  	</dependency> 
  +      <groupId>avalon-meta</groupId> 
  +      <artifactId>avalon-meta-plugin</artifactId> 
  +      <version>1.3.2</version> 
  +      <url>http://avalon.apache.org</url> 
  +      <type>plugin</type>
  +    </dependency> 
     </dependencies>
     
    
  
  
  
  1.9       +2 -9      jakarta-turbine-fulcrum/security/adapters/opensymphony/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/adapters/opensymphony/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	7 Oct 2004 15:13:32 -0000	1.8
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.9
  @@ -29,18 +29,11 @@
       </dependency> 
       
       <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</version>
  -    </dependency>      
  -    <dependency>
  -      <id>commons-lang</id>
  -      <version>2.0</version>
  -    </dependency>  
  -    <dependency>
         <id>cryptix</id>
         <version>3.2.0</version>
         <url>http://www.cryptix.org/</url>
  -    </dependency>    
  +    </dependency>   
  +     
        <dependency>
          <id>commons-beanutils</id>
          <version>1.6.1</version>
  
  
  
  1.13      +1 -1      jakarta-turbine-fulcrum/osworkflow/example/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/osworkflow/example/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.xml	14 Feb 2004 15:50:20 -0000	1.12
  +++ project.xml	13 Oct 2004 16:09:15 -0000	1.13
  @@ -122,7 +122,7 @@
       <!-- Boilerplate Turbine Dependency List -->
       <dependency>
         <id>avalon-framework</id>
  -      <version>4.1.4</version>
  +      <version>4.1.5</version>
         <url>http://jakarta.apache.org/avalon/</url>
         <properties>        
           <war.bundle>true</war.bundle>
  
  
  

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