Return-Path: 
 <jetspeed-dev-return-15914-apmail-jakarta-jetspeed-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org
Received: (qmail 29483 invoked from network); 23 Jun 2004 18:41:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 23 Jun 2004 18:41:17 -0000
Received: (qmail 20279 invoked by uid 500); 23 Jun 2004 18:40:05 -0000
Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org
Received: (qmail 20183 invoked by uid 500); 23 Jun 2004 18:40:03 -0000
Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:jetspeed-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:jetspeed-dev-help@jakarta.apache.org>
List-Post: <mailto:jetspeed-dev@jakarta.apache.org>
List-Id: "Jetspeed Developers List" <jetspeed-dev.jakarta.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@jakarta.apache.org>
Delivered-To: mailing list jetspeed-dev@jakarta.apache.org
Received: (qmail 19810 invoked by uid 500); 23 Jun 2004 18:39:59 -0000
Received: (qmail 19708 invoked by uid 500); 23 Jun 2004 18:39:57 -0000
Received: (qmail 19681 invoked by uid 99); 23 Jun 2004 18:39:56 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 23 Jun 2004 11:39:56 -0700
Received: (qmail 28401 invoked by uid 1642); 23 Jun 2004 18:39:32 -0000
Date: 23 Jun 2004 18:39:32 -0000
Message-ID: <20040623183932.28397.qmail@minotaur.apache.org>
From: weaver@apache.org
To: jakarta-jetspeed-2-cvs@apache.org
Subject: cvs commit: jakarta-jetspeed-2/maven-plugin project.xml plugin.jelly
 maven.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

weaver      2004/06/23 11:39:32

  Modified:    maven-plugin project.xml plugin.jelly maven.xml
  Log:
  started JS2-80 dep handling.
  JS2-46 pico upgrade
  
  Revision  Changes    Path
  1.9       +1 -0      jakarta-jetspeed-2/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	21 Jun 2004 15:19:32 -0000	1.8
  +++ project.xml	23 Jun 2004 18:39:32 -0000	1.9
  @@ -56,6 +56,7 @@
                       <include>plugin.properties</include> 
                       <include>project.properties</include> 
                       <include>project.xml</include> 
  +                    <include>locator.ent</include> 
                   </includes> 
               </resource> 
         </resources> 
  
  
  
  1.7       +5 -0      jakarta-jetspeed-2/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.jelly	18 Jun 2004 20:46:47 -0000	1.6
  +++ plugin.jelly	23 Jun 2004 18:39:32 -0000	1.7
  @@ -106,6 +106,11 @@
     
     <goal name="jetspeed2:build.portal"> 
     	
  +  	  <copy todir="${basedir}/etc/project-dependencies" overwrite="true" failonerror="true">
  +         <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />            	       	       
  +     </copy>
  +     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/locator.ent" tofile="${basedir}/locator.ent" overwrite="true" failonerror="true"/> 
  +  	
     	<j:set var="portal_project_desc_path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" /> 	
     	 	
     	<maven:pom projectDescriptor="${portal_project_desc_path}" var="portal_project" />
  
  
  
  1.6       +8 -6      jakarta-jetspeed-2/maven-plugin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	18 Jun 2004 11:07:29 -0000	1.5
  +++ maven.xml	23 Jun 2004 18:39:32 -0000	1.6
  @@ -18,17 +18,18 @@
            xmlns:maven="jelly:maven"
            xmlns:ant="jelly:ant">
            
  - <preGoal name="plugin:deploy">
  + <preGoal name="java:jar-resources">
  + 	 <copy todir="target/classes/plugin-resources/etc/project-dependencies" overwrite="true" failonerror="true">
  +         <fileset dir="../etc/project-dependencies" />            	       	       
  +     </copy>
  +     <copy file="../locator.ent" tofile="${basedir}/target/classes/plugin-resources/locator.ent" overwrite="true" failonerror="true"/> 
    	 <attainGoal name="copyDb" />
    	 <attainGoal name="copyPortlaWebApp" />
        <copy file="../portal/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml" overwrite="true" failonerror="true"/> 
  +      
    </preGoal>        
    
  -  <preGoal name="plugin:install">
  - 	 <attainGoal name="copyDb" />
  - 	 <attainGoal name="copyPortlaWebApp" />
  - 	 <copy file="../portal/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml" overwrite="true" failonerror="true"/> 
  - </preGoal>   
  +
    
     <goal name="deploy-plugin">
   	<!-- determine if the plugin is already installed and is of the correct version -->
  @@ -98,6 +99,7 @@
            <fileset dir="../portal/src/resources" />            	       	       
        </copy>
        <copy file="../layout-portlets/target/jetspeed-layouts.war" todir="target/classes/plugin-resources/webapp/WEB-INF/deploy" overwrite="true" failonerror="true" />
  +
   </goal>
   
     <goal name="db.execute">
  
  
  

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