Scarab commit: svn commit: r11128 - trunk: . src/conf/classes src/java/org/tigris/scarab/actions src/sql xdocs xdocs/howto

[email protected] Fri, 13 Apr 2012 06:35:44 -0700 (PDT)
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]>
Author: mcoss
Date: 2012-04-13 06:35:44-0700
New Revision: 11128

Added:
   trunk/maven-site.bat
      - copied, changed from r11087, /branches/release/0.22/maven-site.bat
Modified:
   trunk/   (props changed)
   trunk/maven.xml
   trunk/project.properties
   trunk/project.xml
   trunk/properties.xsl   (props changed)
   trunk/scarab_properties.xml
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/java/org/tigris/scarab/actions/DefineXModuleList.java
   trunk/src/sql/scarab-sample-data.sql
   trunk/xdocs/changes.xml
   trunk/xdocs/howto/build-docs-howto.xml
   trunk/xdocs/howto/migrate-howto.xml
   trunk/xdocs/index.xml

Log:
MRG - Merged revision from b22-release branch starting from last revision of merge: 11070-11090

Copied: trunk/maven-site.bat (from r11087, /branches/release/0.22/maven-site.bat)
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven-site.bat?view=diff&pathrev=11128&r1=11087&r2=11128
==============================================================================
--- /branches/release/0.22/maven-site.bat	(original)
+++ trunk/maven-site.bat	2012-04-13 06:35:44-0700
@@ -4,7 +4,5 @@
 
 call maven clean
 
-call maven changes:report
-
 call maven site -Dmaven.test.skip=true -Dmaven.velocity.version=1.5 -Dtorque.doc.dir=target\docs\databases
 

Modified: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/maven.xml	(original)
+++ trunk/maven.xml	2012-04-13 06:35:44-0700
@@ -250,6 +250,12 @@
     <!-- build docs before maven site is generated       -->
 	<!-- =============================================== -->
     <preGoal name="site">
+		<echo>
+Ensure that "maven.velocity.version" is set to 
+an applicable version number, such as 1.5 or 1.4.
+Current value is: ${maven.velocity.version}
+		</echo>
+	   <attainGoal name="changes:report"/>
        <attainGoal name="sdocbook"/>
 <!--        <attainGoal name="torque:doc"/> -->
        <attainGoal name="javadoc"/>

Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/project.properties	(original)
+++ trunk/project.properties	2012-04-13 06:35:44-0700
@@ -2342,6 +2342,7 @@
 #   statcvs.verbose
 #   statcvs.history
 #   statcvs.log.options
+#   maven.velocity.version
 # 
 #  Maven  Properties
 # 
@@ -2357,6 +2358,17 @@
 statcvs.history=false
 statcvs.log.options=-d 2004-01-01<
 
+# ----------------------
+# maven.velocity.version
+# ----------------------
+#
+# Version flag for velocity used by maven build. 
+# 			You have to change this value e.g. to "1.5" for maven goal "site".
+# 			This is necessary for the sake of version incompatiblities
+# 			of the maven xdoc plugin.
+
+maven.velocity.version=1.6.3
+
 # ==================
 # End of Group maven
 # ==================

Modified: trunk/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/project.xml	(original)
+++ trunk/project.xml	2012-04-13 06:35:44-0700
@@ -4,7 +4,7 @@
   <pomVersion>3</pomVersion>
   <id>scarab</id> 
   <name>Scarab</name>
-  <currentVersion>1.0-b22-dev</currentVersion>
+  <currentVersion>1.0.22-RC1</currentVersion>
   <organization>
     <name>Tigris.org</name>
     <url>http://www.tigris.org/</url>
@@ -532,7 +532,7 @@
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.6.3</version>
+      <version>${maven.velocity.version}</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>

Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/scarab_properties.xml	(original)
+++ trunk/scarab_properties.xml	2012-04-13 06:35:44-0700
@@ -2932,6 +2932,15 @@
          <customization modification="optional">advanced</customization>
         <file/>
       </property>
