Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml Sun Feb 4 13:11:53 2007 @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page > +<page id="_user-user-anotherdir-p004" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="jetspeed"
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml Sun Feb 4 13:11:53 2007 @@ -1,32 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2007 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. +--> <!-- nested-layout.psml --> -<page> +<page id="_user-user-nested-layout" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults layout-decorator="tigris" portlet-decorator="tigris"/> <title>Nested Layout Test</title> + <short-title>Nested Layout</short-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> <metadata name="title" xml:lang="zh">å åµå¸å±æµè¯</metadata> <metadata name="title" xml:lang="zh-TW">å §åµä½å±æ¸¬è©¦</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> <metadata name="short-title" xml:lang="zh">å åµå¸å±</metadata> <metadata name="short-title" xml:lang="zh-TW">å §åµä½å±</metadata> - <fragment id="100393" type="layout" name="jetspeed-layouts::VelocityOneColumn"> - <fragment id="100939" type="portlet" name="j2-admin::LocaleSelector"> + <fragment id="FRAG-100393" type="layout" name="jetspeed-layouts::VelocityOneColumn"> + <fragment id="FRAG-100939" type="portlet" name="j2-admin::LocaleSelector"> <property layout="OneColumn" name="row" value="0"/> </fragment> - <fragment id="100345" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> + <fragment id="FRAG-100345" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> <property layout="OneColumn" name="row" value="1"/> <property layout="TwoColumns" name="sizes" value="40%,60%"/> - <fragment id="100121" type="portlet" name="j2-admin::LoginPortlet"> + <fragment id="FRAG-100121" type="portlet" name="j2-admin::LoginPortlet"> <property layout="TwoColumns" name="row" value="0"/> <property layout="TwoColumns" name="column" value="0"/> </fragment> - <fragment id="100171" type="portlet" name="demo::UserInfoTest"> + <fragment id="FRAG-100171" type="portlet" name="demo::UserInfoTest"> <property layout="TwoColumns" name="row" value="0"/> <property layout="TwoColumns" name="column" value="1"/> </fragment> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-table-layout.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-table-layout.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-table-layout.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-table-layout.psml Sun Feb 4 13:11:53 2007 @@ -1,32 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2007 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. +--> <!-- nested-table-layout.psml --> -<page> +<page id="_user-user-nested-table-layout" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults layout-decorator="tigris" portlet-decorator="tigris"/> <title>Nested Table Layout Test</title> + <short-title>Nested Table Layout</short-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> <metadata name="title" xml:lang="zh">å åµå¸å±æµè¯</metadata> <metadata name="title" xml:lang="zh-TW">å §åµä½å±æ¸¬è©¦</metadata> - - <short-title>Nested Table 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> <metadata name="short-title" xml:lang="zh">å åµå¸å±</metadata> <metadata name="short-title" xml:lang="zh-TW">å §åµä½å±</metadata> - <fragment id="100393T" type="layout" name="jetspeed-layouts::VelocityOneColumnTable"> - <fragment id="100939T" type="portlet" name="j2-admin::LocaleSelector"> + <fragment id="FRAG-100393T" type="layout" name="jetspeed-layouts::VelocityOneColumnTable"> + <fragment id="FRAG-100939T" type="portlet" name="j2-admin::LocaleSelector"> <property layout="OneColumn" name="row" value="0"/> </fragment> - <fragment id="100345T" type="layout" name="jetspeed-layouts::VelocityTwoColumnsTable"> + <fragment id="FRAG-100345T" type="layout" name="jetspeed-layouts::VelocityTwoColumnsTable"> <property layout="OneColumn" name="row" value="1"/> <property layout="TwoColumns" name="sizes" value="40%,60%"/> - <fragment id="100121T" type="portlet" name="j2-admin::LoginPortlet"> + <fragment id="FRAG-100121T" type="portlet" name="j2-admin::LoginPortlet"> <property layout="TwoColumns" name="row" value="0"/> <property layout="TwoColumns" name="column" value="0"/> </fragment> - <fragment id="100171T" type="portlet" name="demo::UserInfoTest"> + <fragment id="FRAG-100171T" type="portlet" name="demo::UserInfoTest"> <property layout="TwoColumns" name="row" value="0"/> <property layout="TwoColumns" name="column" value="1"/> </fragment> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/p003.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/p003.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/p003.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/p003.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page > +<page id="_user-user-p003" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/css-demo.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/css-demo.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/css-demo.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/css-demo.psml Sun Feb 4 13:11:53 2007 @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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 @@ -10,25 +11,28 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="css-demo"> +<page id="css-demo" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" portlet-decorator="blue-gradient" /> <title>CSS Demo</title> + <metadata name="title" xml:lang="ja">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> + <metadata name="title" xml:lang="zh">CSS 示ä¾</metadata> <fragment id="css-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> <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 Hojas de Estilo en Cascada</metadata> - <metadata name="short-title" xml:lang="es">Demo CSS</metadata> - <metadata name="title" xml:lang="hu">CSS</metadata> - <metadata name="title" xml:lang="zh">CSS 示ä¾</metadata> - + <security-constraints> <security-constraints-ref>users</security-constraints-ref> </security-constraints> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/customizer.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/customizer.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/customizer.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/customizer.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page hidden='true'> +<page id="customizer" hidden='true' + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="clear" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml Sun Feb 4 13:11:53 2007 @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -13,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page> +<page id="default-page" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jpetstore.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jpetstore.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jpetstore.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jpetstore.psml Sun Feb 4 13:11:53 2007 @@ -1,23 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. --> -<page id="jpetstore"> +<page id="jpetstore" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" portlet-decorator="pretty-single-portlet" /> <title>JPetstore</title> - <metadata name="title" xml:lang="ja">ãããã¹ãã¢</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> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,13 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="JSFPortlets"> - <defaults +<page id="JSFPortlets" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> + <defaults layout-decorator="tigris" portlet-decorator="tigris" /> <title>JSF Demo</title> + <metadata name="title" xml:lang="ja">JSF ãã¢</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> + <metadata name="title" xml:lang="zh">JSF 示ä¾</metadata> + <fragment id="jsfportletspage" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> <fragment id="jsfGuessNumber1" type="portlet" name="jsf-demo::guessNumber"> <property layout="TwoColumns" name="row" value="0" /> @@ -31,11 +40,7 @@ <property layout="TwoColumns" name="column" value="1" /> </fragment> </fragment> - <metadata name="title" xml:lang="ja">JSF ãã¢</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> - <metadata name="title" xml:lang="zh">JSF 示ä¾</metadata> + <security-constraints> <security-constraints-ref>users</security-constraints-ref> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/minimal-default-page.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/minimal-default-page.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/minimal-default-page.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/minimal-default-page.psml Sun Feb 4 13:11:53 2007 @@ -1,19 +1,23 @@ -<!-- -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. +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2007 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. --> -<page hidden="true"> +<page id="minimal-default-page" hidden="true" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults layout-decorator="tigris" portlet-decorator="tigris"/> <title>Welcome to Jetspeed 2</title> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml Sun Feb 4 13:11:53 2007 @@ -1,16 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. --> -<page id="my-account" hidden="true"> +<page id="my-account" hidden="true" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml Sun Feb 4 13:11:53 2007 @@ -1,16 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. --> -<page id="perl"> +<page id="perl" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/php-portlet.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/php-portlet.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/php-portlet.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/php-portlet.psml Sun Feb 4 13:11:53 2007 @@ -1,16 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. --> -<page id="php"> +<page id="php" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,27 +14,26 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page > +<page id="p002" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" portlet-decorator="tigris" /> <title>My Second PSML page</title> - <fragment id="xx2.0" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> - - <fragment id="xx2.1" type="portlet" name="demo::SSOIFramePortlet"/> - <fragment id="wcp2.0" type="portlet" name="demo::SSOWebContentPortlet"/> - - </fragment> - <metadata name="title" xml:lang="ja">PSML ãã¼ã¸ 2</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> <metadata name="title" xml:lang="zh">第äºä¸ªPSML页é¢</metadata> <metadata name="title" xml:lang="zh-TW">第äºåPSMLé é¢</metadata> - + <fragment id="xx2.0" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> + <fragment id="xx2.1" type="portlet" name="demo::SSOIFramePortlet"/> + <fragment id="wcp2.0" type="portlet" name="demo::SSOWebContentPortlet"/> + </fragment> <security-constraints> <security-constraints-ref>users</security-constraints-ref> </security-constraints> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/rss.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/rss.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/rss.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/rss.psml Sun Feb 4 13:11:53 2007 @@ -1,16 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. --> -<page id="rss"> +<page id="rss" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml Sun Feb 4 13:11:53 2007 @@ -1,16 +1,23 @@ -<!-- -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. +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2007 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. --> -<page id="j2-portlet-selector" hidden='true'> +<page id="j2-portlet-selector" hidden='true' + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults layout-decorator="simple" portlet-decorator="clear" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/selector.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/selector.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/selector.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/selector.psml Sun Feb 4 13:11:53 2007 @@ -1,8 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<page id="/Selector.psml" hidden="true"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2007 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. +--> +<page id="Selector.psml" hidden="true" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> + <defaults layout-decorator="tigris" portlet-decorator="tigris"/> <title>Selector</title> <short-title>Selector</short-title> - <defaults layout-decorator="tigris" portlet-decorator="tigris"/> <fragment id="js-cp-selector" type="layout" name="jetspeed-layouts::VelocityOneColumn"> <fragment id="js-cp-selector.2" type="portlet" name="j2-admin::CategoryPortletSelector"/> </fragment> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/testsuite.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/testsuite.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/testsuite.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/testsuite.psml Sun Feb 4 13:11:53 2007 @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -13,14 +14,24 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="testsuite_page"> +<page id="testsuite_page" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" portlet-decorator="tigris" /> - + <title>Test Suite Page</title> + <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> + <metadata name="title" xml:lang="zh">æµè¯é¡µé¢</metadata> + <metadata name="title" xml:lang="zh-TW">測試é é¢</metadata> + <fragment id="ts-0" type="layout" name="jetspeed-layouts::VelocityTwoColumns"> <fragment id="ts-1" type="portlet" name="testsuite::TestPortlet1"> <property layout="TwoColumns" name="row" value="0" /> @@ -31,13 +42,7 @@ <property layout="TwoColumns" name="column" value="1" /> </fragment> </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> - <metadata name="title" xml:lang="zh">æµè¯é¡µé¢</metadata> - <metadata name="title" xml:lang="zh-TW">測試é é¢</metadata> - + <security-constraints> <security-constraint> <groups>accounting, marketing</groups> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/Google.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/Google.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/Google.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/Google.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="Google"> +<page id="Google" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="RssPortlet"> +<page id="RssPortlet" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml?view=diff&rev=503486&r1=503485&r2=503486 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml Sun Feb 4 13:11:53 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright 2004 The Apache Software Foundation +Copyright 2007 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. @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<page id="SunPortlets"> +<page id="SunPortlets" + xmlns="http://portals.apache.org/jetspeed" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd"> <defaults skin="blue" layout-decorator="tigris" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
