Author: taylor
Date: Thu Mar 11 06:13:59 2010
New Revision: 921698
URL: http://svn.apache.org/viewvc?rev=921698&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1121
bug fixes found testing with ui build target
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/delegated.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-ui-seed.xml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
Thu Mar 11 06:13:59 2010
@@ -18,6 +18,7 @@ limitations under the License.
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/folder-metadata.xsd";>
<title >Jetspeed Administrative Portlets</title>
+ <metadata name='space-owner' xml:lang='en'>admin</metadata>
<metadata name="title" xml:lang="fr">Jetspeed Portlets
Administratif</metadata>
<metadata name="title" xml:lang="ja">Jetspeed
管çãã¼ãã¬ãã</metadata>
<metadata name="title" xml:lang="es">Administración de Jetspeed</metadata>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/delegated.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/delegated.psml?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/delegated.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/delegated.psml
Thu Mar 11 06:13:59 2010
@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,14 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<page id="_user-template-delegated.psml"
+<page id="devmgr-home"
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";>
<title>My Team</title>
- <fragment id="devmgr-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="devmgr-211" type="portlet"
name="j2-admin::DevelopersBrowser"/>
- </fragment>
- </page>
\ No newline at end of file
+ <fragment id="devmgr-210" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="devmgr-211" type="portlet"
name="j2-admin::DevelopersBrowser">
+ </fragment>
+ </fragment>
+</page>
+
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
Thu Mar 11 06:13:59 2010
@@ -19,7 +19,7 @@ limitations under the License.
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
<title>Development</title>
- <metadata name='space-owner' xml:lang='en'>admin</metadata>
+ <metadata name='space-owner' xml:lang='en'>manny</metadata>
<security-constraints>
<security-constraints-ref>dev</security-constraints-ref>
</security-constraints>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
Thu Mar 11 06:13:59 2010
@@ -19,7 +19,7 @@ limitations under the License.
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
<title>Financials</title>
- <metadata name='space-owner' xml:lang='en'>admin</metadata>
+ <metadata name='space-owner' xml:lang='en'>bill</metadata>
<security-constraints>
<security-constraints-ref>finance</security-constraints-ref>
</security-constraints>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
Thu Mar 11 06:13:59 2010
@@ -19,7 +19,7 @@ limitations under the License.
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
<title>Marketing</title>
- <metadata name='space-owner' xml:lang='en'>admin</metadata>
+ <metadata name='space-owner' xml:lang='en'>martha</metadata>
<security-constraints>
<security-constraints-ref>marketing</security-constraints-ref>
</security-constraints>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
Thu Mar 11 06:13:59 2010
@@ -18,6 +18,7 @@ limitations under the License.
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/folder-metadata.xsd";>
<title >Security Administration</title>
+ <metadata name='space-owner' xml:lang='en'>admin</metadata>
<document-order>user-mgt.psml</document-order>
<document-order>role-mgt.psml</document-order>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-ui-seed.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-ui-seed.xml?rev=921698&r1=921697&r2=921698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-ui-seed.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-ui-seed.xml
Thu Mar 11 06:13:59 2010
@@ -340,7 +340,7 @@
</userinfo>
</User>
<User name="manny">
- <credentials password="local" enabled="TRUE"
requiresUpdate="FALSE"/>
+ <credentials password="manny" enabled="TRUE"
requiresUpdate="FALSE"/>
<roles>user,devmgr</roles>
<groups>engineering</groups>
<preferences/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
