You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/29 14:41:18 UTC
svn commit: r264129 [1/3] - in
/portals/jetspeed-2/branches/SummersOfCode-2005: ./ src/webapp/WEB-INF/
src/webapp/WEB-INF/assembly/ src/webapp/WEB-INF/assembly/boot/
src/webapp/WEB-INF/decorations/layout/html/ja/tigris/
src/webapp/WEB-INF/decorations/l...
Author: sgala
Date: Mon Aug 29 05:37:53 2005
New Revision: 264129
URL: http://svn.apache.org/viewcvs?rev=264129&view=rev
Log:
this should bring it to sync with yesterday's trunk.
Added:
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/grad1blue.png
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/grad1blue.png
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/grad2blue.png
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/images/grad2blue.png
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/images/grad2gray.png
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/images/grad2gray.png
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/grad1gray.png
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/grad1gray.png
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/grad2gray.png
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/images/grad2gray.png
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/README.txt
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/README.txt
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/close.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/close.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/customize.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/customize.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/edit.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/edit.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/help.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/help.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowdoc_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowdoc_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowfolderclosed1_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowfolderclosed1_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowfolderopen2_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_arrowfolderopen2_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_error_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_error_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_info_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_info_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_success_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_success_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/icon_warning_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/icon_warning_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/info.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/info.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/info1.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/info1.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/leftnavbg.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/leftnavbg.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/maximized.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/maximized.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/minimized.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/minimized.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/nw_maj_rond.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/nw_maj_rond.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/print.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/print.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/restore.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/restore.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/sw_med_rond.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/sw_med_rond.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/images/view.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/images/view.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/pretty-single-portlet/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css (props changed)
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/admin/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/admin/_mediatype/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/guest/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/guest/_mediatype/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/system/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/system/customizer/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/system/customizer/folder.metadata
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/folder.metadata
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/
- copied from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.properties
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
- copied unchanged from r263864, portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
Removed:
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/tigris/decorator.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/tigris/images/
Modified:
portals/jetspeed-2/branches/SummersOfCode-2005/.classpath
portals/jetspeed-2/branches/SummersOfCode-2005/.project
portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample
portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample.oracle9i
portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/boot/datasource.xml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/userinfo.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-macros.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/css/ThemeIE/theme.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/css/ThemeMiniBlack/theme.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/css/ThemeOffice/theme.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/css/ThemePanel/theme.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/simple/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-macros.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-bottom.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/jetspeed/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/metal/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/minty-blue/css/styles.css
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/tigris/decorator.properties
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/folder.metadata
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/palm.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/pam.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/profiler.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/site.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Public/db-browser.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/Public/public.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-bookmarks.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/template/default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/folder.metadata
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/p003.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/css-demo.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/default-page.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jpetstore.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jsf-demo.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/my-account.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/php-portlet.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/p002.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/rss.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/struts-demo.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/testsuite.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/Google.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/wip/role-mgt.psml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml (contents, props changed)
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/.classpath?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/.classpath (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/.classpath Mon Aug 29 05:37:53 2005
@@ -89,7 +89,7 @@
<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/itgroundwork/jars/phpportlet-1.0.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jstl/jars/jstl-1.0.6.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/pluto/jars/pluto-1.0-svn-201864.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/pluto/jars/pluto-1.0.1-rc4.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/nekohtml/jars/nekohtml-0.9.3.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/>
@@ -114,6 +114,6 @@
<classpathentry kind="var" path="MAVEN_REPO/portals-bridges/jars/portals-bridges-php-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/portals-bridges/jars/portals-bridges-struts-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/portals-bridges/jars/portals-bridges-velocity-0.4-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jmx/jars/jmxri-1.2.1.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/jmx/jars/jmxri-1.2.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/.project
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/.project?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/.project (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/.project Mon Aug 29 05:37:53 2005
@@ -3,6 +3,7 @@
<name>jetspeed-2</name>
<comment></comment>
<projects>
+ <project>portals-bridges</project>
</projects>
<buildSpec>
<buildCommand>
@@ -10,10 +11,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.mevenide.ui.mavenbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.springframework.ide.eclipse.beans.core.beansnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>org.mevenide.ui.mavennature</nature>
</natures>
</projectDescription>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample Mon Aug 29 05:37:53 2005
@@ -30,7 +30,6 @@
org.apache.jetspeed.test.jdbc.drivers.path=
org.apache.jetspeed.test.database.default.name=hsql
-org.apache.jetspeed.test.database.ojb.platform=Hsqldb
org.apache.jetspeed.production.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
org.apache.jetspeed.production.database.driver = org.hsqldb.jdbcDriver
@@ -39,4 +38,3 @@
org.apache.jetspeed.production.jdbc.drivers.path=
org.apache.jetspeed.production.database.default.name=hsql
-org.apache.jetspeed.production.database.ojb.platform=Hsqldb
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample.oracle9i
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample.oracle9i?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample.oracle9i (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/build.properties.sample.oracle9i Mon Aug 29 05:37:53 2005
@@ -31,7 +31,6 @@
org.apache.jetspeed.test.jdbc.drivers.path=/portal/lib/oracle/ojdbc14.jar;/portal/lib/oracle/nls_charset12.jar
org.apache.jetspeed.test.database.default.name=oracle
-org.apache.jetspeed.test.database.ojb.platform=oracle9i
org.apache.jetspeed.production.database.url = jdbc:oracle:thin:@localhost:1521:orcl
#org.apache.jetspeed.production.database.driver = com.p6spy.engine.spy.P6SpyDriver
@@ -41,4 +40,3 @@
org.apache.jetspeed.production.jdbc.drivers.path=/portal/lib/oracle/ojdbc14.jar;/portal/lib/oracle/nls_charset12.jar
org.apache.jetspeed.production.database.default.name=oracle
-org.apache.jetspeed.production.database.ojb.platform=oracle9i
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml Mon Aug 29 05:37:53 2005
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
- $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
- <extend>jetspeed-components.xml</extend>
- <dependencies>
- <dependency>
- <id>jetspeed2:jetspeed-portal</id>
- <version>
- ${jetspeed.version}
- </version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>torque</groupId>
- <artifactId>maven-torque-plugin</artifactId>
- <version>3.2-rc2-dev</version>
- <type>plugin</type>
- <properties/>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+ <extend>jetspeed-components.xml</extend>
+ <dependencies>
+ <dependency>
+ <id>jetspeed2:jetspeed-portal</id>
+ <version>
+ ${jetspeed.version}
+ </version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>torque</groupId>
+ <artifactId>maven-torque-plugin</artifactId>
+ <version>3.2-rc2-dev</version>
+ <type>plugin</type>
+ <properties/>
+ </dependency>
+ </dependencies>
+</project>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/full-portal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml Mon Aug 29 05:37:53 2005
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<beans>
- <bean id="AJAXService"
- class="org.apache.jetspeed.ajax.AJAXServiceImpl">
- <constructor-arg>
- <map>
- <entry key="portletRegistry.getPortletApplications">
- <value>
- org.apache.jetspeed.components.portletregistry.PortletRegistry
- </value>
- </entry>
- <entry key="portletRegistry.getPortletApplication">
- <value>
- org.apache.jetspeed.components.portletregistry.PortletRegistry
- </value>
- </entry>
- <entry key="entityAccess.getPortletEntities">
- <value>
- org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
- </value>
- </entry>
- <entry key="entityAccess.getPortletEntity">
- <value>
- org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
- </value>
- </entry>
- </map>
- </constructor-arg>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<beans>
+ <bean id="AJAXService"
+ class="org.apache.jetspeed.ajax.AJAXServiceImpl">
+ <constructor-arg>
+ <map>
+ <entry key="portletRegistry.getPortletApplications">
+ <value>
+ org.apache.jetspeed.components.portletregistry.PortletRegistry
+ </value>
+ </entry>
+ <entry key="portletRegistry.getPortletApplication">
+ <value>
+ org.apache.jetspeed.components.portletregistry.PortletRegistry
+ </value>
+ </entry>
+ <entry key="entityAccess.getPortletEntities">
+ <value>
+ org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+ </value>
+ </entry>
+ <entry key="entityAccess.getPortletEntity">
+ <value>
+ org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+ </value>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/ajax.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/boot/datasource.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/boot/datasource.xml Mon Aug 29 05:37:53 2005
@@ -2,36 +2,43 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
<!--
- Creates a JNDI-based datasource bean name JetspeedDS.
- The jdbc-connection-descriptor jcd-alias property must
- be set to match this. The jdbc-connection-descriptor can
- be located under /etc/db-ojb/repository_database.xml in the
- source tree. The LocalOjbConfigurer defined below is responsible
- for matching Spring-managed datasources with there proper
- bean definition.
-
- Another requirement for this to work is to have the
- ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
- This property is located in /etc/db-ojb/OJB.properties in the source tree.
-
- FYI: The two OJB configuration files mentioned above are currently already setup this way
- in the default Jetspeed implementation.
-
- However, if you need to locate/modify these files in a running instance of jetspeed,
- they will be located under /WEB-INF/classes.
- -->
- <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
+ Creates a JNDI-based datasource bean name "JetspeedDS". The information
+ provided here is merged with the basic configuration for the
+ jdbc-connection-descriptor with the matching jcd-alias property
+ ("JetspeedDS") located under /etc/db-ojb/repository_database.xml in the
+ source tree.
+
+ Another requirement for this to work is to have the
+ ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+ or to have
+ ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl.
+ (either will do, both are recommended, see comments in configuration file).
+ These properties are located in /etc/db-ojb/OJB.properties in the source tree.
+
+ FYI: The two OJB configuration files mentioned above are currently already setup this way
+ in the default Jetspeed implementation.
+
+ However, if you need to locate/modify these files in a running instance of jetspeed,
+ they will be located under /WEB-INF/classes.
+ -->
+ <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
<property name="jndiName">
<value>java:comp/env/jdbc/jetspeed</value>
</property>
</bean>
<!-- If would like use a commons DBCP Pooled datasource as opposed to the default
- JNDI one above you can uncomment the configuration below and fill in
- the datasource information as it relates to your environment.
- -->
+ JNDI one above you can uncomment the configuration below and fill in
+ the datasource information as it relates to your environment.
+
+ A requirement for this to work is to have the
+ ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
+ or to have
+ ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
+ This property is located in /etc/db-ojb/OJB.properties in the source tree.
+ -->
<!--
- <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
<property name="driverClassName">
<value>{my.drivers.class.name}</value>
</property>
@@ -47,9 +54,4 @@
</bean>
-->
- <!-- OJB Locale Configurer
- - see: http://www.springframework.org/docs/reference/orm.html#d0e7571
- -->
-
- <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
-</beans>
\ No newline at end of file
+</beans>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml Mon Aug 29 05:37:53 2005
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
-
- <!-- Capabilities DAO-->
- <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
- <constructor-arg>
- <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
- </constructor-arg>
- </bean>
-
- <!-- Capabilities -->
- <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.capabilities.Capabilities</value>
- </property>
- <property name="target">
- <ref bean="capabilitiesImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans>
+
+ <!-- Capabilities DAO-->
+ <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
+ <constructor-arg>
+ <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Capabilities -->
+ <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.capabilities.Capabilities</value>
+ </property>
+ <property name="target">
+ <ref bean="capabilitiesImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/capabilities.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml Mon Aug 29 05:37:53 2005
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
-
- <!-- Preferences Implementation -->
- <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
- <constructor-arg index="0">
- <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
- </constructor-arg>
- <constructor-arg type="boolean" index="1">
- <value>false</value>
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
- </property>
-
- <property name="target">
- <ref bean="PreferencesProviderImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="createNode*">PROPAGATION_REQUIRED</prop>
- <prop key="storeNode*">PROPAGATION_REQUIRED</prop>
- <prop key="removeNode*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
- <!-- PreferencesFactory implementation -->
- <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init">
- <property name="prefsProvider">
- <ref bean="prefsProvider" />
- </property>
- </bean>
-
- <!-- Property Manager -->
- <bean id="PropertyManagerImpl" class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl">
- <!-- We don't use the Tx proxied prefs provider so that we can demarcate Txs
- exclusively for the PropertyManager -->
- <constructor-arg>
- <ref bean="PreferencesProviderImpl" />
- </constructor-arg>
- </bean>
-
-
- <bean id="org.apache.jetspeed.prefs.PropertyManager" parent="baseTransactionProxy" name="propertyManager">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.prefs.PropertyManager</value>
- </property>
-
- <property name="target">
- <ref bean="PropertyManagerImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="add*">PROPAGATION_REQUIRED</prop>
- <prop key="remove*">PROPAGATION_REQUIRED</prop>
- <prop key="update*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans>
+
+ <!-- Preferences Implementation -->
+ <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
+ </constructor-arg>
+ <constructor-arg type="boolean" index="1">
+ <value>false</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
+ </property>
+
+ <property name="target">
+ <ref bean="PreferencesProviderImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="createNode*">PROPAGATION_REQUIRED</prop>
+ <prop key="storeNode*">PROPAGATION_REQUIRED</prop>
+ <prop key="removeNode*">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- PreferencesFactory implementation -->
+ <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init">
+ <property name="prefsProvider">
+ <ref bean="prefsProvider" />
+ </property>
+ </bean>
+
+ <!-- Property Manager -->
+ <bean id="PropertyManagerImpl" class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl">
+ <!-- We don't use the Tx proxied prefs provider so that we can demarcate Txs
+ exclusively for the PropertyManager -->
+ <constructor-arg>
+ <ref bean="PreferencesProviderImpl" />
+ </constructor-arg>
+ </bean>
+
+
+ <bean id="org.apache.jetspeed.prefs.PropertyManager" parent="baseTransactionProxy" name="propertyManager">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.prefs.PropertyManager</value>
+ </property>
+
+ <property name="target">
+ <ref bean="PropertyManagerImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="add*">PROPAGATION_REQUIRED</prop>
+ <prop key="remove*">PROPAGATION_REQUIRED</prop>
+ <prop key="update*">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/prefs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml Mon Aug 29 05:37:53 2005
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
- <!-- Profiler -->
- <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
- <constructor-arg index="0">
- <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
- </constructor-arg>
- <constructor-arg index="1">
- <value>j2</value>
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.profiler.Profiler</value>
- </property>
- <property name="target">
- <ref bean="profilerImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
- <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
- <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans>
+ <!-- Profiler -->
+ <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>j2</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.profiler.Profiler</value>
+ </property>
+ <property name="target">
+ <ref bean="profilerImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+ <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+ <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/profiler.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml Mon Aug 29 05:37:53 2005
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
-
- <!-- Portlet Factory -->
- <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
-
- <!-- Portlet Registry DAO-->
- <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
-
- <constructor-arg index="0">
- <value>JETSPEED-INF/ojb/registry_repository.xml</value>
- </constructor-arg>
- <constructor-arg index="1">
- <ref bean="portletFactory" />
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
- </property>
-
- <property name="target">
- <ref bean="portletRegistryImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
- <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
- <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
- <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
- <!-- Portlet Entity Access DAO-->
- <!--
- <bean id="systemCache" class="org.apache.jetspeed.cache.general.SimpleHashMapCache" />
-
- <bean id="systemCachingInterceptor" class="org.apache.jetspeed.components.interceptors.CachingInterceptor" >
- <constructor-arg>
- <ref bean="systemCache"/>
- </constructor-arg>
- </bean>
-
- <bean id="systemRemoveFromCacheInterceptor" class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" >
- <constructor-arg>
- <ref bean="systemCache"/>
- </constructor-arg>
- </bean>
-
- <bean id="portletEntityCachingAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
- <property name="advice">
- <ref bean="systemCachingInterceptor"/>
- </property>
- <property name="patterns">
- <list>
- <value>.*getPortletEntity.*</value>
- </list>
- </property>
- </bean>
-
- <bean id="portletEntityRemoveFromCacheAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
- <property name="advice">
- <ref bean="systemRemoveFromCacheInterceptor"/>
- </property>
- <property name="patterns">
- <list>
- <value>.*removePortletEntity.*</value>
- </list>
- </property>
- </bean>
-
- -->
- <!--
- - PortletEntity business object: OJB implementation, as an inner bean wrapped
- - by an outer transactional proxy. The two bean definitions could have been separate,
- - but this is cleaner as there is no need to ever access the unwrapped object.
- -->
-
- <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
- name="portletEntityAccessImpl">
- <constructor-arg>
- <ref bean="portletRegistry" />
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
- </property>
- <property name="target">
- <ref bean="portletEntityAccessImpl" />
- </property>
- <!--
- <property name="preInterceptors">
- <list>
- <ref bean="portletEntityCachingAdvisor"/>
- <ref bean="portletEntityRemoveFromCacheAdvisor"/>
- </list>
- </property>
- -->
- <property name="transactionAttributes">
- <props>
- <prop key="remove*">PROPAGATION_REQUIRED</prop>
- <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans>
+
+ <!-- Portlet Factory -->
+ <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
+
+ <!-- Portlet Registry DAO-->
+ <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
+
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/registry_repository.xml</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="portletFactory" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+ </property>
+
+ <property name="target">
+ <ref bean="portletRegistryImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Portlet Entity Access DAO-->
+ <!--
+ <bean id="systemCache" class="org.apache.jetspeed.cache.general.SimpleHashMapCache" />
+
+ <bean id="systemCachingInterceptor" class="org.apache.jetspeed.components.interceptors.CachingInterceptor" >
+ <constructor-arg>
+ <ref bean="systemCache"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="systemRemoveFromCacheInterceptor" class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" >
+ <constructor-arg>
+ <ref bean="systemCache"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="portletEntityCachingAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+ <property name="advice">
+ <ref bean="systemCachingInterceptor"/>
+ </property>
+ <property name="patterns">
+ <list>
+ <value>.*getPortletEntity.*</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="portletEntityRemoveFromCacheAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+ <property name="advice">
+ <ref bean="systemRemoveFromCacheInterceptor"/>
+ </property>
+ <property name="patterns">
+ <list>
+ <value>.*removePortletEntity.*</value>
+ </list>
+ </property>
+ </bean>
+
+ -->
+ <!--
+ - PortletEntity business object: OJB implementation, as an inner bean wrapped
+ - by an outer transactional proxy. The two bean definitions could have been separate,
+ - but this is cleaner as there is no need to ever access the unwrapped object.
+ -->
+
+ <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
+ name="portletEntityAccessImpl">
+ <constructor-arg>
+ <ref bean="portletRegistry" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+ </property>
+ <property name="target">
+ <ref bean="portletEntityAccessImpl" />
+ </property>
+ <!--
+ <property name="preInterceptors">
+ <list>
+ <ref bean="portletEntityCachingAdvisor"/>
+ <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+ </list>
+ </property>
+ -->
+ <property name="transactionAttributes">
+ <props>
+ <prop key="remove*">PROPAGATION_REQUIRED</prop>
+ <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/registry.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml Mon Aug 29 05:37:53 2005
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
- <!-- SSO Implementation -->
- <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
- <constructor-arg index="0">
- <value>JETSPEED-INF/ojb/sso_repository.xml</value>
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.sso.SSOProvider</value>
- </property>
-
- <property name="target">
- <ref bean="PersistenceBrokerSSOProvider" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="addSite">PROPAGATION_REQUIRED</prop>
- <prop key="removeSite">PROPAGATION_REQUIRED</prop>
- <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
- <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
- <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
-
- </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans>
+ <!-- SSO Implementation -->
+ <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
+ <constructor-arg index="0">
+ <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.sso.SSOProvider</value>
+ </property>
+
+ <property name="target">
+ <ref bean="PersistenceBrokerSSOProvider" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="addSite">PROPAGATION_REQUIRED</prop>
+ <prop key="removeSite">PROPAGATION_REQUIRED</prop>
+ <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
+ <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
+ <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+
+ </bean>
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/assembly/sso.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org