Index: openacs-4/packages/acs-admin/www/apm/build-repository.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/build-repository.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/build-repository.tcl	26 Apr 2004 18:50:47 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl	21 May 2004 08:52:51 -0000	1.14
@@ -13,7 +13,6 @@
 
 set cvs_command "cvs"
 set cvs_root ":pserver:anonymous@openacs.org:/cvsroot"
-set dotlrn_cvs_root ":pserver:anonymous@dotlrn.openacs.org:/dotlrn-cvsroot"
 
 set work_dir "[acs_root_dir]/repository-builder/"
 
@@ -27,10 +26,10 @@
 # from these packages
 #set exclude_package_list { cms cms-news-demo glossary site-wide-search spam library }
 set exclude_package_list {}
-set head_channel "5-1"
+set head_channel "5-2"
 
 # Set this to 1 to only checkout sample packages -- useful for debugging and testing
-set debug_p 1
+set debug_p 0
 
 #----------------------------------------------------------------------
 # Prepare output
@@ -108,8 +107,6 @@
 
     # Wipe and re-create the checkout directory
     file delete -force "${work_dir}openacs-4"
-    file delete -force "${work_dir}dotlrn"
-    file mkdir -force "${work_dir}dotlrn/packages"
     
     # Prepare channel directory
     set channel_dir "${work_dir}repository/${channel}/"
@@ -129,8 +126,7 @@
         # Full list for real use
         set checkout_list [list \
                                $work_dir $cvs_root openacs-4/packages \
-                               $work_dir $cvs_root openacs-4/contrib/packages \
-                               ${work_dir}dotlrn/packages/ $dotlrn_cvs_root dotlrn-core]
+                               $work_dir $cvs_root openacs-4/contrib/packages]
     }
     
     foreach { cur_work_dir cur_cvs_root cur_module } $checkout_list {
@@ -153,12 +149,12 @@
     template::multirow create packages \
         package_path package_key version pretty_name \
         package_type summary description \
-        release_date vendor_url vendor
+        release_date vendor_url vendor \
+        license_url license maturity maturity_text 
     
     foreach packages_dir \
         [list "${work_dir}openacs-4/packages" \
-             "${work_dir}openacs-4/contrib/packages" \
-             "${work_dir}dotlrn/packages"] {
+             "${work_dir}openacs-4/contrib/packages"] {
 
         foreach spec_file [lsort [apm_scan_packages $packages_dir]] {
         
@@ -196,6 +192,9 @@
                     append manifest {    } {<description format="} [ad_quotehtml $version(description.format)] {">} 
                     append manifest [ad_quotehtml $version(description)] {</description>} \n
                     append manifest {    } {<release-date>} [ad_quotehtml $version(release-date)] {</release-date>} \n
+                    append manifest {    } {<maturity>} [ad_quotehtml $version(maturity)] {</maturity>} \n
+                    append manifest {    } {<license url="} [ad_quotehtml $version(license_url)] {">}
+		    append manifest [ad_quotehtml $version(license)] {</license>} \n
                     append manifest {    } {<vendor url="} [ad_quotehtml $version(vendor.url)] {">} 
                     append manifest [ad_quotehtml $version(vendor)] {</vendor>} \n
 
@@ -206,7 +205,8 @@
                     template::multirow append packages \
                         $package_path $package_key $version(name) $version(package-name) \
                         $version(package.type) $version(summary) $version(description) \
-                        $version(release-date) $version(vendor.url) $version(vendor)
+                        $version(release-date) $version(vendor.url) $version(vendor) \
+                        $version(license_url) $version(license) $version(maturity) [apm_maturity_text $version(maturity)]
 
                     set apm_file "${channel_dir}${version(package.key)}-${version(name)}.apm"
 
Index: openacs-4/packages/acs-admin/www/apm/repository-channel-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/repository-channel-index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/repository-channel-index.adp	27 Feb 2004 10:58:47 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/repository-channel-index.adp	21 May 2004 08:52:51 -0000	1.4
@@ -5,15 +5,24 @@
 <table border="1" cellpadding="4" cellspacing="0">
   <tr>
     <th>Package</th>
+    <th>Status</th>
     <th>Description</th>
-    <th>Release</th>
   </tr>
   <multiple name="packages">
     <tr>
-      <td style="border-color:gray; text-align:center" valign="center" ><b>@packages.pretty_name@</b></td>
-      <td style="border-color:gray"><b>@packages.summary@</b><br>@packages.description;noquote@</td>
-      <td style="border-color:gray">@packages.package_key@ @packages.version@
-      <br> released @packages.release_date@ by @packages.vendor@</small></td>
+      <td style="border-color:gray; text-align:center" valign="center" >
+        <b>@packages.pretty_name@</b>
+      </td>
+      <td>
+        @packages.maturity@: @packages.maturity_text@<br>
+        <a href="@packages.license_url@">@packages.license@</a>
+      </td>
+      <td style="border-color:gray">
+        <b>@packages.summary@</b>
+        <br>@packages.description;noquote@
+        <br><small>@packages.package_key@ @packages.version@ released @packages.release_date@ by @packages.vendor@</small>
+
+</td>
    </tr>
   </multiple>
 </table>