Scarab commit: svn commit: r10876 - trunk: . src/java/org/tigris/scarab/om src/webapp/WEB-INF/templates/viewIssue xdocs xdocs/howto

Johannes Höchstädter <[email protected]>
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]> 
Author: jhoech
Date: 2010-01-22 02:45:55-0800
New Revision: 10876

Added:
   trunk/properties.xsl
      - copied unchanged from r10875, /branches/release/0.22/properties.xsl
   trunk/scarab_properties.xml
      - copied unchanged from r10875, /branches/release/0.22/scarab_properties.xml
Removed:
   trunk/xdocs/properties.xsl
Modified:
   trunk/   (props changed)
   trunk/maven.xml
   trunk/minimal.properties
   trunk/project.properties
   trunk/src/java/org/tigris/scarab/om/Activity.java
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
   trunk/wizzard.properties
   trunk/xdocs/howto/release-howto.xml

Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10875. Remind: changes from scarab_properties.xml are still missing.

Modified: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/maven.xml	(original)
+++ trunk/maven.xml	2010-01-22 02:45:55-0800
@@ -122,21 +122,21 @@
         prereqs="set-xml-transformer">
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="project.properties"
              style="project.xsl">
              <outputproperty name="method" value="text"/>
         </ant:style> 
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="minimal.properties"
              style="minimal.xsl">
              <outputproperty name="method" value="text"/>
         </ant:style> 
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="wizzard.properties"
              style="wizzard.xsl">
              <outputproperty name="method" value="text"/>
@@ -269,11 +269,12 @@
         </ant:ant>
     </postGoal>
 
+	<!-- generates source file for properties guide from scarab_properties file --> 
     <postGoal name="xdoc:init"> 
         <attainGoal name="set-xml-transformer"/>
         <j:set var="genDocs" value="${maven.gen.docs}"/> 
-        <ant:style basedir="xdocs/" destdir="${genDocs}" extension=".xml" 
-        style="xdocs/properties.xsl" includes="**/scarab_properties.xml" /> 
+        <ant:style destdir="${genDocs}" in="scarab_properties.xml" out="${genDocs}/scarab_properties_final.xml"
+        style="properties.xsl" /> 
     </postGoal>
       
     <!-- ===================================================== -->

Modified: trunk/minimal.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/minimal.properties?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/minimal.properties	(original)
+++ trunk/minimal.properties	2010-01-22 02:45:55-0800
@@ -17,7 +17,7 @@
 #  NEVER change this file by hand! If you want to introduce a new property,
 #  please update
 #  
-#      xdocs/scarab_properties.xml 
+#      scarab_properties.xml 
 #  
 #  instead and afterwards call
 #  

Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/project.properties	(original)
+++ trunk/project.properties	2010-01-22 02:45:55-0800
@@ -17,7 +17,7 @@
 #   NEVER change this file by hand! If you want to introduce a new property,
 #   please update
 #   
-#       xdocs/scarab_properties.xml 
+#       scarab_properties.xml 
 #   
 #   instead and afterwards call
 #   
@@ -2043,7 +2043,7 @@
 # 
 
 maven.multiproject.type=war
-maven.repo.remote=file:www/repository,http://www.ibiblio.org/maven/,http://mirrors.ibiblio.org/pub/mirrors/maven/,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven, http://www.apache.org/dist/java-repository/
+maven.repo.remote=file:www/repository,http://www.ibiblio.org/maven/,http://mirrors.ibiblio.org/pub/mirrors/maven,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven,http://www.apache.org/dist/java-repository/
 maven.docbook.src=www/book
 maven.sdocbook.src.dir=www/book
 maven.sdocbook.files=**/scarab-*.xml

Modified: trunk/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Activity.java?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Activity.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/Activity.java	2010-01-22 02:45:55-0800
@@ -227,18 +227,9 @@
         if(   getType().equals(ActivityType.DEPENDENCY_DELETED)
            || getType().equals(ActivityType.DEPENDENCY_CHANGED))
          {
-        	if(issue != null 
-        			&& issue.getIssueId().intValue() != getDepend().getIssueRelatedByObservedId().getIssueId().intValue()
-        			&& getOldValue().equals("blocking")){
-            	value = getDepend().getIssueRelatedByObserverId().getUniqueId()
-                + " " + l10n.get("DependsOn") //deprecated, but method is used many times in scarab.
-                + " " + getDepend().getIssueRelatedByObservedId().getUniqueId(); 
-            }
-            else{
-            	value = getDepend().getIssueRelatedByObservedId().getUniqueId()
-            	+ " " + (getOldValue().equals("blocking") ? l10n.get("PrerequisiteFor") : l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())))
-                + " " + getDepend().getIssueRelatedByObserverId().getUniqueId();  
-            }            
+        	 value = getDepend().getIssueRelatedByObserverId().getUniqueId()
+             + " < " + l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())) + " > "
+              + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();       
          } else if( getType().equals(ActivityType.ATTACHMENT_REMOVED))
          {
              value = getAttachment().getFileName();

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm	2010-01-22 02:45:55-0800
@@ -34,9 +34,7 @@
        #set ($attachLink = $link.setPage("ViewAttachment.vm").setPathInfo("attachId", $file.QueryKey).addPathInfo("filename", $file.FileName).toString())
        ## We add the filename here in case the file is saved, it gives a nice default name
        <td><a href="$attachLink"  
-         onclick="fileWindow=window.open('',
-         'filewindow','resizable=yes,menubar=yes,scrollbars=yes,height=450,width=700')" 
-         target="filewindow">$file.FileName</a> 
+         target="_blank">$file.FileName</a> 
        </td>
        <td>$file.Name</td>
        <td>$file.MimeType</td>

Modified: trunk/wizzard.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/wizzard.properties?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/wizzard.properties	(original)
+++ trunk/wizzard.properties	2010-01-22 02:45:55-0800
@@ -17,7 +17,7 @@
 #  NEVER change this file by hand! If you want to introduce a new property,
 #  please update
 #  
-#      xdocs/scarab_properties.xml 
+#      scarab_properties.xml 
 #  
 #  instead and afterwards call
 #  

Modified: trunk/xdocs/howto/release-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/release-howto.xml?view=diff&pathrev=10876&r1=10875&r2=10876
==============================================================================
--- trunk/xdocs/howto/release-howto.xml	(original)
+++ trunk/xdocs/howto/release-howto.xml	2010-01-22 02:45:55-0800
@@ -42,7 +42,7 @@
       If you find any failures or errors, <b>fix them</b> and <b>commit</b> the changes. Then <a href="#buildtest">build and run the tests again</a>.
 	</p>
 	<p>
-	  Edit scarab/xdocs/scarab_properties.xml and change the 
+	  Edit scarab/scarab_properties.xml and change the 
       property with name "version" removing the "-dev" appendix from
       the final version number for the release.<br/>
       Do the same in the &lt;currentVersion&gt; tag in project.xml file.

Removed: trunk/xdocs/properties.xsl
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/properties.xsl?view=markup&pathrev=10875

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2441152
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.