Author: taylor
Date: Mon May 25 18:33:06 2015
New Revision: 1681626
URL: http://svn.apache.org/r1681626
Log:
JS2-1320: completing chart portlets, improving chart data apis, psml cleanup,
securing chart pages
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/four-rows.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/four-rows.psml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
Mon May 25 18:33:06 2015
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<page id="site"
+<page id="profiler"
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.2/schemas/psml.xsd";>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
Mon May 25 18:33:06 2015
@@ -1,5 +1,20 @@
<?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
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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="/charts/jvm-memory.psml" hidden="false">
<title>Jetspeed Chart Demo</title>
<fragment id="P-chart-demo-10008" type="layout"
name="jetspeed-layouts::ResponsiveLayout">
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
Mon May 25 18:33:06 2015
@@ -22,6 +22,6 @@ limitations under the License.
<document-order>charts.psml</document-order>
<security-constraints>
- <security-constraints-ref>public-view</security-constraints-ref>
+ <security-constraints-ref>manager</security-constraints-ref>
</security-constraints>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/four-rows.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/four-rows.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/four-rows.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/four-rows.psml
Mon May 25 18:33:06 2015
@@ -19,7 +19,7 @@
<property name="row" value="1"></property>
<property name="column" value="1"></property>
</fragment>
- <fragment id="fourrow-6" type="portlet" name="j2-admin::ProfilerAdmin">
+ <fragment id="fourrow-6" type="portlet"
name="j2-admin::SSOChangePasswordPortlet">
<property name="row" value="0"></property>
<property name="column" value="0"></property>
</fragment>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
Mon May 25 18:33:06 2015
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<page id="site"
+<page id="profiler"
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.2/schemas/psml.xsd";>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
Mon May 25 18:33:06 2015
@@ -1,5 +1,20 @@
<?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
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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="/charts/jvm-memory.psml" hidden="false">
<title>Jetspeed Chart Demo</title>
<fragment id="P-chart-demo-10008" type="layout"
name="jetspeed-layouts::ResponsiveLayout">
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
Mon May 25 18:33:06 2015
@@ -22,6 +22,6 @@ limitations under the License.
<document-order>charts.psml</document-order>
<security-constraints>
- <security-constraints-ref>public-view</security-constraints-ref>
+ <security-constraints-ref>manager</security-constraints-ref>
</security-constraints>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/four-rows.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/four-rows.psml?rev=1681626&r1=1681625&r2=1681626&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/four-rows.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/four-rows.psml
Mon May 25 18:33:06 2015
@@ -19,7 +19,7 @@
<property name="row" value="1"></property>
<property name="column" value="1"></property>
</fragment>
- <fragment id="fourrow-6" type="portlet" name="j2-admin::ProfilerAdmin">
+ <fragment id="fourrow-6" type="portlet"
name="j2-admin::SSOChangePasswordPortlet">
<property name="row" value="0"></property>
<property name="column" value="0"></property>
</fragment>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