+	  <property>
+			<name>maven.velocity.version</name>
+			<default>1.6.3</default>
+			<type>Build</type>
+			<details>Version flag for velocity used by maven build. 
+			You have to change this value e.g. to "1.5" for maven goal "site".
+			This is necessary for the sake of version incompatiblities
+			of the maven xdoc plugin.</details>
+	  </property>
     </group>
 
     <group name="eclipse">

Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2012-04-13 06:35:44-0700
@@ -142,7 +142,6 @@
 Association=Association
 Availability=Availability
 Location=Location
-CreatedBy=Created by
 CreationDate=Creation date
 Author=Author
 UntilApproved=Until approved
@@ -522,7 +521,6 @@
 AssignUsersWithThisIssue=Associate users with {0,choice,1#this issue|2#these issues}
 NoAssignableUserAttributes=There are no active user attributes to which to assign users.
 AssociateUsersAndIssues=Please select an issue or issues with which to associate users.
-ScrolldownToSelectUsersForQuery=<a href="#add">Scroll down</a> to select users to associate with {0,choice,1#this issue|2#these issues}
 ChangesSavedOnDone=Changes are not saved to the issue until you select "Done"
 PersonnelAssociatedWithIssue=Personnel associated with the issue {0}
 IssueIdNotValid=The issue ID, {0}, is not valid.
@@ -560,10 +558,8 @@
 ProjectIsNotReady=Project is not ready for use yet.  Please wait a few minutes and try again.
 
 ##Edit Module
-RoleNeededForViewing=Visible by role
 ##SelectModule
 RequestRolesInOtherModules=to access other modules.
-CurrentModule=Currently selected module
 YouCannotAccessModules=Currently no roles have been granted to you within this repository. Please either request new roles within this repository, or <a href="{0}">Login</a> with an account that already has been granted to roles within this repository.
 ##RequestRoles
 RequestRoles=Request roles
@@ -1209,7 +1205,6 @@
 GroundRules9=9) Post any and all comments/notes around a particular issue to its description field. This way anyone who is handed an issue can easily see its history and get crackin!
 GroundRules10=10) Refer to Scarab on an almost constant basis.  In practice you'll find that seeing what is expected of you here beats the hell out of sifting through emails.
 GroundRulesEnd=At first this may seem Draconian.  The truth is that this is simply a way for us to track our own to do lists, share our to do's with friends, and keep pesky status mongers out of our hair.  I truly look forward to the day when I come a knockin' and you reply "it's in Scarab!"
-ModifiedBy=Modified by
 ModificationsMade=The following modifications were made to this issue
 IssueMoved=Issue {0} has just been {1,choice,1#copied|2#moved} from {2} to {3}/{4} by user {5}.
 ViewIssueIssueMoved=Issue has been moved to a different module.
@@ -1817,7 +1812,6 @@
 IssueTypeDef=All scarab processes are performed within the realm of an issue type. Issue types are comprised of a unique set of attributes, attribute options, issues, templates, queries and reports. 
 RateOfChangeReport=Rate of change report
 RateOfChangeReportDef=a report that tracks changes to issues over a period of time 
-Report=Report
 ReportDef=to track the progress of your project 
 PrimaryFilterAttribute=Primary filter attribute
 PrimaryFilterAttributeDef=defines the subset of issues from which the report is drawn 

Modified: trunk/src/java/org/tigris/scarab/actions/DefineXModuleList.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/DefineXModuleList.java?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/DefineXModuleList.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/DefineXModuleList.java	2012-04-13 06:35:44-0700
@@ -130,8 +130,9 @@
         throws Exception
     {
         // add any last minute additions
-        addSelectedRMITs(data, context);
         ScarabUser user = (ScarabUser)data.getUser();
+        user.setCurrentMITList(new MITList());
+        addSelectedRMITs(data, context);
         MITList currentList = user.getCurrentMITList();
         // reset selected users map
         getScarabRequestTool(context).resetSelectedUsers();
@@ -436,4 +437,4 @@
         ((ScarabUser)data.getUser()).setShowOtherModulesInIssueTypeList(
             "show".equals(flag));
     }
-}
+}
\ No newline at end of file

