portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/services/security maven.xml project.properties
Date Fri, 27 Feb 2004 18:01:03 GMT
weaver      2004/02/27 10:01:03

  Modified:    services/security maven.xml project.properties
  Log:
  removed all HSQL specific references from the project.
  
  Building will now require the user to start the test HSQL server for "allBuild"
  and the production server for inatallProductionDb and any deployment goals
  
  Revision  Changes    Path
  1.6       +4 -36     jakarta-jetspeed-2/services/security/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/services/security/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	24 Feb 2004 17:26:15 -0000	1.5
  +++ maven.xml	27 Feb 2004 18:01:03 -0000	1.6
  @@ -40,11 +40,11 @@
     <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
     <!-- ================================================================ -->
     <goal name="db.execute">
  -    <sql driver="${database.default.driver}"
  +    <sql driver="${org.apache.jetspeed.database.driver}"
            classpathref="maven.dependency.classpath"
  -         url="${database.default.url}"
  -         userid="${database.default.username}"
  -         password="${database.default.password}"
  +         url="${org.apache.jetspeed.database.url}"
  +         userid="${org.apache.jetspeed.database.user}"
  +         password="${org.apache.jetspeed.database.password}"
            src="${database.arg.script}">
       </sql>
     </goal>
  @@ -76,37 +76,5 @@
       <attainGoal name="db.create" />
     </goal>
   
  -  <!-- ================================================================ -->
  -  <!-- TEST DB SQL SCRIPTS                                              -->
  -  <!-- ================================================================ -->
  -  <goal name="db.test.create">
  -    <j:set var="database.default.url" value="jdbc:hsqldb:${basedir}/../../portal/test/db/hsql/Registry"
/>
  -    <attainGoal name="db.create" />
  -  </goal>
  -
  - 
  -  <goal name="db.test.create.server">
  -    <j:set var="database.default.url" value="jdbc:hsqldb:hsql://127.0.0.1:9001" />
  -    <attainGoal name="db.create" />
  -  </goal>
  -
  -  <goal name="db.test.drop">
  -    <j:set var="database.default.url" value="jdbc:hsqldb:${basedir}/../../portal/test/db/hsql/Registry"
/>
  -    <attainGoal name="db.drop" />
  -  </goal>
  -  
  -  <goal name="db.test.drop.server">
  -    <j:set var="database.default.url" value="jdbc:hsqldb:hsql://127.0.0.1:9001" />
  -    <attainGoal name="db.drop" />
  -  </goal>
  -
  -  <goal name="db.test.recreate">
  -    <attainGoal name="db.test.drop" />
  -    <attainGoal name="db.test.create" />
  -  </goal>
     
  -  <goal name="db.test.recreate.server">
  -    <attainGoal name="db.test.drop.server" />
  -    <attainGoal name="db.test.create.server" />
  -  </goal>
   </project>
  
  
  
  1.2       +11 -4     jakarta-jetspeed-2/services/security/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/services/security/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	12 Feb 2004 14:58:40 -0000	1.1
  +++ project.properties	27 Feb 2004 18:01:03 -0000	1.2
  @@ -25,7 +25,14 @@
   maven.pmd.rulesetfiles=${plugin.resources}/rulesets/strings.xml,${plugin.resources}/rulesets/junit.xml,${plugin.resources}/rulesets/braces.xml,${plugin.resources}/rulesets/basic.xml,${plugin.resources}/rulesets/unusedcode.xml,${plugin.resources}/rulesets/design.xml,${plugin.resources}/rulesets/imports.xml,${plugin.resources}/rulesets/codesize.xml
   
   database.default.name=hsql
  -database.default.driver=org.hsqldb.jdbcDriver
  -database.default.url=jdbc:hsqldb:${basedir}/../../portal/src/webapp/WEB-INF/db/hsql/Registry
  -database.default.username=sa
  -database.default.password=
  +
  +# Sets up the system properties for the test JDBC datasource
  +maven.junit.sysproperties=org.apache.jetspeed.database.url \
  +org.apache.jetspeed.database.driver \
  +org.apache.jetspeed.database.user \
  +org.apache.jetspeed.database.password
  +
  +org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
  +org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
  +org.apache.jetspeed.database.user = sa
  +org.apache.jetspeed.database.password = 
  
  
  

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