portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r545133 - in /portals/jetspeed-2/trunk/xdocs: getting-started-binary.xml guides/guide-app-servers.xml guides/guide-database.xml guides/guide-properties.xml guides/guide-security-declarative-psml.xml j2-maven-plugin.xml
Date Thu, 07 Jun 2007 10:00:47 GMT
Author: ate
Date: Thu Jun  7 03:00:46 2007
New Revision: 545133

URL: http://svn.apache.org/viewvc?view=rev&rev=545133
Log:
Fix for JS2-471: Document Derby as the default database
See: http://issues.apache.org/jira/browse/JS2-471

Modified:
    portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml
    portals/jetspeed-2/trunk/xdocs/guides/guide-app-servers.xml
    portals/jetspeed-2/trunk/xdocs/guides/guide-database.xml
    portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml
    portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml
    portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml

Modified: portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml Thu Jun  7 03:00:46 2007
@@ -395,7 +395,7 @@
 					configuration properties can be placed in
 					<code>${basedir}build.properties</code>
 					. A minimal custom portal configuration using the
-					default HSQLDB database can be something like:
+					default Derby database can be something like:
 					<source>
 						<![CDATA[
 # required portal configuration properties          
@@ -409,7 +409,7 @@
 					</source>
 				</p>
 				<p>
-					If you are not using the HSQLDB database that comes
+					If you are not using the Derby database that comes
 					pre-configured in the
 					<code>${basedir}project.properties</code>
 					file, you also need to define the database
@@ -489,33 +489,16 @@
 			<subsection name="3.6 Start the Database Server">
 				<p>
 					You need to make sure that your database server is
-					running. If you are not using the default HSQLDB
+					running. If you are not using the default Derby
 					database, you need to make sure that it is running
 					and that the user that will own the Jetspeed tables
 					is setup and ready for use. Refer to the
 					<a href="guides/guide-database.html">Database Configuration</a>
-					section for more information. If you are using the
-					default HSQLDB database you need to start it before
-					deploying the portal.
-				</p>
-				<p>
-					To start the HSQLDB production database run the
-					following in a
-					<i>separate</i>
-					console:
-					<source>
-						<![CDATA[
-cd ${org.apache.jetspeed.portal.home}
-maven j2:start.production.server]]>
-					</source>
+					section for more information.
 				</p>
 				<p>
 					You need to have this database running during the
 					deployment and while running the application server.
-					Afterwards you can stop the database and close this
-					console with a
-					<code>Ctrl-C</code>
-					.
 				</p>
 				<p>
 					Note: this is required when using the

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-app-servers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-app-servers.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-app-servers.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-app-servers.xml Thu Jun  7 03:00:46 2007
@@ -145,7 +145,7 @@
 		<section name="Optional Database Server Properties">
 			<p>
 				Jetspeed-2 and its maven-plugin uses, as well as
-				provides, by default a HSQLDB database.
+				provides, by default a Derby database.
 			</p>
 			<p>
 				If you want to use a different database you will need to
@@ -170,14 +170,17 @@
 						Currently supported databases (with
 						corresponding Torque target database name):
 						<ul>
+							<li>derby (derby)</li>
 							<li>hsql (hypersonic)</li>
 							<li>oracle (oracle)</li>
 							<li>mysql (mysql)</li>
 							<li>postgres (postresql)</li>
 							<li>mssql (mssql)</li>
+							<li>sapdb (sapdb)</li>
+							<li>db2 (db2)</li>
 						</ul>
 					</td>
-					<td>hsql</td>
+					<td>derby</td>
 				</tr>
 				<tr>
 					<td>
@@ -186,7 +189,7 @@
 						</code>
 					</td>
 					<td>The jdbc connection url</td>
-					<td>jdbc:hsqldb:hsql://127.0.0.1:9001</td>
+					<td>jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true</td>
 				</tr>
 				<tr>
 					<td>
@@ -195,7 +198,7 @@
 						</code>
 					</td>
 					<td>The database user name to connect with.</td>
-					<td>sa</td>
+					<td><i>empty</i></td>
 				</tr>
 				<tr>
 					<td>
@@ -217,7 +220,7 @@
 						</code>
 					</td>
 					<td>The jdbc driver class name</td>
-					<td>org.hsqldb.jdbcDriver</td>
+					<td>org.apache.derby.EmbeddedDriver</td>
 				</tr>
 				<tr>
 					<td>

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-database.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-database.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-database.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-database.xml Thu Jun  7 03:00:46 2007
@@ -209,7 +209,7 @@
 				properties in your $HOME/build.properties.
 			</p>
 			<p>
-				NOTE: The Hypersonic JDBC driver is distributed with
+				NOTE: The Derby JDBC driver is distributed with
 				Jetspeed and require no configuration.
 			</p>
 			<source test="">
@@ -239,7 +239,7 @@
 			<subsection name="Distributing Drivers">
 				<p>
 					When Jetspeed is deployed to an application server
-					using the maven deploy target, only the Hypersonic
+					using the maven deploy target, only the Derby
 					JDBC driver is copied into the web application. To
 					distribute a specific driver (i.e. Oracle, MySQL),
 					you will need to copy the driver into the

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml Thu Jun  7 03:00:46 2007
@@ -158,7 +158,7 @@
               <code>org.apache.jetspeed.portal.db.dir</code>
             </td>
             <td>
-              The folder where the maven-plugin will create its build-in HSQLDB database(s).
+              The folder where the maven-plugin will create its HSQLDB database(s).
               <br />
               This folder and its contents is created or updated by plugin goal <code>j2:start.production.server</code>
               or <code>j2:start.test.server</code>.
@@ -169,6 +169,19 @@
           </tr>
           <tr>
             <td>
+              <code>org.apache.jetspeed.derbydatabase.path</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will create its built-in Derby database(s).
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:quickStart</code>.
+            </td>
+            <td>
+              <i>/tmp</i>
+            </td>
+           </tr>
+            <tr>
+            <td>
               <code>org.apache.jetspeed.portal.webapp.dir</code>
             </td>
             <td>
@@ -292,7 +305,7 @@
       </subsection>
       <subsection name="Optional Database Server Properties">
         <p>
-          Jetspeed-2 and its maven-plugin uses, as well as provides, by default a HSQLDB
database.
+          Jetspeed-2 and its maven-plugin uses, as well as provides, by default a Derby database.
         </p>
         <p>
           If you want to use a different database you will need to override the following
properties:
@@ -312,28 +325,31 @@
               <br />
               Currently supported databases (with corresponding Torque target database name):
               <ul>
+                <li>derby (derby)</li>
                 <li>hsql (hypersonic)</li>
                 <li>oracle (oracle)</li>
                 <li>mysql (mysql)</li>
                 <li>postgres (postresql)</li>
                 <li>mssql (mssql)</li>
+                <li>sapdb (sapdb)</li>
+                <li>db2 (db2)</li>
               </ul>
             </td>
-            <td>hsql</td>
+            <td>derby</td>
           </tr>
           <tr>
             <td>
               <code>org.apache.jetspeed.production.database.url</code>
             </td>
             <td>The jdbc connection url</td>
-            <td>jdbc:hsqldb:hsql://127.0.0.1:9001</td>
+            <td>jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true</td>
           </tr>
           <tr>
             <td>
               <code>org.apache.jetspeed.production.database.user</code>
             </td>
             <td>The database user name to connect with.</td>
-            <td>sa</td>
+            <td><i>empty</i></td>
           </tr>
           <tr>
             <td>
@@ -349,7 +365,7 @@
               <code>org.apache.jetspeed.production.database.driver</code>
             </td>
             <td>The jdbc driver class name</td>
-            <td>org.hsqldb.jdbcDriver</td>
+            <td>org.apache.derby.jdbc.EmbeddedDriver</td>
           </tr>
           <tr>
             <td>
@@ -368,8 +384,8 @@
       </subsection>
       <subsection name="Example: A minimal custom portal configuration">
         <p>
-          Make sure you have define at least the required properties as described above in
your
-          <code>${USER_HOME}/build.properties</code>. A minimal custom portal
configuration using the default HSQLDB
+          Make sure you have defined at least the required properties as described above
in your
+          <code>${USER_HOME}/build.properties</code>. A minimal custom portal
configuration using the default Derby
           database can be something like:
           <source>
             <![CDATA[
@@ -388,11 +404,6 @@
 org.apache.jetspeed.services.autodeployment.password = xxxxx
 org.apache.jetspeed.catalina.version.major           = 5.5]]>
           </source>
-          <i>
-            Note: If you're going to build the default Jetspeed 2 portal directly from the
source only the
-            <code>org.apache.jetspeed.portal.home</code> property is required
from the set of required portal
-            configuration properties.
-          </i>  
         </p>
       </subsection>
     </section>

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml Thu Jun  7 03:00:46
2007
@@ -52,7 +52,7 @@
 Grants are associated with permissions, authorizing, or granting, a principal list 
 access to a page or folder.    
 A granting security constraint is the association of a list of one 
-or more security principals combined with one or permissions. Grant constraints grant access
to a page or folder
+or more security principals combined with one or more permissions. Grant constraints grant
access to a page or folder
 for the associated list of permissions. 
 </p>
 </subsection>
@@ -78,7 +78,7 @@
 </section>
 <section name='The Security Constraint'>
 <p>
-A security constraint is an XML element found in a PSML file, a folder metadata file, or
inthe global security declarations.
+A security constraint is an XML element found in a PSML file, a folder metadata file, or
in the global security declarations.
 A security constraint has one attribute: the name. A security constraint has the following
elements:
 </p>
 <ul>

Modified: portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml?view=diff&rev=545133&r1=545132&r2=545133
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/j2-maven-plugin.xml Thu Jun  7 03:00:46 2007
@@ -429,18 +429,19 @@
         </tr>
         <tr>
           <td><code>j2:start.production.server</code></td>
-          <td>Starts the default HSQLDB production database for usage by the portal.</td>
+          <td>Starts the HSQLDB production database for usage by the portal. This goal
is optional to those who use the default embedded Derby database.</td>
         </tr>
         <tr>
           <td><code>j2:start.test.server</code></td>
           <td>
-            Starts the default HSQLDB test database to be used for the testcases during the
build of Jetspeed 2.
+            Starts the HSQLDB test database to be used for the testcases during the build
of Jetspeed 2.
+            This goal is optional for those who use the default embedded Derby database for
testing Jetspeed 2.
           </td>
         </tr>
         <tr>
           <td><code>j2:db.create.test</code></td>
           <td>
-            Creates the test database tables. If using the default HSQLDB database, it should
be started first with
+            Creates the test database tables. If using the HSQLDB database, it should be
started first with
             goal <code>j2:start.test.server</code>.
             <br />
             Existing portal tables are dropped first. The first time, this will lead to "table
does not exist"
@@ -450,7 +451,7 @@
         <tr>
           <td><code>j2:db.create.production</code></td>
           <td>
-            Creates the production database tables. If using the default HSQLDB database,
it should be started first
+            Creates the production database tables. If using the HSQLDB database, it should
be started first
             with goal <code>j2:start.production.server</code>.
             <br />
             Existing portal tables are dropped first. The first time, this will lead to "table
does not exist"



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message