Author: taylor
Date: Fri May 1 23:04:55 2015
New Revision: 1677251
URL: http://svn.apache.org/r1677251
Log:
JS2-1320: adding charts folder to demo and min sites
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/
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/pages/charts/
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
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/nested.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/nested.psml
Added:
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=1677251&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/charts.psml
Fri May 1 23:04:55 2015
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <fragment id="P-chart-memory-20009" type="portlet"
name="j2-admin::MemoryUsageChart">
+ <property name="row" value="0"></property>
+ <property name="column" value="0"></property>
+ </fragment>
+ <fragment id="P-chart-memory-20010" type="portlet"
name="j2-admin::PageUsageChart">
+ <property name="row" value="0"></property>
+ <property name="column" value="1"></property>
+ </fragment>
+ <fragment id="P-chart-users-20012" type="portlet"
name="j2-admin::UserLoginsChart">
+ <property name="row" value="1"></property>
+ <property name="column" value="0"></property>
+ </fragment>
+ <fragment id="P-chart-caches-20012" type="portlet"
name="j2-admin::CacheUsageChart">
+ <property name="row" value="1"></property>
+ <property name="column" value="1"></property>
+ </fragment>
+
+ </fragment>
+ <defaults layout-decorator="bootstrap"
portlet-decorator='bootstrap'></defaults>
+</page>
\ No newline at end of file
Added:
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=1677251&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/charts/folder.metadata
Fri May 1 23:04:55 2015
@@ -0,0 +1,27 @@
+<?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.
+-->
+<folder
+ 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/folder-metadata.xsd";>
+ <title>Charts</title>
+
+ <document-order>charts.psml</document-order>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/nested.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/nested.psml?rev=1677251&r1=1677250&r2=1677251&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/nested.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/nested.psml
Fri May 1 23:04:55 2015
@@ -7,7 +7,7 @@
<title>Nested Demo</title>
<short-title>Nested</short-title>
<fragment id="nested-2" type="layout"
name="jetspeed-layouts::ResponsiveLayout">
- <fragment id="nested-6" type="portlet" name="j2-admin::ProfilerAdmin">
+ <fragment id="nested-6" type="portlet"
name="j2-admin::MemoryUsageChart">
<property name="row" value="0"></property>
<property name="column" value="0"></property>
</fragment>
Added:
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=1677251&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/charts.psml
Fri May 1 23:04:55 2015
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <fragment id="P-chart-memory-20009" type="portlet"
name="j2-admin::MemoryUsageChart">
+ <property name="row" value="0"></property>
+ <property name="column" value="0"></property>
+ </fragment>
+ <fragment id="P-chart-memory-20010" type="portlet"
name="j2-admin::PageUsageChart">
+ <property name="row" value="0"></property>
+ <property name="column" value="1"></property>
+ </fragment>
+ <fragment id="P-chart-users-20012" type="portlet"
name="j2-admin::UserLoginsChart">
+ <property name="row" value="1"></property>
+ <property name="column" value="0"></property>
+ </fragment>
+ <fragment id="P-chart-caches-20012" type="portlet"
name="j2-admin::CacheUsageChart">
+ <property name="row" value="1"></property>
+ <property name="column" value="1"></property>
+ </fragment>
+
+ </fragment>
+ <defaults layout-decorator="bootstrap"
portlet-decorator='bootstrap'></defaults>
+</page>
\ No newline at end of file
Added:
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=1677251&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/charts/folder.metadata
Fri May 1 23:04:55 2015
@@ -0,0 +1,27 @@
+<?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.
+-->
+<folder
+ 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/folder-metadata.xsd";>
+ <title>Charts</title>
+
+ <document-order>charts.psml</document-order>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/nested.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/nested.psml?rev=1677251&r1=1677250&r2=1677251&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/nested.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/nested.psml
Fri May 1 23:04:55 2015
@@ -7,7 +7,7 @@
<title>Nested Demo</title>
<short-title>Nested</short-title>
<fragment id="nested-2" type="layout"
name="jetspeed-layouts::ResponsiveLayout">
- <fragment id="nested-6" type="portlet" name="j2-admin::ProfilerAdmin">
+ <fragment id="nested-6" type="portlet" name="demo::PickANumberPortlet">
<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]
