You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/29 14:41:18 UTC
svn commit: r264129 [3/3] - in
/portals/jetspeed-2/branches/SummersOfCode-2005: ./ src/webapp/WEB-INF/
src/webapp/WEB-INF/assembly/ src/webapp/WEB-INF/assembly/boot/
src/webapp/WEB-INF/decorations/layout/html/ja/tigris/
src/webapp/WEB-INF/decorations/l...
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/template/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/template/default-page.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/template/default-page.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/template/default-page.psml Mon Aug 29 05:37:53 2005
@@ -19,6 +19,7 @@
<title>User Home</title>
<metadata name="title" xml:lang="ja">ã¦ã¼ã¶ã¼ãã¼ã </metadata>
<metadata name="title" xml:lang="es">Carpeta de Usuario</metadata>
+ <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</metadata>
<fragment id="uhtemp-1000" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="uhtemp-1001" type="portlet" name="rss::RSS">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/folder.metadata?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/folder.metadata (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/folder.metadata Mon Aug 29 05:37:53 2005
@@ -47,7 +47,7 @@
<separator>
<text>Non Java Pages</text>
<metadata name="text" xml:lang="ja">Non-Javaãã¼ã¸</metadata>
- <metadata name="text" xml:lang="es">Páginas sin Java</metadata>
+ <metadata name="text" xml:lang="es">Portlets sin Java</metadata>
</separator>
<options>/non-java</options>
</menu>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml Mon Aug 29 05:37:53 2005
@@ -4,9 +4,12 @@
<title>Nested Layout Test</title>
<metadata name="title" xml:lang="ja">å
¥ãåã¬ã¤ã¢ã¦ããã¹ã</metadata>
<metadata name="title" xml:lang="es">Prueba: puesta en página anidada</metadata>
+ <metadata name="title" xml:lang="hu">Beágyazott elrendezés teszt</metadata>
+
<short-title>Nested Layout</short-title>
<metadata name="short-title" xml:lang="ja">å
¥ãåã¬ã¤ã¢ã¦ã</metadata>
<metadata name="short-title" xml:lang="es">Anidación</metadata>
+ <metadata name="short-title" xml:lang="hu">Beágyazott elrendezés</metadata>
<fragment id="100393" type="layout" name="jetspeed-layouts::VelocityOneColumn">
<fragment id="100939" type="portlet" name="pam::LocaleSelector">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/p003.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/p003.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/p003.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/_user/user/p003.psml Mon Aug 29 05:37:53 2005
@@ -23,6 +23,7 @@
<title>[USER 003] PSML page</title>
<metadata name="title" xml:lang="ja">[ã¦ã¼ã¶ã¼ 003] PSML ãã¼ã¸</metadata>
<metadata name="title" xml:lang="es">Página PSML, [USUARIO 003]</metadata>
+ <metadata name="title" xml:lang="hu">[Felhasználó 003] PSML oldal</metadata>
<fragment id="u3-xx2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/css-demo.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/css-demo.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/css-demo.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/css-demo.psml Mon Aug 29 05:37:53 2005
@@ -14,17 +14,19 @@
<defaults
skin="orange"
layout-decorator="tigris"
- portlet-decorator="tigris"
+ portlet-decorator="blue-gradient"
/>
<title>CSS Demo</title>
<fragment id="css-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
- <fragment id="css-1" type="portlet" name="demo::CSSDemoPortlet" decorator="tigris">
+ <fragment id="css-1" type="portlet" name="demo::CSSDemoPortlet" >
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
</fragment>
<metadata name="title" xml:lang="ja">CSS ãã¢</metadata>
- <metadata name="title" xml:lang="es">Demo de hojas de Estilo CSS</metadata>
+ <metadata name="title" xml:lang="es">Demo Hojas de Estilo en Cascada</metadata>
+ <metadata name="short-title" xml:lang="es">Demo CSS</metadata>
+ <metadata name="title" xml:lang="hu">CSS</metadata>
<security-constraints>
<security-constraints-ref>users</security-constraints-ref>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/default-page.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/default-page.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/default-page.psml Mon Aug 29 05:37:53 2005
@@ -23,6 +23,7 @@
<metadata name="title" xml:lang="fr">Ma Premiere Page de PSML</metadata>
<metadata name="title" xml:lang="ja">Jetspeed 2 ã¸ãããã</metadata>
<metadata name="title" xml:lang="es">¡Bienvenido a Jetspeed 2!</metadata>
+ <metadata name="title" xml:lang="hu">Köszönti a Jetspeed 2!</metadata>
<fragment id="dp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="dp-3" type="portlet" name="pam::LocaleSelector">
@@ -41,7 +42,7 @@
<property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="dp-9" type="portlet" name="demo::IFramePortlet">
+ <fragment id="dp-9" type="portlet" name="demo::IFramePortlet" decorator="gray-gradient-noborder">
<property layout="TwoColumns" name="row" value="2" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jpetstore.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jpetstore.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jpetstore.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jpetstore.psml Mon Aug 29 05:37:53 2005
@@ -14,17 +14,19 @@
<defaults
skin="orange"
layout-decorator="tigris"
- portlet-decorator="tigris"
+ portlet-decorator="pretty-single-portlet"
/>
<title>JPetstore</title>
- <metadata name="title" xml:lang="ja">ãããã¹ãã¢</metadata>
- <metadata name="title" xml:lang="es">Tienda de Animales (JPetstore)</metadata>
+ <metadata name="title" xml:lang="ja">ãããã¹ãã¢</metadata>
+ <metadata name="short-title" xml:lang="es">JPetstore</metadata>
+ <metadata name="title" xml:lang="es">Demo: tienda de animales</metadata>
+ <metadata name="title" xml:lang="hu">Kisállatkereskedés (JPetstore)</metadata>
<fragment id="jp-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
<fragment id="jp-2" type="portlet" name="jpetstore::JPetstorePortlet"/>
</fragment>
<security-constraints>
- <security-constraints-ref>public-view</security-constraints-ref>
+ <security-constraints-ref>users</security-constraints-ref>
</security-constraints>
</page>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jsf-demo.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jsf-demo.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jsf-demo.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/jsf-demo.psml Mon Aug 29 05:37:53 2005
@@ -36,7 +36,9 @@
</fragment>
</fragment>
<metadata name="title" xml:lang="ja">JSF ãã¢</metadata>
- <metadata name="title" xml:lang="es">Demostración Java Server Faces</metadata>
+ <metadata name="title" xml:lang="es">Demo Java Server Faces</metadata>
+ <metadata name="short-title" xml:lang="es">Demo JSF</metadata>
+ <metadata name="title" xml:lang="hu">JSF Demo</metadata>
<security-constraints>
<security-constraints-ref>users</security-constraints-ref>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/my-account.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/my-account.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/my-account.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/my-account.psml Mon Aug 29 05:37:53 2005
@@ -19,6 +19,7 @@
<title>My Account</title>
<metadata name="title" xml:lang="ja">ã¢ã«ã¦ã³ã</metadata>
<metadata name="title" xml:lang="es">Mi cuenta</metadata>
+ <metadata name="title" xml:lang="hu">Személyes beállÃtások</metadata>
<fragment id="cpwd-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="cpwd-2" type="portlet" name="security::ChangePasswordPortlet">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml Mon Aug 29 05:37:53 2005
@@ -19,6 +19,7 @@
<title>PERL demo</title>
<metadata name="title" xml:lang="ja">Perlãã¢</metadata>
<metadata name="title" xml:lang="es">Demo en perl</metadata>
+ <metadata name="title" xml:lang="hu">PERL demo</metadata>
<fragment id="perl-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="perldemo-1" type="portlet" name="perl::perl-demo">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/php-portlet.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/php-portlet.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/php-portlet.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/non-java/php-portlet.psml Mon Aug 29 05:37:53 2005
@@ -19,6 +19,7 @@
<title>PHP demo</title>
<metadata name="title" xml:lang="ja">PHP ãã¢</metadata>
<metadata name="title" xml:lang="es">Demo en PHP</metadata>
+ <metadata name="title" xml:lang="hu">PHP Demo</metadata>
<fragment id="php-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="phpdemo-1" type="portlet" name="php::php-demo">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/p002.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/p002.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/p002.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/p002.psml Mon Aug 29 05:37:53 2005
@@ -29,7 +29,9 @@
</fragment>
<metadata name="title" xml:lang="ja">PSML ãã¼ã¸ 2</metadata>
- <metadata name="title" xml:lang="es">Mi segunda página PSML</metadata>
+ <metadata name="title" xml:lang="es">Mi 2ª página PSML</metadata>
+ <metadata name="short-title" xml:lang="es">Otra página</metadata>
+ <metadata name="title" xml:lang="hu">A második PSML oldalam</metadata>
<security-constraints>
<security-constraints-ref>users</security-constraints-ref>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/rss.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/rss.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/rss.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/rss.psml Mon Aug 29 05:37:53 2005
@@ -14,12 +14,13 @@
<defaults
skin="orange"
layout-decorator="tigris"
- portlet-decorator="tigris"
+ portlet-decorator="gray-gradient"
/>
<title>RSS Demo</title>
<metadata name="title" xml:lang="ja">RSS ãã¢</metadata>
- <metadata name="title" xml:lang="es">Portlet RSS</metadata>
-
+ <metadata name="title" xml:lang="es">Demo de portlets de sindicación RSS</metadata>
+ <metadata name="short-title" xml:lang="es">Demo RSS</metadata>
+ <metadata name="title" xml:lang="hu">RSS hÃrolvasó</metadata>
<fragment id="rss-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="rss-101" type="portlet" name="rss::RSS">
<property layout="TwoColumns" name="row" value="0" />
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/struts-demo.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/struts-demo.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/struts-demo.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/struts-demo.psml Mon Aug 29 05:37:53 2005
@@ -14,19 +14,21 @@
<defaults
skin="orange"
layout-decorator="tigris"
- portlet-decorator="tigris"
+ portlet-decorator="pretty-single-portlet"
/>
- <title>Struts MailReader Demo</title>
- <fragment id="sd-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
- <fragment id="15" type="portlet" name="struts-demo::StrutsPortletDemo">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
+
+ <title>MailReader Demo</title>
+ <metadata name="title" xml:lang="ja">Struts ã¡ã¼ã«ãªã¼ãã¼ãã¢</metadata>
+ <metadata name="title" xml:lang="es">Demo Lector de Correo Struts</metadata>
+ <metadata name="short-title" xml:lang="es">Demo Struts</metadata>
+ <metadata name="title" xml:lang="hu">Struts levelezÅ</metadata>
+
+ <fragment id="sd-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="15" type="portlet" name="struts-demo::StrutsPortletDemo"/>
</fragment>
- <metadata name="title" xml:lang="ja">Struts ã¡ã¼ã«ãªã¼ãã¼ãã¢</metadata>
- <metadata name="title" xml:lang="es">Lector de correo Struts</metadata>
<security-constraints>
<security-constraints-ref>users</security-constraints-ref>
</security-constraints>
-</page>
+
+</page>
\ No newline at end of file
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/testsuite.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/testsuite.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/testsuite.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/testsuite.psml Mon Aug 29 05:37:53 2005
@@ -33,6 +33,8 @@
</fragment>
<metadata name="title" xml:lang="ja">ãã¹ãã¹ã¤ã¼ããã¼ã¸</metadata>
<metadata name="title" xml:lang="es">Página de casos de prueba</metadata>
+ <metadata name="short-title" xml:lang="es">Pruebas</metadata>
+ <metadata name="title" xml:lang="hu">Teszt gyűjtemény</metadata>
<security-constraints>
<security-constraint>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/Google.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/Google.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/Google.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/Google.psml Mon Aug 29 05:37:53 2005
@@ -24,6 +24,7 @@
<title>Google Portlets</title>
<metadata name="title" xml:lang="ja">ã°ã¼ã°ã«ãã¼ãã¬ãã</metadata>
<metadata name="title" xml:lang="es">Portlets de Google</metadata>
+ <metadata name="title" xml:lang="hu">Google keresÅ portlet</metadata>
<fragment id="goo-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="googlePortlet1" type="portlet" name="GooglePortlet::GooglePortlet">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml Mon Aug 29 05:37:53 2005
@@ -24,6 +24,7 @@
<title>Plumtree RSS Portlet</title>
<metadata name="title" xml:lang="ja">Plumtree RSS ãã¼ãã¬ãã</metadata>
<metadata name="title" xml:lang="es">Portlet RSS de Plumtree</metadata>
+ <metadata name="title" xml:lang="hu">RSS hÃrolvasó</metadata>
<fragment id="rss-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="rrsPortlet1" type="portlet" name="RssPortlet::RssPortlet">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml Mon Aug 29 05:37:53 2005
@@ -24,6 +24,7 @@
<title>Sun Portlets</title>
<metadata name="title" xml:lang="ja">Sun ãã¼ãã¬ãã</metadata>
<metadata name="title" xml:lang="es">Portlets de Sun</metadata>
+ <metadata name="title" xml:lang="hu">SUN portletek</metadata>
<fragment id="sunportletspage" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="showTime1" type="portlet" name="portletsamples::JSPPortlet">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/wip/role-mgt.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/wip/role-mgt.psml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
Binary files - no diff available.
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/wip/role-mgt.psml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/pages/wip/role-mgt.psml
('svn:mime-type' removed)
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm Mon Aug 29 05:37:53 2005
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#*
Copyright 2004 The Apache Software Foundation
@@ -24,7 +25,6 @@
#set($actions = $jetspeed.PageDecoratorActions)
-#set($editing = false)
#if($jetspeed.portletMode.toString() == "edit")
#set($editing = true)
#set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
@@ -49,157 +49,100 @@
#set($layoutType =$portletConfig.getInitParameter("layoutType"))
#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
-#if ($actions.size()>0)
-<table width="100%" cellspacing="0" cellpadding="0" >
- <tr>
- <td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
-
- <td align="left" valign="middle" class="PContent" >
- </td>
- <td align="right" valign="middle" class="PContent" >
- <table border="0" cellpadding="0" cellspacing="0" >
- <tr>
- #foreach ($action in $actions)
- <td align="right" valign="middle" class="PContent" >
- <a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}" alt="${action.Alt}" border="0"></a>
- </td>
- #end
- #if($editing == true)
- #set ($chooser = "${jetspeed.basePath}/Administrative/choosers/portlet-selector.psml")
- <td align="right" valign="middle" class="PContent" >
- #set ($imgsrc="${jetspeed.pageBasePath}/content/images/select.gif")
- <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Select"/></a>
- </td>
- #end
- </tr>
- </table>
- </td>
-
- <td class="PContent" style="font-size:1pt;" nowrap="true"> </td>
- </tr>
-</table>
-#end
-
-<form name='portletform' action="$renderResponse.createActionURL()" method="post">
-<input type='hidden' name='portlets'/>
-<input type='hidden' name='page' value='$myPage'/>
-</form>
-
-<div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout">
-<table width="100%" cellspacing="0" cellpadding="0" >
- <tr>
- #set ($sizeIndex = 0)
- #set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images")
- #foreach($column in $columnLayout.columns)
- #if ($sizes)
- #if ($sizeIndex < $sizes.size())
- <td valign='top' width='$sizes.get($sizeIndex)'/>
- #else
- <td valign="top">
- #end
- #else
- <td valign="top">
- #end
- #set ($sizeIndex = $sizeIndex + 1)
- <table width="100%" class="portal-layout-column">
- #foreach($f in $column)
- <tr>
- <td width="100%">
- #set($coords = $columnLayout.getCoordinate($f))
- #set($col = $coords.x)
- #set($lastRow = $columnLayout.getLastRowNumber($col))
- #set($row = $coords.y)
- #if($editing)<div id="_$f.id">
- <div style="position:relative; top:10px; left:0; width:100%; height:100%;">
- <div id="_$f.id_toolBox" >
- <table cellpadding="0" cellspacing="0" >
- <tr>
- <td></td>
- <td align="center" onMouseover="this.style.backgroundColor='red'" onMouseout="this.style.backgroundColor=''">
- #if($row > 0)
- #set($upUrl = $renderResponse.createRenderURL())
- $!upUrl.setParameter("move","1")
- $!upUrl.setParameter("fragmentId","$f.id")
- #set ($imgsrc="$layoutImageBase/movePortletUp.gif")
- <a href="$upUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Up"/></a>
- #end
- </td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td align="right" onMouseover="this.style.backgroundColor='red'" onMouseout="this.style.backgroundColor=''">
- #if($lastColumn > 0 && $col > 0)
- #set($leftUrl = $renderResponse.createRenderURL())
- $!leftUrl.setParameter("move","3")
- $!leftUrl.setParameter("fragmentId","$f.id")
- #set ($imgsrc="$layoutImageBase/movePortletLeft.gif")
- <a href="$leftUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Left"/></a>
- #end
- </td>
- <td align="center" style="font-size:smaller; font-weight:bold" >
- Position
- </td>
- <td align="left" onMouseover="this.style.backgroundColor='red'" onMouseout="this.style.backgroundColor=''">
- #if($lastColumn > 0 && $col < $lastColumn)
- #set($rightUrl = $renderResponse.createRenderURL())
- $!rightUrl.setParameter("move","4")
- $!rightUrl.setParameter("fragmentId","$f.id")
- #set ($imgsrc="$layoutImageBase/movePortletRight.gif")
- <a href="$rightUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Right"/></a>
- #end
- </td>
- <td>
- #set($deleter = $renderResponse.createActionURL())
- $deleter.setParameter("deleteId","$f.id")
- $deleter.setParameter("page","$myPage")
- #set ($imgsrc="$layoutImageBase/close.gif")
- <a href="$deleter"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Remove Portlet"/></a>
- </td>
- </tr>
- <tr>
- <td></td>
- <td align="center" onMouseover="this.style.backgroundColor='red'" onMouseout="this.style.backgroundColor=''">
- #if($row < $lastRow)
- #set($downUrl = $renderResponse.createRenderURL())
- $!downUrl.setParameter("move","2")
- $!downUrl.setParameter("fragmentId","$f.id")
- #set ($imgsrc="$layoutImageBase/movePortletDown.gif")
- <a href="$downUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Down"/></a>
- #end
- </td>
- <td></td>
- <td></td>
- </tr>
- </table>
- </div>
- #end
- ## get the decorated Portlet content
- #if($f.type == "portlet")
- #parse($jetspeed.decorateAndInclude($f))
- #else
- $jetspeed.setCurrentFragment($f)
- $f.renderedContent
- #end
-
- ##$jetspeed.decorateAndInclude($f)
- #if($editing)
+ <div id="$renderResponse.namespace" class="portal-layout">
+ #set ($sizeIndex = 0)
+ #set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images")
+ #foreach($column in $columnLayout.columns)
+ #set($columnWidth = "auto")
+
+ #if ($columnLayout.getColumnWidth($sizeIndex) > 0)
+ #set($columnWidth = $columnLayout.getColumnWidth($sizeIndex))
+ #end
+
+ #set ($sizeIndex = $sizeIndex + 1)
+ <div class="portal-layout-column" style="width:${columnWidth}%;">
+ <div class="portal-layout-column-gutter">
+ #foreach($f in $column)
+
+ ## Set up coordinates for this fragment
+ #set($coords = $columnLayout.getCoordinate($f))
+ #set($col = $coords.x)
+ #set($lastRow = $columnLayout.getLastRowNumber($col))
+ #set($row = $coords.y)
+
+ ## get the decorated Portlet content
+ <div class="portal-layout-cell" >
+ ## editing block
+ #if($editing)
+ <div class="portlet-edit-bar">
+ ## Move portlet left
+ #if($lastColumn > 0 && $col > 0)
+ #set($leftUrl = $renderResponse.createActionURL())
+ $!leftUrl.setParameter("move","3")
+ $!leftUrl.setParameter("fragmentToMove","$f.id")
+ $!leftUrl.setParameter("editingPage","$myPage.id")
+ #set ($imgsrc="$layoutImageBase/movePortletLeft.gif")
+ <a href="$leftUrl" class="move-portlet-left"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Left"/></a>
+ #end
+
+ ## Move portlet up
+ #if($row > 0)
+ #set($upUrl = $renderResponse.createActionURL())
+ $!upUrl.setParameter("move","1")
+ $!upUrl.setParameter("fragmentToMove","$f.id")
+ $!upUrl.setParameter("editingPage","$myPage.id")
+ #set ($imgsrc="$layoutImageBase/movePortletUp.gif")
+ <a href="$upUrl" class="move-portlet-up"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Up"/></a>
+ #end
+
+ ## Remove portlet from page
+ #set($deleter = $renderResponse.createActionURL())
+ $deleter.setParameter("deleteId","$f.id")
+ $deleter.setParameter("page","$myPage")
+ #set ($imgsrc="$layoutImageBase/close.gif")
+ <a href="$deleter" class="remove-portlet-from-apge"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Remove Portlet"/></a>
+
+ ## Move portlet down
+ #if($row < $lastRow)
+ #set($downUrl = $renderResponse.createActionURL())
+ $!downUrl.setParameter("move","2")
+ $!downUrl.setParameter("fragmentToMove","$f.id")
+ $!downUrl.setParameter("editingPage","$myPage.id")
+ #set ($imgsrc="$layoutImageBase/movePortletDown.gif")
+ <a href="$downUrl" class="move-portlet-down"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Down"/></a>
+ #end
+
+ ## Move portlet right
+ #if($lastColumn > 0 && $col < $lastColumn)
+ #set($rightUrl = $renderResponse.createActionURL())
+ $!rightUrl.setParameter("move","4")
+ $!rightUrl.setParameter("fragmentToMove","$f.id")
+ $!rightUrl.setParameter("editingPage","$myPage.id")
+ #set ($imgsrc="$layoutImageBase/movePortletRight.gif")
+ <a href="$rightUrl" class="move-portlet-right"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Right"/></a>
+ #end
+ </div>
+ #end
+
+ #if($f.type == "portlet")
+ #parse($jetspeed.decorateAndInclude($f))
+ #else
+ $jetspeed.setCurrentFragment($f)
+ $f.renderedContent
+ #end
+ </div>
+ #end
</div>
- </div>
- #end
+ </div>
+ #end
+ </div>
- </td>
- </tr>
- #end
-
- </table>
- </td>
- #end
- </tr>
-</table>
-</div>
-
-#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
- #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
-#end
+ #if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
+ #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
+ #end
+
+ <form name='portletform' action="$renderResponse.createActionURL()" method="post">
+ <input type='hidden' name='portlets'/>
+ <input type='hidden' name='page' value='$myPage'/>
+ </form>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm Mon Aug 29 05:37:53 2005
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#*
Copyright 2004 The Apache Software Foundation
@@ -43,14 +44,12 @@
#if ($decoTop)
#parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
#end
-<table width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td valign="top">
- ## get the decorated Portlet content
- #parse($jetspeed.decorateAndInclude($myFragment))
- </td>
- </tr>
-</table>
+
+ ## get the decorated Portlet content
+ <div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout-maxed">
+ #parse($jetspeed.decorateAndInclude($myFragment))
+ </div>
+
#if ($decoBottom)
#parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml?rev=264129&r1=264128&r2=264129&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml Mon Aug 29 05:37:53 2005
@@ -1,272 +1,272 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>Jetspeed-2 Enterprise Portal</display-name>
- <filter>
- <filter-name>ContentServer</filter-name>
- <filter-class>org.apache.jetspeed.contentserver.ContentFilter</filter-class>
- <init-param>
- <param-name>content.directory</param-name>
- <param-value>
- WEB-INF/decorations
- </param-value>
- </init-param>
- <init-param>
- <param-name>url.hint</param-name>
- <param-value>
- content/
- </param-value>
- </init-param>
- <init-param>
- <param-name>use.caching</param-name>
- <param-value>
- false
- </param-value>
- </init-param>
- </filter>
-
- <filter>
- <filter-name>AJAXFilter</filter-name>
- <filter-class>org.apache.jetspeed.ajax.AJAXFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>AJAXFilter</filter-name>
- <url-pattern>*.ajax</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.gif</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.jpg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.jpeg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.png</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.ico</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.css</url-pattern>
- </filter-mapping>
-
-
- <servlet>
- <servlet-name>jetspeed</servlet-name>
- <servlet-class>org.apache.jetspeed.engine.JetspeedServlet</servlet-class>
- <init-param>
- <param-name>properties</param-name>
- <param-value>/WEB-INF/conf/jetspeed.properties</param-value>
- </init-param>
- <init-param>
- <param-name>configuration</param-name>
- <param-value>/WEB-INF/conf/jetspeed-configuration.xml</param-value>
- </init-param>
- <init-param>
- <param-name>applicationRoot</param-name>
- <param-value>webContext</param-value>
- </init-param>
- <!-- To enable SpringEngine, uncomment this param and comment out the
- PicoEngine one. -->
- <init-param>
- <param-name>engine</param-name>
- <param-value>org.apache.jetspeed.engine.SpringEngine</param-value>
- </init-param>
-
- <!--
- <init-param>
- <param-name>engine</param-name>
- <param-value>org.apache.jetspeed.engine.PicoEngine</param-value>
- </init-param>
- -->
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Define Velocity template compiler -->
- <servlet>
- <servlet-name>velocity</servlet-name>
- <servlet-class>org.apache.jetspeed.velocity.JetspeedVelocityViewServlet</servlet-class>
- <init-param>
- <param-name>org.apache.velocity.toolbox</param-name>
- <param-value>/WEB-INF/toolbox.xml</param-value>
- </init-param>
- <init-param>
- <param-name>org.apache.velocity.properties</param-name>
- <param-value>/WEB-INF/velocity.properties</param-value>
- </init-param>
- <init-param>
- <param-name>org.apache.jetspeed.cache.size</param-name>
- <param-value>50</param-value>
- </init-param>
- <init-param>
- <param-name>org.apache.jetspeed.cache.validation.interval</param-name>
- <param-value>10000</param-value>
- </init-param>
- <load-on-startup>10</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>LoginProxyServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.login.LoginProxyServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>LoginServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.login.LoginServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>LoginErrorServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.login.LoginErrorServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>LoginRedirectorServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.login.LoginRedirectorServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>LogoutServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.login.LogoutServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ManagerServlet</servlet-name>
- <servlet-class>org.apache.jetspeed.manager.ManagerServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- jetspeed
- </servlet-name>
- <url-pattern>
- /portal/*
- </url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>
- jetspeed
- </servlet-name>
- <url-pattern>
- /jetspeed/*
- </url-pattern>
- </servlet-mapping>
-
- <!-- Map *.vm files to Velocity -->
- <servlet-mapping>
- <servlet-name>velocity</servlet-name>
- <url-pattern>*.vm</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LoginProxyServlet</servlet-name>
- <url-pattern>/login/proxy</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LoginServlet</servlet-name>
- <url-pattern>/login/login</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LoginErrorServlet</servlet-name>
- <url-pattern>/login/error</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LoginRedirectorServlet</servlet-name>
- <url-pattern>/login/redirector</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LogoutServlet</servlet-name>
- <url-pattern>/login/logout</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ManagerServlet</servlet-name>
- <url-pattern>/manager/*</url-pattern>
- </servlet-mapping>
-
- <!-- The Usual Welcome File List -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <!-- JNDI Db resource -->
- <resource-ref>
- <description>DB Connection</description>
- <res-ref-name>jdbc/jetspeed</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-
- <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Login</web-resource-name>
- <url-pattern>/login/redirector</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
-
- <!-- securing the ManagerServlet -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Manager</web-resource-name>
- <url-pattern>/manager</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>admin</role-name>
- </auth-constraint>
- </security-constraint>
-
- <!-- Login configuration uses form-based authentication -->
- <login-config>
- <auth-method>FORM</auth-method>
- <realm-name>Jetspeed</realm-name>
- <form-login-config>
- <form-login-page>/login/login</form-login-page>
- <form-error-page>/login/error</form-error-page>
- </form-login-config>
- </login-config>
-
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>Jetspeed-2 Enterprise Portal</display-name>
+ <filter>
+ <filter-name>ContentServer</filter-name>
+ <filter-class>org.apache.jetspeed.contentserver.ContentFilter</filter-class>
+ <init-param>
+ <param-name>content.directory</param-name>
+ <param-value>
+ WEB-INF/decorations
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>url.hint</param-name>
+ <param-value>
+ content/
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>use.caching</param-name>
+ <param-value>
+ false
+ </param-value>
+ </init-param>
+ </filter>
+
+ <filter>
+ <filter-name>AJAXFilter</filter-name>
+ <filter-class>org.apache.jetspeed.ajax.AJAXFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>AJAXFilter</filter-name>
+ <url-pattern>*.ajax</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.gif</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.jpg</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.jpeg</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.png</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.js</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.html</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.ico</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ContentServer</filter-name>
+ <url-pattern>*.css</url-pattern>
+ </filter-mapping>
+
+
+ <servlet>
+ <servlet-name>jetspeed</servlet-name>
+ <servlet-class>org.apache.jetspeed.engine.JetspeedServlet</servlet-class>
+ <init-param>
+ <param-name>properties</param-name>
+ <param-value>/WEB-INF/conf/jetspeed.properties</param-value>
+ </init-param>
+ <init-param>
+ <param-name>configuration</param-name>
+ <param-value>/WEB-INF/conf/jetspeed-configuration.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>applicationRoot</param-name>
+ <param-value>webContext</param-value>
+ </init-param>
+ <!-- To enable SpringEngine, uncomment this param and comment out the
+ PicoEngine one. -->
+ <init-param>
+ <param-name>engine</param-name>
+ <param-value>org.apache.jetspeed.engine.SpringEngine</param-value>
+ </init-param>
+
+ <!--
+ <init-param>
+ <param-name>engine</param-name>
+ <param-value>org.apache.jetspeed.engine.PicoEngine</param-value>
+ </init-param>
+ -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Define Velocity template compiler -->
+ <servlet>
+ <servlet-name>velocity</servlet-name>
+ <servlet-class>org.apache.jetspeed.velocity.JetspeedVelocityViewServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.velocity.toolbox</param-name>
+ <param-value>/WEB-INF/toolbox.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.velocity.properties</param-name>
+ <param-value>/WEB-INF/velocity.properties</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.jetspeed.cache.size</param-name>
+ <param-value>50</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.jetspeed.cache.validation.interval</param-name>
+ <param-value>10000</param-value>
+ </init-param>
+ <load-on-startup>10</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LoginProxyServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.login.LoginProxyServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LoginServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.login.LoginServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LoginErrorServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.login.LoginErrorServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LoginRedirectorServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.login.LoginRedirectorServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LogoutServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.login.LogoutServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ManagerServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.manager.ManagerServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ jetspeed
+ </servlet-name>
+ <url-pattern>
+ /portal/*
+ </url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>
+ jetspeed
+ </servlet-name>
+ <url-pattern>
+ /jetspeed/*
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- Map *.vm files to Velocity -->
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.vm</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LoginProxyServlet</servlet-name>
+ <url-pattern>/login/proxy</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LoginServlet</servlet-name>
+ <url-pattern>/login/login</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LoginErrorServlet</servlet-name>
+ <url-pattern>/login/error</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LoginRedirectorServlet</servlet-name>
+ <url-pattern>/login/redirector</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LogoutServlet</servlet-name>
+ <url-pattern>/login/logout</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ManagerServlet</servlet-name>
+ <url-pattern>/manager/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- The Usual Welcome File List -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <!-- JNDI Db resource -->
+ <resource-ref>
+ <description>DB Connection</description>
+ <res-ref-name>jdbc/jetspeed</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Login</web-resource-name>
+ <url-pattern>/login/redirector</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <!-- securing the ManagerServlet -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Manager</web-resource-name>
+ <url-pattern>/manager/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <!-- Login configuration uses form-based authentication -->
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>Jetspeed</realm-name>
+ <form-login-config>
+ <form-login-page>/login/login</form-login-page>
+ <form-error-page>/login/error</form-error-page>
+ </form-login-config>
+ </login-config>
+
+</web-app>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org