Index: openacs-4/packages/wp-slim/tcl/wp-slim-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/wp-slim-callback-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/wp-slim/tcl/wp-slim-callback-procs.tcl	19 Jul 2005 22:15:20 -0000	1.1.2.1
@@ -0,0 +1,40 @@
+ad_library {
+    
+    Library for Wimpy Point's callbacks implementations
+    
+    @author Enrique Catalan (quio@galileo.edu)
+    @creation-date Jul 19, 2005
+    @cvs-id $Id: wp-slim-callback-procs.tcl,v 1.1.2.1 2005/07/19 22:15:20 enriquec Exp $
+}
+
+ad_proc -callback merge::MergeShowUserInfo -impl wp-slim {
+    -user_id:required
+} {
+    Merge the wp items of two users.
+} {
+    set msg "Wimpty point items of $user_id"
+    set result [list $msg]
+    
+    set styles [db_list_of_lists sel_wp_styles { *SQL* } ] 
+    
+    lappend result "Styles of $user_id: $styles"
+    
+    return $result
+}
+
+ad_proc -callback merge::MergePackageUser -impl wp-slim {
+    -from_user_id:required
+    -to_user_id:required
+} {
+    Merge the wp items of two users.
+} {
+    set msg "Merging wp-slim "
+    ns_log Notice $msg
+    set result [list $msg]
+    
+    db_dml upd_wp_styles  { *SQL* }
+    
+    lappend result "Merge of wp-slim is done"
+    
+    return $result
+}
Index: openacs-4/packages/wp-slim/tcl/wp-slim-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/Attic/wp-slim-callback-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/wp-slim/tcl/wp-slim-callback-procs.xql	19 Jul 2005 22:15:20 -0000	1.1.2.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<queryset>
+
+  <fullquery name="callback::MergePackageUser::impl::wp-slim.upd_wp_styles">      
+    <querytext>
+      update wp_styles 
+      set owner = :to_user_id
+      where owner = :from_user_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="callback::MergeShowUserInfo::impl::wp-slim.sel_wp_styles">      
+    <querytext>
+      select style_id , name 
+      from wp_styles
+      where owner = :user_id
+    </querytext>
+  </fullquery>
+ 
+</queryset>
Index: openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl,v
diff -u -N -r1.2.8.1 -r1.2.8.2
--- openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl	15 Jun 2005 18:04:56 -0000	1.2.8.1
+++ openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl	19 Jul 2005 22:15:20 -0000	1.2.8.2
@@ -3,42 +3,6 @@
    Wimpy procs
 }
 
-namespace eval wp::merge {
-
-    ad_proc -callback MergeShowUserInfo -impl wp-slim {
-	-user_id:required
-    } {
-	Merge the wp items of two users.
-    } {
-	set msg "Wimpty point items of $user_id"
-	set result [list $msg]
-
-	set styles [db_list_of_lists sel_wp_styles { *SQL* } ] 
-	
-	lappend result "Styles of $user_id: $styles"
-	
-	return $result
-    }
-
-    ad_proc -callback MergePackageUser -impl wp-slim {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the wp items of two users.
-    } {
-	set msg "Merging wp-slim "
-	ns_log Notice $msg
-	set result [list $msg]
-
-	db_dml upd_wp_styles  { *SQL* }
-	
-	lappend result "Merge of wp-slim is done"
-	
-	return $result
-    }
-}
-
-
 ad_proc wp_header {style_id} { Build the proper style for an specific page. } {
 
     db_1row get_style_data { *SQL* }
Index: openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql,v
diff -u -N -r1.2.8.1 -r1.2.8.2
--- openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql	15 Jun 2005 18:04:56 -0000	1.2.8.1
+++ openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql	19 Jul 2005 22:15:20 -0000	1.2.8.2
@@ -18,20 +18,4 @@
       </querytext>
 </fullquery>
 
-  <fullquery name="callback::MergePackageUser::impl::wp-slim.upd_wp_styles">      
-    <querytext>
-      update wp_styles 
-      set owner = :to_user_id
-      where owner = :from_user_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="callback::MergeShowUserInfo::impl::wp-slim.sel_wp_styles">      
-    <querytext>
-      select style_id , name 
-      from wp_styles
-      where owner = :user_id
-    </querytext>
-  </fullquery>
- 
 </queryset>