Author: kevinshen
Date: 2010-01-11 04:00:20 +0100 (Mon, 11 Jan 2010)
New Revision: 40444
Modified:
CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml
CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml
CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml
CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml
CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml
CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml
CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml
CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
Log:
CMSC-1539 CAS single sign-on implementation add new relation from page to
pagegroup in sitemanagement.xml, upgrade the version
Modified:
CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="cmscrichtext" maintainer="finalist.com" version="1"
type="application"/>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<!-- These are the basecontentelements specific builders -->
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscportlets" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE application PUBLIC "-//MMBase/DTD application config 1.1//EN"
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="sitemanagement" maintainer="finalist.com" version="2"
auto-deploy="true">
+<application name="sitemanagement" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
</requirements>
@@ -64,8 +64,8 @@
<relation from="view" to="typedef" type="allowrel" />
<relation from="contentelement" to="page" type="posrel" />
<relation from="contentelement" to="page" type="inlinerel" />
- <!--secure module
- <relation from="page" to="pagegroup" type="related" />-->
+
+ <relation from="page" to="pagegroup" type="related" />
</allowedrelationlist>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="cmscrichtext" maintainer="finalist.com" version="1"
type="application"/>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<!-- These are the basecontentelements specific builders -->
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscportlets" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE application PUBLIC "-//MMBase/DTD application config 1.1//EN"
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="sitemanagement" maintainer="finalist.com" version="2"
auto-deploy="true">
+<application name="sitemanagement" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="${packageInPathFormat}.com"
version="1" auto-deploy="true">
<requirements>
<requires name="contentrepository"
maintainer="${packageInPathFormat}.com" version="2" type="application"/>
- <requires name="sitemanagement" maintainer="${packageInPathFormat}.com"
version="1" type="application"/>
+ <requires name="sitemanagement" maintainer="${packageInPathFormat}.com"
version="3" type="application"/>
<requires name="cmscportlets" maintainer="${packageInPathFormat}.com"
version="1" type="application"/>
<requires name="basecontentelements"
maintainer="${packageInPathFormat}.com" version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="2"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="1"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="cmscrichtext" maintainer="finalist.com" version="1"
type="application"/>
<requires name="contentrepository" maintainer="finalist.com" version="2"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="1"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<!-- These are the basecontentelements specific builders -->
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscportlets" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="2"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="1"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE application PUBLIC "-//MMBase/DTD application config 1.1//EN"
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="sitemanagement" maintainer="finalist.com" version="1"
auto-deploy="true">
+<application name="sitemanagement" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="2"
type="application" />
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscimpl" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="2"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application"/>
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="cmscrichtext" maintainer="finalist.com" version="1"
type="application"/>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<!-- These are the basecontentelements specific builders -->
Modified:
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscportlets" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE application PUBLIC "-//MMBase/DTD application config 1.1//EN"
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="sitemanagement" maintainer="finalist.com" version="2"
auto-deploy="true">
+<application name="sitemanagement" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application" />
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++ CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="alias" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="fileupload" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com"
version="4" type="application" />
- <requires name="sitemanagement" maintainer="finalist.com"
version="2" type="application" />
+ <requires name="sitemanagement" maintainer="finalist.com"
version="3" type="application" />
<requires name="cmscportlets" maintainer="finalist.com"
version="1" type="application" />
<requires name="basecontentelements" maintainer="finalist.com"
version="1" type="application" />
</requirements>
Modified:
CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
<requires name="cmscportlets" maintainer="finalist.com" version="1"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<builder maintainer="finalist.com"
version="1">pagewizarddefinition</builder>
Modified:
CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="rssfeed" maintainer="finalist.com" version="2"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="subsite" maintainer="finalist.com" version="4"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="workflow" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="4"
type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<builder maintainer="mmbase.org" version="1">insrel</builder>
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="googlemap" maintainer="finalist.cn" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com"
version="4" type="application"/>
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
2010-01-11 03:00:20 UTC (rev 40444)
@@ -56,8 +56,6 @@
{
if (sRequest instanceof HttpServletRequest) {
HttpServletRequest request = (HttpServletRequest)sRequest;
- log.info("######################## remote
user==="+request.getRemoteUser());
- log.info("########################
UserPrincipal==="+request.getUserPrincipal());
String username =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
if (username != null) {
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -7,7 +7,7 @@
auto-deploy="true">
<requirements>
- <requires name="sitemanagement" maintainer="finalist.com"
version="2" type="application" />
+ <requires name="sitemanagement" maintainer="finalist.com"
version="3" type="application" />
<requires name="contentrepository" maintainer="finalist.com"
version="4" type="application" />
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -4,7 +4,7 @@
<requirements>
<requires name="cmscrichtext" maintainer="finalist.com" version="1"
type="application"/>
<requires name="contentrepository" maintainer="finalist.com" version="3"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
<!-- These are the basecontentelements specific builders -->
Modified:
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -3,7 +3,7 @@
<application name="cmscportlets" maintainer="finalist.com" version="1"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="3"
type="application" />
- <requires name="sitemanagement" maintainer="finalist.com" version="2"
type="application"/>
+ <requires name="sitemanagement" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
<neededbuilderlist>
Modified:
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-10 12:46:04 UTC (rev 40443)
+++
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml
2010-01-11 03:00:20 UTC (rev 40444)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE application PUBLIC "-//MMBase/DTD application config 1.1//EN"
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="sitemanagement" maintainer="finalist.com" version="2"
auto-deploy="true">
+<application name="sitemanagement" maintainer="finalist.com" version="3"
auto-deploy="true">
<requirements>
<requires name="contentrepository" maintainer="finalist.com" version="3"
type="application"/>
</requirements>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
