Scarab commit: svn commit: r11006 - branches/release/0.22: . src/webapp/WEB-INF/templates/screens www/repository/torque/jars www/repository/velocity/jars

[email protected] Fri, 30 Apr 2010 06:54:43 -0700 (PDT)
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]>
Author: jhoech
Date: 2010-04-30 06:54:43-0700
New Revision: 11006

Added:
   branches/release/0.22/www/repository/torque/jars/torque-3.3.jar   (contents, props changed)
   branches/release/0.22/www/repository/torque/jars/torque-gen-3.3.jar   (contents, props changed)
   branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3.jar   (contents, props changed)
   branches/release/0.22/www/repository/velocity/jars/texen-1.0.jar   (contents, props changed)
   branches/release/0.22/www/repository/velocity/jars/velocity-1.5.jar   (contents, props changed)
Removed:
   branches/release/0.22/www/repository/torque/jars/torque-3.3-RC2.jar
   branches/release/0.22/www/repository/torque/jars/torque-gen-3.3-RC2.jar
   branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3-RC2.jar
   branches/release/0.22/www/repository/velocity/jars/velocity-1.4.jar
Modified:
   branches/release/0.22/project.xml
   branches/release/0.22/src/webapp/WEB-INF/templates/screens/IssueList.vm

Log:
CHG - Moved torque from 3.3-RC2 to 3.3 as discussed in mailing list on April the 27th.
  CHG - Update of related component velocity from 1.4 to 1.5. velocity-1.5.jar seems to have a bug for rendering multi-line comments, but torque 3.3 does not work with velocity-1.4.jar.
  ADD - Torque needs texen-1.0.jar now.

Modified: branches/release/0.22/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/project.xml?view=diff&pathrev=11006&r1=11005&r2=11006
==============================================================================
--- branches/release/0.22/project.xml	(original)
+++ branches/release/0.22/project.xml	2010-04-30 06:54:43-0700
@@ -491,11 +491,21 @@
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
+	<!-- Added by jhoech to make torque 3.3 happy -->
+	<dependency>
+      <groupId>velocity</groupId>
+      <artifactId>texen</artifactId>
+      <version>1.0</version>
+      <type>jar</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
     <dependency>
       <!-- Added by HD to make the ant-build happy -->
       <groupId>torque</groupId>
       <artifactId>torque-gen</artifactId>
-      <version>3.3-RC2</version>
+      <version>3.3</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>
@@ -504,7 +514,7 @@
     <dependency>
       <groupId>torque</groupId>
       <artifactId>torque</artifactId>
-      <version>3.3-RC2</version>
+      <version>3.3</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>
@@ -513,7 +523,7 @@
     <dependency>
       <groupId>torque</groupId>
       <artifactId>torque-gen-templates</artifactId>
-      <version>3.3-RC2</version>
+      <version>3.3</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>
@@ -532,7 +542,7 @@
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>

Modified: branches/release/0.22/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&pathrev=11006&r1=11005&r2=11006
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/screens/IssueList.vm	(original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/screens/IssueList.vm	2010-04-30 06:54:43-0700
@@ -39,6 +39,7 @@
 	 href="$link.setPage('Index.vm')/action/Search/go	/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/atom_0.3"><img align="middle" src="$staticLink.setPath('/images/icon_atom.gif')" border="0" /></a>
 </td>
 #end
+## <-- For the purpose of these seemingly obsolete characters, invalid multiline-comments.
 *#
 
 </tr></table>

Removed: branches/release/0.22/www/repository/torque/jars/torque-3.3-RC2.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-3.3-RC2.jar?view=markup&pathrev=11005

Added: branches/release/0.22/www/repository/torque/jars/torque-3.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-3.3.jar?view=markup&pathrev=11006
==============================================================================
Binary file. No diff available.

Removed: branches/release/0.22/www/repository/torque/jars/torque-gen-3.3-RC2.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-gen-3.3-RC2.jar?view=markup&pathrev=11005

Added: branches/release/0.22/www/repository/torque/jars/torque-gen-3.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-gen-3.3.jar?view=markup&pathrev=11006
==============================================================================
Binary file. No diff available.

Removed: branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3-RC2.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3-RC2.jar?view=markup&pathrev=11005

Added: branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/torque/jars/torque-gen-templates-3.3.jar?view=markup&pathrev=11006
==============================================================================
Binary file. No diff available.

Added: branches/release/0.22/www/repository/velocity/jars/texen-1.0.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/velocity/jars/texen-1.0.jar?view=markup&pathrev=11006
==============================================================================
Binary file. No diff available.

Removed: branches/release/0.22/www/repository/velocity/jars/velocity-1.4.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/velocity/jars/velocity-1.4.jar?view=markup&pathrev=11005

Added: branches/release/0.22/www/repository/velocity/jars/velocity-1.5.jar
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/www/repository/velocity/jars/velocity-1.5.jar?view=markup&pathrev=11006
==============================================================================
Binary file. No diff available.

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