portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal maven.xml
Date Thu, 20 Jan 2005 20:56:11 GMT
ate         2005/01/20 12:56:11

  Modified:    portal   maven.xml
  Log:
  Restored incorrectly removed goals nodbfullDeploy and nodbMinDeploy.
  As my previous commit contained a whitespace mess, I first reverted back to version 1.116
and then applied my changes again.
  
  Revision  Changes    Path
  1.118     +109 -86   jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- maven.xml	20 Jan 2005 01:52:52 -0000	1.117
  +++ maven.xml	20 Jan 2005 20:56:11 -0000	1.118
  @@ -55,7 +55,7 @@
   		<j:if test="$pam.app.war}">
   			<echo>Using war ${pam.app.war}</echo>
   		</j:if>
  -
  +		
   		<echo>${org.apache.jetspeed.deploy.war.dir}</echo>
   		<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
   			<classpath>
  @@ -68,51 +68,51 @@
   			<sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
   			<sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
   			<sysproperty key="portal.use.internal.jndi" value="true"/>
  -
  +			
   			<arg value="-action"/>
   			<arg value="deploy"/>
  -
  +			
   			<arg value="-PortletAppName"/>
   			<arg value="${pam.app.name}"/>
  -
  +			
   			<arg value="-PortalName"/>
   			<arg value="jetspeed"/>
  -
  +	
   			<arg value="-warfilename"/>
   			<arg value="${pam.app.war}"/>
  -
  +			
   			<arg value="-webappDir"/>
   			<arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
  -
  +			
   			<!--
   			<arg value="-ApplicationType"/>
   			<arg value="${pam.app.type}"/>
  -
  +	
   			<arg value="-UserName"/>
   			<arg value="${pam.username}"/>
  -
  +	
   			<arg value="-Password"/>
   			<arg value="${pam.password}"/>
  -
  +	
   			<arg value="-ApplicationServer"/>
   			<arg value="${pam.server.type}"/>
  -
  +	
   			<arg value="-Server"/>
   			<arg value="${pam.server}"/>
  -
  +	
   			<arg value="-ServerPort"/>
   			<arg value="${pam.server.port}"/>
  -
  +	
   			<arg value="-Impl"/>
   			<arg value="${pam.impl}"/>
   			-->
  -
  +	
   		</java>
   	</goal>
  -
  +	
   	<goal name="pam.template.register">
   		<echo>Performing action ${pam.action} with App ${pam.app.name}</echo>
  -
  +		
   		<echo>${org.apache.jetspeed.deploy.war.dir}</echo>
   		<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
   			<classpath>
  @@ -125,54 +125,54 @@
   			<sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
   			<sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
   			<sysproperty key="portal.use.internal.jndi" value="true"/>
  -
  +			
   			<arg value="-action"/>
   			<arg value="${pam.action}"/>
  -
  +			
   			<arg value="-PortletAppName"/>
   			<arg value="${pam.app.name}"/>
  -
  +			
   			<arg value="-PortalName"/>
   			<arg value="jetspeed"/>
  -
  +	
   			<arg value="-warfilename"/>
   			<arg value="${pam.app.war}"/>
  -
  +			
   			<arg value="-webappDir"/>
   			<arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
  -
  +			
   			<!--
   			<arg value="-ApplicationType"/>
   			<arg value="${pam.app.type}"/>
  -
  +	
   			<arg value="-UserName"/>
   			<arg value="${pam.username}"/>
  -
  +	
   			<arg value="-Password"/>
   			<arg value="${pam.password}"/>
  -
  +	
   			<arg value="-ApplicationServer"/>
   			<arg value="${pam.server.type}"/>
  -
  +	
   			<arg value="-Server"/>
   			<arg value="${pam.server}"/>
  -
  +	
   			<arg value="-ServerPort"/>
   			<arg value="${pam.server.port}"/>
  -
  +	
   			<arg value="-Impl"/>
   			<arg value="${pam.impl}"/>
   			-->
  -
  +	
   		</java>
   	</goal>
  -
  +	
   	<goal name="pam.template.undeploy">
   		<echo>Undeploying App ${pam.app.name}</echo>
   		<j:if test="$pam.app.war}">
   			<echo>Using war ${pam.app.war}</echo>
   		</j:if>
  -
  +		
   		<echo>${org.apache.jetspeed.deploy.war.dir}</echo>
   		<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
   			<classpath>
  @@ -185,55 +185,55 @@
   			<sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
   			<sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
   			<sysproperty key="portal.use.internal.jndi" value="true"/>
  -
  +			
   			<arg value="-action"/>
   			<arg value="undeploy"/>
  -
  +			
   			<arg value="-PortletAppName"/>
   			<arg value="${pam.app.name}"/>
  -
  +			
   			<arg value="-PortalName"/>
   			<arg value="jetspeed"/>
  -
  +			
   			<arg value="-ApplicationType"/>
   			<arg value="${pam.app.type}"/>
  -
  +			
   			<arg value="-webappDir"/>
   			<arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
  -
  +	
   			<!--
   			<arg value="-UserName"/>
   			<arg value="${pam.username}"/>
  -
  +	
   			<arg value="-Password"/>
   			<arg value="${pam.password}"/>
  -
  +	
   			<arg value="-ApplicationServer"/>
   			<arg value="${pam.server.type}"/>
  -
  +	
   			<arg value="-Server"/>
   			<arg value="${pam.server}"/>
  -
  +	
   			<arg value="-ServerPort"/>
   			<arg value="${pam.server.port}"/>
  -
  +	
   			<arg value="-Impl"/>
   			<arg value="${pam.impl}"/>
   			-->
  -
  +	
   		</java>
   	</goal>
   
   
     <goal name="pam.register">
     	<!--
  -
  +  		
     	<j:set var="pam.action" value="register"/>
    	<j:set var="pam.app.name" value="jetspeed"/>
    	<j:set var="pam.app.war" value="target/jetspeed.war"/>
    	<attainGoal name="pam.template.register"/>
    	-->
  - 	<j:set var="maven.build.dir" value="../layout-portlets/target" />
  + 	<j:set var="maven.build.dir" value="../layout-portlets/target" /> 	
    	<j:set var="maven.war.final.name" value="jetspeed-layouts.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  @@ -251,8 +251,8 @@
    	<j:set var="pam.app.war" value="../applications/demo/target/demo.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/demo/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/demo/target" /> 	
    	<j:set var="maven.war.final.name" value="demo.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  @@ -263,8 +263,8 @@
    	<j:set var="pam.app.war" value="../applications/pam/target/pam.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/pam/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/pam/target" /> 	
    	<j:set var="maven.war.final.name" value="pam.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  @@ -273,14 +273,14 @@
     	<!--
    	<j:set var="pam.app.name" value="testsuite"/>
    	<j:set var="pam.app.war" value="../../jakarta-pluto/testsuite/target/testsuite.war"/>
  -
  + 	
    	<attainGoal name="pam.template.deploy"/>
    	-->
  - 	<j:set var="maven.build.dir" value="../../jakarta-pluto/testsuite/target" />
  + 	<j:set var="maven.build.dir" value="../../jakarta-pluto/testsuite/target" /> 	
    	<j:set var="maven.war.final.name" value="testsuite.war" />
    	<attainGoal name="jetspeed2:deploy" />
  -
  -
  + 	
  + 	
     </goal>
   
     <goal name="pam.strutsdeploy">
  @@ -289,12 +289,12 @@
    	<j:set var="pam.app.war" value="../applications/struts-demo/target/struts-demo.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/struts-demo/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/struts-demo/target" /> 	
    	<j:set var="maven.war.final.name" value="struts-demo.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  -
  +  
     <goal name="pam.jpetstoredeploy">
    	<j:set var="maven.build.dir" value="../applications/jpetstore/target" />
    	<j:set var="maven.war.final.name" value="jpetstore.war" />
  @@ -302,8 +302,8 @@
     </goal>
   
     <goal name="pam.jsfdeploy">
  -
  - 	<j:set var="maven.build.dir" value="../applications/jsf-demo/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/jsf-demo/target" /> 	
    	<j:set var="maven.war.final.name" value="jsf-demo.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  @@ -314,38 +314,38 @@
    	<j:set var="pam.app.war" value="../applications/security/target/security.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/security/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/security/target" /> 	
    	<j:set var="maven.war.final.name" value="security.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  -
  +  
     <goal name="pam.phpdeploy">
     	<!--
    	<j:set var="pam.app.name" value="PHP"/>
    	<j:set var="pam.app.war" value="../applications/php/target/php.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/php/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/php/target" /> 	
    	<j:set var="maven.war.final.name" value="php.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  -
  +  
     <goal name="pam.perldeploy">
     	<!--
    	<j:set var="pam.app.name" value="perl"/>
    	<j:set var="pam.app.war" value="../applications/perl/target/perl.war"/>
    	<attainGoal name="pam.template.deploy"/>
    	-->
  -
  - 	<j:set var="maven.build.dir" value="../applications/perl/target" />
  + 	
  + 	<j:set var="maven.build.dir" value="../applications/perl/target" /> 	
    	<j:set var="maven.war.final.name" value="perl.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
   
     <goal name="pam.rss">
  - 	<j:set var="maven.build.dir" value="../applications/rss/target" />
  + 	<j:set var="maven.build.dir" value="../applications/rss/target" /> 	
    	<j:set var="maven.war.final.name" value="rss.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  @@ -373,7 +373,7 @@
    	<j:set var="pam.app.type" value="webapp"/>
    	<attainGoal name="pam.template.undeploy"/>
     </goal>
  -
  +  
     <goal name="pam.jpetstoreundeploy">
    	<j:set var="pam.app.name" value="jpetstore"/>
    	<j:set var="pam.app.type" value="webapp"/>
  @@ -391,13 +391,13 @@
    	<j:set var="pam.app.type" value="webapp"/>
    	<attainGoal name="pam.template.undeploy"/>
     </goal>
  -
  +  
     <goal name="pam.phpundeploy">
    	<j:set var="pam.app.name" value="php"/>
    	<j:set var="pam.app.type" value="webapp"/>
    	<attainGoal name="pam.template.undeploy"/>
     </goal>
  -
  +  
     <goal name="pam.perlundeploy">
    	<j:set var="pam.app.name" value="perl"/>
    	<j:set var="pam.app.type" value="webapp"/>
  @@ -465,7 +465,7 @@
     	 <attainGoal name="deploy" />
     	 <attainGoal name="pam.register" />
     	 <attainGoal name="pam.deploy" />
  -  	 <attainGoal name="pam.pamdeploy" />
  +  	 <attainGoal name="pam.pamdeploy" />  	 
        <attainGoal name="pam.strutsdeploy" />
        <attainGoal name="pam.jsfdeploy" />
        <attainGoal name="pam.securitydeploy" />
  @@ -477,11 +477,32 @@
        <attainGoal name="db.entities" />
     </goal>
   
  -  <goal name='minDeploy'>
  +  <goal name="nodbfullDeploy">
     	 <attainGoal name="deploy" />
     	 <attainGoal name="pam.register" />
  +  	 <attainGoal name="pam.deploy" />
  +  	 <attainGoal name="pam.pamdeploy" />  	 
  +     <attainGoal name="pam.strutsdeploy" />
  +     <attainGoal name="pam.jsfdeploy" />
        <attainGoal name="pam.securitydeploy" />
  -     <attainGoal name="db.entities" />
  +     <attainGoal name="pam.phpdeploy" />
  +     <attainGoal name="pam.perldeploy" />
  +     <attainGoal name="pam.rss" />
  +     <attainGoal name="pam.jpetstoredeploy" />
  +  </goal>
  +
  +  <goal name='minDeploy'>
  +  	 <attainGoal name="deploy" />
  +  	 <attainGoal name="pam.register" />
  +     <attainGoal name="pam.securitydeploy" />  	     
  +     <attainGoal name="db.entities" />     
  +  </goal>
  +
  +  <goal name='nodbMinDeploy'>
  +  	 <attainGoal name="remove.wars" />
  +  	 <attainGoal name="deploy" />
  +  	 <attainGoal name="pam.register" />
  +     <attainGoal name="pam.securitydeploy" />  	     
     </goal>
   
     <goal name="deployClasses">
  @@ -571,16 +592,16 @@
           	<j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql"
