taylor      2004/08/10 16:39:27

  Modified:    fusion   maven.xml
  Log:
  set both production and default props
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.8       +19 -12    jakarta-jetspeed/fusion/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/maven.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- maven.xml 30 Jul 2004 00:10:30 -0000      1.7
  +++ maven.xml 10 Aug 2004 23:39:27 -0000      1.8
  @@ -14,11 +14,11 @@
   limitations under the License.
   -->
   <project default="jar:jar"
  -         xmlns:j="jelly:core" 
  +         xmlns:j="jelly:core"
            xmlns:define="jelly:define"
            >
  -    <goal name="db.fusion.create">  
  -      <attainGoal name="db.production.properties"/>  
  +    <goal name="db.fusion.create">
  +      <attainGoal name="db.production.properties"/>
           <attainGoal name="jetspeed2:db.create"/>
       </goal>
   
  @@ -29,6 +29,13 @@
         <j:set var="org.apache.jetspeed.database.user" 
value="${org.apache.jetspeed.fusion.production.database.user}"/>
         <j:set var="org.apache.jetspeed.database.password" 
value="${org.apache.jetspeed.fusion.production.database.password}"/>
         <j:set var="org.apache.jetspeed.jdbc.drivers.path" 
value="${org.apache.jetspeed.fusion.production.jdbc.drivers.path}"/>
  +      <j:set var="org.apache.jetspeed.production.database.default.name" 
value="${org.apache.jetspeed.fusion.production.database.default.name}"/>
  +      <j:set var="org.apache.jetspeed.production.database.url" 
value="${org.apache.jetspeed.fusion.production.database.url}"/>
  +      <j:set var="org.apache.jetspeed.production.database.driver" 
value="${org.apache.jetspeed.fusion.production.database.driver}"/>
  +      <j:set var="org.apache.jetspeed.production.database.user" 
value="${org.apache.jetspeed.fusion.production.database.user}"/>
  +      <j:set var="org.apache.jetspeed.production.database.password" 
value="${org.apache.jetspeed.fusion.production.database.password}"/>
  +      <j:set var="org.apache.jetspeed.production.jdbc.drivers.path" 
value="${org.apache.jetspeed.fusion.production.jdbc.drivers.path}"/>
  +
       </goal>
   
       <goal name="db.fusion.start">
  @@ -38,27 +45,27 @@
       <goal name="deployFusion">
          <attainGoal name="deploy.shared"/>
          <attainGoal name="copy.context"/>
  -       <attainGoal name="db.fusion.create"/> 
  +       <attainGoal name="db.fusion.create"/>
       </goal>
   
       <goal name="copy.context">
         <j:set var="org.apache.jetspeed.context.file.name" value="jetspeed.xml"/>
  -      <j:set var="org.apache.jetspeed.context.file.source" 
value="../src/resources/jetspeed.xml"/>    
  -      <attainGoal name="db.production.properties"/>  
  +      <j:set var="org.apache.jetspeed.context.file.source" 
value="../src/resources/jetspeed.xml"/>
  +      <attainGoal name="db.production.properties"/>
         <attainGoal name="jetspeed2:copy.context"/>
       </goal>
   
  -    <goal name='deploy.shared'> 
  -      <echo>Copying from ${maven.repo.local} to 
${maven.war.appserver.home}/shared/lib...</echo>   
  +    <goal name='deploy.shared'>
  +      <echo>Copying from ${maven.repo.local} to 
${maven.war.appserver.home}/shared/lib...</echo>
         <copy file="${pom.getDependencyPath('pluto')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
         <copy file="${pom.getDependencyPath('commons-lang')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
         <copy file="${pom.getDependencyPath('commons-logging')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
         <copy file="${pom.getDependencyPath('commons-configuration')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
         <copy file="${pom.getDependencyPath('log4j')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
  -      <copy 
file="${pom.getDependencyPath('portals-bridges:portals-bridges-common')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>   
  +      <copy 
file="${pom.getDependencyPath('portals-bridges:portals-bridges-common')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
         <copy file="${pom.getDependencyPath('jetspeed2:jetspeed-commons')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true" />
  -      <copy file="${pom.getDependencyPath('portlet-api')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>   
     
  -      <copy file="${pom.getDependencyPath('jetspeed2:jetspeed-api')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>   
 
  +      <copy file="${pom.getDependencyPath('portlet-api')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
  +      <copy file="${pom.getDependencyPath('jetspeed2:jetspeed-api')}" 
todir="${maven.war.appserver.home}/shared/lib" failonerror="true" overwrite="true"/>
     </goal>
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to