Modified: trunk/src/sql/scarab-sample-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-sample-data.sql?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/src/sql/scarab-sample-data.sql	(original)
+++ trunk/src/sql/scarab-sample-data.sql	2012-04-13 06:35:44-0700
@@ -25,41 +25,41 @@
 -- module_id, issue_type_id,active,display, preferred_order, dedupe,
 -- history, comments,display_name, display_description
 
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,101,1,1,1,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,103,1,1,2,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,105,1,1,3,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,107,1,1,4,1,5,5,NULL,NULL,NULL,NULL);
-INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,109,1,1,5,1,5,5,NULL,NULL,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1001,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1002,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1003,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1005,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1004,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1006,109,1,1,5,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,101,1,1,1,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,103,1,1,2,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,105,1,1,3,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,107,1,1,4,1,5,5,NULL,NULL);
+INSERT INTO SCARAB_R_MODULE_ISSUE_TYPE VALUES (1007,109,1,1,5,1,5,5,NULL,NULL);
 
 -- 'SCARAB_ATTRIBUTE_GROUP'
 -- attribute_group_id, name, description, module_id, issue_type_id

Modified: trunk/xdocs/changes.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/changes.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/xdocs/changes.xml	(original)
+++ trunk/xdocs/changes.xml	2012-04-13 06:35:44-0700
@@ -6,7 +6,22 @@
   </properties>
 
   <body>
-	<release version="b22" date="16-MARCH-2010">
+	<release version="22" date="21-FEB-2012">
+		<action dev="jhoech" type="update">
+		Moved velocity to 1.6.3.
+		</action>
+		<action dev="jhoech" type="fix">
+		If an assigned user was removed from issue, related issues weren't removed from according search result.
+		</action>
+		<action dev="jhoech" type="update">
+		Moved torque to 3.3
+		</action>
+		<action dev="jhoech" type="fix">
+		Changed value for boolean values in table SCARAB_GLOBAL_PARAMETER in scarab's database from single characters into long form.
+		</action>
+		<action dev="jhoech" type="fix">
+		Fix for popup calendar, which adds a method for stopping event "onmouseup" for drop downs.
+		</action>
 		<action dev="jhoech" type="fix">
 		Implemented property for maximum file size of uploads: scarab.file.max.size
 		</action>
@@ -20,7 +35,7 @@
 		Support threads for notifications by email.
 		</action>
 		<action dev="jhoech" type="add">
-		Reworked dependency tab: More conservative evaluation of blocking states and accroding conditions, modifiable display attributes for dependant issues.
+		Reworked dependency tab: More conservative evaluation of blocking states and according conditions, modifiable display attributes for dependant issues.
 		</action>
 		<action dev="jhoech" type="add">
 		Changes for report engine: support for date ranges, report can be displayed on module home page.
@@ -34,9 +49,6 @@
 		<action dev="ronvoe122" type="fix">
 		Reworked search engine.
 		</action>
-		<action dev="ronvoe122" type="add">
-		Now using Torque 3.3 RC2
-		</action>
 		<action dev="spjames" type="add">
 		Adds support for multi-part MIME email for sending plain-text-with-HTML email.
 		</action>
@@ -58,7 +70,7 @@
        <a href="howto/windowsdomain-howto.html">this howto</a>.
       </action>
       <action dev="jorgeuriarte" type="add" fix="SCB1565">
-      Date and user of issue-creation and last-modification are now availaible in search results' output.
+      Date and user of issue-creation and last-modification are now available in search results' output.
       </action>
       <action dev="jorgeuriarte" type="fix" due-to="Ricardo Amillategui" fix="SCB1708">
        Attribute fields could not be undefined once setted.

Modified: trunk/xdocs/howto/build-docs-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/build-docs-howto.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/xdocs/howto/build-docs-howto.xml	(original)
+++ trunk/xdocs/howto/build-docs-howto.xml	2012-04-13 06:35:44-0700
@@ -23,6 +23,11 @@
 	If you don't want to bother to run the unit tests, then run: <source>maven site -Dmaven.test.skip=true</source>
 	This will generate all the site documentation, as well as the FAQ, Javadocs, and various code analysis reports in the directory /target/docs.
 	</p>
+	<p>So far so good, but: For compatibility reasons maven site plugin cannot handle the docs if velocity version is set to any wrong version.
+	It is recommended to use 1.5 here. See documentation site for maven xdoc plugin, too. Problem is: Scarab uses another version of velocity,
+	as it is good for the xdoc plugin. This is why another important build property named: maven.velocity.version, exists. 
+	To build the docs properly you have to set this property manually: <source>maven site -Dmaven.velocity.version=1.5</source> or use an adapted batch script.
+	</p>
 	</subsection>
 	<subsection name="Used Plugins">
 	<p>