/>
   	    </j:otherwise>
     	</j:choose>
  -
  +  	
       <attainGoal name="db.execute" />
       -->
       <j:choose>
         <j:when test="${dbase == 'mssql'}" >
             <j:set var="database.arg.script" value="../src/sql/mssql/populate-userinfo-for-default-psml.sql"
/>
  -      </j:when>
  +      </j:when>   
         <j:when test="${dbase == 'mysql'}" >
           	<j:set var="database.arg.script" value="../src/sql/mysql/populate-userinfo-for-default-psml.sql"
/>
  -      </j:when>
  +      </j:when>   
         <j:when test="${dbase == 'oracle'}" >
             <j:set var="database.arg.script" value="../src/sql/oracle/populate-userinfo-for-default-psml.sql"
/>
         </j:when>
  @@ -592,24 +613,26 @@
     </goal>
   
     <goal name="ojb.set.production.database.platform">
  -    <copy file="../etc/db-ojb/repository_database.xml" todir="${maven.build.dest}" overwrite="true">
  -    <filterset begintoken="@" endtoken="@">
  -        <filter token="PLATFORM" value="${org.apache.jetspeed.production.database.ojb.platform}"/>
  -    </filterset>
  +    <copy todir="${maven.build.dest}" overwrite="true">
  +        <fileset dir="../etc/db-ojb"/>
  +        <filterset begintoken="@" endtoken="@">
  +            <filter token="PLATFORM"
  +                value="${org.apache.jetspeed.production.database.ojb.platform}"/>
  +        </filterset>
       </copy>
  -  </goal>
  +  </goal>  
   
     <preGoal name="jar:jar">
       <attainGoal name="ojb.set.production.database.platform"/>
     </preGoal>
   
  -  <preGoal name="war:init">
  +  <preGoal name="war:init">  	
      <attainGoal name= "jar:install"/>
      <j:set var="maven.test.skip" value="true" />
      <echo>Testing flag is: ${maven.test.skip} for war:install</echo>
     </preGoal>
  -
  -  <postGoal name="war:install">
  +  
  +  <postGoal name="war:install">  	
      <j:set var="maven.test.skip" value="false" />
     </postGoal>
   
  @@ -636,7 +659,7 @@
         </filterset>
       </copy>
     </postGoal>
  -
  +  
     <goal name='remove.wars'>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war"/>
  @@ -647,7 +670,7 @@
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/PHP"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/perl"/>
  -    <delete dir="${org.apache.jetspeed.deploy.war.dir}/rss"/>
  +    <delete dir="${org.apache.jetspeed.deploy.war.dir}/rss"/>	
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore"/>
       <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}"/>
       <j:choose>
  
  
  

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