cvs commit: jakarta-jetspeed/xdocs portlet_config_DBBrowser.xml portlet_config_PSMLBrowser.xml catalog.xml
taylor 2002/07/16 15:05:58 Modified:docs/site catalog.html webapp/WEB-INF/conf JetspeedSecurity.properties admin.xreg webapp/WEB-INF/psml/user/turbine/html default.psml webapp/rss admin.rss xdocscatalog.xml Added: xdocsportlet_config_DBBrowser.xml portlet_config_PSMLBrowser.xml Log: Documentation 1.4b1 release. more to come Revision ChangesPath 1.8 +6 -0 jakarta-jetspeed/docs/site/catalog.html Index: catalog.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/catalog.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- catalog.html 9 Feb 2002 23:58:43 - 1.7 +++ catalog.html 16 Jul 2002 22:05:56 - 1.8 @@ -135,6 +135,12 @@ li a href=portlet_config_XSL.htmlXSL Portlet/a /li +li + a href=portlet_config_DBBrowser.htmlDatabase Browser Portlet/a + /li +li + a href=portlet_config_PSMLBrowser.htmlPSML Browser Portlet/a + /li /ul a href=portlet_config_common.htmlConfiguration common to many standard portlets/a /blockquote 1.9 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 1.23 +2 -1 jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg Index: admin.xreg === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- admin.xreg16 Jul 2002 19:10:40 - 1.22 +++ admin.xreg16 Jul 2002 22:05:57 - 1.23 @@ -366,7 +366,8 @@ parameter name=page-size value=25/ parameter name=action value=portlets.PsmlBrowseAction/ meta-info - titlePsml browser/title + titlePSML Browser/title + descriptionHierarchical tree browser of all PSML resources in the system./description /meta-info media-type ref=html/ categoryadmin/category 1.17 +4 -0 jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml Index: default.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- default.psml 30 Jun 2002 04:37:42 - 1.16 +++ default.psml 16 Jul 2002 22:05:57 - 1.17 @@ -55,6 +55,10 @@ property name=row value=3/ /layout /entry +entry id=P-ef1547a162-10018 parent=DatabaseBrowserTest +parameter name=sql value=select * from coffees/ +parameter name=windowSize value=10/ +/entry !-- reference id=P-ed09142736-10018 path=group/apache/page/news layout position=-1 size=-1 1.8 +0 -8 jakarta-jetspeed/webapp/rss/admin.rss Index: admin.rss === RCS file: /home/cvs/jakarta-jetspeed/webapp/rss/admin.rss,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- admin.rss 16 Jul 2002 19:10:41 - 1.7 +++ admin.rss 16 Jul 2002 22:05:57 - 1.8 @@ -9,14 +9,6 @@ from the admin user home page by chosing the Admin and Security tabs. Here are some the most common administrative portlets from both tabs: /description - -item - titlePSML Browser/title - description -This portlet allows the administrator to edit the PSML for all users and resources in the portal. - /description - link./portal?action=controls.Maximize#38;js_peid=344/link -/item item titleGlobal/title description 1.3 +3 -0 jakarta-jetspeed/xdocs/catalog.xml Index: catalog.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/catalog.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- catalog.xml 28 Aug 2001 03:33:03 - 1.2 +++ catalog.xml 16 Jul 2002 22:05:58 - 1.3 @@ -29,6 +29,9 @@ li a href=portlet_config_XSL.htmlXSL Portlet/a /li +li
cvs commit: jakarta-jetspeed/xdocs install.xml
taylor 2002/07/16 16:09:06 Modified:xdocsinstall.xml Log: Installation procedure rewritten Revision ChangesPath 1.21 +109 -19 jakarta-jetspeed/xdocs/install.xml Index: install.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/install.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- install.xml 13 Jul 2002 09:03:59 - 1.20 +++ install.xml 16 Jul 2002 23:09:06 - 1.21 @@ -31,8 +31,96 @@ /li /ul /section - section name=Installation - p + section name=Downloading A Release Build +p +When downloading a release build, there are three kinds of builds that you can download: +ul +libFull WAR/b - Gives you the entire Web Application including all documentation and javadocs. +/li +libWAR/b - Gives you the Web Application minus documentation and javadocs. +/li +libSource/b - Gives you the source code and resources. You will need to build Jetspeed yourself. +/li +/ul +The WAR and Full WAR downloads do not require for you to build Jetspeed. The Web Application is ready to deploy to your application server in a Web Archive (WAR) format. +/p + table +tr + thRelease 1.4b1 (Latest)/th + thDownload From:/th + /tr + tr + tdJetspeed Release 1.4b1 - Full WAR/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-fullwar.zip/a/td + /tr + tr + tdJetspeed Release 1.4b1 - Standard WAR/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-war.zip/a/td + /tr + tr + tdJetspeed Release 1.4b1 - Source Only/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-src.zip/a/td + /tr + + /table + table +tr + thRelease 1.3a2/th + thDownload From:/th + /tr + tr + tdJetspeed Release 1.3a2 - Full WAR/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-fullwar.zip;jetspeed-1.3a2-release-fullwar.zip/a/td + /tr + tr + tdJetspeed Release 1.3a2 - Standard WAR/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-fullwar.zip;jetspeed-1.3a2-release-war.zip/a/td + /tr + tr + tdJetspeed Release 1.3a2 - Source Only/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-fullwar.zip;jetspeed-1.3a2-release-src.zip/a/td + /tr + + /table + + /section +section name=Downloading A Nightly Build +p +The Jetspeed Nightly Builds are automatically updated from CVS every night on the Jakarta server. +Each zip file is a snapshot of the entire CVS at the end of the given day. +You will need to build Jetspeed from the nightly snapshots. +The last seven builds are available for download in both GZIP and ZIP formats. +The last seven builds are available from here: +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/nightly/;Nightly Builds/a +/p +/section +section name=Checkout from CVS +p +The best way to get the latest Jetspeed source is to checkout directly from CVS. +Follow the Jakarta CVS instructions available a href=http://jakarta.apache.org/site/cvsindex.html;here/a +and checkout the bjakarta-jetspeed/b module. +/p +p +b +cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login +password: anoncvs +/b +br/ +b +cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout jakarta-jetspeed +/b +br/ +br/ +To check for a particular date, use the -D option: +br/br/ +b +cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout -D 2002-06-04 jakarta-jetspeed +/b +/p +/section + +section name
cvs commit: jakarta-jetspeed/xdocs install.xml psml.xml
taylor 2002/07/16 17:03:31 Modified:docs/site catalog.html install.html psml.html webapp/WEB-INF/conf JetspeedSecurity.properties xdocsinstall.xml psml.xml Log: Documented PSML References and Locators Revision ChangesPath 1.9 +0 -3 jakarta-jetspeed/docs/site/catalog.html Index: catalog.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/catalog.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- catalog.html 16 Jul 2002 22:05:56 - 1.8 +++ catalog.html 17 Jul 2002 00:03:31 - 1.9 @@ -138,9 +138,6 @@ li a href=portlet_config_DBBrowser.htmlDatabase Browser Portlet/a /li -li - a href=portlet_config_PSMLBrowser.htmlPSML Browser Portlet/a - /li /ul a href=portlet_config_common.htmlConfiguration common to many standard portlets/a /blockquote 1.20 +203 -17 jakarta-jetspeed/docs/site/install.html Index: install.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/install.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- install.html 13 Jul 2002 09:03:59 - 1.19 +++ install.html 17 Jul 2002 00:03:31 - 1.20 @@ -118,6 +118,9 @@ blockquote ul lia href=#RequirementsRequirements/a/li + lia href=#Downloading A Release BuildDownloading A Release Build/a/li + lia href=#Downloading A Nightly BuildDownloading A Nightly Build/a/li + lia href=#Checkout from CVSCheckout from CVS/a/li lia href=#InstallationInstallation/a/li lia href=#Database ConfigurationDatabase Configuration/a/li lia href=#Servlet Container NotesServlet Container Notes/a/li @@ -154,6 +157,187 @@ table border=0 cellspacing=0 cellpadding=2 width=100% trtd bgcolor=#525D76 font color=#ff face=arial,helvetica,sanserif + a name=Downloading A Release BuildstrongDownloading A Release Build/strong/a +/font + /td/tr + trtd +blockquote +p +When downloading a release build, there are three kinds of builds that you can download: +ul +libFull WAR/b - Gives you the entire Web Application including all documentation and javadocs. +/li +libWAR/b - Gives you the Web Application minus documentation and javadocs. +/li +libSource/b - Gives you the source code and resources. You will need to build Jetspeed yourself. +/li +/ul +The WAR and Full WAR downloads do not require for you to build Jetspeed. The Web Application is ready to deploy to your application server in a Web Archive (WAR) format. +/p +table +tr +td bgcolor=#039acc colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Release 1.4b1 (Latest) +/font +/td +td bgcolor=#039acc colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Download From: +/font +/td +/tr +tr +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Jetspeed Release 1.4b1 - Full WAR +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-fullwar.zip/a +/font +/td +/tr +tr +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Jetspeed Release 1.4b1 - Standard WAR +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-war.zip/a +/font +/td +/tr +tr
cvs commit: jakarta-jetspeed/xdocs/stylesheets project.xml
taylor 2002/07/17 00:07:24 Modified:docs/site administration.html application-development.html branches.html catalog.html changes.html code-standards.html config_guide.html config_skin.html config_skin_param_summary.html content-syndication.html contributors.html customizer.html developer-notes.html diskcache.html faq.html features.html icalendar.html index.html install.html license.html portlet_config_DBBrowser.html portlet_config_HTML.html portlet_config_JSP.html portlet_config_PSMLBrowser.html portlet_config_RSS.html portlet_config_Velocity.html portlet_config_WebPagePortlet.html portlet_config_XSL.html portlet_config_common.html psml.html psml_db.html resources.html security.html todo.html uml.html usejetspeed.html wap.html webapp/WEB-INF/conf JetspeedSecurity.properties xdocsfaq.xml security.xml xdocs/stylesheets project.xml Log: updated documentation, fixed hyperlinks Revision ChangesPath 1.19 +1 -1 jakarta-jetspeed/docs/site/administration.html Index: administration.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/administration.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- administration.html 17 Jul 2002 06:29:30 - 1.18 +++ administration.html 17 Jul 2002 07:07:22 - 1.19 @@ -69,7 +69,7 @@ ul lia href=./config_guide.htmlConfiguration Guide/a /li -lia href=http://www.bluesunrise.com/jetspeed-docs/javadocs/;Javadoc/a +lia href=http://jakarta.apache.org/jetspeed/api/index.html;Javadocs/a /li lia href=./application-development.htmlDevelopment/a /li 1.19 +1 -1 jakarta-jetspeed/docs/site/application-development.html Index: application-development.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/application-development.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- application-development.html 17 Jul 2002 06:29:30 - 1.18 +++ application-development.html 17 Jul 2002 07:07:22 - 1.19 @@ -69,7 +69,7 @@ ul lia href=./config_guide.htmlConfiguration Guide/a /li -lia href=http://www.bluesunrise.com/jetspeed-docs/javadocs/;Javadoc/a +lia href=http://jakarta.apache.org/jetspeed/api/index.html;Javadocs/a /li lia href=./application-development.htmlDevelopment/a /li 1.19 +1 -1 jakarta-jetspeed/docs/site/branches.html Index: branches.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/branches.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- branches.html 17 Jul 2002 06:29:30 - 1.18 +++ branches.html 17 Jul 2002 07:07:22 - 1.19 @@ -69,7 +69,7 @@ ul lia href=./config_guide.htmlConfiguration Guide/a /li -lia href=http://www.bluesunrise.com/jetspeed-docs/javadocs/;Javadoc/a +lia href=http://jakarta.apache.org/jetspeed/api/index.html;Javadocs/a /li lia href=./application-development.htmlDevelopment/a /li 1.11 +1 -1 jakarta-jetspeed/docs/site/catalog.html Index: catalog.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/catalog.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- catalog.html 17 Jul 2002 06:29:30 - 1.10 +++ catalog.html 17 Jul 2002 07:07:22 - 1.11 @@ -69,7 +69,7 @@ ul lia href=./config_guide.htmlConfiguration Guide/a /li -lia href=http://www.bluesunrise.com/jetspeed-docs/javadocs/;Javadoc/a +lia href=http://jakarta.apache.org/jetspeed/api/index.html;Javadocs/a /li lia href=./application-development.htmlDevelopment/a /li 1.26 +1 -1 jakarta-jetspeed/docs/site/changes.html Index: changes.html
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties
taylor 2002/07/17 00:34:04 Modified:.INSTALL NOTES webapp/WEB-INF/conf JetspeedSecurity.properties Log: updated release notes Revision ChangesPath 1.6 +5 -5 jakarta-jetspeed/INSTALL Index: INSTALL === RCS file: /home/cvs/jakarta-jetspeed/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- INSTALL 10 Dec 2001 05:16:18 - 1.5 +++ INSTALL 17 Jul 2002 07:34:04 - 1.6 @@ -104,8 +104,8 @@ Database Configuration --- -Jetspeed uses Turbine's security model to authorize users and persist minimal -user information. Turbine security should work with any JDBC 2.0 compliant +Jetspeed uses Jakarta Torque to store users and persist minimal +user information. This security model should work with any JDBC 2.0 compliant driver. The following databases are tested: DB2 @@ -117,10 +117,10 @@ Jetspeed is distributed with a populated Hypersonic-SQL database. This database is selected as the default database in the -TurbineResources.properties file. +TorqueResources.properties file. To configure Jetspeed with a different database, modify the -TurbineResources.properties file. +TorqueResources.properties file. Here is an example for Oracle: @@ -137,7 +137,7 @@ sid the name of Oracle database sid at the host username the oracle user(schema) name -The TurbineResources.properties file can be found in /webapp/WEB-INF/conf. +The TorqueResources.properties file can be found in /webapp/WEB-INF/conf. The database scripts for setting up the database are included with the source code distribution, under the src/sql/external folder. 1.5 +1 -4 jakarta-jetspeed/NOTES Index: NOTES === RCS file: /home/cvs/jakarta-jetspeed/NOTES,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NOTES 10 Dec 2001 16:17:08 - 1.4 +++ NOTES 17 Jul 2002 07:34:04 - 1.5 @@ -1,4 +1,4 @@ -Jetspeed 1.3a2 Release Notes +Jetspeed 1.4b1 Release Notes This file documents some known issues or incomplete features @@ -6,12 +6,9 @@ Customizer -- -The customizer included in this release is much improved over 1.3a1. There are still some known problems: -- You cannot customize the anonymous page, or group/role pages. Only the default page for the logged on user. - You cannot switch directly between some layouts, for ex. 3-column to 2-column. You must first delete all portlets, then you can switch to 2-column. -- Removing a portlet from the standard view, it still shows up in the customize view. The only way to bring the portlet back is to delete it and re-add it. - You can't search for a given portlet Portlets 1.12 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/xdocs install.xml
taylor 2002/07/17 00:48:45 Modified:docs/site install.html webapp/WEB-INF/conf JetspeedSecurity.properties xdocsinstall.xml Log: fixed 2 more bad links on install.html/xml Revision ChangesPath 1.23 +4 -4 jakarta-jetspeed/docs/site/install.html Index: install.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/install.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- install.html 17 Jul 2002 07:07:22 - 1.22 +++ install.html 17 Jul 2002 07:48:44 - 1.23 @@ -209,7 +209,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-war.zip/a +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-war.zip;jetspeed-1.4b1-release-war.zip/a /font /td /tr @@ -221,7 +221,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-src.zip/a +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-src.zip;jetspeed-1.4b1-release-src.zip/a /font /td /tr @@ -259,7 +259,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-fullwar.zip;jetspeed-1.3a2-release-war.zip/a +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-war.zip;jetspeed-1.3a2-release-war.zip/a /font /td /tr @@ -271,7 +271,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-fullwar.zip;jetspeed-1.3a2-release-src.zip/a +a href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/jetspeed-1.3a2-release-src.zip;jetspeed-1.3a2-release-src.zip/a /font /td /tr 1.13 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 1.24 +4 -4 jakarta-jetspeed/xdocs/install.xml Index: install.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/install.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- install.xml 17 Jul 2002 06:29:31 - 1.23 +++ install.xml 17 Jul 2002 07:48:45 - 1.24 @@ -58,11 +58,11 @@ /tr tr tdJetspeed Release 1.4b1 - Standard WAR/td - tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-war.zip/a/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-war.zip;jetspeed-1.4b1-release-war.zip/a/td /tr tr tdJetspeed Release 1.4b1 - Source Only/td - tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-fullwar.zip;jetspeed-1.4b1-release-src.zip/a/td + tda href=http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/jetspeed-1.4b1-release-src.zip;jetspeed-1.4b1-release-src.zip/a/td /tr /table @@ -77,11 +77,11 @@ /tr tr tdJetspeed Release 1.3a2 - Standard WAR/td
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties TurbineResources.properties
taylor 2002/07/18 14:00:08
Modified:webapp/WEB-INF/conf JetspeedSecurity.properties
TurbineResources.properties
Log:
Changed log4j pattern to show time and date (not just time, pretty useless without
the date)
Revision ChangesPath
1.14 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
1.54 +2 -2 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
Index: TurbineResources.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TurbineResources.properties 28 Jun 2002 05:37:37 - 1.53
+++ TurbineResources.properties 18 Jul 2002 21:00:08 - 1.54
@@ -63,7 +63,7 @@
services.LoggingService.logforj.log4j.appender.logforj.file
=${webappRoot}/WEB-INF/log/jetspeed.log
services.LoggingService.logforj.log4j.appender.logforj =
org.apache.log4j.FileAppender
services.LoggingService.logforj.log4j.appender.logforj.layout =
org.apache.log4j.PatternLayout
-services.LoggingService.logforj.log4j.appender.logforj.layout.conversionPattern =
[%d{ABSOLUTE} %-5p] %m%n
+services.LoggingService.logforj.log4j.appender.logforj.layout.conversionPattern =
[%d{dd MMM HH:mm:ss} %5p] - %m%n
services.LoggingService.logforj.log4j.appender.logforj.append = false
services.LoggingService.logforj.className=org.apache.turbine.services.logging.Log4JavaLogger
services.LoggingService.logforj.level=DEBUG
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf TurbineResources.properties
taylor 2002/07/18 15:05:44
Modified:webapp/WEB-INF/conf TurbineResources.properties
Log:
turn off debug logging from torque
Revision ChangesPath
1.55 +3 -2 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
Index: TurbineResources.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- TurbineResources.properties 18 Jul 2002 21:00:08 - 1.54
+++ TurbineResources.properties 18 Jul 2002 22:05:44 - 1.55
@@ -59,7 +59,8 @@
# need this rootCategory entry to capture the torque/fulcrum etc logging
services.LoggingService.logforj.log4j.rootCategory = DEBUG, logforj
# need this category entry for the actual jetspeed logging (I don't know why it
doesn't get covered by the root category!)
-services.LoggingService.logforj.log4j.category.logforj = DEBUG, logforj
+services.LoggingService.logforj.log4j.category.logforj = INFO, logforj
+
services.LoggingService.logforj.log4j.appender.logforj.file
=${webappRoot}/WEB-INF/log/jetspeed.log
services.LoggingService.logforj.log4j.appender.logforj =
org.apache.log4j.FileAppender
services.LoggingService.logforj.log4j.appender.logforj.layout =
org.apache.log4j.PatternLayout
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties TurbineResources.properties
taylor 2002/07/18 15:46:28
Modified:webapp/WEB-INF/conf JetspeedSecurity.properties
TurbineResources.properties
Log:
Last commit wasn't quite right. I think I've got it now. (disabled debug on Torque)
Revision ChangesPath
1.15 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
1.56 +4 -3 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
Index: TurbineResources.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TurbineResources.properties 18 Jul 2002 22:05:44 - 1.55
+++ TurbineResources.properties 18 Jul 2002 22:46:28 - 1.56
@@ -57,9 +57,10 @@
# An example configuration for using Log4Java, with log4j properties inline
# The category name - at the end of this line - needs to match the logging facility
name - the first log4j.
# need this rootCategory entry to capture the torque/fulcrum etc logging
-services.LoggingService.logforj.log4j.rootCategory = DEBUG, logforj
+services.LoggingService.logforj.log4j.rootCategory = INFO, logforj
+
# need this category entry for the actual jetspeed logging (I don't know why it
doesn't get covered by the root category!)
-services.LoggingService.logforj.log4j.category.logforj = INFO, logforj
+services.LoggingService.logforj.log4j.category.logforj = DEBUG, logforj
services.LoggingService.logforj.log4j.appender.logforj.file
=${webappRoot}/WEB-INF/log/jetspeed.log
services.LoggingService.logforj.log4j.appender.logforj =
org.apache.log4j.FileAppender
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html - New directory
taylor 2002/07/22 16:07:18 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/html - New directory
taylor 2002/07/22 16:35:53 jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/html - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm customizer-portlet.vm customizer-portletset-add.vm customizer-portletset-addset.vm customizer-portletset-general.vm customizer-portletset-layout.vm customizer-portletset.vm
taylor 2002/07/22 17:03:57
Modified:src/java/org/apache/jetspeed/modules/actions/controllers
MultiColumnControllerAction.java
RowColumnControllerAction.java
src/java/org/apache/jetspeed/modules/actions/controls
Customize.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
src/java/org/apache/jetspeed/om/dbpsml/map
JetspeedGroupProfileMapBuilder.java
JetspeedRoleProfileMapBuilder.java
JetspeedUserProfileMapBuilder.java
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
src/java/org/apache/jetspeed/services/psmlmanager
TestMarshalPsml.java
src/java/org/apache/jetspeed/util AutoProfile.java
src/java/org/apache/jetspeed/util/template
BaseJetspeedLink.java JetspeedLink.java
webapp/WEB-INF/conf JetspeedSecurity.properties
webapp/WEB-INF/db jetspeed.properties jetspeed.script
webapp/WEB-INF/psml/test testcase.psml
webapp/WEB-INF/psml/user/admin/wml default.psml
webapp/WEB-INF/psml/user/anon/wml default.psml
webapp/WEB-INF/psml/user/anon/wml/en default.psml
webapp/WEB-INF/psml/user/turbine/wml default.psml
webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
flow-customize.vm multicolumn-customize.vm
row-customize.vm
webapp/WEB-INF/templates/vm/navigations/html top.vm
webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm
customizer-portlet.vm customizer-portletset-add.vm
customizer-portletset-addset.vm
customizer-portletset-general.vm
customizer-portletset-layout.vm
customizer-portletset.vm
Added: webapp/WEB-INF/psml/group/Jetspeed/html default.psml
news.psml
webapp/WEB-INF/psml/group/apache/html default.psml news.psml
webapp/WEB-INF/psml/role/admin/html default.psml
webapp/WEB-INF/psml/role/user/html default.psml
Removed: webapp/WEB-INF/psml/group/Jetspeed default.psml news.psml
webapp/WEB-INF/psml/group/apache default.psml news.psml
webapp/WEB-INF/psml/role/admin default.psml
webapp/WEB-INF/psml/role/user default.psml
Log:
Updated customizer to better support customizing any PSML resource in the system
(group, role, mediatype, language ...)
Tested from PSML Browser.
The customizer needs a lot of work, however I won't have time for several weeks at
least.
If anyone wants to continue I can point them in the right direction.
One example of smelly code needing a rewrite is AutoProfile.java - which hardcodes
mediatypes.
Revision ChangesPath
1.13 +13 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
Index: MultiColumnControllerAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MultiColumnControllerAction.java 30 Jun 2002 05:23:19 - 1.12
+++ MultiColumnControllerAction.java 23 Jul 2002 00:03:54 - 1.13
@@ -356,6 +356,13 @@
try
{
jsLink = JetspeedLinkFactory.getInstance(data);
+String mtype = data.getParameters().getString(mtype);
+if (mtype != null)
+{
+jsLink.setMediaType(mtype);
+jsLink.addQueryData(mtype, mtype);
+}
+
} catch (Exception e)
{
Log.error(e);
@@ -369,7 +376,6 @@
public void doSave(RunData data, Context context)
{
Profile profile = ((JetspeedRunData)data).getProfile();
-System.out.println(In + this.getClass().getName() + .doSave());
List[] columns = (List[])data.getUser().getTemp(columns);
for (int col=0; col columns.length; col++)
@@ -382,6 +388,12 @@
try
{
+String mtype = data.getParameters().getString(mtype);
+if (mtype != null)
+{
+profile.setMediaType(mtype);
+}
+
profile.store();
}
catch (Exception e)
1.14
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/07/22 17:06:43 Modified:xdocschanges.xml Log: changes Revision ChangesPath 1.48 +5 -1 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- changes.xml 19 Jul 2002 20:56:19 - 1.47 +++ changes.xml 23 Jul 2002 00:06:43 - 1.48 @@ -24,6 +24,10 @@ -- /ul li + Update - 2002/07/22 - Updated Customizer to better support editing of any PSML page (DST) + - Cleanup up invalid PSML pages in cvs +/li +li Add - 2002/07/19 - Weather Portlet from Ozgur Balsoy (DST) /li li -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/docs/site changes.html
taylor 2002/07/22 17:07:08 Modified:docs/site changes.html Log: changes Revision ChangesPath 1.28 +4 -0 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- changes.html 20 Jul 2002 04:48:32 - 1.27 +++ changes.html 23 Jul 2002 00:07:08 - 1.28 @@ -130,6 +130,10 @@ -- /ul li + Update - 2002/07/22 - Updated Customizer to better support editing of any PSML page (DST) + - Cleanup up invalid PSML pages in cvs +/li +li Add - 2002/07/19 - Weather Portlet from Ozgur Balsoy (DST) /li li -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml default.psml
taylor 2002/07/22 18:24:21 Modified:webapp/WEB-INF/psml/user/anon/wml default.psml Log: fixed typo in psml Revision ChangesPath 1.4 +7 -11 jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/default.psml Index: default.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/default.psml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.psml 23 Jul 2002 00:03:56 - 1.3 +++ default.psml 23 Jul 2002 01:24:21 - 1.4 @@ -1,18 +1,14 @@ ?xml version=1.0 encoding=iso-8859-1? portlets xmlns=http://xml.apache.org/jetspeed/2000/psml; -controller name=FlowPortletController/ -control name=ClearPortletControl/ + controller name=FlowPortletController/ - controller name=ColumnController/ - control name=ClearPortletControl/ + entry parent=StockQuote +control name=ClearPortletControl/ + /entry - entry parent=StockQuote -control name=ClearPortletControl/ - /entry - - entry parent=MyWeather -control name=ClearPortletControl/ - /entry + entry parent=MyWeather +control name=ClearPortletControl/ + /entry /portlets -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html customizer-portletset-add.vm
taylor 2002/07/22 21:54:36
Modified:buildbuild.xml
src/java/org/apache/jetspeed/modules/actions/controls
Customize.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
src/java/org/apache/jetspeed/services/psmlmanager
PsmlImporter.java TestMarshalPsml.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
webapp/WEB-INF/conf JetspeedSecurity.properties
webapp/WEB-INF/db jetspeed.properties
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset-add.vm
Log:
- Fixed bug 8985 - Cancel button on add portlet customizer page does reset
- Brought DB-PSML feature up-to-date to work with new 1.4 release.
- Added support to DB-PSML for query() method to return full profiles
- Removed auto-run feature of DB-PSML - too many init() problems from users - it now
must be ran from the cmdline
(im working on that - see next commit)
Revision ChangesPath
1.152 +22 -0 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- build.xml 19 Jul 2002 10:21:46 - 1.151
+++ build.xml 23 Jul 2002 04:54:36 - 1.152
@@ -862,6 +862,28 @@
/junit
/target
+!-- === --
+!-- PSML Importer --
+!-- === --
+target name=import depends=compile
+description=Import PSML
+
+junit printsummary=yes haltonfailure=yes haltonerror=yes fork=yes
+
+classpath
+pathelement location=${build.dest.dir}/
+path refid=classpath/
+pathelement location=${junit.jar}/
+pathelement location=${hsql.jar}/
+/classpath
+
+formatter type=plain usefile=false/
+
+!-- JUnit unit tests --
+test name=org.apache.jetspeed.services.psmlmanager.TestPsmlImporter/
+
+/junit
+/target
!-- === --
!-- Run the client JUnit test cases (non-cactus) on the Caching system --
1.12 +1 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java
Index: Customize.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Customize.java23 Jul 2002 00:03:54 - 1.11
+++ Customize.java23 Jul 2002 04:54:36 - 1.12
@@ -107,6 +107,7 @@
jdata.setCustomized(null);
p = jdata.getCustomized();
}
+ jdata.setCustomized(null);
}
1.22 +4 -6
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CustomizeSetAction.java 23 Jul 2002 00:03:54 - 1.21
+++ CustomizeSetAction.java 23 Jul 2002 04:54:36 - 1.22
@@ -186,6 +186,7 @@
template = TemplateLocator.locatePortletTemplate(rundata,
buffer.toString());
context.put(feature,template);
+
}
if (set==null) return;
@@ -292,11 +293,9 @@
/** Clean up the customization state */
public void doCancel(RunData rundata, Context context)
{
-((JetspeedRunData)rundata).setCustomized(null);
-if (((JetspeedRunData)rundata).getCustomized()==null)
-{
-rundata.setScreenTemplate(Home);
-}
+//((JetspeedRunData)rundata).setCustomized(null);
+//rundata.setScreenTemplate(Home);
+rundata.getUser().setTemp(mode, layout);
}
/** Save the general informations for this set */
@@ -329,7 +328,6 @@
public void doApply(RunData rundata, Context context)
{
doSave(rundata, context);
-doCancel(rundata, context
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/07/22 21:57:43 Modified:docs/site changes.html xdocschanges.xml Log: changes Revision ChangesPath 1.30 +8 -0 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- changes.html 23 Jul 2002 03:11:59 - 1.29 +++ changes.html 23 Jul 2002 04:57:42 - 1.30 @@ -130,6 +130,14 @@ -- /ul li + Fix - 2002/07/22 - Fixed Cancel bug so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) +/li +li + Fix - 2002/07/22 - Brought DB-PSML feature up-to-date to work with new 1.4 release. (DST) + - Added support to DB-PSML for query() method to return full profiles (DST) + - Removed auto-run feature of DB-PSML - too many init() problems from users - it now must be ran from the cmdline (DST) +/li +li Add - 2002/07/22 - Context variable portlet_instance to VelocityPortletControl (PS) /li li 1.50 +9 -1 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- changes.xml 23 Jul 2002 03:11:58 - 1.49 +++ changes.xml 23 Jul 2002 04:57:42 - 1.50 @@ -24,6 +24,14 @@ -- /ul li + Fix - 2002/07/22 - Fixed Cancel bug so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) +/li +li + Fix - 2002/07/22 - Brought DB-PSML feature up-to-date to work with new 1.4 release. (DST) + - Added support to DB-PSML for query() method to return full profiles (DST) + - Removed auto-run feature of DB-PSML - too many init() problems from users - it now must be ran from the cmdline (DST) +/li +li Add - 2002/07/22 - Context variable portlet_instance to VelocityPortletControl (PS) /li li -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/html default.psml
taylor 2002/07/22 22:30:04 Modified:src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_de.properties JetspeedLocalization_en.properties JetspeedLocalization_es.properties JetspeedLocalization_fr.properties src/java/org/apache/jetspeed/portal BasePortletSet.java webapp/WEB-INF/conf JetspeedSecurity.properties webapp/WEB-INF/psml/group/apache/html news.psml webapp/WEB-INF/psml/role/admin/html default.psml Log: - Added patch from Scott Weaver to BasePortletSet to complete PSML page-level security. - Localized error messages - As example, Added user-only security-ref to group/apache/page/news page. - As example, Added admin-only security-ref to role/admin page. Revision ChangesPath 1.6 +2 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties Index: JetspeedLocalization_de.properties === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JetspeedLocalization_de.properties25 Feb 2002 04:38:12 - 1.5 +++ JetspeedLocalization_de.properties23 Jul 2002 05:30:04 - 1.6 @@ -21,6 +21,8 @@ LOGOUTUSER_THANKS=Vielen Dank für Ihren Besuch. Bitte kommen Sie bald wieder. +SECURITY_NO_ACCESS=Sie haben nicht Access zu diesen portlets. + SENDCONFIRMATIONEMAIL_BODY1=Herzlich Willkommen bei Jyve\n\n\ Ihr neuer Zugang wurde erstellt.\n\n\ Dies ist Ihr Authorisierungscode:\n\n\ 1.18 +2 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties Index: JetspeedLocalization_en.properties === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- JetspeedLocalization_en.properties30 Jun 2002 05:23:19 - 1.17 +++ JetspeedLocalization_en.properties23 Jul 2002 05:30:04 - 1.18 @@ -14,6 +14,8 @@ LOGINHELP_TITLE=Account Login Assistance LOGINHELP_NOTICE=If you need additional assistance, please send email to the address below. +SECURITY_NO_ACCESS=You do not have access to these portlets. + PASSWORDREMINDER_EMAIL_HEADER=Hello PASSWORDREMINDER_EMAIL_BODY1=Your jetspeed account password is: PASSWORDREMINDER_EMAIL_BODY2=You can now go to the jetspeed site and login. 1.6 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties Index: JetspeedLocalization_es.properties === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JetspeedLocalization_es.properties25 Feb 2002 04:38:12 - 1.5 +++ JetspeedLocalization_es.properties23 Jul 2002 05:30:04 - 1.6 @@ -21,6 +21,8 @@ CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, the passwords do not match. CREATENEWUSERANDCONFIRM_DUPLICATEMSG=Elija otro nombre de usuario. +SECURITY_NO_ACCESS=Usted no tiene acceso a estas portlets. + DISPLAYUSER_EMAILMSG=Your Email: DISPLAYUSER_INFOMSG=Below is the information you requested: DISPLAYUSER_LOGINMSG=Last Login: 1.8 +2 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties Index: JetspeedLocalization_fr.properties === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- JetspeedLocalization_fr.properties21 Mar 2002 11:13:11 - 1.7 +++ JetspeedLocalization_fr.properties23 Jul 2002 05:30:04 - 1.8 @@ -24,6 +24,8 @@ LOGOUTUSER_THANKS=Merci d'avoir utiliseacute; le systegrave;me. A bientôt. +SECURITY_NO_ACCESS=Vous n'avez pas acces a ces portlets. + SENDCONFIRMATIONEMAIL_BODY1=Bienvenue sur Jetspeed\n\n\ Votre nouveau compte a eacute;teacute; creacute;eacute;.\n\n\ Votre clef secregrave;te est :\n\n 1.23 +21 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java Index: BasePortletSet.java
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/07/22 22:33:59 Modified:docs/site changes.html xdocschanges.xml Log: changes Revision ChangesPath 1.31 +7 -1 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- changes.html 23 Jul 2002 04:57:42 - 1.30 +++ changes.html 23 Jul 2002 05:33:59 - 1.31 @@ -130,7 +130,13 @@ -- /ul li - Fix - 2002/07/22 - Fixed Cancel bug so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) + Fix - 2002/07/22 - Fixed bug #8830 to complete PSML page-level security (with Scott Weaver's patch). (DST) + - Localized page-level security error messages (DST) + - As example, Added user-only security-ref to group/apache/page/news page. (DST) + - As example, Added admin-only security-ref to role/admin page. (DST) +/li +li + Fix - 2002/07/22 - Fixed Cancel bug #8985 so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) /li li Fix - 2002/07/22 - Brought DB-PSML feature up-to-date to work with new 1.4 release. (DST) 1.51 +8 -2 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- changes.xml 23 Jul 2002 04:57:42 - 1.50 +++ changes.xml 23 Jul 2002 05:33:59 - 1.51 @@ -24,7 +24,13 @@ -- /ul li - Fix - 2002/07/22 - Fixed Cancel bug so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) + Fix - 2002/07/22 - Fixed bug #8830 to complete PSML page-level security (with Scott Weaver's patch). (DST) + - Localized page-level security error messages (DST) + - As example, Added user-only security-ref to group/apache/page/news page. (DST) + - As example, Added admin-only security-ref to role/admin page. (DST) +/li +li + Fix - 2002/07/22 - Fixed Cancel bug #8985 so that it goes back to the previous page without saving in Add Portlets feature of Customizer. (DST) /li li Fix - 2002/07/22 - Brought DB-PSML feature up-to-date to work with new 1.4 release. (DST) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/wml default.vm
taylor 2002/07/23 10:26:08 Modified:webapp/WEB-INF/templates/vm/layouts/wml default.vm Log: Patch from Scott Weaver to fix WAP DTD URL Revision ChangesPath 1.4 +1 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/wml/default.vm Index: default.vm === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/wml/default.vm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.vm6 Dec 2001 06:03:40 - 1.3 +++ default.vm23 Jul 2002 17:26:08 - 1.4 @@ -1,6 +1,5 @@ ?xml version=1.0 ? -!DOCTYPE wml PUBLIC -//WAPFORUM//DTD WML 1.1//EN - http://www.wapform.org/DTD/wml_1.1.xml; +!DOCTYPE wml PUBLIC -//WAPFORUM//DTD WML 1.1//EN http://www.wapforum.org/DTD/wml_1.1.xml; wml $navigation.setTemplate(wml/top.vm) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/xdocs changes.xml psml_db.xml
taylor 2002/07/23 14:18:32
Modified:buildbuild.xml
docs/site changes.html psml_db.html
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java PsmlImporter.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
webapp/WEB-INF/conf JetspeedResources.properties
webapp/WEB-INF/db jetspeed.properties
xdocschanges.xml psml_db.xml
Log:
- Updated PsmlImporter to run from command line only. Run ant import
- Importer now supports exporting both ways (file system to db, db to file system)
- Updated docs for new PSML import-export process
Revision ChangesPath
1.153 +2 -9 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- build.xml 23 Jul 2002 04:54:36 - 1.152
+++ build.xml 23 Jul 2002 21:18:31 - 1.153
@@ -868,21 +868,14 @@
target name=import depends=compile
description=Import PSML
-junit printsummary=yes haltonfailure=yes haltonerror=yes fork=yes
-
+java fork=true
classname=org.apache.jetspeed.services.psmlmanager.PsmlImporter
classpath
pathelement location=${build.dest.dir}/
path refid=classpath/
pathelement location=${junit.jar}/
pathelement location=${hsql.jar}/
/classpath
-
-formatter type=plain usefile=false/
-
-!-- JUnit unit tests --
-test name=org.apache.jetspeed.services.psmlmanager.TestPsmlImporter/
-
-/junit
+/java
/target
!-- === --
1.32 +5 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- changes.html 23 Jul 2002 05:33:59 - 1.31
+++ changes.html 23 Jul 2002 21:18:32 - 1.32
@@ -130,6 +130,11 @@
--
/ul
li
+ Update - 2002/07/23 - Updated PsmlImporter to run from command line only. Run
ant import (DST)
+ - Importer now supports exporting both ways (file system to
db, db to file system) (DST)
+ - Updated docs for new PSML
import-export process (DST)
+/li
+li
Fix - 2002/07/22 - Fixed bug #8830 to complete PSML page-level security (with
Scott Weaver's patch). (DST)
- Localized page-level security error messages (DST)
- As example, Added user-only
security-ref to group/apache/page/news page. (DST)
1.11 +176 -14 jakarta-jetspeed/docs/site/psml_db.html
Index: psml_db.html
===
RCS file: /home/cvs/jakarta-jetspeed/docs/site/psml_db.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- psml_db.html 17 Jul 2002 07:07:23 - 1.10
+++ psml_db.html 23 Jul 2002 21:18:32 - 1.11
@@ -421,8 +421,10 @@
trtd
blockquote
p
- To switch to the Database PSML Manager, the following
settings
- will need to be modified in the
JetspeedResources.properties. Here are the default settings:
+ To switch to the Database PSML Manager, modify the
PSML Manager settings in the JetspeedResources.properties.
+You can select your active PSML Manager service by uncommenting it.
There can only be one PSML Service active.
+ The default is the file-based service:
'CastorPsmlManagerService'. If you uncomment one service, you must comment the other
service.
+ Here are the default setting:
/p
div align=left
table cellspacing=4 cellpadding=0 border=0
@@ -435,8 +437,6 @@
td bgcolor=#023264 width=1img src=/images/void.gif width=1
height=1 vspace=0 hspace=0 border=0//td
td bgcolor=#ffpre
services.PsmlManager.classname=org.apache.jetspeed.services.psmlmanager.CastorPsmlManagerService
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties
taylor 2002/07/28 19:25:28
Modified:src/java/org/apache/jetspeed/modules/actions/portlets/browser
DatabaseBrowserAction.java
src/java/org/apache/jetspeed/om/dbpsml/map
JetspeedGroupProfileMapBuilder.java
JetspeedRoleProfileMapBuilder.java
JetspeedUserProfileMapBuilder.java
src/java/org/apache/jetspeed/portal
JetspeedPortletInstance.java
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java PsmlImporter.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
src/java/org/apache/jetspeed/util/template JetspeedTool.java
webapp/WEB-INF/conf JetspeedSecurity.properties
Log:
- PSML Importer now updates if it fails to create
- Added option to PSML Importer to check for existing input (optional)
- Cleaned up error msgs, null pointer checks
Revision ChangesPath
1.22 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java
Index: DatabaseBrowserAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DatabaseBrowserAction.java28 Jun 2002 05:37:29 - 1.21
+++ DatabaseBrowserAction.java29 Jul 2002 02:25:27 - 1.22
@@ -205,7 +205,7 @@
}
else
{
-Log.error(The sql query is null, hence not generating the
result set.);
+Log.info(The sql query is null, hence not generating the
result set.);
}
}
else
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java
Index: JetspeedGroupProfileMapBuilder.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedGroupProfileMapBuilder.java 26 Jul 2002 01:47:20 - 1.9
+++ JetspeedGroupProfileMapBuilder.java 29 Jul 2002 02:25:27 - 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedGroupProfileMapBuilder implements MapBuilder
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java
Index: JetspeedRoleProfileMapBuilder.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedRoleProfileMapBuilder.java26 Jul 2002 01:47:20 - 1.9
+++ JetspeedRoleProfileMapBuilder.java29 Jul 2002 02:25:27 - 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedRoleProfileMapBuilder implements MapBuilder
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java
Index: JetspeedUserProfileMapBuilder.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedUserProfileMapBuilder.java26 Jul 2002 01:47:20 - 1.9
+++ JetspeedUserProfileMapBuilder.java29 Jul 2002 02:25:27 - 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedUserProfileMapBuilder implements MapBuilder
1.4 +6 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java
Index: JetspeedPortletInstance.java
===
RCS file:
/home/cvs/jakarta-jetspeed
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util PortletSessionState.java
taylor 2002/07/28 21:50:34
Modified:src/java/org/apache/jetspeed/util PortletSessionState.java
Log:
- check for null ptr
Revision ChangesPath
1.2 +11 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/PortletSessionState.java
Index: PortletSessionState.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PortletSessionState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletSessionState.java 26 Apr 2002 18:31:13 - 1.1
+++ PortletSessionState.java 29 Jul 2002 04:50:34 - 1.2
@@ -55,6 +55,7 @@
package org.apache.jetspeed.util;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.Log;
import org.apache.jetspeed.portal.portlets.VelocityPortlet;
import org.apache.jetspeed.portal.PortletConfig;
@@ -99,7 +100,15 @@
*/
protected static String generateKey(VelocityPortlet portlet, String name)
{
-return (portlet.getID()+.+name);
+if (portlet != null)
+{
+return (portlet.getID()+.+name);
+}
+else
+{
+Log.error(PortletSessionState: Passed null Velocity Portlet for name:
+ name);
+return name;
+}
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions JLoginUser.java
taylor 2002/07/29 11:51:18
Modified:src/java/org/apache/jetspeed/modules/actions JLoginUser.java
Log:
- Patch to check for null pointed out by Werner Ramaekers [[EMAIL PROTECTED]]
Revision ChangesPath
1.26 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JLoginUser.java 28 Jun 2002 05:37:28 - 1.25
+++ JLoginUser.java 29 Jul 2002 18:51:18 - 1.26
@@ -302,7 +302,7 @@
String confirmed = data.getUser().getConfirmed();
if (confirmed == null ||
!confirmed.equals(JetspeedResources.CONFIRM_VALUE ))
{
-if ( confirmed.equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
+if (confirmed != null
confirmed.equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
{
data.setMessage(Localization.getString(JLOGINUSER_KEYNOTVALID));
data.setScreenTemplate(NewUserRejected);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions JLoginUser.java
taylor 2002/07/29 19:44:32
Modified:src/java/org/apache/jetspeed/modules/actions JLoginUser.java
Log:
- Fixed bug with refresh pressed immediately after loggin in (resubmit params)
Revision ChangesPath
1.27 +4 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JLoginUser.java 29 Jul 2002 18:51:18 - 1.26
+++ JLoginUser.java 30 Jul 2002 02:44:32 - 1.27
@@ -192,7 +192,10 @@
// continue on with the Login procedure.
if ( data.getUserFromSession() != null )
{
-return;
+if (data.getUser().hasLoggedIn())
+{
+return;
+}
}
String username = data.getParameters().getString(username, );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties
taylor 2002/07/29 22:45:21
Modified:src/java/org/apache/jetspeed/modules/actions JLoginUser.java
webapp/WEB-INF/conf JetspeedSecurity.properties
Log:
- Removing check for relogon altogether. After checking the logic and running tests,
it appears it isn;t necessary
Revision ChangesPath
1.28 +1 -12
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JLoginUser.java 30 Jul 2002 02:44:32 - 1.27
+++ JLoginUser.java 30 Jul 2002 05:45:21 - 1.28
@@ -185,18 +185,6 @@
public void doPerform( RunData rundata ) throws Exception
{
JetspeedRunData data = (JetspeedRunData)rundata;
-
-// This prevents a db hit on second Action call during page
-// generation. Turbine removes everything from the Session
-// before calling this method, so in this case we should
-// continue on with the Login procedure.
-if ( data.getUserFromSession() != null )
-{
-if (data.getUser().hasLoggedIn())
-{
-return;
-}
-}
String username = data.getParameters().getString(username, );
String password = data.getParameters().getString(password, );
@@ -398,4 +386,5 @@
}
}
+
}
1.25 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml JetspeedUserProfilePeer.java
taylor 2002/08/13 15:12:06 Modified:src/java/org/apache/jetspeed/om/dbpsml JetspeedUserProfilePeer.java Log: patch to fix update in User DB PSML from Mark Orciuch Revision ChangesPath 1.7 +2 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java Index: JetspeedUserProfilePeer.java === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JetspeedUserProfilePeer.java 26 Jul 2002 01:47:20 - 1.6 +++ JetspeedUserProfilePeer.java 13 Aug 2002 22:12:06 - 1.7 @@ -107,6 +107,7 @@ Criteria values = buildCriteria(userProfile); Criteria select = buildCriteria(userProfile); select.remove(PROFILE); +BasePeer.doUpdate( select, values ); } } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/08/13 15:24:53
Modified:docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeAction.java
webapp/WEB-INF/conf JetspeedSecurity.properties
webapp/WEB-INF/templates/vm/portlets/html
customizer-portlet.vm
xdocschanges.xml
Log:
Patch from Mark Orciuch , enhacement for customizing the portle title
Revision ChangesPath
1.42 +6 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- changes.html 8 Aug 2002 03:05:41 - 1.41
+++ changes.html 13 Aug 2002 22:24:53 - 1.42
@@ -130,6 +130,12 @@
--
/ul
li
+ Add - 2002/08/13 - Bug fixes: enhancement to customizing portlet title, DB-PSML
User update bug fixed
+/li
+li
+ Add - 2002/08/13 - Export-To-File-System Feature Added to PSML Browser
+/li
+li
Add - 2002/08/07 - Customizer can now add a reference.
/li
li
1.13 +46 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java
Index: CustomizeAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CustomizeAction.java 5 Jul 2002 18:14:12 - 1.12
+++ CustomizeAction.java 13 Aug 2002 22:24:53 - 1.13
@@ -78,6 +78,7 @@
import org.apache.jetspeed.services.PortalToolkit;
import org.apache.jetspeed.services.security.PortalResource;
import org.apache.jetspeed.portal.PortletInstance;
+import org.apache.jetspeed.util.MetaData;
// Turbine stuff
import org.apache.turbine.util.Log;
@@ -166,6 +167,14 @@
if (p.getPortletConfig().getSkin() != null)
context.put(current_skin,
p.getPortletConfig().getPortletSkin().getName());
+Profile profile = ((JetspeedRunData)rundata).getProfile();
+String currentTitle =
profile.getDocument().getEntryById(p.getID()).getTitle();
+if (currentTitle == null p.getPortletConfig().getMetainfo() != null)
+{
+currentTitle = p.getPortletConfig().getMetainfo().getTitle();
+}
+context.put(current_title, currentTitle);
+
}
/** Clean up the customization state */
@@ -188,8 +197,9 @@
List params = (List)rundata.getSession().getAttribute(parameters);
String newSecurityParent =
rundata.getParameters().getString(_security_ref);
String newSkinName = (String) rundata.getParameters().getString(_skin);
+String newTitle = (String)
rundata.getParameters().getString(current_title);
-boolean changeRequested = ( (params == null) || (newSkinName == null) ||
(newSecurityParent == null));
+boolean changeRequested = ( (params == null) || (newSkinName == null) ||
(newSecurityParent == null) || (newTitle == null));
boolean madePsChange = false;
boolean madePcChange = false;
@@ -275,6 +285,41 @@
entry.setSkin(null);
}
madePcChange = true;
+}
+}
+
+// Only update the title if the title changed
+if (newTitle != null)
+{
+boolean titleChanged = false;
+String currentTitle = entry.getTitle();
+
+MetaData md = pc.getMetainfo();
+if (currentTitle == null md != null md.getTitle() != null)
+currentTitle = md.getTitle();
+
+if (currentTitle != null)
+{
+titleChanged = (newTitle.equals(currentTitle) == false);
+}
+else
+{
+titleChanged = (newTitle.trim().length() 0);
+}
+
+if (titleChanged == true)
+{
+
+if ((newTitle.trim().length() 0))
+{
+if (md == null) {
+md = new MetaData();
+pc.setMetainfo(md);
+}
+md.setTitle(newTitle);
+entry.setTitle(newTitle);
+madePcChange = true;
+}
}
}
1.28
cvs commit: jakarta-jetspeed/xdocs changes.xml todo.xml
taylor 2002/08/14 19:17:53 Modified:docs/site changes.html todo.html src/java/org/apache/jetspeed/portal BasePortletSet.java xdocschanges.xml todo.xml Log: update TODO list for next release Revision ChangesPath 1.44 +6 -0 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- changes.html 14 Aug 2002 03:28:03 - 1.43 +++ changes.html 15 Aug 2002 02:17:53 - 1.44 @@ -130,6 +130,12 @@ -- /ul li + Add - 2002/08/13 - Bug fixes: enhancement to customizing portlet title allowing for multiple instances of same portlet on a page with different titles +/li +li + Add - 2002/08/13 - DB-PSML User update bug fixed +/li +li Add - 2002/08/13 - Added checkStyle to build process. (PS) /li li 1.30 +409 -10 jakarta-jetspeed/docs/site/todo.html Index: todo.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/todo.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- todo.html 12 Aug 2002 02:25:39 - 1.29 +++ todo.html 15 Aug 2002 02:17:53 - 1.30 @@ -206,6 +206,13 @@ liTurbine to release 2.2b2/li liVelocity to version 1.3/li liXerces to version 2.0.2/li + liHypersonic/li + liTurbine and related/li + liTorque/li + liXalan/li + liCastor/li + liAnt/li + liDocumentation Page for Jar Files/li /ul /font @@ -260,14 +267,277 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -Bug Fixes +Review all Bugs in Bugzilla. Create a list of ones we want to fix and assign amonst us. /font /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif +PS, DT +/font +/td +/tr +tr +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +nbsp; +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Fix all other bugs identified in above Task +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +nbsp; +/font +/td +/tr +tr +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +nbsp; +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +Cleanup JRP, TRP +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +DT +/font +/td +/tr +tr +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +nbsp; +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif + +Jetspeed Security Enhancements. +ul + liChange Security as proposed by Jan Grant (DT)/li + liOwner rule (Add owner support in authorization) (PS)/li + lidefault security ref per portlet, per portlet-set (for customizer during Add Portlet)/li +/ul + +/font +/td +td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left +font color=#00 size=-1 face=arial,helvetica,sanserif +nbsp; +/font +/td
cvs commit: jakarta-jetspeed/build build.xml
taylor 2002/08/15 16:55:54
Modified:buildbuild.xml
Log:
hotdeploy target now copies over web-inf deltas
Revision ChangesPath
1.155 +5 -0 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- build.xml 14 Aug 2002 03:27:18 - 1.154
+++ build.xml 15 Aug 2002 23:55:54 - 1.155
@@ -613,6 +613,11 @@
exclude name=cactus.properties/
/fileset
/copy
+ copy todir=${deploy.war}/jetspeed
+fileset dir=${webapp.dir}
+/fileset
+ /copy
+
/target
!-- === --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/template BaseJetspeedLink.java
taylor 2002/08/16 17:02:25
Modified:src/java/org/apache/jetspeed/util/template
BaseJetspeedLink.java
Log:
Fixed bug in country and media type links
Revision ChangesPath
1.15 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
Index: BaseJetspeedLink.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BaseJetspeedLink.java 23 Jul 2002 00:03:55 - 1.14
+++ BaseJetspeedLink.java 17 Aug 2002 00:02:24 - 1.15
@@ -619,7 +619,7 @@
// Set Country in path
if (country != null)
{
-if (mediaType.length() 0)
+if (country.length() 0)
uri.addPathInfo( Profiler.PARAM_COUNTRY, country);
else
uri.removePathInfo( Profiler.PARAM_COUNTRY);
@@ -1236,7 +1236,7 @@
public DynamicURI setMediaType(String mediaType)
{
-return getLink( JetspeedLink.CURRENT, null, null, JetspeedLink.DEFAULT,
null, null,null,null,mediaType);
+return getLink( JetspeedLink.CURRENT, null, null, JetspeedLink.DEFAULT,
null, null,null,mediaType);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_nl.properties
taylor 2002/08/19 14:25:21 Added: src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_nl.properties Log: Dutch translation of Jetspeed resources, contributed by Werner Ramaekers Revision ChangesPath 1.1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_nl.properties Index: JetspeedLocalization_nl.properties === # # The English values MUST be maintained in addition the default value due to the # way Java behaves when English is NOT the default language. # # Nederlandse versie door Werner Ramaekers a href=mailto:[EMAIL PROTECTED];[EMAIL PROTECTED]/a [EMAIL PROTECTED] LOGIN_USERNAME=Gebruikersnaam: LOGIN_PASSWORD=Paswoord: LOGIN_REMEMBERME=Automatisch inloggen LOGIN_LOGIN=Inloggen LOGIN_NEW_ACCOUNT=Maak een nieuw profiel aan LOGIN_TITLE=Login profiel LOGINHELP_TITLE=Hulp bij het inloggen LOGINHELP_NOTICE=Heeft u problemen bij het inloggen,stuur dan een e-mail naar onderstaand adres. SECURITY_NO_ACCESS=U hebt niet de nodige rechten voor de deze portlets. PASSWORDREMINDER_EMAIL_HEADER=Hallo PASSWORDREMINDER_EMAIL_BODY1=Uw KBVB portal paswoord is: PASSWORDREMINDER_EMAIL_BODY2=U kan nu naar de KBVB portal site gaan en inloggen. PASSWORDREMINDER_EMAIL_FOOTER=Vriendelijke groeten, PASSWORDREMINDER_EMAIL_PS=PS: vergeet niet dat uw gebruikersnaam de volgende : PASSWORDREMINDER_EMAIL_SUBJECT=Paswoord voor KBVB portal CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, de paswoorden stemmen niet overeen. CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, u moet een gebruikersnaam invullen. CREATENEWUSERANDCONFIRM_NOEMAIL=Sorry, u moet een geldig e-mail adres invullen. CREATENEWUSERANDCONFIRM_CHOOSENEWNAME=Sorry, die gebruikersnaam bestaat al. Gelieve een andere te kiezen. CREATENEWUSERANDCONFIRM_CREATE=Uw nieuw profiel werd aangemaakt! CREATENEWUSERANDCONFIRM_DUPLICATEMSG=Kies een andere naam. JLOGINUSER_KEYNOTVALID=Sorry, de geheime sleutel die u heeft ingevuld is niet geldig. JLOGINUSER_WELCOME=Welkom! Uw registratie is bevestigd. U kan n het systeem gebruiken. JLOGINUSER_NAMENOTVALID=Sorry, die gebruikersnaam is niet geldig. Verzeker u ervan dat u de URL uit de email goed hebt overgenomen of maak een nieuw profiel aan. JLOGINUSER_CONFIRMFIRST=Sorry, maar u moet eerst uw profiel bevestigen alvorens in te loggen. JLOGINUSER_NOAUTHUSERROLE=De rol authenticated_user bestaat niet in de databank. JLOGINUSER_PASSWORDREMINDER_INVALIDUSER=Sorry, die gebruikersnaam is niet geldig. JLOGINUSER_PASSWORDREMINDER_SENT=Uw paswoord werd verzonden. JLOGINUSER_PASSWORDREMINDER_ERROR=Probleem bij het verzenden van uw paswoord : LOGOUTUSER_THANKS=Bedankt om ons systeem te gebruiken. Hopelijk komt u snel weer langs. SENDCONFIRMATIONEMAIL_BODY1=Welkom op de KBVB portal site. Uw profield werd \n\ aangemaakt. Gelieve in te loggen met de geheime sleutel om uw \n\ registratie te bevestigen:\n SENDCONFIRMATIONEMAIL_BODY2=Ga naar de volgende URL om uw profiel te bevestigen :\n\n SENDCONFIRMATIONEMAIL_SENT=Email verzonden! SENDCONFIRMATIONEMAIL_ERROR=Fout bij het verzenden van de email: SENDCONFIRMATIONEMAIL_FOOTER=Vriendelijke groeten, SENDCONFIRMATIONEMAIL_HEADER=Hallo SENDCONFIRMATIONEMAIL_SUBJECT=KBVB portal : registratie van een nieuwe gebruiker SENDUSEREMAIL_IDNOTVALID=Gelieve een geldige gebruikersnaam in te vullen. SENDUSEREMAIL_EMAILNOTVALID=Deze gebruiker heeft momenteel geen geldig email adres. SENDUSEREMAIL_FILLTHEFORM=Gelieve onderstaande velden in te vullen. SENDUSEREMAIL_SENT=Email verzonden! SESSIONVALIDATOR_SESSIONNOTVALID=Er is een fout opgetreden, uw sessie is geldig, maar de scherm variable is niet bepaald. SHOWEDIT_MUSTLOGIN=U moet inloggen alvorens u dit kan editeren. UPDATEACCOUNT_NOTLOGGEDIN=U moet inloggen alvorens u uw profiel kan bewerken. UPDATEACCOUNT_PWNOTMATCH=Sorry, de paswoorden stemmen niet overeen. UPDATEACCOUNT_NOFIRSTNAME=Sorry, u moet een geldige gebruikersnaam invullen. UPDATEACCOUNT_NOLASTNAME=Sorry, u moet een naam invullen. UPDATEACCOUNT_NOEMAIL=Sorry, u moet een geldig email adres invullen. UPDATEACCOUNT_DONE=Uw profiel werd aangepast! UPDATEACCOUNT_NOUSER=De gebruiker kan niet gevonden worden. UPDATEACCOUNT_NEWEMAILCONFIRM=U hebt uw e-mail address aangepast. U zal dit moeten bevestigen alvorens verder te kunnen werken. Gelieve uw mailbox te willen controleren voor een mail van KBVB portal. UPDATEACCOUNT_BADOLDPASSWORD=Sorry, het oude paswoord is niet juist. CONFIRMREGISTRATION_TITLE=Bevestig de registratie CONFIRMREGISTRATION_NOUSERNAME=Sorry, er moet een gebruikersnaam zijn ingevuld. CONFIRMREGISTRATION_MESSAGE=Gelieve uw mailbox te willen controleren voor de geheime sleutel. Deze sleutel is noodzakelijk om uw registratie te kunnen bevestigen
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine TurbineUserPeer.java
taylor 2002/08/19 14:40:14
Modified:src/java/org/apache/jetspeed/om/security/turbine
TurbineUserPeer.java
Log:
Patch from Amit Amte to fix bug when columns in db table don't exist in JetspeedUser
Revision ChangesPath
1.3 +28 -32
jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/TurbineUserPeer.java
Index: TurbineUserPeer.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/TurbineUserPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineUserPeer.java 28 Jun 2002 05:37:32 - 1.2
+++ TurbineUserPeer.java 19 Aug 2002 21:40:13 - 1.3
@@ -162,7 +162,7 @@
/*
* Populates a JetspeedUser from a single row in the result set.
* The hashtable of attributes for each user is populated with columns
- * from the result set.
+ * from the result set.
*
* @param row a row containing a single user's attributes.
* @param user the JetspeedUser object to be populated.
@@ -171,24 +171,10 @@
protected static void populateUserObject(Record row, int offset, JetspeedUser
user)
throws Exception
{
-// Set values are where columns are expected. They are not
-// required to be in these positions, as we set the positions
-// immediately following.
-int idPosition = 1;
-int objectDataPosition = columnNames.length;
-for( int i=0; icolumnNames.length; i++ )
-{
-if (columnNames[i].equals(USER_ID))
-idPosition = i+1;
-
-if (columnNames[i].equals(TURBINE_OBJECTDATA))
-objectDataPosition = i+1;
-}
-
// Restore the Permanent Storage Hashtable. First the
// Hashtable is restored, then any explicit table columns
// which should be included in the Hashtable are added.
-byte[] objectData = (byte[])row.getValue(objectDataPosition).asBytes();
+byte[] objectData = (byte[])row.getValue(OBJECTDATA).asBytes();
Hashtable tempHash = (Hashtable)ObjectUtils.deserialize(objectData);
if (tempHash == null)
{
@@ -197,37 +183,46 @@
for( int j=0; jcolumnNames.length; j++ )
{
-if (! columnNames[j].equalsIgnoreCase( TURBINE_OBJECTDATA ) )
+if (! columnNames[j].equalsIgnoreCase( OBJECTDATA ) )
{
Object obj2 = null;
-Value value = row.getValue(j+1);
-if (value.isString())
+Value value = null;
+try {
+value = row.getValue(columnNames[j]);
+} catch (Exception ex) {
+// Column missing from the torque record ..
+// Probable/intentional mis-match between the
+// torque schema and db table
+continue;
+}
+
+if (value.isString())
obj2 = value.asString();
-else if (value.isBigDecimal())
+else if (value.isBigDecimal())
obj2 = value.asBigDecimal();
-else if (value.isBytes())
+else if (value.isBytes())
obj2 = value.asBytes();
-else if (value.isDate())
+else if (value.isDate())
obj2 = value.asDate();
-else if (value.isShort())
+else if (value.isShort())
obj2 = new Short(value.asShort());
-else if (value.isInt())
+else if (value.isInt())
obj2 = new Integer(value.asInt());
-else if (value.isLong())
+else if (value.isLong())
obj2 = new Long(value.asLong());
-else if (value.isDouble())
+else if (value.isDouble())
obj2 = new Double(value.asDouble());
-else if (value.isFloat())
+else if (value.isFloat())
obj2 = new Float(value.asFloat());
-else if (value.isBoolean())
+else if (value.isBoolean())
obj2 = new Boolean(value.asBoolean());
-else if (value.isTime())
+else if (value.isTime())
obj2 = value.asTime();
-else if (value.isTimestamp())
+else if (value.isTimestamp())
obj2 = value.asTimestamp();
-else if (value.isUtilDate())
+else if (value.isUtilDate
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_ja.properties
taylor 2002/08/20 23:17:37 Added: src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_ja.properties Log: Japanese localisation of Jetspeed, contributed by Shinsuke SUGAYA Revision ChangesPath 1.1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_ja.properties Index: JetspeedLocalization_ja.properties === # # The English values MUST be maintained in addition the default value due to the # way Java behaves when English is NOT the default language. # LOCALIZATION_MAINTAINER=Jetspeed \u958b\u767a\u30c1\u30fc\u30e0 LOGIN_USERNAME=\u30e6\u30fc\u30b6\u30fc\u540d: LOGIN_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9: LOGIN_REMEMBERME=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u8a18\u61b6 LOGIN_LOGIN=\u30ed\u30b0\u30a4\u30f3 LOGIN_NEW_ACCOUNT=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u4f5c\u6210 LOGIN_TITLE=\u30a2\u30ab\u30a6\u30f3\u30c8\u30ed\u30b0\u30a4\u30f3 LOGINHELP_TITLE=\u30a2\u30ab\u30a6\u30f3\u30c8\u30ed\u30b0\u30a4\u30f3\u30a2\u30b7\u30b9\u30bf\u30f3\u30c8 LOGINHELP_NOTICE=\u3055\u3089\u306b\u652f\u63f4\u304c\u5fc5\u8981\u306a\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u30a2\u30c9\u30ec\u30b9\u306b\u30e1\u30fc\u30eb\u3092\u9001\u3063\u3066\u304f\u3060\u3055\u3044\u3002 SECURITY_NO_ACCESS=\u3053\u308c\u3089\u306e Portlet \u3078\u306e\u30a2\u30af\u30bb\u30b9\u306f\u3067\u304d\u307e\u305b\u3093\u3002 PASSWORDREMINDER_EMAIL_HEADER=\u3053\u3093\u306b\u3061\u306f PASSWORDREMINDER_EMAIL_BODY1=Jetspeed \u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30d1\u30b9\u30ef\u30fc\u30c9: PASSWORDREMINDER_EMAIL_BODY2=Jetspeed \u30b5\u30a4\u30c8\u3078\u79fb\u52d5\u3057\uff0c\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u307e\u3059\u3002 PASSWORDREMINDER_EMAIL_FOOTER=\u4ee5\u4e0a\u3092\u3088\u308d\u3057\u304f\u304a\u9858\u3044\u3057\u307e\u3059\u3002\n PASSWORDREMINDER_EMAIL_PS=PS: \u30e6\u30fc\u30b6\u30fc\u540d\u3092\u5fd8\u308c\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u30e6\u30fc\u30b6\u30fc\u540d: PASSWORDREMINDER_EMAIL_SUBJECT=\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d CREATENEWUSERANDCONFIRM_PWNOTMATCH=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002 CREATENEWUSERANDCONFIRM_NOUSERNAME=\u30e6\u30fc\u30b6\u30fc\u540d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\uff0e CREATENEWUSERANDCONFIRM_NOEMAIL=\u6709\u52b9\u306a\u96fb\u5b50\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 CREATENEWUSERANDCONFIRM_CHOOSENEWNAME=\u65e2\u306b\u305d\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306a\u30e6\u30fc\u30b6\u30fc\u540d\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 CREATENEWUSERANDCONFIRM_CREATE=\u65b0\u898f\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 CREATENEWUSERANDCONFIRM_DUPLICATEMSG=\u5225\u306a\u540d\u524d\u3092\u9078\u629e JLOGINUSER_KEYNOTVALID=\u5165\u529b\u3055\u308c\u305f\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u30ad\u30fc\u304c\u6709\u52b9\u3067\u3042\u308a\u307e\u305b\u3093\u3002 JLOGINUSER_WELCOME=\u3088\u3046\u3053\u305d! \u767b\u9332\u304c\u78ba\u8a8d\u3055\u308c\u307e\u3057\u305f\u3002\u30b7\u30b9\u30c6\u30e0\u3092\u81ea\u7531\u306b\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 JLOGINUSER_NAMENOTVALID=\u30e6\u30fc\u30b6\u30fc\u540d\u304c\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u96fb\u5b50\u30e1\u30fc\u30eb\u306e\u6709\u52b9\u306a URL \u306e\u5165\u529b\u3092\u78ba\u8a8d\u3059\u308b\u304b\u3001\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002 JLOGINUSER_CONFIRMFIRST=\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u524d\u306b\u3001\u3053\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u78ba\u8a8d\u304c\u5fc5\u8981\u3067\u3059\u3002 JLOGINUSER_NOAUTHUSERROLE=authenticated_user \u30ed\u30fc\u30eb\u304c\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 JLOGINUSER_PASSWORDREMINDER_INVALIDUSER=\u30e6\u30fc\u30b6\u30fc\u540d\u304c\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 JLOGINUSER_PASSWORDREMINDER_SENT=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002 JLOGINUSER_PASSWORDREMINDER_ERROR=\u30d1\u30b9\u30ef\u30fc\u30c9\u30ea\u30de\u30a4\u30f3\u30c0\u30fc\u306e\u9001\u4fe1\u30a8\u30e9\u30fc: LOGOUTUSER_THANKS=\u3054\u5229\u7528\u3044\u305f\u3060\u304d\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u3044\u307e\u3059\u3002\u307e\u305f\uff0c\u3054\u5229\u7528\u304f\u3060\u3055\u3044\uff0e SENDCONFIRMATIONEMAIL_BODY1=Apache \u306e Jetspeed Portal \u3078\u3088\u3046\u3053\u305d\u3002 \u65b0\u898f\u30a2\u30ab\u30a6\u30f3\u30c8
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/template JetspeedTool.java
taylor 2002/09/10 09:51:29
Modified:src/java/org/apache/jetspeed/util/template JetspeedTool.java
Log:
made rundata protected (not private)
Revision ChangesPath
1.23 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
Index: JetspeedTool.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JetspeedTool.java 21 Aug 2002 15:55:42 - 1.22
+++ JetspeedTool.java 10 Sep 2002 16:51:29 - 1.23
@@ -95,7 +95,7 @@
public class JetspeedTool implements ApplicationTool
{
/** RunData object for this request */
-private JetspeedRunData rundata = null;
+protected JetspeedRunData rundata = null;
/** Empty constructor used by introspection
*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets PortletWrapper.java
taylor 2002/09/17 08:44:00
Modified:src/java/org/apache/jetspeed/portal/security/portlets
PortletWrapper.java
Log:
Added method to get around cast firewall.
Plan to convert this code to properly use Java Proxies.
Revision ChangesPath
1.13 +7 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
Index: PortletWrapper.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PortletWrapper.java 3 Sep 2002 15:02:13 - 1.12
+++ PortletWrapper.java 17 Sep 2002 15:44:00 - 1.13
@@ -439,5 +439,10 @@
public boolean providesCustomization()
{
return wrappedPortlet.providesCustomization();
-}
+}
+
+public Portlet getPortlet()
+{
+return wrappedPortlet;
+}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/xml flow.vm column.vm
taylor 2002/09/17 08:48:54 Added: webapp/WEB-INF/templates/vm/controllers/xml flow.vm Removed: webapp/WEB-INF/templates/vm/controllers/xml column.vm Log: Fixed WML generation. Column.vm is no longer referenced in the default config. It is now called flow.vm Revision ChangesPath 1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/xml/flow.vm Index: flow.vm === #foreach ( $portlet in $portlets ) $!portlet.getContent($data) #end -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/xml column.vm
taylor 2002/09/20 10:36:24 Added: webapp/WEB-INF/templates/vm/controllers/wml flow.vm webapp/WEB-INF/templates/vm/controllers/xml column.vm Log: WML was broken since the default controller was changed in the configuration. It was column.vm, now it is flow.vm In trying to fix it last week, I accidently changed XML instead, breaking it. Hopefully Ive got it right this time... Revision ChangesPath 1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/wml/flow.vm Index: flow.vm === ##modified: Andreas Kempf, 12/10/01 ## added support for LinkPortlet ##- card title=User Home #parse(welcome.vm) pbr/ #foreach ( $portlet in $portlets ) ## Search for image #set ($img=) #set ($img=$!portlet.getPortletConfig().getInitParameter(imagewml)) #if ((!$img) || ($img==)) #set ($img=bullet.wbmp) #end ## Check and retrieve link #set ($newlink=*) #set ($newlink=$!portlet.getPortletConfig().getInitParameter(link)) ## Insert deck (local) link #if ($!newlink==*) img src=$clink.getExternal()images/wml/$img alt=/a href=#_$!portlet.Name$!portlet.Title/abr/ ## Insert link #else #set ($newtitle=*) #set ($newtitle=$!portlet.getPortletConfig().getInitParameter(anchor)) ## Display link anchor or title #if ($!newtitle==*) #set ($newtitle=$!portlet.Title) #end img src=$clink.getExternal()images/wml/$img alt=/a href=$!newlink$!newtitle/abr/ #end #end ## add Logout link br/img src=$clink.getExternal()images/wml/exit.wbmp alt=/ba href=$link.setAction(LogoutUser)Logout/a/bbr/ /p /card #foreach ( $portlet in $portlets ) $!portlet.getContent($data) #end 1.3 +0 -0 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/xml/column.vm -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db DatabasePsmlManager.java DatabasePsmlManagerService.java
taylor 2002/09/20 10:38:08
Modified:src/java/org/apache/jetspeed/om/dbpsml
JetspeedGroupProfilePeer.java
JetspeedRoleProfilePeer.java
JetspeedUserProfilePeer.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
Added: src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManager.java
Log:
Added interface for DB PSML Manager. This is necessary for a delegating PSML that I
wrote, which stores some of its PSML resources in the webapp, and others in the
database.
Revision ChangesPath
1.8 +25 -25
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java
Index: JetspeedGroupProfilePeer.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JetspeedGroupProfilePeer.java 12 Sep 2002 13:38:00 - 1.7
+++ JetspeedGroupProfilePeer.java 20 Sep 2002 17:38:07 - 1.8
@@ -20,11 +20,11 @@
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.services.psmlmanager.db.DBOperations;
import org.apache.jetspeed.services.psmlmanager.db.DBUtils;
-import org.apache.jetspeed.services.psmlmanager.db.DatabasePsmlManagerService;
+import org.apache.jetspeed.services.psmlmanager.db.DatabasePsmlManager;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.Profiler;
-/**
+/**
* The skeleton for this class was autogenerated by Torque on:
*
* [Mon Sep 10 13:30:53 PDT 2001]
@@ -34,19 +34,19 @@
* long as it does not already exist in the output directory.
*
* @author a href=mailto:[EMAIL PROTECTED];Atul Dambalkar/a
- * @version $Id$
+ * @version $Id$
*/
-public class JetspeedGroupProfilePeer
+public class JetspeedGroupProfilePeer
extends org.apache.jetspeed.om.dbpsml.BaseJetspeedGroupProfilePeer
implements DBOperations
{
-
+
/**
* Default constructor.
*/
public JetspeedGroupProfilePeer() {}
-
-
+
+
/**
* Insert a group profile record in the database table.
*
@@ -74,7 +74,7 @@
throws Exception
{
JetspeedGroupProfile groupProfile = new JetspeedGroupProfile();
-DatabasePsmlManagerService service =
(DatabasePsmlManagerService)PsmlManager.getService();
+DatabasePsmlManager service = (DatabasePsmlManager)PsmlManager.getService();
groupProfile.setGroupName(profile.getGroup().getName());
groupProfile.setMediaType(profile.getMediaType());
@@ -93,28 +93,28 @@
groupProfile.setProfile(DBUtils.portletsToBytes(
profile.getDocument().getPortlets(),
service.getMapping()));
-if (operation == INSERT)
+if (operation == INSERT)
{
super.doInsert(groupProfile, connection);
}
-else if (operation == UPDATE)
+else if (operation == UPDATE)
{
Criteria values = buildCriteria(groupProfile);
Criteria select = buildCriteria(groupProfile);
select.remove(PROFILE);
-BasePeer.doUpdate( select, values, connection );
+BasePeer.doUpdate( select, values, connection );
}
}
/**
* Delete group profile record from the database table.
- *
+ *
* @param profile Profile object that will be deleted from the database
* @param connection A database connection to use
- */
+ */
public void delete(ProfileLocator locator, DBConnection connection) throws
Exception
-{
+{
super.doDelete(buildCriteria(locator), connection);
}
@@ -154,16 +154,16 @@
return super.doSelect(criteria, connection);
}
-/**
+/**
* Delete all records from the database table for a group.
- *
+ *
* @param group Group object for which all the records will be deleted from the
database
* @param connection A database connection to use
- */
+ */
public void delete(Group group, DBConnection connection) throws Exception
-{
+{
Criteria criteria = new Criteria();
-
+
criteria.add(GROUP_NAME, group.getName());
super.doDelete(criteria, connection);
@@ -189,27 +189,27 @@
groupName = group.getName();
}
-if (groupName != null groupName.length() 0
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager CastorPsmlManagerService.java
taylor 2002/09/23 01:42:44
Modified:src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
Log:
changed private to protected in order to extend CastorPsmlManagerService
Revision ChangesPath
1.29 +48 -45
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CastorPsmlManagerService.java 29 Jul 2002 02:25:27 - 1.28
+++ CastorPsmlManagerService.java 23 Sep 2002 08:42:44 - 1.29
@@ -128,13 +128,13 @@
implements PsmlManagerService
{
// resource path constants
-private static final String PATH_GROUP = group;
-private static final String PATH_ROLE = role;
-private static final String PATH_USER = user;
+protected static final String PATH_GROUP = group;
+protected static final String PATH_ROLE = role;
+protected static final String PATH_USER = user;
// configuration keys
-private final static String CONFIG_ROOT = root;
-private final static String CONFIG_EXT = ext;
+protected final static String CONFIG_ROOT = root;
+protected final static String CONFIG_EXT = ext;
// default configuration values
public final static String DEFAULT_ROOT = /WEB-INF/psml;
@@ -144,33 +144,34 @@
public final static String DEFAULT_RESOURCE = default.psml;
// the root psml resource directory
-private String root;
+protected String root;
// base store directory
-private File rootDir = null;
+protected File rootDir = null;
// file extension
-private String ext;
+protected String ext;
/** The documents loaded by this manager */
-private Map documents = new HashMap();
+protected Map documents = new HashMap();
/** The watcher for the document locations */
-private DocumentWatcher watcher = null;
+protected DocumentWatcher watcher = null;
/** the output format for pretty printing when saving registries */
-private OutputFormat format = null;
+protected OutputFormat format = null;
/** the base refresh rate for documents */
-private long scanRate = 1000 * 60;
+protected long scanRate = 1000 * 60;
/** the import/export consumer service **/
-private PsmlManagerService consumer = null;
-private boolean importFlag = false;
+protected PsmlManagerService consumer = null;
+protected boolean importFlag = false;
// castor mapping
public static final String DEFAULT_MAPPING =
${webappRoot}/WEB-INF/conf/psml-mapping.xml;
-String mapFile = null;
+protected String mapFile = null;
+
/** the Castor mapping file name */
-private Mapping mapping = null;
+protected Mapping mapping = null;
/**
* This is the early initialization method called by the
@@ -387,7 +388,7 @@
* @param fileOrUrl a String representing either an absolute URL or an
* absolute filepath
*/
-private PSMLDocument loadDocument(String fileOrUrl)
+protected PSMLDocument loadDocument(String fileOrUrl)
{
PSMLDocument doc = null;
@@ -419,8 +420,10 @@
doc.setPortlets(portlets);
-this.watcher.addFile(fileOrUrl,f);
-
+if (this.watcher != null)
+{
+this.watcher.addFile(fileOrUrl,f);
+}
}
catch (IOException e)
{
@@ -694,9 +697,9 @@
protected class DocumentWatcher extends Thread
{
-private Map fileToName = new HashMap();
-private Map fileToDate = new HashMap();
-private boolean done = false;
+protected Map fileToName = new HashMap();
+protected Map fileToDate = new HashMap();
+protected boolean done = false;
protected DocumentWatcher()
{
@@ -1087,12 +1090,12 @@
return path.toString();
}
-private static int STATE_INIT = 0;
-private static int STATE_BASE = 1;
-private static int STATE_NAME = 2;
-private static int STATE_MEDIA = 3;
-private static int STATE_LANGUAGE = 4;
-private static int STATE_COUNTRY = 5;
+protected static int STATE_INIT = 0;
+protected static
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets CustomizeSetAction.java
taylor 2002/09/23 11:56:22
Modified:src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
Log:
Fixed bug to handle category filtering. Removed the code to reuse the portlet list
and the allportlets list from the session.
The portlet list is still stored in the session, however it is used only by
maintainUserSelections() method. The userSelectionMap is updated on filtering, or when
previous/next are clicked. On clicking apply all the entries in the userSelectionMap
are committed.Added start parameter to the url after doFilterCategory is called as
otherwise the session variables are cleared.
Revision ChangesPath
1.30 +38 -12
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CustomizeSetAction.java 17 Sep 2002 00:23:22 - 1.29
+++ CustomizeSetAction.java 23 Sep 2002 18:56:22 - 1.30
@@ -134,6 +134,7 @@
private static final String USER_SELECTIONS =
session.portlets.user.selections;
private static final String UI_PORTLETS_SELECTED = portletsSelected;
private static final String PORTLET_LIST = session.portlets.list;
+private static final String ALL_PORTLET_LIST = session.all.portlets.list;
private static final String PORTLET_LIST_PAGE_SIZE =
session.portlets.page.size;
/**
@@ -282,6 +283,7 @@
int start = rundata.getParameters().getInt(start, -1);
if (start 0)
{
+//System.out.println(Clearing session variables);
start = 0;
PortletSessionState.clearAttribute(rundata,USER_SELECTIONS);
PortletSessionState.clearAttribute(rundata,PORTLET_LIST);
@@ -558,6 +560,8 @@
{
int end = Math.min(start + size, portlets.size());
int pnames_index = 0;
+ //Go through all the portlets on this page and figure out which ones
have been
+ //checked and which ones unchecked and accordingly update the
userSelectionMap
for (int portlet_index = start; portlet_index end; portlet_index++)
{
PortletEntry entry = (PortletEntry)portlets.get(portlet_index);
@@ -565,7 +569,7 @@
pnames_index pnames.length
pnames[pnames_index].equals(entry.getName()))
{
-userSelections.put(entry.getName(),
String.valueOf(portlet_index));
+userSelections.put(entry.getName(), entry);
pnames_index++;
}
else
@@ -574,9 +578,8 @@
}
}
PortletSessionState.setAttribute(rundata,USER_SELECTIONS,userSelections);
-
- Iterator it = userSelections.keySet().iterator();
/*
+ Iterator it = userSelections.keySet().iterator();
System.out.print(User Selections: );
while (it.hasNext())
{
@@ -584,7 +587,6 @@
}
System.out.println(\n);
*/
-
}
else
{
@@ -887,13 +889,19 @@
// Create a list of all available portlets
public static List buildPortletList(RunData data, PortletSet set, String
mediaType, List allPortlets)
{
+/* Can not use this as filtering of category requires us to rebuild the
portlet
+ list and the allPortlets list each time.
List list = (List)PortletSessionState.getAttribute(data,PORTLET_LIST,null);
if (list != null)
-{
-return list;
+{
+allPortlets =
(List)PortletSessionState.getAttribute(data,ALL_PORTLET_LIST,null);
+if (allPortlets != null)
+{
+return list;
+}
}
-
-list = new ArrayList();
+*/
+List list = new ArrayList();
String mime = ((JetspeedRunData) data).getCapability()
.getPreferredType()
@@ -964,7 +972,8 @@
return t1.compareTo(t2);
}
});
-
+//this is used only by maintainUserSelection - which does not need the
+//portlet list to be regenrated
PortletSessionState.setAttribute(data,PORTLET_LIST,list);
return list;
}
@@ -1108,10 +1117,27 @@
/**
* Adds a filter over the available portlets
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser ActionParameter.java
taylor 2002/09/25 06:50:44
Modified:src/java/org/apache/jetspeed/modules/actions/portlets/browser
ActionParameter.java
Log:
made ActionParameter serializable
Revision ChangesPath
1.3 +4 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/ActionParameter.java
Index: ActionParameter.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/ActionParameter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionParameter.java 27 Apr 2002 21:14:05 - 1.2
+++ ActionParameter.java 25 Sep 2002 13:50:44 - 1.3
@@ -54,6 +54,8 @@
package org.apache.jetspeed.modules.actions.portlets.browser;
+import java.io.Serializable;
+
/**
* Action Parameter
*
@@ -61,7 +63,7 @@
* @version $Id$
*
*/
-public class ActionParameter
+public class ActionParameter implements Serializable
{
String name;
String action;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util MetaData.java
taylor 2002/09/26 10:35:59
Modified:src/java/org/apache/jetspeed/om/registry ContentURL.java
src/java/org/apache/jetspeed/portal Portlet.java
PortletController.java
src/java/org/apache/jetspeed/services/security
PortalResource.java
src/java/org/apache/jetspeed/util MetaData.java
Log:
Changed the following files to implement Serializable, needed to use the reloadable
feature for sessions in tomcat.
Revision ChangesPath
1.2 +3 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/ContentURL.java
Index: ContentURL.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/ContentURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentURL.java 26 Mar 2002 09:06:53 - 1.1
+++ ContentURL.java 26 Sep 2002 17:35:58 - 1.2
@@ -54,13 +54,14 @@
package org.apache.jetspeed.om.registry;
+import java.io.Serializable;
/**
* Interface describing a ContentURL in the registry
*
* @author a href=mailto:[EMAIL PROTECTED];David Sean Taylor/a
* @version $Id$
*/
-public interface ContentURL
+public interface ContentURL extends Serializable
{
/** @return the string URL */
1.46 +3 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java
Index: Portlet.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Portlet.java 24 Jul 2002 03:21:17 - 1.45
+++ Portlet.java 26 Sep 2002 17:35:58 - 1.46
@@ -58,6 +58,7 @@
import org.apache.turbine.util.RunData;
import org.apache.ecs.ConcreteElement;
+import java.io.Serializable;
/**
A portlet is an implementation of a small control (usually rendered in HTML)
that is available to a client application. Portlets were designed to be
@@ -66,7 +67,7 @@
@author a href=mailto:[EMAIL PROTECTED];Kevin A. Burton/a
@version $Id$
*/
-public interface Portlet
+public interface Portlet extends Serializable
{
public int PORTLET_NORMAL = 0;
1.53 +3 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletController.java
Index: PortletController.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletController.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- PortletController.java4 Jun 2001 17:46:53 - 1.52
+++ PortletController.java26 Sep 2002 17:35:58 - 1.53
@@ -58,6 +58,7 @@
import org.apache.turbine.util.RunData;
import org.apache.ecs.ConcreteElement;
import java.util.Map;
+import java.io.Serializable;
/**
* A PortletController is responsible for laying out and rendering the content of
@@ -73,7 +74,7 @@
* @author a href=mailto:[EMAIL PROTECTED];Kevin A. Burton/a
* @version $Id$
*/
-public interface PortletController
+public interface PortletController extends Serializable
{
/**
1.4 +3 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/PortalResource.java
Index: PortalResource.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/PortalResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortalResource.java 25 Aug 2002 19:20:12 - 1.3
+++ PortalResource.java 26 Sep 2002 17:35:59 - 1.4
@@ -59,13 +59,14 @@
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.registry.RegistryEntry;
+import java.io.Serializable;
/**
* PortalResource
*
* @author a href=[EMAIL PROTECTED]Paul Spencer/a
* @version $Id$
*/
-public class PortalResource
+public class PortalResource implements Serializable
{
public static final int TYPE_PORTLET = 100;
public static final int TYPE_ENTRY = 200;
1.9 +7 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/util/MetaData.java
Index: MetaData.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/MetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MetaData.java 13 Aug 2002 13:25:36 - 1.8
+++ MetaData.java 26 Sep 2002 17:35:59 - 1.9
@@ -58,8 +58,9 @@
import
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire Expire.java FileWatcher.java
taylor 2002/09/26 19:17:24
Modified:src/java/org/apache/jetspeed/portal/expire Expire.java
FileWatcher.java
Log:
Implemented Serializable as required for reloadable webapp feature (needed to
maintain sessions).
Revision ChangesPath
1.4 +12 -11
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/Expire.java
Index: Expire.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/Expire.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Expire.java 7 Mar 2001 06:46:16 - 1.3
+++ Expire.java 27 Sep 2002 02:17:24 - 1.4
@@ -56,13 +56,14 @@
import org.apache.jetspeed.portal.*;
+import java.io.Serializable;
/**
Handles content expiration
@author a href=mailto:[EMAIL PROTECTED];Kevin A. Burton/a
@version $Id$
*/
-public interface Expire {
+public interface Expire extends Serializable{
/**
1.12 +5 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatcher.java
Index: FileWatcher.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatcher.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FileWatcher.java 17 Jan 2002 10:56:27 - 1.11
+++ FileWatcher.java 27 Sep 2002 02:17:24 - 1.12
@@ -73,7 +73,7 @@
@author a href=mailto:[EMAIL PROTECTED];Kevin A. Burton/a
@version $Id$
*/
-public class FileWatcher {
+public class FileWatcher implements Serializable{
//BEGIN Exception index
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html customizer-portletset-add.vm
taylor 2002/09/27 13:00:04 Modified:webapp/WEB-INF/templates/vm/portlets/html customizer-portletset-add.vm Log: Undid the change to disable an already added portlet Revision ChangesPath 1.15 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm Index: customizer-portletset-add.vm === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- customizer-portletset-add.vm 17 Sep 2002 20:35:33 - 1.14 +++ customizer-portletset-add.vm 27 Sep 2002 20:00:03 - 1.15 @@ -68,7 +68,7 @@ #if($portletsSelected.containsKey($portlet.Name)) input type=checkbox name=pname value=$portlet.Name checked #else - input type=checkbox name=pname value=$portlet.Name #if($FF == checked) disabled #end + input type=checkbox name=pname value=$portlet.Name #end /td td -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/lib commons-beanutils-1.4.1.jar commons-configuration-1.0-dev.jar commons-dbcp-1.0-dev-20020806.jar commons-lang-1.0.jar commons-logging-1.0.2.jar commons-pool-1.0.jar fulcrum-3.0-b2-dev.jar jcs-1.0-dev.jar stratum-1.0-b4-dev.jar torque-3.0-b5-dev.jar turbine-2.2-b4-dev.jar xerces-2.0.2.jar xml-apis-2.0.2.jar commons-lang-0.1-dev.jar fulcrum-3.0-b1.jar stratum-1.0-b2-dev.jar torque-3.0-b2-dev.jar turbine-2.2-b2-dev.jar xerces-1.4.4.jar xml-apis.jar
taylor 2002/10/15 10:33:47 Added: lib commons-beanutils-1.4.1.jar commons-configuration-1.0-dev.jar commons-dbcp-1.0-dev-20020806.jar commons-lang-1.0.jar commons-logging-1.0.2.jar commons-pool-1.0.jar fulcrum-3.0-b2-dev.jar jcs-1.0-dev.jar stratum-1.0-b4-dev.jar torque-3.0-b5-dev.jar turbine-2.2-b4-dev.jar xerces-2.0.2.jar xml-apis-2.0.2.jar Removed: lib commons-lang-0.1-dev.jar fulcrum-3.0-b1.jar stratum-1.0-b2-dev.jar torque-3.0-b2-dev.jar turbine-2.2-b2-dev.jar xerces-1.4.4.jar xml-apis.jar Log: upgrading all jakarta jar files to latest versions Revision ChangesPath 1.1 jakarta-jetspeed/lib/commons-beanutils-1.4.1.jar Binary file 1.1 jakarta-jetspeed/lib/commons-configuration-1.0-dev.jar Binary file 1.1 jakarta-jetspeed/lib/commons-dbcp-1.0-dev-20020806.jar Binary file 1.1 jakarta-jetspeed/lib/commons-lang-1.0.jar Binary file 1.1 jakarta-jetspeed/lib/commons-logging-1.0.2.jar Binary file 1.1 jakarta-jetspeed/lib/commons-pool-1.0.jar Binary file 1.1 jakarta-jetspeed/lib/fulcrum-3.0-b2-dev.jar Binary file 1.1 jakarta-jetspeed/lib/jcs-1.0-dev.jar Binary file 1.1 jakarta-jetspeed/lib/stratum-1.0-b4-dev.jar Binary file 1.1 jakarta-jetspeed/lib/torque-3.0-b5-dev.jar Binary file 1.1 jakarta-jetspeed/lib/turbine-2.2-b4-dev.jar Binary file 1.1 jakarta-jetspeed/lib/xerces-2.0.2.jar Binary file 1.1 jakarta-jetspeed/lib/xml-apis-2.0.2.jar Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/xdocs/stylesheets project.xml
taylor 2002/10/15 12:06:24 Modified:xdocschanges.xml faq.xml xdocs/stylesheets project.xml Added: xdocssupporting-projects.xml Log: - Added documentation for building Jetspeed with latest versions of Torque, Turbine. - Added FAQ docs Revision ChangesPath 1.80 +5 -2 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- changes.xml 11 Oct 2002 20:07:17 - 1.79 +++ changes.xml 15 Oct 2002 19:06:24 - 1.80 @@ -23,7 +23,10 @@ /li -- li - Add - 2002/11/08 - Added simple filtering in User Browser and Psml Browser (MO) + Update - 2002/10/15 - Upgrade to latest versions Torque,Turbine,Stratum,Fulcrum,Commons (DST) +/li +li + Add - 2002/10/08 - Added simple filtering in User Browser and Psml Browser (MO) /li li Add - 2002/10/08 - Added optional functionality to override settings in default property files (MO) 1.15 +34 -2 jakarta-jetspeed/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/faq.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- faq.xml 2 Aug 2002 07:35:01 - 1.14 +++ faq.xml 15 Oct 2002 19:06:24 - 1.15 @@ -100,11 +100,18 @@ Windows:br/br set TOMCAT_OPTS=-DproxySet=true -DproxyHost=lt;proxyHostgt; -DproxyPort=lt;proxyPortgt; +br/ /li -li -br/brUnix:br/br +liUnix:br/ export TOMCAT_OPTS=-DproxySet=true -DproxyHost=lt;proxyHostgt; -DproxyPort=lt;proxyPortgt; +br/ +/li +li +Excludesbr/ +To exclude servers from being proxied, list them under the bhttp.nonProxyHosts/b parameter separated by | delimiter: +br/br/ +-Dhttp.nonProxyHosts=localhost|*.mycompany.com /li /ul /td @@ -224,6 +231,31 @@ lt;tomcat_homegt;/webapps/jetspeed/WEB-INF/log/jetspeed.log /td /tr +/table +/section + +section name=SSL and Jetspeed +table +tr +thQuestion/th +thAnswer/th +/tr +tr +tdI need to ensure that Logging in uses SSL. Does jetspeed login use SSL currently? +If not how do I go about changing it so that it does? +/td +td +You have to configure your webapp server to allow SSL only. +Add a dispatcher (uncomment and edit) in conf/server.xml and generate the key, as shown at those links. +br/ +Tomcat 4 : +a href=http://jakarta.apache.org/tomcat/tomcat-4.0-doc/ssl-howto.html;Catalina 4.0 SSL Docs/a +br/ +Tomcat 3 : +a href=http://jakarta.apache.org/tomcat/tomcat-3.3-doc/tomcat-ssl-howto.html;Tomcat 3.3 SSL Docs/a +/td +/tr + /table /section 1.1 jakarta-jetspeed/xdocs/supporting-projects.xml Index: supporting-projects.xml === ?xml version=1.0? document properties titleSupporting Jakarta Projects/title subtitleJakarta Projects Used in Jetspeed/subtitle authors person name=David Sean Taylor email=[EMAIL PROTECTED]/ /authors /properties body section name=Supporting Jakarta Projects p Jetspeed is dependent on many open source projects. We provide downloads to the four most dependent projects used in Jetspeed: ul lia href=http://jakarta.apache.org/turbine/;Turbine/a/li lia href=http://jakarta.apache.org/turbine/torque/;Torque/a/li lia href=http://jakarta.apache.org/turbine/stratum/;Stratum/a/li lia href=http://jakarta.apache.org/turbine/fulcrum/;Fulcrum/a/li /ul /p p The supporting projects can be checked out from their cvs repository for the date of October 15. For example: br/ bcvs co -D 2002-10-15 jakarta-turbine-2/b br/ bcvs co -D 2002-10-15 jakarta-turbine-torque/b br/ bcvs co -D 2002-10-15 jakarta-turbine-fulcrum/b br/ bcvs co -D 2002-10-15 jakarta-turbine-stratum/b br/ /p p The complete builds of supporting Jakarta projects are available at: a href=http://www.bluesunrise.com/jetspeed-dev/;Jetspeed Supporting Projects/a /p /section section name=Upgrading Torque 3.0 b2 to Torque 3.0 b5 Torque changes its API. An overview of the changes is listed below: ul liAll Torque queries that used to return bjava.util.Vector/b now return bjava.util.List/b /li libDBConnection/b has been removed. You must convert your code to use bjava.sql.Connection/b /li liAccessors for PKs and FK columns return the actual data type, including Java primitive data types, not an ObjectKey (or derivative). For ex: a column that is an INTEGER called USER_ID will return have accessors :br/ int getUserId()br
cvs commit: jakarta-jetspeed/docs/site supporting-projects.html administration.html application-development.html branches.html catalog.html changes.html code-standards.html config_guide.html config_skin.html config_skin_param_summary.html content-syndication.html contributors.html customizer.html developer-notes.html diskcache.html faq.html features.html icalendar.html index.html install.html jars.html license.html override_props.html portlet_config_DBBrowser.html portlet_config_HTML.html portlet_config_JSP.html portlet_config_PSMLBrowser.html portlet_config_RSS.html portlet_config_Velocity.html portlet_config_WebPagePortlet.html portlet_config_XSL.html portlet_config_common.html psml.html psml_db.html resources.html security.html todo.html uml.html usejetspeed.html wap.html
taylor 2002/10/15 12:06:51 Modified:docs/site administration.html application-development.html branches.html catalog.html changes.html code-standards.html config_guide.html config_skin.html config_skin_param_summary.html content-syndication.html contributors.html customizer.html developer-notes.html diskcache.html faq.html features.html icalendar.html index.html install.html jars.html license.html override_props.html portlet_config_DBBrowser.html portlet_config_HTML.html portlet_config_JSP.html portlet_config_PSMLBrowser.html portlet_config_RSS.html portlet_config_Velocity.html portlet_config_WebPagePortlet.html portlet_config_XSL.html portlet_config_common.html psml.html psml_db.html resources.html security.html todo.html uml.html usejetspeed.html wap.html Added: docs/site supporting-projects.html Log: - Added documentation for building Jetspeed with latest versions of Torque, Turbine. - Added FAQ docs Revision ChangesPath 1.22 +2 -0 jakarta-jetspeed/docs/site/administration.html Index: administration.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/administration.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- administration.html 2 Aug 2002 10:57:28 - 1.21 +++ administration.html 15 Oct 2002 19:06:47 - 1.22 @@ -64,6 +64,8 @@ /li lia href=http://jakarta.apache.org/site/sourceindex.html;Source Code/a /li +lia href=./supporting-projects.htmlSupporting Projects/a +/li /ul pstrongDocumentation/strong/p ul 1.22 +2 -0 jakarta-jetspeed/docs/site/application-development.html Index: application-development.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/application-development.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- application-development.html 2 Aug 2002 10:57:28 - 1.21 +++ application-development.html 15 Oct 2002 19:06:48 - 1.22 @@ -64,6 +64,8 @@ /li lia href=http://jakarta.apache.org/site/sourceindex.html;Source Code/a /li +lia href=./supporting-projects.htmlSupporting Projects/a +/li /ul pstrongDocumentation/strong/p ul 1.22 +2 -0 jakarta-jetspeed/docs/site/branches.html Index: branches.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/branches.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- branches.html 2 Aug 2002 10:57:28 - 1.21 +++ branches.html 15 Oct 2002 19:06:48 - 1.22 @@ -64,6 +64,8 @@ /li lia href=http://jakarta.apache.org/site/sourceindex.html;Source Code/a /li +lia href=./supporting-projects.htmlSupporting Projects/a +/li /ul pstrongDocumentation/strong/p ul 1.14 +2 -0 jakarta-jetspeed/docs/site/catalog.html Index: catalog.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/catalog.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- catalog.html 2 Aug 2002 10:57:28 - 1.13 +++ catalog.html 15 Oct 2002 19:06:48 - 1.14 @@ -64,6 +64,8 @@ /li lia href=http://jakarta.apache.org/site/sourceindex.html;Source Code/a /li +lia href=./supporting-projects.htmlSupporting Projects/a +/li /ul pstrongDocumentation/strong/p ul 1.62 +6 -1 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- changes.html 11 Oct 2002 20:07:16 - 1.61 +++ changes.html 15 Oct 2002 19:06:48 - 1.62 @@ -64,6 +64,8 @@ /li lia href=http://jakarta.apache.org/site/sourceindex.html;Source Code/a /li
cvs commit: jakarta-jetspeed/xdocs supporting-projects.xml
taylor 2002/10/16 10:29:56
Modified:xdocssupporting-projects.xml
Log:
updated docs for new Torque Data Source config
Revision ChangesPath
1.2 +9 -1 jakarta-jetspeed/xdocs/supporting-projects.xml
Index: supporting-projects.xml
===
RCS file: /home/cvs/jakarta-jetspeed/xdocs/supporting-projects.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supporting-projects.xml 15 Oct 2002 19:06:24 - 1.1
+++ supporting-projects.xml 16 Oct 2002 17:29:56 - 1.2
@@ -59,7 +59,15 @@
lib{$webapp_root}/b no longer seems to work, just remove it
/li
liYou have a lot more choice for Connection pooling, such as using JNDI,
-Jdbc2Pool, and ConnectionPoolDataSource. See the Torque.properties in Jetspeed cvs
for examples
+Jdbc2Pool, and ConnectionPoolDataSource. See the Torque.properties in Jetspeed cvs
for examples.
+The format of the connection properties have changed. You will need to change your
Torque.properties to the new format:br/
+# MySQLbr/
+b
+torque.dsfactory.default.connection.driver = org.gjt.mm.mysql.Driverbr/
+torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/torquebr/
+torque.dsfactory.default.connection.user = userbr/
+torque.dsfactory.default.connection.password = password
+/b
/li
liTorque.properties now prefixes Torque properties with btorque./b
/li
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/build/torque build.xml
taylor 2002/10/23 15:06:53
Modified:build/torque build.xml
Log:
Added 'clean' task to Torque build.
Revision ChangesPath
1.19 +30 -0 jakarta-jetspeed/build/torque/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 15 Oct 2002 17:35:31 - 1.18
+++ build.xml 23 Oct 2002 22:06:53 - 1.19
-31,6 +31,36
/target
+!-- === --
+!-- Cleans up the distribution --
+!-- === --
+target name=clean description=Cleans up the distribution
+delete quiet=true
+fileset dir=${torque.outputDirectory}/sql
+!-- Everything in the build lib dir --
+include name=**.sql/
+include name=**.generation/
+/fileset
+fileset
dir=${torque.outputDirectory}/java/org/apache/jetspeed/om/security/turbine
+!-- Everything in the build lib dir --
+include name=Base**.java/
+/fileset
+fileset
dir=${torque.outputDirectory}/java/org/apache/jetspeed/om/security/turbine/map
+!-- Everything in the build lib dir --
+include name=**.java/
+/fileset
+fileset dir=${torque.outputDirectory}/java/org/apache/jetspeed/om/dbpsml
+!-- Everything in the build lib dir --
+include name=Base**.java/
+/fileset
+fileset
dir=${torque.outputDirectory}/java/org/apache/jetspeed/om/dbpsml/map
+!-- Everything in the build lib dir --
+include name=**.java/
+/fileset
+
+/delete
+ /target
+
!-- --
!-- I N I T T A S K T A R G E T--
--
To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_nl.properties
taylor 2002/10/23 15:12:03 Modified:src/java/org/apache/jetspeed/modules/localization JetspeedLocalization_nl.properties Log: Dutch localization update from Werner Ramaekers Revision ChangesPath 1.5 +23 -21 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_nl.properties Index: JetspeedLocalization_nl.properties === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_nl.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JetspeedLocalization_nl.properties16 Sep 2002 17:57:14 - 1.4 +++ JetspeedLocalization_nl.properties23 Oct 2002 22:12:03 - 1.5 -19,11 +19,11 SECURITY_NO_ACCESS=U hebt niet de nodige rechten voor de deze portlets. PASSWORDREMINDER_EMAIL_HEADER=Hallo -PASSWORDREMINDER_EMAIL_BODY1=Uw KBVB portal paswoord is: -PASSWORDREMINDER_EMAIL_BODY2=U kan nu naar de KBVB portal site gaan en inloggen. +PASSWORDREMINDER_EMAIL_BODY1=Uw Jetspeed portal paswoord is: +PASSWORDREMINDER_EMAIL_BODY2=U kan nu naar de Jetspeed portal site gaan en inloggen. PASSWORDREMINDER_EMAIL_FOOTER=Vriendelijke groeten, PASSWORDREMINDER_EMAIL_PS=PS: vergeet niet dat uw gebruikersnaam de volgende : -PASSWORDREMINDER_EMAIL_SUBJECT=Paswoord voor KBVB portal +PASSWORDREMINDER_EMAIL_SUBJECT=Paswoord voor Jetspeed portal CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, de paswoorden stemmen niet overeen. CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, u moet een gebruikersnaam invullen. -43,7 +43,7 LOGOUTUSER_THANKS=Bedankt om ons systeem te gebruiken. Hopelijk komt u snel weer langs. -SENDCONFIRMATIONEMAIL_BODY1=Welkom op de KBVB portal site. Uw profield werd \n\ +SENDCONFIRMATIONEMAIL_BODY1=Welkom op de Jetspeed portal site. Uw profield werd \n\ aangemaakt. Gelieve in te loggen met de geheime sleutel om uw \n\ registratie te bevestigen:\n SENDCONFIRMATIONEMAIL_BODY2=Ga naar de volgende URL om uw profiel te bevestigen :\n\n -51,7 +51,7 SENDCONFIRMATIONEMAIL_ERROR=Fout bij het verzenden van de email: SENDCONFIRMATIONEMAIL_FOOTER=Vriendelijke groeten, SENDCONFIRMATIONEMAIL_HEADER=Hallo -SENDCONFIRMATIONEMAIL_SUBJECT=KBVB portal : registratie van een nieuwe gebruiker +SENDCONFIRMATIONEMAIL_SUBJECT=Jetspeed portal : registratie van een nieuwe gebruiker SENDUSEREMAIL_IDNOTVALID=Gelieve een geldige gebruikersnaam in te vullen. -70,7 +70,7 UPDATEACCOUNT_NOEMAIL=Sorry, u moet een geldig email adres invullen. UPDATEACCOUNT_DONE=Uw profiel werd aangepast! UPDATEACCOUNT_NOUSER=De gebruiker kan niet gevonden worden. -UPDATEACCOUNT_NEWEMAILCONFIRM=U hebt uw e-mail address aangepast. U zal dit moeten bevestigen alvorens verder te kunnen werken. Gelieve uw mailbox te willen controleren voor een mail van KBVB portal. +UPDATEACCOUNT_NEWEMAILCONFIRM=U hebt uw e-mail address aangepast. U zal dit moeten bevestigen alvorens verder te kunnen werken. Gelieve uw mailbox te willen controleren voor een mail van Jetspeed portal. UPDATEACCOUNT_BADOLDPASSWORD=Sorry, het oude paswoord is niet juist. CONFIRMREGISTRATION_TITLE=Bevestig de registratie CONFIRMREGISTRATION_NOUSERNAME=Sorry, er moet een gebruikersnaam zijn ingevuld. -101,14 +101,14 USERFORM_PASSWORDREMINDER=Paswoord vergeten ?brVul je gebruikersnaam in br en klik Passwoord? USERFORM_FORGOTPASSWORD_NOTICE=Stuur me een e-mail met mijn paswoord. -NEWACCOUNT_TITLE=Aanmaken van een nieuw KBVB portal profiel +NEWACCOUNT_TITLE=Aanmaken van een nieuw Jetspeed portal profiel NEWACCOUNT_NOTICE=Om een nieuw profiel aan te maken, gelieve alle onderstaande velden in te vullen. NEWACCOUNT_CONFIRMATION=Nadat uw profiel wordt aangemaakt zal u een email ontvangen met een geheime sleutel. Vul de geheime sleutel in op de volgende pagina om uw profiel te activeren. NEWACCOUNT_APPROVAL=De aanmaak van een profiel vereist een goedkeuring.U zal een email ontvangen als uw profielaanvraag aanvaard of verworpen is. #Text before user's full name, i.e. Welcome Joe Smith TOP_USERWELCOMEMSG=Welkom -TOP_TITLE=Welkom op de KBVB portal site +TOP_TITLE=Welkom op de Jetspeed portal site TOP_USERNAMEMSG=Gebruikersnaam: TOP_PASSWORDMSG=Paswoord: TOP_CREATENEWACCOUNT=Maak nieuw profiel -173,22 +173,24 CUSTOMIZER_SAVE=Opslaan CUSTOMIZER_SAVEAPPLY=Aanpassen en Opslaan CUSTOMIZER_SELECTE=Selecteren -CUSTOMIZER_SELECTEDPANE=Selected Pane +CUSTOMIZER_SELECTEDPANE=Gekozen scherm CUSTOMIZER_SECURITY_REF=Security ID CUSTOMIZER_SKIN=Skin CUSTOMIZER_TITLE=Titel CUSTOMIZER_TYPE=Type CUSTOMIZER_UPDATE=Aanpassing -PASSWORDFORM_TITLE=Change your account password -PASSWORDFORM_USERNAMEMSG=Username: -PASSWORDFORM_OLDPASSWORDMSG=Old Password
cvs commit: jakarta-jetspeed/docs/site changes.html
taylor 2002/10/17 17:51:47 Modified:docs/site changes.html Log: Revision ChangesPath 1.63 +3 -0 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- changes.html 15 Oct 2002 19:06:48 - 1.62 +++ changes.html 18 Oct 2002 00:51:47 - 1.63 -131,6 +131,9 /li -- li + Update - 2002/10/16 - Upgrade Scripts, Configuration Parameters for MySQL, Oracle to latest Torque (DST) +/li +li Update - 2002/10/15 - Upgrade to latest versions Torque,Turbine,Stratum,Fulcrum,Commons (DST) /li li -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/10/17 17:51:33 Modified:xdocschanges.xml Log: Revision ChangesPath 1.81 +4 -1 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- changes.xml 15 Oct 2002 19:06:24 - 1.80 +++ changes.xml 18 Oct 2002 00:51:33 - 1.81 -23,6 +23,9 /li -- li + Update - 2002/10/16 - Upgrade Scripts, Configuration Parameters for MySQL, Oracle to latest Torque (DST) +/li +li Update - 2002/10/15 - Upgrade to latest versions Torque,Turbine,Stratum,Fulcrum,Commons (DST) /li li -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties
taylor 2002/10/17 17:50:11 Modified:build/torque build.properties dbpsml.properties build/torque/schema dbpsml-schema.xml security-schema.xml turbine-schema.xml src/sql/external populate-mysql.sql populate-oracle.sql turbine-mysql.sql turbine-oracle.sql webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties Log: - tested Oracle support with Torque latest version - updated Oracle scripts - tested unit tests against Oracle Revision ChangesPath 1.8 +2 -2 jakarta-jetspeed/build/torque/build.properties Index: build.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.properties 17 Oct 2002 21:11:00 - 1.7 +++ build.properties 18 Oct 2002 00:50:10 - 1.8 @@ -46,8 +46,8 @@ # --- torque.database=hypersonic -#torque.database=mysql -#database=oracle +### torque.database=mysql +### database=oracle # --- # 1.6 +2 -2 jakarta-jetspeed/build/torque/dbpsml.properties Index: dbpsml.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/dbpsml.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbpsml.properties 17 Oct 2002 21:11:00 - 1.5 +++ dbpsml.properties 18 Oct 2002 00:50:10 - 1.6 @@ -46,8 +46,8 @@ # --- torque.database=hypersonic -#torque.database=mysql -#database=oracle +### torque.database=mysql +### torque.database=oracle # --- # 1.5 +7 -7 jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml Index: dbpsml-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbpsml-schema.xml 28 Jun 2002 05:37:28 - 1.4 +++ dbpsml-schema.xml 18 Oct 2002 00:50:10 - 1.5 @@ -18,7 +18,7 @@ database - table name=JETSPEED_USER_PROFILE idMethod=idbroker + table name=JETSPEED_USER_PROFILE idMethod=native column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ @@ -27,7 +27,7 @@ column name=LANGUAGE size=2 type=VARCHAR/ column name=COUNTRY size=2 type=VARCHAR/ column name=PAGE size=99 type=VARCHAR/ -column name=PROFILE type=VARBINARY/ +column name=PROFILE type=BINARY/ unique name=JETSPEED_USER_PROFILE_UNIQUE unique-column name=USER_NAME / @@ -39,7 +39,7 @@ /table - table name=JETSPEED_GROUP_PROFILE idMethod=idbroker + table name=JETSPEED_GROUP_PROFILE idMethod=native column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ @@ -48,7 +48,7 @@ column name=LANGUAGE size=2 type=VARCHAR/ column name=COUNTRY size=2 type=VARCHAR/ column name=PAGE size=99 type=VARCHAR/ -column name=PROFILE type=VARBINARY/ +column name=PROFILE type=BINARY/ unique name=JETSPEED_GROUP_PROFILE_UNIQUE unique-column name=GROUP_NAME / @@ -60,7 +60,7 @@ /table - table name=JETSPEED_ROLE_PROFILE idMethod=idbroker + table name=JETSPEED_ROLE_PROFILE idMethod=native column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ @@ -69,7 +69,7 @@ column name=LANGUAGE size=2 type=VARCHAR/ column name=COUNTRY size=2 type=VARCHAR/ column name=PAGE size=99 type=VARCHAR/ -column name=PROFILE type=VARBINARY/ +column name=PROFILE type=BINARY/ unique name=JETSPEED_ROLE_PROFILE_UNIQUE unique-column name=ROLE_NAME / 1.4 +11 -11jakarta-jetspeed/build/torque/schema/security-schema.xml Index: security-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/security-schema.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- security-schema.xml 13 Sep 2002 18:44:05 - 1.3 +++ security-schema.xml 18 Oct 2002 00:50:10 - 1.4 @@ -18,7 +18,7 @@ database - table name=TURBINE_USER idMethod=idbroker + table name=TURBINE_USER
cvs commit: jakarta-jetspeed/webapp/WEB-INF/db jetspeed.properties jetspeed.script
taylor 2002/10/17 14:11:01 Modified:build/torque build.properties dbpsml.properties build/torque/schema turbine-schema.xml src/java/org/apache/jetspeed/services/security TestUserManagement.java src/sql/external populate-mysql.sql turbine-mysql.sql webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties webapp/WEB-INF/db jetspeed.properties jetspeed.script Log: - tested MySQL support with Torque latest version - updated MySQL scripts - normalized all unit tests to run against all databases NOTE: this meant changing the hypersonic db scripts so that: admin=1, turbine=2, anon=3 - tested unit tests against MySQL Revision ChangesPath 1.7 +7 -10 jakarta-jetspeed/build/torque/build.properties Index: build.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.properties 15 Oct 2002 17:35:31 - 1.6 +++ build.properties 17 Oct 2002 21:11:00 - 1.7 @@ -46,6 +46,8 @@ # --- torque.database=hypersonic +#torque.database=mysql +#database=oracle # --- # @@ -171,15 +173,10 @@ schemaDirectory=schema torque.schemaDirectory=schema -torque.schema.sql.includes = security-schema.xml -torque.schema.create-db.includes = security-schema.xml -torque.schema.init-sql.includes = security-schema.xml -torque.schema.om.includes = security-schema.xml - -## if you need the ID table and COFFEES table: -#torque.schema.sql.includes = security-schema.xml, turbine-schema.xml, coffees-schema.xml -#torque.schema.create-db.includes = security-schema.xml, turbine-schema.xml, coffees-schema.xml -#torque.schema.init-sql.includes = security-schema.xml, turbine-schema.xml, coffees-schema.xml -#torque.schema.om.includes = security-schema.xml, turbine-schema.xml, coffees-schema.xml + +torque.schema.sql.includes = security-schema.xml, coffees-schema.xml +torque.schema.create-db.includes = security-schema.xml, coffees-schema.xml +torque.schema.init-sql.includes = security-schema.xml, coffees-schema.xml +torque.schema.om.includes = security-schema.xml, coffees-schema.xml 1.5 +1 -0 jakarta-jetspeed/build/torque/dbpsml.properties Index: dbpsml.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/dbpsml.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbpsml.properties 15 Oct 2002 17:35:31 - 1.4 +++ dbpsml.properties 17 Oct 2002 21:11:00 - 1.5 @@ -46,6 +46,7 @@ # --- torque.database=hypersonic +#torque.database=mysql #database=oracle # --- 1.4 +5 -5 jakarta-jetspeed/build/torque/schema/turbine-schema.xml Index: turbine-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/turbine-schema.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- turbine-schema.xml28 Jun 2002 05:37:28 - 1.3 +++ turbine-schema.xml17 Oct 2002 21:11:00 - 1.4 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=ISO-8859-1 standalone=no? -!-- !DOCTYPE database SYSTEM http://java.apache.org/turbine/dtd/database.dtd; -- +!DOCTYPE database SYSTEM http://jakarta.apache.org/turbine/dtd/database.dtd; !-- -- !-- -- @@ -16,7 +16,7 @@ !-- @version $Id$ -- !-- -- -database name=@DATABASE_DEFAULT@ +database table name=TURBINE_SCHEDULED_JOB idMethod=idbroker column name=JOB_ID required=true primaryKey=true type=INTEGER/ @@ -30,8 +30,8 @@ column name=PROPERTY type=VARBINARY/ /table - table name=ID_TABLE -column name=ID_TABLE_ID autoIncrement=true required=true primaryKey=true type=INTEGER/ + table name=ID_TABLE idMethod=idbroker +column name=ID_TABLE_ID required=true primaryKey=true type=INTEGER/ column name=TABLE_NAME required=true size=255 type=VARCHAR/ column name=NEXT_ID type=INTEGER/ column name=QUANTITY type=INTEGER/ 1.4 +6 -7 jakarta-jetspeed/src/java/org/apache/jetspeed/services
cvs commit: jakarta-jetspeed/webapp/WEB-INF/db jetspeed.properties jetspeed.script
taylor 2002/10/18 12:16:32 Modified:build/torque build.properties dbpsml.properties build/torque/schema dbpsml-schema.xml security-schema.xml turbine-schema.xml lib torque-3.0-b5-dev.jar src/java/org/apache/jetspeed/services/security/turbine TurbineGroupManagement.java TurbinePermissionManagement.java TurbineRoleManagement.java src/sql/external populate-sqlserver.sql turbine-sqlserver.sql webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties webapp/WEB-INF/db jetspeed.properties jetspeed.script Log: 1. Fixed the hypersonic functionality by switching back to idbroker mode as default looks like Torque doesnt support 'native' for Hypersonic DB will have to fix the Hypersonic Adaptor in Torque to handle native mode For now, the syndication-schema.xml will need to be EDITED to use 'native' mode when other dbs if you want to use native mode: change table name=TURBINE_USER idMethod=idbroker to table name=TURBINE_USER idMethod=native etc 2. MS SQL support - patched Torque to fix MS SQL bugs - updated MS SQL scripts - ran unit tests with MS SQL Revision ChangesPath 1.9 +1 -0 jakarta-jetspeed/build/torque/build.properties Index: build.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.properties 18 Oct 2002 00:50:10 - 1.8 +++ build.properties 18 Oct 2002 19:16:31 - 1.9 @@ -48,6 +48,7 @@ torque.database=hypersonic ### torque.database=mysql ### database=oracle +### database=mssql # --- # 1.7 +1 -0 jakarta-jetspeed/build/torque/dbpsml.properties Index: dbpsml.properties === RCS file: /home/cvs/jakarta-jetspeed/build/torque/dbpsml.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbpsml.properties 18 Oct 2002 00:50:10 - 1.6 +++ dbpsml.properties 18 Oct 2002 19:16:31 - 1.7 @@ -48,6 +48,7 @@ torque.database=hypersonic ### torque.database=mysql ### torque.database=oracle +### torque.database=mssql # --- # 1.6 +4 -7 jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml Index: dbpsml-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbpsml-schema.xml 18 Oct 2002 00:50:10 - 1.5 +++ dbpsml-schema.xml 18 Oct 2002 19:16:31 - 1.6 @@ -20,8 +20,7 @@ table name=JETSPEED_USER_PROFILE idMethod=native -column name=PSML_ID required=true primaryKey=true -autoIncrement=true type=INTEGER/ +column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=USER_NAME required=true size=32 type=VARCHAR/ column name=MEDIA_TYPE size=99 type=VARCHAR/ column name=LANGUAGE size=2 type=VARCHAR/ @@ -41,8 +40,7 @@ table name=JETSPEED_GROUP_PROFILE idMethod=native -column name=PSML_ID required=true primaryKey=true -autoIncrement=true type=INTEGER/ +column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=GROUP_NAME required=true size=99 type=VARCHAR/ column name=MEDIA_TYPE size=99 type=VARCHAR/ column name=LANGUAGE size=2 type=VARCHAR/ @@ -62,8 +60,7 @@ table name=JETSPEED_ROLE_PROFILE idMethod=native -column name=PSML_ID required=true primaryKey=true -autoIncrement=true type=INTEGER/ +column name=PSML_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=ROLE_NAME required=true size=99 type=VARCHAR/ column name=MEDIA_TYPE size=99 type=VARCHAR/ column name=LANGUAGE size=2 type=VARCHAR/ 1.5 +16 -12jakarta-jetspeed/build/torque/schema/security-schema.xml Index: security-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/security-schema.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- security-schema.xml 18 Oct 2002 00:50:10 - 1.4 +++ security-schema.xml 18
cvs commit: jakarta-jetspeed/src/sql/external populate-db2.sql turbine-db2.sql
taylor 2002/10/18 15:08:36
Modified:src/sql/external populate-db2.sql turbine-db2.sql
Log:
Generated DDL for DB2 with Torque
Updated populate script
WARNING: these scripts are not tested.
Sorry but I couldn't get the trial version of Personal DB2 to install, it kept
crashing.
Revision ChangesPath
1.8 +14 -16jakarta-jetspeed/src/sql/external/populate-db2.sql
Index: populate-db2.sql
===
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/populate-db2.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- populate-db2.sql 28 Jun 2002 05:37:36 - 1.7
+++ populate-db2.sql 18 Oct 2002 22:08:36 - 1.8
@@ -11,9 +11,9 @@
INSERT INTO TURBINE_ROLE VALUES(3,'guest',NULL);
INSERT INTO TURBINE_GROUP VALUES(1,'Jetspeed',NULL);
INSERT INTO TURBINE_GROUP VALUES(2,'apache',NULL);
-INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Raphael','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f4377080005000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b59741903787077087874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02787000a778');
-INSERT INTO TURBINE_USER
VALUES(2,'turbine','turbine','David','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f4377080005000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b59741903787077087874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b027870007478');
-INSERT INTO TURBINE_USER
VALUES(3,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2001-11-11
18:45:41.671','F',NULL);
+INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Jetspeed','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, NULL);
+INSERT INTO TURBINE_USER
VALUES(2,'turbine','turbine','Tommy','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, NULL);
+INSERT INTO TURBINE_USER
VALUES(3,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, NULL);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,1);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,2);
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,3);
@@ -33,17 +33,15 @@
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,1);
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,2);
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(3,1,3);
-INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',120,10);
-INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',100,10);
-INSERT INTO ID_TABLE VALUES(4,'TURBINE_USER',120,10);
-INSERT INTO ID_TABLE VALUES(5,'TURBINE_SCHEDULED_JOB',100,10);
-INSERT INTO ID_TABLE VALUES(6,'TURBINE_ROLE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(7,'TURBINE_USER_GROUP_ROLE',100,10);
-INSERT INTO ID_TABLE VALUES(8,'JETSPEED_USER_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(9,'JETSPEED_GROUP_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(10,'JETSPEED_ROLE_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(11,'JETSPEED_ANON_PROFILE',120,10);
-
-
+INSERT INTO COFFEES VALUES('ColombianGrade',5,7.99,1,2);
+INSERT INTO COFFEES VALUES('KonaGrade',6,7.99,1,2);
+INSERT INTO COFFEES VALUES('FrenchRoastGrade',7,7.99,1,2);
+INSERT INTO COFFEES VALUES('HazelNutGrade',8,7.99,1,2);
+INSERT INTO COFFEES VALUES('VanillaGrade',9,7.99,1,2);
+INSERT INTO COFFEES VALUES('JavaGrade',10,7.99,1,2);
+INSERT INTO COFFEES VALUES('IndonesianGrade',11,7.99,1,2);
+INSERT INTO COFFEES VALUES('OotyGrade',1,7.99,1,2);
+INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99,1,2);
+INSERT INTO COFFEES VALUES('JoeGrade',3,7.99,1,2);
+INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2);
1.4 +136 -102 jakarta-jetspeed/src/sql/external/turbine-db2.sql
Index: turbine-db2.sql
===
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/turbine-db2.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- turbine-db2.sql 25 Feb 2002 04:15:43 - 1.3
+++ turbine-db2.sql 18 Oct 2002 22:08:36 - 1.4
@@ -1,191 +1,225
cvs commit: jakarta-jetspeed/src/ldap - New directory
taylor 2002/10/21 15:26:08 jakarta-jetspeed/src/ldap - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/ldap - New directory
taylor 2002/10/21 15:26:41 jakarta-jetspeed/src/java/org/apache/jetspeed/services/ldap - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap - New directory
taylor 2002/10/21 15:27:02 jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/ldap - New directory
taylor 2002/10/21 15:28:07 jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/ldap - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/ldap jetspeed.ldif jetspeed.schema
taylor 2002/10/21 15:37:29 Added: src/ldap jetspeed.ldif jetspeed.schema Log: - schema and ldif definitions for Jetspeed LDAP Security Service Revision ChangesPath 1.1 jakarta-jetspeed/src/ldap/jetspeed.ldif Index: jetspeed.ldif === dn: ou=jetspeed, o=EBIT ou: jetspeed objectClass: top objectClass: organizationalUnit dn: ou=groups, ou=jetspeed, o=EBIT ou: groups objectClass: top objectClass: organizationalUnit dn: ou=roles, ou=jetspeed, o=EBIT ou: roles objectClass: top objectClass: organizationalUnit dn: uid=Jetspeed,ou=groups, ou=jetspeed, o=EBIT groupname: Jetspeed uid: Jetspeed objectClass: jetspeedgroup dn: uid=apache,ou=groups, ou=jetspeed, o=EBIT groupname: apache uid: apache objectClass: jetspeedgroup dn: uid=user,ou=roles, ou=jetspeed, o=EBIT rolepermissions: view rolepermissions: customize rolepermissions: maximize rolepermissions: minimize rolepermissions: personalize rolepermissions: info rolename: user uid: user objectClass: jetspeedrole dn: uid=admin,ou=roles, ou=jetspeed, o=EBIT rolepermissions: view rolepermissions: customize rolepermissions: maximize rolepermissions: minimize rolepermissions: personalize rolepermissions: info rolepermissions: close rolename: admin uid: admin objectClass: jetspeedrole dn: uid=guest,ou=roles, ou=jetspeed, o=EBIT rolename: guest uid: guest objectClass: jetspeedrole dn: ou=users, ou=jetspeed, o=EBIT ou: users objectClass: top objectClass: organizationalUnit dn: uid=ender,ou=users, ou=jetspeed, o=EBIT mail: [EMAIL PROTECTED] confirm: CONFIRMED name: ender userPassword:: e2NyeXB0fXlLZHJDZmtZanJTSVk= uid: ender usergrouprole: Jetspeed,user objectClass: jetspeeduser dn: uid=anon,ou=users, ou=jetspeed, o=EBIT mail: [EMAIL PROTECTED] name: anon userPassword:: e2NyeXB0fXlLZHJDZmtZanJTSVk= uid: anon usergrouprole: Jetspeed,user objectClass: jetspeeduser sn: anon dn: ou=permissions, ou=jetspeed, o=EBIT ou: permissions objectClass: top objectClass: organizationalUnit dn: uid=view,ou=permissions, ou=jetspeed, o=EBIT uid: view objectClass: jetspeedpermission permissionname: view dn: uid=customize,ou=permissions, ou=jetspeed, o=EBIT uid: customize objectClass: jetspeedpermission permissionname: customize dn: uid=maximize,ou=permissions, ou=jetspeed, o=EBIT uid: maximize objectClass: jetspeedpermission permissionname: maximize dn: uid=minimize,ou=permissions, ou=jetspeed, o=EBIT uid: minimize objectClass: jetspeedpermission permissionname: minimize dn: uid=personalize,ou=permissions, ou=jetspeed, o=EBIT uid: personalize objectClass: jetspeedpermission permissionname: personalize dn: uid=info,ou=permissions, ou=jetspeed, o=EBIT uid: info objectClass: jetspeedpermission permissionname: info dn: uid=close,ou=permissions, ou=jetspeed, o=EBIT uid: close objectClass: jetspeedpermission permissionname: close 1.1 jakarta-jetspeed/src/ldap/jetspeed.schema Index: jetspeed.schema === attributetype ( 1.3.6.1.4.1.7915.1.2.3.1 NAME 'groupname' DESC 'group name' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.7915.1.2.3.2 NAME 'rolename' DESC 'role name' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.7915.1.2.3.3 NAME 'permissionname' DESC 'role name' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.7915.1.2.3.4 NAME 'rolepermissions' DESC 'role rigth' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44) attributetype ( 1.3.6.1.4.1.7915.1.2.3.5 NAME 'members' DESC 'member list' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44) attributetype ( 1.3.6.1.4.1.7915.1.2.3.6 NAME 'confirm' DESC 'Confirm value' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.7915.1.2.3.7 NAME 'psml' DESC 'PSML' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.7915.1.2.3.8 NAME 'usergrouprole' DESC 'User Group Role' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) objectclass ( 1.3.6.1.4.1.7915.1.2.4.1 NAME 'jetspeedgroup' DESC 'Jetspeed Group' MUST ( groupname $ uid) MAY ( members ) ) objectclass ( 1.3.6.1.4.1.7915.1.2.4.2 NAME 'jetspeedrole' DESC
cvs commit: jakarta-jetspeed/build build.xml
taylor 2002/10/21 15:41:03
Modified:buildbuild.xml
Log:
- updated CheckStyle tasks to work with version 2.4
- started added CheckStyle tasks for LDAP
Revision ChangesPath
1.163 +8 -4 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- build.xml 15 Sep 2002 16:18:18 - 1.162
+++ build.xml 21 Oct 2002 22:41:03 - 1.163
-203,18 +203,20
!-- Basic requirement --
checkstyle properties=build/checkstyle.properties
failOnViolation=false
-failureProperty=checkstyle.failure
-cacheFile=build/${checkstyle.cache.basic}
+failureProperty=checkstyle.failure
+!--cacheFile=build/${checkstyle.cache.basic}
basedir=${src.java.dir}
+--
formatter type=plain toFile=build/${checkstyle.errors}/
fileset dir=${src.java.dir} includes=**/*.java/
/checkstyle
!-- Ideal requirement --
checkstyle properties=build/checkstyle.properties
-failOnViolation=true
-cacheFile=build/${checkstyle.cache.ideal}
+failOnViolation=true
+!--cacheFile=build/${checkstyle.cache.ideal}
basedir=${src.java.dir}
+--
fileset dir=${src.java.dir}
patternset
include
name=org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java/
-258,6 +260,8
include
name=org/apache/jetspeed/services/security/RoleManagement.java/
include
name=org/apache/jetspeed/services/security/UserManagement.java/
include name=org/apache/jetspeed/util/MetaData.java/
+!-- include
name=org/apache/jetspeed/services/security/ldap/UnixCrypt.java/ --
+ include
name=org.apache/jetspeed/services/security/ldap/JetspeedLDAPSecurityService/
/patternset
/fileset
/checkstyle
--
To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services JetspeedLDAP.java
taylor 2002/10/22 07:35:50
Added: src/java/org/apache/jetspeed/services JetspeedLDAP.java
Log:
static accessor for LDAP service
Revision ChangesPath
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedLDAP.java
Index: JetspeedLDAP.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
* Apache Jetspeed must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache or
*Apache Jetspeed, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.jetspeed.services;
import org.apache.jetspeed.services.ldap.LDAPService;
import org.apache.jetspeed.services.ldap.LDAPURL;
import org.apache.turbine.services.TurbineServices;
import javax.naming.*;
import javax.naming.directory.*;
import java.util.Vector;
/**
*
* @author a href=mailto:ender;kilicoglu.nom.trEnder KILICOGLU/a
* @version $Id: JetspeedLDAP.java,v 1.1 2002/10/22 14:35:50 taylor Exp $
*
*/
public class JetspeedLDAP
{
private static LDAPService getService()
{
return(LDAPService)TurbineServices
.getInstance()
.getService(LDAPService.SERVICE_NAME);
}
public static boolean addAttribute(LDAPURL url, Attribute at)
{
return getService().addAttribute(url, at);
}
public static boolean addEntry(LDAPURL url, Attributes at)
{
return getService().addEntry(url, at);
}
public static int compare(LDAPURL srcUrl, LDAPURL dstUrl)
{
return getService().compare(srcUrl, dstUrl);
}
public static boolean deleteAttribute(LDAPURL url, Attribute at)
{
return getService().deleteAttribute(url, at);
}
public static boolean deleteEntry(LDAPURL url)
{
return getService().deleteEntry(url);
}
public static LDAPURL buildURL(String DN)
{
return getService().buildURL(DN);
}
public static boolean deleteTree(LDAPURL url)
{
return getService().deleteTree(url);
}
public static boolean exists(LDAPURL url)
{
return getService().exists(url);
}
public static LDAPURL findEntryName(LDAPURL url)
{
return getService().findEntryName(url);
}
public static
cvs commit: jakarta-jetspeed/build build.xml
taylor 2002/10/22 09:14:32 Modified:buildbuild.xml Log: updated version of check style to 2.4 Revision ChangesPath 1.164 +1 -1 jakarta-jetspeed/build/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- build.xml 21 Oct 2002 22:41:03 - 1.163 +++ build.xml 22 Oct 2002 16:14:31 - 1.164 -186,7 +186,7 The style checker checkStyle is not present, thus no style checking will be performed. -You can get checkStyle Release 2.3 from: +You can get checkStyle Release 2.4 from: lt;http://checkstyle.sourceforge.netgt; /echo /target -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/ldap LDAPURL.java
taylor 2002/10/22 22:29:30
Modified:src/java/org/apache/jetspeed/services/ldap LDAPURL.java
Log:
moved back to 1.3 compatibility
Revision ChangesPath
1.2 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/ldap/LDAPURL.java
Index: LDAPURL.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/ldap/LDAPURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LDAPURL.java 21 Oct 2002 22:31:15 - 1.1
+++ LDAPURL.java 23 Oct 2002 05:29:30 - 1.2
-82,7 +82,10
{
try
{
-url = URLDecoder.decode(url,UTF-8);
+// this is the correct approach for 1.4, unfortunately its unsupported
in 1.3
+// uncomment the line below if using 1.4
+// url = URLDecoder.decode(url,UTF-8);
+url = URLDecoder.decode(url); // deprecated in 1.4
}
catch(Exception e)
{
--
To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/xdocs changes.xml
taylor 2002/10/24 10:22:03 Modified:docs/site changes.html xdocschanges.xml Log: change log Revision ChangesPath 1.65 +3 -0 jakarta-jetspeed/docs/site/changes.html Index: changes.html === RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- changes.html 24 Oct 2002 16:17:20 - 1.64 +++ changes.html 24 Oct 2002 17:22:03 - 1.65 -131,6 +131,9 /li -- li + Update - 2002/10/24 - Upgraded Hypersonic SQL to 1.7.1, upgraded Torque to support Native mode for Hypersonic SQL (DST) +/li +li Update - 2002/10/24 - Added template support (Velocity or JSP) to parameter presentation styles (MO) /li li 1.83 +4 -1 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- changes.xml 24 Oct 2002 16:17:22 - 1.82 +++ changes.xml 24 Oct 2002 17:22:03 - 1.83 -23,6 +23,9 /li -- li + Update - 2002/10/24 - Upgraded Hypersonic SQL to 1.7.1, upgraded Torque to support Native mode for Hypersonic SQL (DST) +/li +li Update - 2002/10/24 - Added template support (Velocity or JSP) to parameter presentation styles (MO) /li li -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/lib hsqldb.jar hsql.jar
taylor 2002/10/24 10:17:41 Modified:buildbuild.properties build/torque/schema security-schema.xml webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties webapp/WEB-INF/db jetspeed.properties jetspeed.script manageDB.bat Added: webapp/WEB-INF/db hsqldb.jar webapp/WEB-INF/lib hsqldb.jar Removed: webapp/WEB-INF/db hsql.jar webapp/WEB-INF/lib hsql.jar Log: - upgraded to Hypersonic 1.7.1 latest stable release - upgraded to cvs head of Torque, fixing identity problem with Hypersonic and allowing Hypersonic to run in native mode - no longer necessary to change security-schema.xml's table idmethod from idbroker for Hypersonic to native for all other dbs. all dbs now support native idmethod=native Revision ChangesPath 1.12 +1 -1 jakarta-jetspeed/build/build.properties Index: build.properties === RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.properties 6 Apr 2002 01:47:30 - 1.11 +++ build.properties 24 Oct 2002 17:17:39 - 1.12 -7,7 +7,7 cactus-23.jar = build/lib/cactus-23-1.2.jar cactus.ant.jar = build/lib/cactus-ant-1.2.jar junit.jar = build/lib/junit.jar -hsql.jar = webapp/WEB-INF/lib/hsql.jar +hsql.jar = webapp/WEB-INF/lib/hsqldb.jar # Servlet engine locations for the tests 1.6 +5 -9 jakarta-jetspeed/build/torque/schema/security-schema.xml Index: security-schema.xml === RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/security-schema.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- security-schema.xml 18 Oct 2002 19:16:31 - 1.5 +++ security-schema.xml 24 Oct 2002 17:17:39 - 1.6 -18,8 +18,7 database - !-- for dbs other than HYPERSONIC: table name=TURBINE_USER idMethod=native -- - table name=TURBINE_USER idMethod=idbroker + table name=TURBINE_USER idMethod=native column name=USER_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=LOGIN_NAME required=true size=32 type=VARCHAR/ column name=PASSWORD_VALUE required=true size=32 type=VARCHAR/ -40,8 +39,7 /table - !-- for dbs other than HYPERSONIC: table name=TURBINE_ROLE idMethod=native -- - table name=TURBINE_ROLE idMethod=idbroker + table name=TURBINE_ROLE idMethod=native column name=ROLE_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=ROLE_NAME required=true size=99 type=VARCHAR/ column name=OBJECTDATA type=BINARY/ -52,8 +50,7 /table - !-- for dbs other than HYPERSONIC: table name=TURBINE_GROUP idMethod=native -- - table name=TURBINE_GROUP idMethod=idbroker + table name=TURBINE_GROUP idMethod=native column name=GROUP_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=GROUP_NAME required=true type=VARCHAR size=99/ column name=OBJECTDATA type=BINARY/ -64,8 +61,7 /table - !-- for dbs other than HYPERSONIC: table name=TURBINE_PERMISSION idMethod=native -- - table name=TURBINE_PERMISSION idMethod=idbroker + table name=TURBINE_PERMISSION idMethod=native column name=PERMISSION_ID required=true primaryKey=true autoIncrement=true type=INTEGER/ column name=PERMISSION_NAME required=true size=99 type=VARCHAR/ column name=OBJECTDATA type=BINARY/ 1.36 +1 -37 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- JetspeedSecurity.properties 21 Oct 2002 22:40:22 - 1.35 +++ JetspeedSecurity.properties 24 Oct 2002 17:17:39 - 1.36 -8,7 +8,6 # # --- services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService -### LDAP: services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedLDAPSecurityService # # Programmatic Cascade Delete Service # -21,8 +20,6 # services.PortalAuthentication.classname=org.apache.jetspeed.services.security.turbine.TurbineAuthentication -### LDAP: services.PortalAuthentication.classname
cvs commit: jakarta-jetspeed/lib torque-3.0-b5-dev.jar
taylor 2002/10/24 10:10:51 Modified:lib torque-3.0-b5-dev.jar Log: updated Torque jar to support latest Hypersonic SQL and Identity() function Revision ChangesPath 1.3 +352 -350 jakarta-jetspeed/lib/torque-3.0-b5-dev.jar Binary file -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util OverwriteProperties.java
taylor 2002/10/28 10:44:46
Added: src/java/org/apache/jetspeed/util OverwriteProperties.java
Log:
Property merging utility for Tutorial (work in progress)
Revision ChangesPath
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java
Index: OverwriteProperties.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
* Apache Jetspeed must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache or
*Apache Jetspeed, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.jetspeed.util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.StringTokenizer;
import java.io.FileReader;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.FileOutputStream;
/**
* Task to overwrite Properties: used for JRP, TRP and Torque.properties
*
* @author a href=mailto:taylor;apache.orgDavid Sean Taylor/a
* @version $Id: OverwriteProperties.java,v 1.1 2002/10/28 18:44:46 taylor Exp $
*/
public class OverwriteProperties
{
protected static String baseProperties;
protected static String properties;
protected static String includeRoot;
public static boolean verbose = false;
protected static ArrayList baseArray = new ArrayList(1024);
protected static ArrayList removeArray = new ArrayList(128);
protected static HashMap baseMap = new HashMap();
protected static String lineSeparator = System.getProperty(line.separator,
\r\n);
public static void main(String[] args) throws Exception
{
OverwriteProperties main=new OverwriteProperties();
try
{
if(args.length 3)
{
System.out.println(Usage: java OverwriteProperties
c:/temp/File1.props c:/temp/File2.props c:/include-root/);
System.out.println(Usage: File1 will be modified, new parameters
from File 2 will be added,);
System.out.println(Usage: and same parameters will be updated. The
include-root is where include files are found.);
throw new Exception(Incorrect number of arguments supplied);
}
baseProperties = args[0];
properties = args[1
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties demo-portlets.xreg portlets.xreg
taylor 2002/10/29 10:35:53 Modified:webapp/WEB-INF/conf JetspeedSecurity.properties demo-portlets.xreg portlets.xreg Log: - added WebPagePortlet2, a rewrite of WebPagePortlet - still under construction, doesn't yet support all params from WebPagePortlet - Added demo JakartaWeb portlet using WebPagePortlet2, shows bug fixes - fixed bug in AggregationPortlet Revision ChangesPath 1.37 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 1.25 +361 -353 jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg Index: demo-portlets.xreg === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- demo-portlets.xreg24 Oct 2002 16:17:21 - 1.24 +++ demo-portlets.xreg29 Oct 2002 18:35:53 - 1.25 -1,364 +1,372 ?xml version=1.0 encoding=UTF-8? registry - portlet-entry name=HelloVelocityCached hidden=false type=ref parent=CustomizerVelocity application=false - meta-info - titleHelloVelocityCached/title - descriptionSimple Cached Velocity Portlet Example/description - /meta-info - parameter name=template value=hello hidden=false/ - parameter name=cache-period-milliseconds value=6 hidden=false/ - parameter name=action value=portlets.HelloAction hidden=false/ - parameter name=text value=Hello - only changes occasionally due to content caching hidden=false/ - media-type ref=html/ - categorydemo/category - categoryvelocity.demo/category - /portlet-entry - portlet-entry name=HelloVelocity hidden=false type=ref parent=CustomizerVelocity application=false - meta-info - titleHelloVelocity/title - descriptionSimple Velocity Portlet Example/description - /meta-info - parameter name=template value=hello hidden=false/ - parameter name=action value=portlets.HelloAction hidden=false/ - parameter name=text value=Hello World in Velocity hidden=false/ - media-type ref=html/ - categorydemo/category - categoryvelocity.demo/category - /portlet-entry - portlet-entry name=HelloJSP hidden=false type=ref parent=JSP application=false - meta-info - titleHelloJSP/title - descriptionSimple JSP Portlet Example/description - /meta-info - parameter name=template value=hello.jsp hidden=false/ - media-type ref=html/ - categorydemo/category - categoryjsp.demo/category - /portlet-entry - portlet-entry name=JSP1_1andJetspeedTagLib hidden=false type=ref parent=JSP application=false - meta-info - titleJSP1_1andJetspeedTagLib/title - description +portlet-entry name=HelloVelocityCached hidden=false type=ref parent=CustomizerVelocity application=false +meta-info +titleHelloVelocityCached/title +descriptionSimple Cached Velocity Portlet Example/description +/meta-info +parameter name=template value=hello hidden=false/ +parameter name=cache-period-milliseconds value=6 hidden=false/ +parameter name=action value=portlets.HelloAction hidden=false/ +parameter name=text value=Hello - only changes occasionally due to content caching hidden=false/ +media-type ref=html/ +categorydemo/category +categoryvelocity.demo/category +/portlet-entry +portlet-entry name=HelloVelocity hidden=false type=ref parent=CustomizerVelocity application=false +meta-info +titleHelloVelocity/title +descriptionSimple Velocity Portlet Example/description +/meta-info +parameter name=template value=hello hidden=false/ +parameter name=action value=portlets.HelloAction hidden=false/ +parameter name=text value=Hello World in Velocity hidden=false/ +media-type ref=html/ +categorydemo/category +categoryvelocity.demo/category +/portlet-entry +portlet-entry name=HelloJSP hidden=false type=ref parent=JSP application=false +meta-info +titleHelloJSP/title
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter ProxyRewriter.java TestRewriter.java FrameRewriterTest.java HTMLParserAdaptor.java HTMLRewriter.java Rewriter.java SampleRewriter.java SwingParserAdaptor.java
taylor 2002/10/29 10:38:06
Modified:src/java/org/apache/jetspeed/modules/actions/controllers
PanedControllerAction.java
src/java/org/apache/jetspeed/portal/portlets
AggregatePortlet.java
src/java/org/apache/jetspeed/util/rewriter
FrameRewriterTest.java HTMLParserAdaptor.java
HTMLRewriter.java Rewriter.java SampleRewriter.java
SwingParserAdaptor.java
Added: src/java/org/apache/jetspeed/portal/portlets
WebPagePortlet2.java
src/java/org/apache/jetspeed/util Streams.java
src/java/org/apache/jetspeed/util/rewriter
ProxyRewriter.java TestRewriter.java
Log:
- implementation of WebPagePortlet2
- added starts of a Proxy-based rewriter. This is incomplete and shouldn't yet be
used until all code is committed
Revision ChangesPath
1.8 +9 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java
Index: PanedControllerAction.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PanedControllerAction.java22 Mar 2002 18:42:06 - 1.7
+++ PanedControllerAction.java29 Oct 2002 18:38:05 - 1.8
@@ -65,6 +65,7 @@
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.MetaInfo;
import org.apache.jetspeed.om.profile.Layout;
+import org.apache.jetspeed.services.resources.JetspeedResources;
// Turbine stuff
import org.apache.turbine.util.Log;
@@ -104,13 +105,18 @@
Portlet portlet = null;
String paneID = null;
-String paneName = rundata.getParameters().getString( js_panename );
+String paneName = rundata.getParameters().getString(
JetspeedResources.PATH_PANENAME_KEY );
+
if (null != paneName)
{
portlet = myPortlets.getPortletByName(paneName);
if (portlet != null)
+{
paneID = portlet.getID();
+
rundata.getParameters().setString(JetspeedResources.PATH_PANEID_KEY, paneID);
+}
}
+
if (null == portlet)
{
paneID = cont.retrievePaneID(rundata, true);
@@ -120,8 +126,8 @@
paneID = cont.retrievePaneID(rundata, false);
portlet = myPortlets.getPortletByID(paneID);
}
-
}
+
if (portlet != null)
context.put(pane, portlet);
cont.savePaneID(rundata, paneID);
1.3 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java
Index: AggregatePortlet.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AggregatePortlet.java 27 Sep 2002 19:54:26 - 1.2
+++ AggregatePortlet.java 29 Oct 2002 18:38:05 - 1.3
@@ -111,15 +111,18 @@
{
return new JetspeedClearElement(Path parameter not set);
}
-
+System.err.println(path = + path);
ProfileLocator locator = new BaseProfileLocator();
locator.createFromPath(path);
String id = locator.getId();
+System.err.println(id = + id);
try
{
Profile profile = Profiler.getProfile(locator);
PSMLDocument doc = profile.getDocument();
+System.err.println(doc = + doc);
+
if (doc == null)
{
return null;
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java
Index: WebPagePortlet2.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets AggregatePortlet.java
taylor 2002/10/29 10:39:39
Modified:src/java/org/apache/jetspeed/portal/portlets
AggregatePortlet.java
Log:
removed debug
Revision ChangesPath
1.4 +1 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java
Index: AggregatePortlet.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AggregatePortlet.java 29 Oct 2002 18:38:05 - 1.3
+++ AggregatePortlet.java 29 Oct 2002 18:39:39 - 1.4
-111,17 +111,14
{
return new JetspeedClearElement(Path parameter not set);
}
-System.err.println(path = + path);
ProfileLocator locator = new BaseProfileLocator();
locator.createFromPath(path);
String id = locator.getId();
-System.err.println(id = + id);
try
{
Profile profile = Profiler.getProfile(locator);
PSMLDocument doc = profile.getDocument();
-System.err.println(doc = + doc);
if (doc == null)
{
--
To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.template
taylor 2002/10/29 10:53:32 Modified:webapp/WEB-INF/conf JetspeedSecurity.template Log: The LDAP settings disappeared! The JetspeedSecurity properties configuration confuses me My vote is to get rid of the 3 file-configuration. Its just too complicated Revision ChangesPath 1.8 +39 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.template Index: JetspeedSecurity.template === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.template,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- JetspeedSecurity.template 21 Oct 2002 22:40:22 - 1.7 +++ JetspeedSecurity.template 29 Oct 2002 18:53:32 - 1.8 @@ -8,6 +8,8 @@ # # --- services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService +### LDAP: services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.ldap.LDAPService + # # Programmatic Cascade Delete Service # @@ -20,6 +22,7 @@ # [EMAIL PROTECTED]@ +### LDAP: services.PortalAuthentication.classname=org.apache.jetspeed.services.security.ldap.LDAPAuthentication # # Authorization Service # @@ -32,6 +35,8 @@ # [EMAIL PROTECTED]@ +### LDAP: services.UserManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPUserManagement +### LDAP: services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.ldap.LDAPUser # # Role Management Service # @@ -41,6 +46,9 @@ services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.BaseJetspeedRole services.JetspeedSecurity.role.default=user +### LDAP: services.RoleManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPRoleManagement +### LDAP: services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.ldap.LDAPRole + # # Group Management Service # # @@ -48,6 +56,10 @@ [EMAIL PROTECTED]@ services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup +### LDAP: services.GroupManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPGroupManagement +### LDAP: services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.ldap.LDAPGroup + + # # Permission Management Service# # @@ -55,6 +67,9 @@ [EMAIL PROTECTED]@ services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission +### LDAP: services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement + + # # Security Cache Service# # @@ -131,4 +146,27 @@ # services.JetspeedSecurity.actions.anon.disable=true services.JetspeedSecurity.action.allusers.disable=false + + + # + # LDAP Service # + # + services.ldap.classname=org.apache.jetspeed.services.ldap.LDAPService + #services.ldap.host=192.168.0.20 + services.ldap.host=213.194.65.90 + services.ldap.port=389 + services.ldap.sslport=636 + services.ldap.basedn=o/EBIT + services.ldap.managerdn=cn/administrator%ou/members%o/EBIT + services.ldap.password=password + services.ldap.anonymousbind=false + services.ldap.securityauthentication=simple + #services.ldap.securityprotocol=ssl + #services.ldap.socketfactory=javax.net.ssl.SSLSocketFactory + #services.ldap.jndiprovider=com.sun.jndi.ldap.LdapCtxFactory + #services.ldap.saslclientpckgs= + services.ldap.limit=0 + services.ldap.timeout=0 + services.ldap.version=3 + -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.default JetspeedSecurity.template
taylor 2002/10/29 11:09:24 Modified:webapp/WEB-INF/conf JetspeedSecurity.default JetspeedSecurity.template Log: cleaning up ant merges on security. I dont agree with this method, but it needs to be fixed. Revision ChangesPath 1.5 +36 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default Index: JetspeedSecurity.default === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JetspeedSecurity.default 6 Sep 2002 03:29:43 - 1.4 +++ JetspeedSecurity.default 29 Oct 2002 19:09:24 - 1.5 @@ -7,6 +7,7 @@ # escape the comma (i.e. '\,') # # --- +services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService # # Authentication Service# @@ -14,6 +15,7 @@ services.PortalAuthentication.classname=org.apache.jetspeed.services.security.turbine.TurbineAuthentication #services.PortalAuthentication.classname=org.apache.jetspeed.services.security.nosecurity.NoAuthentication +### LDAP: services.PortalAuthentication.classname=org.apache.jetspeed.services.security.ldap.LDAPAuthentication # # Authorization Service # @@ -28,32 +30,65 @@ # services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement +services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser #services.UserManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoUserManagement +### LDAPservices.UserManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPUserManagement +### LDAP: services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.ldap.LDAPUser # # Role Management Service # # services.RoleManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineRoleManagement +services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.BaseJetspeedRole #services.RoleManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoRoleManagement +### LDAP: services.RoleManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPRoleManagement +### LDAP: services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.ldap.LDAPRole # # Group Management Service # # services.GroupManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineGroupManagement +services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup #services.GroupManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoGroupManagement +### LDAP: services.GroupManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPGroupManagement +### LDAP: services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.ldap.LDAPGroup + # # Permission Management Service# # services.PermissionManagement.classname=org.apache.jetspeed.services.security.turbine.TurbinePermissionManagement +services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission #services.PermissionManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoPermissionManagement +### LDAP: services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement # # Security Cache Service# # services.SecurityCache.classname=org.apache.jetspeed.services.security.SecurityCacheImpl + + # + # LDAP Service # + # + services.ldap.classname=org.apache.jetspeed.services.ldap.LDAPService + #services.ldap.host=192.168.0.20 + services.ldap.host=213.194.65.90 + services.ldap.port=389 + services.ldap.sslport=636 + services.ldap.basedn=o/EBIT + services.ldap.managerdn=cn/administrator%ou/members%o/EBIT + services.ldap.password=password + services.ldap.anonymousbind=false + services.ldap.securityauthentication=simple + #services.ldap.securityprotocol=ssl + #services.ldap.socketfactory
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties
taylor 2002/10/29 11:10:57 Modified:webapp/WEB-INF/conf JetspeedSecurity.properties Log: Revision ChangesPath 1.38 +2 -3 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties Index: JetspeedSecurity.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- JetspeedSecurity.properties 29 Oct 2002 18:35:53 - 1.37 +++ JetspeedSecurity.properties 29 Oct 2002 19:10:57 - 1.38 -32,6 +32,7 # services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement +services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser # # Role Management Service # -60,8 +61,6 # services.SecurityCache.classname=org.apache.jetspeed.services.security.SecurityCacheImpl - -services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser # This is used by the SecurityService to make the password checking # secure. When enabled, passwords are transformed by a one-way -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.default
taylor 2002/10/29 11:25:25 Modified:webapp/WEB-INF/conf JetspeedSecurity.default Log: Revision ChangesPath 1.6 +3 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default Index: JetspeedSecurity.default === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JetspeedSecurity.default 29 Oct 2002 19:09:24 - 1.5 +++ JetspeedSecurity.default 29 Oct 2002 19:25:25 - 1.6 -64,6 +64,8 services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission #services.PermissionManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoPermissionManagement ### LDAP: services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement +### LDAP: services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.ldap.LDAPPermission + # # Security Cache Service# -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html user-group-form.vm user-browser.vm
taylor 2002/11/08 14:12:22
Modified:webapp/WEB-INF/conf JetspeedSecurity.properties admin.xreg
webapp/WEB-INF/psml/user/admin/html default.psml
webapp/WEB-INF/templates/vm/portlets/html user-browser.vm
Added: src/java/org/apache/jetspeed/modules/actions/portlets/security
UserGroupUpdateAction.java
webapp/WEB-INF/templates/vm/portlets/html user-group-form.vm
Log:
User-Group management for Admin contributed by Scott Weaver
Revision ChangesPath
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserGroupUpdateAction.java
Index: UserGroupUpdateAction.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
* Apache Jetspeed must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache or
*Apache Jetspeed, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.jetspeed.modules.actions.portlets.security;
// java util
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
import org.apache.jetspeed.modules.actions.portlets.security.SecurityConstants;
import org.apache.jetspeed.om.security.Group;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.portal.portlets.VelocityPortlet;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.StringUtils;
import org.apache.velocity.context.Context;
/**
* This action sets up the template context for editing security roles in the
Turbine database
* for a given user.
*
* @author a href=mailto:taylor;apache.orgDavid Sean Taylor/a
* @version $Id: UserGroupUpdateAction.java,v 1.1 2002/11/08 22:12:21 taylor Exp $
*/
public class UserGroupUpdateAction extends VelocityPortletAction
{
/**
* Build the maximized state content for this portlet. (Same as normal state).
*
* @param portlet The velocity-based portlet that is being built
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html Tool_jslink_examples.vm
taylor 2002/11/11 16:34:57
Modified:src/java/org/apache/jetspeed/portal/controllers
VelocityPanedPortletController.java
src/java/org/apache/jetspeed/services/resources
JetspeedResources.java
src/java/org/apache/jetspeed/util/template
JetspeedTemplateLink.java
webapp/WEB-INF/conf JetspeedSecurity.properties
webapp/WEB-INF/templates/vm/portlets/html
Tool_jslink_examples.vm
Log:
Bug Fix: 14421 - Can't navigate to subpanes
NOTE: Current support only to one subpane level
Added example to jslink example portlet
Revision ChangesPath
1.7 +59 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java
Index: VelocityPanedPortletController.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityPanedPortletController.java 30 Jul 2002 02:07:59 - 1.6
+++ VelocityPanedPortletController.java 12 Nov 2002 00:34:57 - 1.7
-67,6 +67,7
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
import org.apache.jetspeed.services.statemanager.SessionState;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
+import org.apache.jetspeed.services.resources.JetspeedResources;
/**
* A Velocity based portlet controller implementation that can be used
-83,7 +84,6
implements PanedPortletController
{
public static final String DEFAULT_PARAMETER = pane;
-public static final String PANE_PARAMETER = js_pane;
/*
* return the pane parameter name
-91,9 +91,10
*/
public String getPaneParameter()
{
-return PANE_PARAMETER;
+return JetspeedResources.PATH_PANEID_KEY;
}
+
/**
* Test whether the selected portlet is considered selected for the current
* request.
-106,6 +107,7
{
String peid = rundata.getParameters().getString( getPaneParameter() );
String last = retrievePaneIDFromSession(rundata);
+
if (peid == null)
{
if (last == null)
-119,22 +121,65
}
else
{
-if (p.getID().equals(peid))
-return true;
+String subPane = null;
+int index = peid.indexOf(JetspeedResources.PATH_SUBPANE_SEPARATOR);
+if (index -1)
+{
+subPane = peid.substring(index + 1);
+peid = peid.substring(0, index);
+}
+
+
+
+if ( p.getID().equals(peid) ) // subPane == null )
+{
+return true;
+}
+
+// is this the sub pane?
+if (subPane!=null p.getID().equals(subPane))
+{
+ // change the currently selected pane in the user session
+ // If this is not done, the tab selection works, but the
+ // content is picked up from the pane in the session!!
+ SessionState state =
((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
+ state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);
+
+ return true;
+}
+
// is the peid for this tab set?
if (getPortlets().getPortletByID(peid) != null)
{
// its for another tab in this set
return false;
}
-else
+if (subPane == null)
{
if (last == null)
+{
return (getPortlets().getPortletAt( 0 ) == p);
+}
else
+{
return (p.getID().equals(last));
+}
+}
+else
+{
+if (p.getID().equals( subPane ))
+{
+// change the currently selected pane in the user session
+// If this is not done, the tab selection works, but the
+// content is picked up from the pane in the session!!
+SessionState state =
+
((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
+state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);
+return true;
+}
}
}
+return false;
}
/**
-188,6 +233,12
cvs commit: jakarta-jetspeed/test/testdata/psml - New directory
taylor 2002/11/13 22:41:14 jakarta-jetspeed/test/testdata/psml - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/test/testdata/psml/user - New directory
taylor 2002/11/13 22:41:21 jakarta-jetspeed/test/testdata/psml/user - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/test/testdata/psml/user/cachetest - New directory
taylor 2002/11/13 22:41:31 jakarta-jetspeed/test/testdata/psml/user/cachetest - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf HttpAgentLog4j.properties JetspeedResources.properties JetspeedSecurity.properties
taylor 2002/11/13 22:52:41 Modified:buildbuild.xml src/java/org/apache/jetspeed/services/psmlmanager CastorPsmlManagerService.java webapp/WEB-INF/conf JetspeedResources.properties JetspeedSecurity.properties Added: src/java/org/apache/jetspeed/cache FileCache.java FileCacheEntry.java FileCacheEventListener.java TestFileCache.java test/testdata/psml/user/cachetest default.psml webapp/WEB-INF/conf HttpAgentLog4j.properties Log: Refactored the CastorPSMLManager service. After several days of (unplanned) JMeter testing, was seeing that: - the weakreferences *Never* worked. The cache was being completely bypassed - if the document failed to load for some reason, we had an infinite loop crash in the getDocument method - still not sure why the document was failing to load, but I can no longer repro with refactored impl The new implementation makes use of some new classes in the org.apache.jetspeed.cache package: * FileCache - a file cache, used by the CastorPSMLManager, to manager the caching of psml resources * FileCachEventListener - events are sent back to the CastorPSMLManager when a doc is refreshed or evicted * The JR.p now supports to more settings: - scanRate - in seconds for refreshing the cache - cacheSize - the max size of the cache before eviction kicks. Eviction is based least used * unit test for FileCache Revision ChangesPath 1.167 +6 -1 jakarta-jetspeed/build/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- build.xml 7 Nov 2002 20:25:17 - 1.166 +++ build.xml 14 Nov 2002 06:52:36 - 1.167 @@ -261,7 +261,10 @@ include name=org/apache/jetspeed/services/security/UserManagement.java/ include name=org/apache/jetspeed/util/MetaData.java/ !-- include name=org/apache/jetspeed/services/security/ldap/UnixCrypt.java/ -- - include name=org.apache/jetspeed/services/security/ldap/JetspeedLDAPSecurityService/ +include name=org.apache/jetspeed/services/security/ldap/JetspeedLDAPSecurityService/ +include name=org.apache/jetspeed/cache/FileCache.java/ +include name=org.apache/jetspeed/cache/FileCacheEntry.java/ +include name=org.apache/jetspeed/cache/TestFileCache.java/ /patternset /fileset /checkstyle @@ -975,6 +978,7 @@ test name=org.apache.jetspeed.util.rewriter.FrameRewriterTest/ test name=org.apache.jetspeed.services.profiler.TestProfilerService/ test name=org.apache.jetspeed.services.registry.TestRegistryCategories/ + test name=org.apache.jetspeed.cache.TestFileCache/ !-- test name=org.apache.jetspeed.services.registry.TestRegistryPersistence/ -- @@ -1212,6 +1216,7 @@ /ant /target + !-- === -- !-- Include the usage target and the test targets for the different -- 1.1 jakarta-jetspeed/src/java/org/apache/jetspeed/cache/FileCache.java Index: FileCache.java === /* * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. The end-user documentation included with the redistribution, *if any, must include the following acknowledgment: * This product includes software developed by the *Apache Software Foundation (http://www.apache.org/). *Alternately, this acknowledgment may appear in the software itself, *if and wherever such third-party acknowledgments normally appear. * * 4. The names Apache
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/cache FileCache.java TestFileCache.java
taylor 2002/11/13 22:58:39
Modified:src/java/org/apache/jetspeed/cache FileCache.java
TestFileCache.java
Log:
broke the unit test with the newly created 'cvs' directory, nice
Revision ChangesPath
1.2 +1 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/cache/FileCache.java
Index: FileCache.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/FileCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileCache.java14 Nov 2002 06:52:36 - 1.1
+++ FileCache.java14 Nov 2002 06:58:38 - 1.2
-333,7 +333,6
{
FileCacheEntry e1 = (FileCacheEntry)o1;
FileCacheEntry e2 = (FileCacheEntry)o2;
-
if (e1.getLastAccessed() e2.getLastAccessed())
{
return -1;
1.2 +5 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/cache/TestFileCache.java
Index: TestFileCache.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/TestFileCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFileCache.java14 Nov 2002 06:52:37 - 1.1
+++ TestFileCache.java14 Nov 2002 06:58:38 - 1.2
-135,6 +135,10
File[] files = directory.listFiles();
for (int ix=0; ix files.length; ix++)
{
+if (files[ix].isDirectory())
+{
+continue;
+}
String testData = readFile(files[ix]);
cache.put(files[ix], testData);
}
--
To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/build/axis - New directory
taylor 2002/11/14 09:58:12 jakarta-jetspeed/build/axis - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/build/axis/bin - New directory
taylor 2002/11/14 10:03:19 jakarta-jetspeed/build/axis/bin - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/build/axis/dist - New directory
taylor 2002/11/14 10:03:23 jakarta-jetspeed/build/axis/dist - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/build/axis/local - New directory
taylor 2002/11/14 10:03:26 jakarta-jetspeed/build/axis/local - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/build/axis/tmp - New directory
taylor 2002/11/14 10:03:30 jakarta-jetspeed/build/axis/tmp - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization - New directory
taylor 2002/11/14 12:27:31 jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/language - New directory
taylor 2002/11/14 12:28:08 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/language - New directory -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/xdocs code-standards.xml
taylor 2002/11/14 12:30:24
Modified:buildbuild.xml
webapp/WEB-INF/conf TurbineResources.properties
portlets.xreg
xdocscode-standards.xml
Added: src/java/org/apache/jetspeed/portal/portlets/language
ChangeLanguagePortlet.java ConstructorHtml.java
src/java/org/apache/jetspeed/services/customlocalization
CustomLocalization.java
CustomLocalizationService.java
CustomLocalizationTool.java
JetspeedLocalizationService.java
webapp/images ic-de.gif ic-en.gif ic-es.gif ic-fr.gif
ic-it.gif ic_ja.gif
Log:
Change Language Portlet, JetspeedLocalizationService contributed by Massimiliano
Dessi [[EMAIL PROTECTED]]
Its not working yet, but hope to work with Massimiliano to clean it up soon
Revision ChangesPath
1.169 +0 -26 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- build.xml 14 Nov 2002 18:04:32 - 1.168
+++ build.xml 14 Nov 2002 20:30:23 - 1.169
@@ -1219,32 +1219,6 @@
!-- === --
-!-- Run the client JUnit test cases (non-cactus)--
-!-- === --
-target name=t depends=compile
-description=General unit tests
-
-junit printsummary=yes haltonfailure=yes haltonerror=yes fork=yes
-
-classpath
-pathelement location=${build.dest.dir}/
-path refid=classpath/
-pathelement location=${junit.jar}/
-pathelement location=${hsql.jar}/
-/classpath
-
-formatter type=plain usefile=false/
-
-!-- JUnit unit tests --
- test name=org.apache.jetspeed.cache.TestFileCache/
-!--
-test
name=org.apache.jetspeed.services.registry.TestRegistryPersistence/
---
-
-/junit
-/target
-
-!-- === --
!-- Include the usage target and the test targets for the different --
!-- servlet engine --
!-- === --
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/language/ChangeLanguagePortlet.java
Index: ChangeLanguagePortlet.java
===
package org.apache.jetspeed.portal.portlets.language;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
* Apache Jetspeed must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache or
*Apache Jetspeed, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS
cvs commit: jakarta-jetspeed/xdocs/stylesheets project.xml
taylor 2002/11/14 14:43:09 Modified:xdocschanges.xml xdocs/stylesheets project.xml Log: turned on registry docs (possibly before its time, sorry Raphael) i needed a link to reference in the tutorial Revision ChangesPath 1.91 +7 -1 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- changes.xml 14 Nov 2002 20:21:51 - 1.90 +++ changes.xml 14 Nov 2002 22:43:09 - 1.91 -23,6 +23,12 /li -- li + Add - 2002/11/14 - Jetspeed/Axis Integration, ChangeLanguagePortlet (DT) +/li +li + Add - 2002/11/14 - Added FileCache, refactored and bug fixes on CastorPSMLManager (DT) +/li +li Add - 2002/11/14 - Empty portlet categories in customizer are now supressed by default (MO) /li li 1.16 +1 -0 jakarta-jetspeed/xdocs/stylesheets/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-jetspeed/xdocs/stylesheets/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 15 Oct 2002 19:06:24 - 1.15 +++ project.xml 14 Nov 2002 22:43:09 - 1.16 -31,6 +31,7 item name=Jetspeed Trailmap href=http://mml.hpl.hp.com:9090/jetspeed/trailmap/index.html/ /menu menu name=Components +item name=Registry href=/registry.html/ item name=Security href=/security.html/ item name=Syndication href=/content-syndication.html/ item name=WAP href=/wap.html/ -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf TurbineResources.properties
taylor 2002/11/15 14:02:51 Modified:webapp/WEB-INF/conf TurbineResources.properties Log: - rollback to TurbineLocalization service, multiple resource files failing with new service Revision ChangesPath 1.64 +2 -3 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties Index: TurbineResources.properties === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- TurbineResources.properties 14 Nov 2002 20:30:24 - 1.63 +++ TurbineResources.properties 15 Nov 2002 22:02:50 - 1.64 -364,8 +364,7 services.RunDataService.classname=org.apache.jetspeed.services.rundata.JetspeedRunDataService services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService -# services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService -services.LocalizationService.classname=org.apache.jetspeed.services.customlocalization.JetspeedLocalizationService +services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService -- To unsubscribe, e-mail: mailto:jetspeed-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:jetspeed-dev-help;jakarta.apache.org
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager TestDbCriteria.java
taylor 2002/11/18 16:14:49
Added: src/java/org/apache/jetspeed/services/psmlmanager
TestDbCriteria.java
Log:
added unit test for PSML DB Criteria
Revision ChangesPath
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java
Index: TestDbCriteria.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
* Apache Jetspeed must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache or
*Apache Jetspeed, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.jetspeed.services.psmlmanager;
// Junit imports
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.framework.TestCase;
// Turbine imports
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.BaseProfile;
import org.apache.torque.util.Criteria;
/**
* TestDbCriteria
*
* @author a href=[EMAIL PROTECTED]David Sean Taylor/a
* @version $Id: TestDbCriteria.java,v 1.1 2002/11/19 00:14:48 taylor Exp $
*/
public class TestDbCriteria extends TestCase {
/** the column name for the PSML_ID field */
public static final String PSML_ID;
/** the column name for the USER_NAME field */
public static final String USER_NAME;
/** the column name for the MEDIA_TYPE field */
public static final String MEDIA_TYPE;
/** the column name for the LANGUAGE field */
public static final String LANGUAGE;
/** the column name for the COUNTRY field */
public static final String COUNTRY;
/** the column name for the PAGE field */
public static final String PAGE;
/** the column name for the PROFILE field */
public static final String PROFILE;
static
{
PSML_ID = JETSPEED_USER_PROFILE.PSML_ID;
USER_NAME = JETSPEED_USER_PROFILE.USER_NAME;
MEDIA_TYPE = JETSPEED_USER_PROFILE.MEDIA_TYPE;
LANGUAGE = JETSPEED_USER_PROFILE.LANGUAGE;
COUNTRY = JETSPEED_USER_PROFILE.COUNTRY;
PAGE = JETSPEED_USER_PROFILE.PAGE;
PROFILE = JETSPEED_USER_PROFILE.PROFILE
cvs commit: jakarta-jetspeed/build build.xml
taylor 2002/11/18 16:15:38 Modified:buildbuild.xml Log: added unittest for dbpsml criteria Revision ChangesPath 1.171 +1 -1 jakarta-jetspeed/build/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- build.xml 16 Nov 2002 17:30:32 - 1.170 +++ build.xml 19 Nov 2002 00:15:38 - 1.171 @@ -973,6 +973,7 @@ !-- JUnit unit tests -- test name=org.apache.jetspeed.capability.TestCapabilityMap/ test name=org.apache.jetspeed.services.psmlmanager.TestMarshalPsml/ +test name=org.apache.jetspeed.services.psmlmanager.TestDbCriteria/ test name=org.apache.jetspeed.services.registry.TestMarshallRegistry/ test name=org.apache.jetspeed.services.idgenerator.TestIdGenerator/ test name=org.apache.jetspeed.util.template.TestJetspeedLinkFactory/ @@ -1217,7 +1218,6 @@ /ant /target - !-- === -- !-- Include the usage target and the test targets for the different -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html default.psml
taylor 2002/11/19 16:18:55 Modified:webapp/WEB-INF/psml/group/Jetspeed/html default.psml news.psml ref_example.psml security_example.psml webapp/WEB-INF/psml/group/apache/html default.psml news.psml webapp/WEB-INF/psml/role/admin/html default.psml webapp/WEB-INF/psml/role/user/html default.psml webapp/WEB-INF/psml/user/admin/html default.psml new.psml webapp/WEB-INF/psml/user/anon/html default.psml webapp/WEB-INF/psml/user/anon/html/en default.psml news.psml webapp/WEB-INF/psml/user/anon/html/es default.psml news.psml webapp/WEB-INF/psml/user/turbine/html default.psml Log: - removed all the hardcoded skins so that a bloke can apply a default skin to the entire website with one configuration line in the JRP Revision ChangesPath 1.2 +0 -1 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/default.psml Index: default.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/default.psml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- default.psml 23 Jul 2002 00:03:55 - 1.1 +++ default.psml 20 Nov 2002 00:18:54 - 1.2 @@ -3,7 +3,6 @@ metainfo titleDefault Jetspeed Group page/title /metainfo -skin name=orange-red/ controller name=RowController/ entry id=P-ef3491cc34-10004 parent=Apacheweek/ entry id=P-ef3491cc34-10005 parent=Mozilla 1.3 +0 -1 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml Index: news.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news.psml 30 Jul 2002 02:07:59 - 1.2 +++ news.psml 20 Nov 2002 00:18:54 - 1.3 @@ -3,7 +3,6 @@ metainfo titleDefault Jetspeed News page/title /metainfo -skin name=orange-red / controller name=ColumnController/ control name=TitlePortletControl/ entry id=P-ef3477167b-1001c parent=Apacheweek/ 1.2 +0 -1 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/ref_example.psml Index: ref_example.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/ref_example.psml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ref_example.psml 3 Aug 2002 14:55:48 - 1.1 +++ ref_example.psml 20 Nov 2002 00:18:54 - 1.2 @@ -3,7 +3,6 @@ metainfo titleReference Example/title /metainfo -skin name=orange-red/ controller name=TwoColumns/ entry id=P-ef707d3346-1001c parent=HelloVelocity layout position=-1 size=-1 1.4 +0 -1 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml Index: security_example.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- security_example.psml 30 Jul 2002 02:07:59 - 1.3 +++ security_example.psml 20 Nov 2002 00:18:54 - 1.4 @@ -1,7 +1,6 @@ ?xml version=1.0 encoding=UTF-8? portlets id=100 security-ref parent=admin-only/ -skin name=orange-red/ metainfo titleSecurity Example/title /metainfo 1.3 +0 -4 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml Index: default.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- default.psml 30 Jul 2002 02:07:57 - 1.2 +++ default.psml 20 Nov 2002 00:18:54 - 1.3 @@ -7,10 +7,6 @@ controller name=RowController/ control name=TitlePortletControl/ -skin - property name=background-color value=#ee/ -/skin - entry id=101 type=ref parent=Apacheweek/ entry id=102 type=ref parent=Mozilla parameter name=itemDisplayed value=5/ 1.3 +0 -2 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml Index: news.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml,v retrieving revision 1.2 retrieving
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit JetspeedPortalToolkitService.java
taylor 2002/11/19 16:19:44
Modified:src/java/org/apache/jetspeed/services/portaltoolkit
JetspeedPortalToolkitService.java
Log:
- Fixed the bug in the toolkit that was breaking default skin support from the JRP
Revision ChangesPath
1.24 +6 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java
Index: JetspeedPortalToolkitService.java
===
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JetspeedPortalToolkitService.java 8 Nov 2002 10:05:18 - 1.23
+++ JetspeedPortalToolkitService.java 20 Nov 2002 00:19:44 - 1.24
@@ -116,7 +116,7 @@
this.defaultControl = serviceConf.getString(default.control);
this.defaultController = serviceConf.getString(default.controller);
this.defaultSkin = serviceConf.getString(default.skin);
-
+System.out.println(default skin = + this.defaultSkin);
setInit(true);
}
@@ -535,6 +535,10 @@
if (portlets.getSkin()!=null)
{
pc.setPortletSkin( getSkin( portlets.getSkin() ) );
+}
+else
+{
+pc.setPortletSkin( getSkin( this.defaultSkin ) );
}
pc.setSecurityRef( portlets.getSecurityRef() );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit JetspeedPortalToolkitService.java
taylor 2002/11/20 08:32:38 Modified:src/java/org/apache/jetspeed/services/portaltoolkit JetspeedPortalToolkitService.java Log: remove println Revision ChangesPath 1.25 +1 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java Index: JetspeedPortalToolkitService.java === RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- JetspeedPortalToolkitService.java 20 Nov 2002 00:19:44 - 1.24 +++ JetspeedPortalToolkitService.java 20 Nov 2002 16:32:38 - 1.25 @@ -116,7 +116,6 @@ this.defaultControl = serviceConf.getString(default.control); this.defaultController = serviceConf.getString(default.controller); this.defaultSkin = serviceConf.getString(default.skin); -System.out.println(default skin = + this.defaultSkin); setInit(true); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/role/user/html default.psml
taylor 2002/11/20 11:48:30 Modified:webapp/WEB-INF/psml/group/Jetspeed/html news.psml security_example.psml webapp/WEB-INF/psml/group/apache/html default.psml news.psml webapp/WEB-INF/psml/role/user/html default.psml Log: problems with referencing PSML resources with hard-coded ids such as 100, in that they conflicted with ids in the current page. This was giving me some real headaches, so I removed all the common ids from any psml that may be referenced Revision ChangesPath 1.4 +1 -1 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml Index: news.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- news.psml 20 Nov 2002 00:18:54 - 1.3 +++ news.psml 20 Nov 2002 19:48:30 - 1.4 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -portlets id=100 user=default xmlns=http://xml.apache.org/jetspeed/2000/psml; +portlets user=default xmlns=http://xml.apache.org/jetspeed/2000/psml; metainfo titleDefault Jetspeed News page/title /metainfo 1.5 +9 -9 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml Index: security_example.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- security_example.psml 20 Nov 2002 00:18:54 - 1.4 +++ security_example.psml 20 Nov 2002 19:48:30 - 1.5 @@ -1,34 +1,34 @@ ?xml version=1.0 encoding=UTF-8? -portlets id=100 +portlets security-ref parent=admin-only/ metainfo titleSecurity Example/title /metainfo control name=TabControl/ controller name=TabController/ -portlets id=101 +portlets security-ref parent=user-only/ metainfo titleUser group can Customize/title /metainfo controller name=TwoColumns/ -entry id=102 parent=LoggedInWelcome/ -entry id=103 parent=SecurityExample/ -entry id=104 parent=Search/ +entry parent=LoggedInWelcome/ +entry parent=SecurityExample/ +entry parent=Search/ /portlets -portlets id=105 +portlets security-ref parent=admin-only/ metainfo titleAdmin group can Customize/title /metainfo controller name=TwoColumns/ -entry id=106 parent=LoggedInWelcome/ -entry id=107 parent=SecurityExample +entry parent=LoggedInWelcome/ +entry parent=SecurityExample metainfo titleSecurity Example in Admin Tab/title /metainfo /entry -entry id=108 parent=Search +entry parent=Search metainfo titleSearch in Admin Tab/title /metainfo 1.4 +5 -9 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml Index: default.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.psml 20 Nov 2002 00:18:54 - 1.3 +++ default.psml 20 Nov 2002 19:48:30 - 1.4 @@ -1,17 +1,13 @@ ?xml version=1.0 encoding=UTF-8? -portlets id=100 user=default +portlets xmlns=http://xml.apache.org/jetspeed/2000/psml; metainfo titleDefault Apache Group page/title /metainfo - controller name=RowController/ - control name=TitlePortletControl/ + controller name=ColumnController/ -entry id=101 type=ref parent=Apacheweek/ -entry id=102 type=ref parent=Mozilla - parameter name=itemDisplayed value=5/ -/entry - -entry id=103 type=ref parent=XMLHack/ +entry type=ref parent=Apacheweek/ +entry type=ref parent=Mozilla/ +entry type=ref parent=XMLHack/ /portlets 1.4 +3 -3 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml Index: news.psml === RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- news.psml 20 Nov 2002 00:18:54 - 1.3 +++ news.psml 20 Nov 2002 19:48:30 - 1.4 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -portlets id='5000' xmlns=http://xml.apache.org
