Index: openacs-4/packages/dotlrn-attendance/dotlrn-attendance.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-attendance/dotlrn-attendance.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-attendance/dotlrn-attendance.info	19 Jun 2005 06:05:05 -0000	1.2
+++ openacs-4/packages/dotlrn-attendance/dotlrn-attendance.info	22 Jun 2005 05:41:06 -0000	1.3
@@ -13,7 +13,8 @@
 
         <!-- No dependency information -->
         <provides url="dotlrn-attendance" version="0.1d"/>
-        <requires url="dotlrn" version="1.0"/>
+        <requires url="attendance" version="0.1d"/>
+        <requires url="dotlrn" version="2.1.2d1"/>
 
         <parameters>
         <!-- No version parameters -->
Index: openacs-4/packages/dotlrn-attendance/sql/postgresql/dotlrn-attendance-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-attendance/sql/postgresql/dotlrn-attendance-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-attendance/sql/postgresql/dotlrn-attendance-create.sql	31 May 2005 22:03:56 -0000	1.1
+++ openacs-4/packages/dotlrn-attendance/sql/postgresql/dotlrn-attendance-create.sql	22 Jun 2005 05:41:06 -0000	1.2
@@ -131,3 +131,5 @@
 	    'dotlrn_applet',
 	    'dotlrn_attendance'
 );
+
+\i dotlrn-attendance-admin-portlet-create.sql
Index: openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	19 Jun 2005 06:05:06 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	22 Jun 2005 05:40:32 -0000	1.4
@@ -14,16 +14,23 @@
         <description format="text/html">Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together.  Initially intended for the MOS and MGH projects, the goal is to create a reusable module for similar projects.</description>
 
         <provides url="dotlrn-ecommerce" version="0.1d"/>
+	<requires url="categories" version="1.1d3"/>
+        <requires url="dotlrn-catalog" version="0.1a4"/>
+	<requires url="assessment" version="0.11"/>
+	<requires url="ecommerce" version="5.05"/>
+	<requires url="dotlrn" version="2.1.2d1"/>
+	<requires url="acs-kernel" version="5.2.0d2"/>
 
+
         <callbacks>
             <callback type="after-install"  proc="dotlrn_ecommerce::install"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AssistantCommunityId"  description="Specify the community id whose members we will use in the Assistant field in the add section form."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="GradeCategoryTree"  description="Category tree to hold participant grades"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="InstructorCommunityId"  description="Specify the community id whose members we will use in the Instructors field in Add Section."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MemberPriceP"  default="0" description="Whether we give special sale price to members."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PatronRelationshipCategoryTree"  description="Category tree to use when adding participant-patron relationships."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="AssistantCommunityId"  description="Specify the community id whose members we will use in the Assistant field in the add section form."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="InstructorCommunityId"  description="Specify the community id whose members we will use in the Instructors field in Add Section."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="GradeCategoryTree"  description="Category tree to hold participant grades"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="PatronRelationshipCategoryTree"  description="Category tree to use when adding participant-patron relationships."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="0.00" name="MemberPriceP"  default="0" description="Whether we give special sale price to members."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql	19 Jun 2005 06:05:06 -0000	1.5
+++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql	22 Jun 2005 05:40:32 -0000	1.6
@@ -59,4 +59,5 @@
 	participant_id	integer	references parties(party_id) on delete cascade not null
 );
 
-\i dotlrn-ecommerce-memberships-create.sql
\ No newline at end of file
+\i dotlrn-ecommerce-memberships-create.sql
+\i dotlrn-ecommerce-admin-portlet-create.sql
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl	19 Jun 2005 06:05:06 -0000	1.5
+++ openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl	22 Jun 2005 05:40:33 -0000	1.6
@@ -13,6 +13,7 @@
 namespace eval dotlrn_ecommerce {}
 
 ad_proc -private dotlrn_ecommerce::install {
+
 } {
     After install callback
     
@@ -30,7 +31,7 @@
     catch {
 	rel_types::new -supertype dotlrn_member_rel -role_two student dotlrn_club_student_rel "dotLRN Club Student" "dotLRN Club Students" dotlrn_club 0 "" user 0 ""
 	rel_types::new -supertype dotlrn_member_rel -role_two instructor dotlrn_club_instructor_rel "dotLRN Club Instructor" "dotLRN Club Instructors" dotlrn_club 0 "" user 0 ""
-    }
+   }
 
     rel_types::new -role_one user -role_two user patron_rel "Patron" "Patrons" user 0 65535 user 0 65535
 
