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 project.properties maven.xml GETTING-STARTED.html
Date Fri, 27 Feb 2004 18:03:27 GMT
weaver      2004/02/27 10:03:27

  Modified:    .        project.properties maven.xml GETTING-STARTED.html
  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.5       +9 -7      jakarta-jetspeed-2/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.properties	24 Feb 2004 15:43:02 -0000	1.4
  +++ project.properties	27 Feb 2004 18:03:27 -0000	1.5
  @@ -10,11 +10,13 @@
   maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
   
   
  +# 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
   
  -database.test.name=hsql
  -database.test.driver=org.hsqldb.jdbcDriver
  -database.test.url=jdbc:hsqldb:hsql://127.0.0.1:9001
  -database.test.username=sa
  -database.test.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 = 
  
  
  
  1.27      +45 -8     jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- maven.xml	26 Feb 2004 17:42:00 -0000	1.26
  +++ maven.xml	27 Feb 2004 18:03:27 -0000	1.27
  @@ -6,9 +6,6 @@
            
     <property name='testcase' value='org.apache.jetspeed.pipeline.TestPipeline'/>
     
  -  <!-- Set up the test DB via System property override -->
  -  <property name="HSQLDBServer.db.path" value="./portal/test/db/hsql/Registry"/>
  -
     <goal name="allClean"
           description="Clean the master project and all subprojects">
       <attainGoal name="subClean"/>
  @@ -80,7 +77,7 @@
       <maven:reactor
                  basedir="${basedir}/components/registry"
                  includes="project.xml"
  -               goals="build.registry.server"
  +               goals="build.registry"
                  banner="Build and Install the Regsitry Components jar"
                  postProcessing="false"
                  ignoreFailures="false"/>
  @@ -102,7 +99,7 @@
       <maven:reactor
                  basedir="${basedir}"
                  includes="services/security/project.xml"
  -               goals="db.recreate,db.test.recreate.server,jar:install,ojb.registry"
  +               goals="db.recreate,jar:install,ojb.registry"
                  banner="Build and Install the services - security jar"
                  postProcessing="false"
                  ignoreFailures="false"/>
  @@ -111,7 +108,7 @@
        <maven:reactor
                  basedir="${basedir}"
                  includes="portal/project.xml"
  -               goals="db.recreate,db.test.recreate.server,war:install"
  +               goals="war:install"
                  banner="Build and Install the Portlet WAR"
                  postProcessing="false"
                  ignoreFailures="false"/>
  @@ -162,15 +159,55 @@
     	<echo message="maven.repo.local = ${maven.repo.local}" />
     </goal>
   
  +  <goal name="start.production.server">
  +  	<echo message="====================================" />
  +  	<echo message="  Production/Deployment Database    " />  	
  +  	<echo message="====================================" />
  +         <java classname="org.hsqldb.Server" fork="yes">
  +          <classpath>
  +            <path refid="maven.dependency.classpath"/>
  +            <pathelement path="${maven.build.dest}"/>
  +          </classpath>
  +            <arg value="-database" />          
  +            <arg value="./src/database/hsql/Production" />
  +            <arg value="-port" />          
  +            <arg value="9001" />
  +            <arg value="-silent" />          
  +            <arg value="true" />
  +            <arg value="-trace" />          
  +            <arg value="false" />
  +        </java>  
  +  </goal>
  +  
     <goal name="start.test.server">
  -         <java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="yes">
  +  	<echo message="====================================" />
  +  	<echo message="        Testing Database            " />  	
  +  	<echo message="====================================" />
  +         <java classname="org.hsqldb.Server" fork="yes">
             <classpath>
               <path refid="maven.dependency.classpath"/>
               <pathelement path="${maven.build.dest}"/>
             </classpath>
               <arg value="-database" />          
  -            <arg value="./portal/test/db/hsql/Registry" />
  +            <arg value="./src/database/hsql/Test" />
  +            <arg value="-port" />          
  +            <arg value="9001" />
  +            <arg value="-silent" />          
  +            <arg value="true" />
  +            <arg value="-trace" />          
  +            <arg value="false" />
           </java>  
  +  </goal>
  +  
  +   <goal name="installProductionDb">
  +  	<echo message="${basedir}" />
  +  	 <maven:reactor
  +               basedir="${basedir}"
  +               includes="components/registry/project.xml,services/security/project.xml,portal/project.xml"
  +               goals="db.recreate"
  +               banner="Create production database"
  +               postProcessing="false"
  +               ignoreFailures="false"/>
     </goal>
     
     
  
  
  
  1.7       +23 -9     jakarta-jetspeed-2/GETTING-STARTED.html
  
  Index: GETTING-STARTED.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/GETTING-STARTED.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GETTING-STARTED.html	5 Feb 2004 02:16:57 -0000	1.6
  +++ GETTING-STARTED.html	27 Feb 2004 18:03:27 -0000	1.7
  @@ -86,12 +86,6 @@
       <td width="229">${CATALINA_BASE}/webapps/</td>
       <td width="261">The location to deploy web application in Tomcat.</td>
     </tr>
  -  <tr> 
  -    <td width="134"><s>deployment.db.alias</s></td>
  -    <td width="229"><s>${CATALINA_BASE}/webapps/jetspeed/WEB-INF/db/hsql/Registry</s></td>
  -    <td width="261"><s>The location of HypersonicSQL database file that will