Modified: trunk/xdocs/howto/migrate-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/migrate-howto.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/xdocs/howto/migrate-howto.xml	(original)
+++ trunk/xdocs/howto/migrate-howto.xml	2012-04-13 06:35:44-0700
@@ -22,11 +22,11 @@
 	WARNING: Before performing any of the operations outlined by this 
 	document, please BACKUP YOUR DATABASE!!!
 </p>
-<subsection name="Upgrading the database from b20 to 0.21">
+<subsection name="Upgrading the database">
 	<subsection name="The quick step migration procedure">
 	<ul>
-	<li>We assume, you have already built the 0.21 web application either with Ant or with Maven.</li>
-	<li>Change to the build/ directory of your generated web application. From there run the database migration procedure as follows:
+	<li>We assume, you have already built the "b21" web application either with Ant or with Maven. It is the same for other versions, too, e.g. "22".</li>
+	<li>Change to the build/ directory of your generated web application and run the appropriate target for the predecessor's version number, e.g. for "b21":
 	<source>ant migrate-from-b20</source></li>
 	<li>
 		<p>REMEMBER: Not all the information is inside the database!</p>
@@ -53,7 +53,44 @@
 	</li>
     </ul>
 	</subsection>
-	<subsection name="Details of the migration tasks">
+	<subsection name="Details of 22 migration task">
+		<p>
+		This migration contains following database relevant modifications:
+		</p>
+		<table>
+		<tr>
+			<td>SCB2307 Now there is an own permission constraint for requesting roles.</td>
+			<td>upgrade-0.22-add-new-permission.sql</td>
+			<td>Adds new permission into TURBINE_PERMISSION 'Role | Request'</td>
+		</tr>
+		<tr>
+			<td>SCB845: All emails from one issue belonging to same mail thread.</td>
+			<td>upgrade-0.22-add-scarab-issues-email-references.sql</td>
+			<td>Adds field SCARAB_ISSUE.EMAIL_REFERENCES</td>
+		</tr>
+		<tr>
+			<td>Activity list should not show restricted attributegroup's attributes.</td>
+			<td>upgrade-0.22-attributegroup-viewrole.sql</td>
+			<td>Adds field SCARAB_ATTRIBUTE_GROUP.VIEW_ROLE_ID</td>
+		</tr>
+		<tr>
+			<td>Activity type is now mandatory</td>
+			<td>upgrade-0.22-fill_activity_type.sql</td>
+			<td>Updates values for field SCARAB_ACTIVITY.ACTIVITY_TYPE</td>
+		</tr>
+		<tr>
+			<td>Technical update</td>
+			<td>upgrade-0.22-global-booleans-to-long-form.sql</td>
+			<td>Change boolean values in SCARAB_GLOBAL_PARAMETER to their long form, e.g. turn "T" into "TRUE"</td>
+		</tr>
+		<tr>
+			<td>Technical update</td>
+			<td>upgrade-0.22-resize_id_prefix.sql</td>
+			<td>Resizes field length for SCARAB_ISSUE.ID_PREFIX and SCARAB_MODULE.MODULE_CODE</td>
+		</tr>
+		</table>    	
+	</subsection>
+	<subsection name="Details of b21 migration task">
 		<p>
 		This migration contains following database relevant modifications:
 		</p>

Modified: trunk/xdocs/index.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/index.xml?view=diff&pathrev=11128&r1=11127&r2=11128
==============================================================================
--- trunk/xdocs/index.xml	(original)
+++ trunk/xdocs/index.xml	2012-04-13 06:35:44-0700
@@ -27,7 +27,7 @@
          Scarab has fully and free
          customizable and unlimited numbers of
          <ul>
-           <li>Modules (e.g. your various projects)</li>
+           <li>Modules (i.e. your various projects)</li>
            <li>Artifact types (e.g. "Defect", "Enhancement", "Requirement", etc)</li>
            <li>Attributes (e.g. "Operating System", "Status", "Priority", etc)</li>
            <li>Attribute options</li>

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2948054