@@ -41,6 +42,7 @@
     rel_types::new -role_one as_session_role -role_two ec_product_role as_session_ec_product_rel "Assessment Session to ECommerce Product" "Assessment Sessions to ECommerce Products" as_sessions 0 1 ec_product 0 1
 
     rel_types::new -role_one member_rel_role -role_two user membership_patron_rel "Membership Patron" "Membership Patrons" dotlrn_member_rel 0 65535 user 0 65535
+
 }
 
 ad_proc -private dotlrn-catalog::package_mount {
@@ -51,6 +53,7 @@
     
 } {
     # To categorize courses
-    set tree_id [category_tree::add -name "dotlrn-section-terms"]
+    set tree_id [category_tree::add -name "Terms"]
     category_tree::map -tree_id $tree_id -object_id $package_id
+
 }
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/setup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/Attic/setup.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/setup.tcl	22 Jun 2005 05:40:33 -0000	1.1
@@ -0,0 +1,37 @@
+# /dotlrn-ecommerce/www/admin/setup.tcl
+#  HAM : ham@solutiongrove.com (062205)
+#  This script is called from ecwork.test
+
+set package_id [ad_conn package_id]
+
+# set the default template
+parameter::set_value -parameter "DefaultMaster" -value "/www/mos-master" -package_id [subsite::main_site_id]
+
+# create instructor and assitant community
+# and set the parameters
+
+set community_id [dotlrn_community::new \
+			  -community_type dotlrn_club \
+			  -object_type dotlrn_club \
+			  -community_key "instructorcommunity" \
+			  -pretty_name "Instructors Community"]
+parameter::set_value -package_id $package_id -parameter "InstructorCommunityId" -value $community_id
+
+set community_id [dotlrn_community::new \
+			  -community_type dotlrn_club \
+			  -object_type dotlrn_club \
+			  -community_key "assistantcommunity" \
+			  -pretty_name "Assistants Community"]
+parameter::set_value -package_id $package_id -parameter "AssistantCommunityId" -value $community_id
+
+# create category and set parameter
+set tree_id [category_tree::add -name "Grade"]
+category_tree::map -tree_id $tree_id -object_id $package_id
+parameter::set_value -package_id $package_id -parameter "GradeCategoryTree" -value $tree_id
+
+# populate categories with data
+
+
+# populate courses
+
+ad_returnredirect "/"
\ No newline at end of file
Index: openacs-4/packages/dotlrn-expense-tracking/dotlrn-expense-tracking.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-expense-tracking/dotlrn-expense-tracking.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-expense-tracking/dotlrn-expense-tracking.info	19 Jun 2005 06:05:07 -0000	1.2
+++ openacs-4/packages/dotlrn-expense-tracking/dotlrn-expense-tracking.info	22 Jun 2005 05:43:03 -0000	1.3
@@ -13,7 +13,8 @@
 
         <!-- No dependency information -->
         <provides url="dotlrn-expense-tracking" version="0.1d"/>
-        <requires url="dotlrn" version="1.0"/>
+        <requires url="expense-tracking" version="0.1a"/>
+	<requires url="dotlrn" version="2.1.2d1"/>
 
         <parameters>
         <!-- No version parameters -->
Index: openacs-4/packages/dotlrn-expense-tracking/sql/postgresql/dotlrn-expense-tracking-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-expense-tracking/sql/postgresql/dotlrn-expense-tracking-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-expense-tracking/sql/postgresql/dotlrn-expense-tracking-create.sql	31 May 2005 22:05:38 -0000	1.1
+++ openacs-4/packages/dotlrn-expense-tracking/sql/postgresql/dotlrn-expense-tracking-create.sql	22 Jun 2005 05:43:03 -0000	1.2
@@ -131,3 +131,5 @@
 	    'dotlrn_applet',
 	    'dotlrn_expense_tracking'
 );
+
+\i dotlrn-expense-tracking-admin-portlet-create.sql
\ No newline at end of file