commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prick...@apache.org
Subject cvs commit: jakarta-commons-sandbox/periodicity/src/plugins-build/database plugin.jelly project.xml developer.properties user.properties
Date Fri, 11 Oct 2002 18:44:59 GMT
prickett    2002/10/11 11:44:59

  Modified:    periodicity project.properties
               periodicity/conf/build build.properties
               periodicity/src/plugins-build/database plugin.jelly
                        project.xml
  Removed:     periodicity/src/plugins-build/database developer.properties
                        user.properties
  Log:
  Removed testlet properties from build.properties file
  
  Added a message to be printed by the build process when setting database
  information.
  
  Added code to create a valid postgresql url to the database plugin jelly file
  
  Removed an extraneous test echo statement
  
  Removed the developer.properties file in the database plugin directory
  
  Removed the user.properties file in the database plugin directory
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-commons-sandbox/periodicity/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/project.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.properties	11 Oct 2002 06:40:38 -0000	1.5
  +++ project.properties	11 Oct 2002 18:44:59 -0000	1.6
  @@ -23,7 +23,7 @@
   # Default: none
   # -------------------------------------------------------------------
   
  -periodicity.database.type=mysql
  +periodicity.database.type=postgresql
   
   # --------------------------------------------------------------------
   #
  
  
  
  1.3       +1 -4      jakarta-commons-sandbox/periodicity/conf/build/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties	9 Oct 2002 16:15:45 -0000	1.2
  +++ build.properties	11 Oct 2002 18:44:59 -0000	1.3
  @@ -1,6 +1,3 @@
   torque.contextProperties=conf/build/build.torque.properties
   torque.jar=${maven.home}/repository/torque/jars/torque-SNAPSHOT.jar
  -periodicity.testlet.cvs.repository=:pserver:anoncvs@cvs.apache.org:/home/cvspublic
  -periodicity.testlet.cvs.password=anoncvs
  -periodicity.testlet.cvs.package=jakarta-avalon-testlet/src/java
  -periodicity.testlet.home=${maven.build.dir}/testlet
  +periodicity.setting.db.info.message=Setting database information for database type "${periodicity.database.type}".
  
  
  
  1.4       +10 -2     jakarta-commons-sandbox/periodicity/src/plugins-build/database/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly	11 Oct 2002 06:40:38 -0000	1.3
  +++ plugin.jelly	11 Oct 2002 18:44:59 -0000	1.4
  @@ -3,6 +3,7 @@
   
     <property file="conf/build/build.db.developer.properties"/>
     <property file="conf/build/build.db.user.properties"/>
  +  <property file="conf/build/build.properties"/>
   
     <goal name="database">
       <echo>You made it to the periodicity database plugin!!!</echo>
  @@ -16,11 +17,19 @@
       <j:when test="${dbType == 'mysql'}">
         <j:choose>
           <j:otherwise>
  -          <echo>Setting db url for ${periodicity.database.type}</echo>
  +          <echo>${periodicity.setting.db.info.message}</echo>
             <property name="derived.db.url" value="${periodicity.mysql.default.driver.scheme}://${periodicity.database.host}:${periodicity.database.port}/${periodicity.database.name}"/>
           </j:otherwise>
         </j:choose>
       </j:when>  
  +    <j:when test="${dbType == 'postgresql'}">
  +      <j:choose>
  +        <j:otherwise>
  +          <echo>${periodicity.setting.db.info.message}</echo>
  +          <property name="derived.db.url" value="${periodicity.postgresql.default.driver.scheme}://${periodicity.database.host}:${periodicity.database.port}/${periodicity.database.name}"/>
  +        </j:otherwise>
  +      </j:choose>
  +    </j:when>  
       <j:otherwise>
           <echo>Database Type "${periodicity.database.type}" is not yet supported</echo>
       </j:otherwise>
  @@ -38,7 +47,6 @@
   
     <goal name="database:derived">
       <echo>derived.db.url = "${derived.db.url}"</echo>
  -    <echo>scheme="${periodicity.mysql.default.driver.scheme}"</echo>
     </goal>  
   
   </project>  
  
  
  
  1.4       +1 -1      jakarta-commons-sandbox/periodicity/src/plugins-build/database/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	11 Oct 2002 17:37:21 -0000	1.3
  +++ project.xml	11 Oct 2002 18:44:59 -0000	1.4
  @@ -38,7 +38,7 @@
     <build>
       <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
       <sourceDirectory>src/java</sourceDirectory>
  -    <aspectSourceDirectory/>
  +    <aspectSourceDirectory>target</aspectSourceDirectory>
     </build>  
     
   </project>  
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message