[Aplaws-commit] r432 - ccm-ldn-dublin/trunk

[<mb...@re...>]

Author: mbooth
Date: 2005-03-21 00:10:27 +0100 (Mon, 21 Mar 2005)
New Revision: 432

Modified:
   ccm-ldn-dublin/trunk/
   ccm-ldn-dublin/trunk/application.xml
Log:
Merged revisions 319-431 via svnmerge from
/releases/1.0.2/ccm-ldn-dublin/



Property changes on: ccm-ldn-dublin/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /releases/1.0.2/ccm-ldn-dublin/:1-318
   + /releases/1.0.2/ccm-ldn-dublin/:1-431

Modified: ccm-ldn-dublin/trunk/application.xml
===================================================================
--- ccm-ldn-dublin/trunk/application.xml	2005-03-20 22:52:19 UTC (rev 431)
+++ ccm-ldn-dublin/trunk/application.xml	2005-03-20 23:10:27 UTC (rev 432)
@@ -1,27 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<ccm:application name="ccm-ldn-dublin"
-           prettyName="Dublin Core"
-              version="1.4.1"
-              release="7"
-  webapp="ROOT"
-            xmlns:ccm="http://ccm.redhat.com/ccm-project">
-
+<?xml version="1.0"?>
+<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  name="ccm-ldn-dublin"
+  prettyName="Dublin Core"
+  version="1.4.1"
+  release="9"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.1.1"/>
     <ccm:requires name="ccm-cms" version="6.1.1"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
+    <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
     <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
   </ccm:dependencies>
-
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rh...@re..." type="support"/>
   </ccm:contacts>
-
   <ccm:description>
     The Red Hat Web Application Framework is a platform for writing
     database-backed web applications in Java.
   </ccm:description>
-
 </ccm:application>