contain 
  -      Jetspeed information like registries and user info.</s></td>
  -  </tr>
   </table>
   <h2>3. Build .jar and .war files</h2>
   <p>There are two procedures you can follow that will yeild the same results which

  @@ -102,11 +96,23 @@
       <th>procedure 2 (long and boring)</th>
     </tr>
     <tr> 
  -    <td rowspan="4" valign="top"> 
  -      <p><b>Build all jars and wars:</b><br>
  +    <td rowspan="6" valign="top"> 
  +      <p><b>Start the HSQL test server:</b><br>
  +        cd ${jetspeed-2-home}<br>
  +        maven start.test.server</p>
  +      <p><b>Build all jars and wars:<br>
  +        </b>(in seperate window/terminal session)<br>
           cd ${jetspeed-2-home}<br>
           maven allBuild</p>
       </td>
  +    <td><b>Start the HSQL test server:</b><br>
  +      cd ${jetspeed-2-home}<br>
  +      maven start.test.server</td>
  +  </tr>
  +  <tr>
  +    <td><b>(in seperate window/terminal session)</b></td>
  +  </tr>
  +  <tr> 
       <td><b>Build Portlet-API</b><br>
         cd ${jetspeed-2-home}/portlet-api<br>
         maven jar:install</td>
  @@ -131,6 +137,12 @@
     4. Deploying Jetspeed 2</h2>
   <p><b>Deploy Jetspeed Portal WAR into Catalina</b></p>
   <ol>
  +  <li>make sure you have terminated the test HSQLserver</li>
  +  <li>cd ${jetspeed-2-home}</li>
  +  <li>maven start.proudction.server</li>
  +  <li>(in seperate window/terminal session) cd ${jetspeed-2-home}</li>
  +  <li>maven installProductionDb this will recreate the DB to deploy into. &nbsp;WARNING

  +    This will drop all the tables and data in the proudction database.</li>
     <li>cd ${jetspeed-2-home}/portal</li>
     <li>maven deploy</li>
   </ol>
  @@ -143,7 +155,9 @@
     <li>maven pam.deploy </li>
   </ol>
   <p><strong>NOTE:</strong> Steps 4 and 5 have been combined into the ${jetspeed-2-home}/portal

  -  <code>&quot;<b>maven fullDeploy</b>&quot;</code> goal.</p>
  +  <code>&quot;<b>maven fullDeploy</b>&quot;</code> goal.
&nbsp;However, you will 
  +  still need to manually start the production HSQL server and populate it as defined 
  +  in steps 4.1 - 4.5.</p>
   <h2>6. Start Tomcat</h2>
   <p>Run Tomcat, go to http://localhost:8080/jetspeed.</p>
   <h2>(Optional) How to undeploy the demo application</h2>
  
  
  

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