Author: rwatler
Date: Thu Mar 25 09:12:29 2010
New Revision: 927312
URL: http://svn.apache.org/viewvc?rev=927312&view=rev
Log:
correct transaction processing for portal administration registration and DB
page manager proxy SecurityException propagation
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/etc/import/assembly/import-page-manager.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/import/assembly/import-page-manager.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
Thu Mar 25 09:12:29 2010
@@ -75,25 +75,25 @@ limitations under the License.
for methods that directly or indirectly add cache
transactions so that
they can properly rollback and cleanup thread local storage
-->
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
<property name="preInterceptors">
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
Thu Mar 25 09:12:29 2010
@@ -292,8 +292,7 @@ public class PortalAdministrationImpl im
String userFolderPath = null;
if ((subsite == null) && (serverName != null))
{
- PortalSiteRequestContext requestContext =
getMockPortalSiteRequestContext(userName, user, locale, serverName);
- userFolderPath = requestContext.getUserFolderPath();
+ userFolderPath = invokeGetUserFolderPath(userName, user,
locale, serverName);
}
else if (subsite != null)
{
@@ -548,8 +547,7 @@ public class PortalAdministrationImpl im
try
{
User user = userManager.getUser(userName);
- PortalSiteRequestContext requestContext =
getMockPortalSiteRequestContext(userName, user, locale, serverName);
- return requestContext.getUserFolderPath();
+ return invokeGetUserFolderPath(userName, user, locale, serverName);
}
catch (Exception e)
{
@@ -566,8 +564,7 @@ public class PortalAdministrationImpl im
try
{
User user = userManager.getUser(userName);
- PortalSiteRequestContext requestContext =
getMockPortalSiteRequestContext(userName, user, locale, serverName);
- return requestContext.getBaseFolderPath();
+ return invokeGetBaseFolderPath(userName, user, locale, serverName);
}
catch (Exception e)
{
@@ -575,11 +572,90 @@ public class PortalAdministrationImpl im
return null;
}
}
+
+ /**
+ * Returns PSML user folder path for specified user by
+ * running full profiler and portal site rules within a
+ * JSSubject.doAsPrivileged() block with a subject matching
+ * the specified user.
+ *
+ * @param userName existing portal user name
+ * @param user existing portal user
+ * @param locale optional locale, (defaults to system locale, for language
+ * profiling rules)
+ * @param serverName server name, (required for subsite profiling rules)
+ * @return PSML user folder path
+ * @throws Exception
+ */
+ private String invokeGetUserFolderPath(final String userName, final User
user, final Locale locale, final String serverName) throws Exception
+ {
+ Object doneAs = JSSubject.doAsPrivileged(user.getSubject(), new
PrivilegedAction()
+ {
+ public Object run()
+ {
+ try
+ {
+ PortalSiteRequestContext requestContext =
getMockPortalSiteRequestContext(userName, user, locale, serverName);
+ return requestContext.getUserFolderPath();
+ }
+ catch (Exception e)
+ {
+ return e;
+ }
+ }
+ }, null);
+ if (doneAs instanceof Exception)
+ {
+ throw (Exception)doneAs;
+ }
+ return (String)doneAs;
+ }
+
+ /**
+ * Returns PSML base folder path for specified user by
+ * running full profiler and portal site rules within a
+ * JSSubject.doAsPrivileged() block with a subject matching
+ * the specified user.
+ *
+ * @param userName existing portal user name
+ * @param user existing portal user
+ * @param locale optional locale, (defaults to system locale, for language
+ * profiling rules)
+ * @param serverName server name, (required for subsite profiling rules)
+ * @return PSML base folder path
+ * @throws Exception
+ */
+ private String invokeGetBaseFolderPath(final String userName, final User
user, final Locale locale, final String serverName) throws Exception
+ {
+ Object doneAs = JSSubject.doAsPrivileged(user.getSubject(), new
PrivilegedAction()
+ {
+ public Object run()
+ {
+ try
+ {
+ PortalSiteRequestContext requestContext =
getMockPortalSiteRequestContext(userName, user, locale, serverName);
+ return requestContext.getBaseFolderPath();
+ }
+ catch (Exception e)
+ {
+ return e;
+ }
+ }
+ }, null);
+ if (doneAs instanceof Exception)
+ {
+ throw (Exception)doneAs;
+ }
+ return (String)doneAs;
+ }
/**
* Returns temporary mock portal site request context for
* specified user for use in constructing user or base PSML
- * folder paths or accessing other profiled site data.
+ * folder paths or accessing other profiled site data. This
+ * method invocation should be wrapped in a
+ * JSSubject.doAsPrivileged() block with a subject matching
+ * the specified user.
*
* @param userName portal user name
* @param user portal user
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/etc/import/assembly/import-page-manager.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/etc/import/assembly/import-page-manager.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/etc/import/assembly/import-page-manager.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/etc/import/assembly/import-page-manager.xml
Thu Mar 25 09:12:29 2010
@@ -44,25 +44,25 @@ limitations under the License.
</property>
<property name="transactionAttributes">
<props>
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
</bean>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/import/assembly/import-page-manager.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/import/assembly/import-page-manager.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/import/assembly/import-page-manager.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/import/assembly/import-page-manager.xml
Thu Mar 25 09:12:29 2010
@@ -44,25 +44,25 @@ limitations under the License.
</property>
<property name="transactionAttributes">
<props>
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
</bean>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
Thu Mar 25 09:12:29 2010
@@ -50,25 +50,25 @@ limitations under the License.
for methods that directly or indirectly add cache
transactions so that
they can properly rollback and cleanup thread local storage
-->
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
</bean>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
Thu Mar 25 09:12:29 2010
@@ -49,25 +49,25 @@ limitations under the License.
for methods that directly or indirectly add cache
transactions so that
they can properly rollback and cleanup thread local storage
-->
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
</bean>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?rev=927312&r1=927311&r2=927312&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
Thu Mar 25 09:12:29 2010
@@ -50,25 +50,25 @@ limitations under the License.
for methods that directly or indirectly add cache
transactions so that
they can properly rollback and cleanup thread local storage
-->
- <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
- <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
- <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
- <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
- <prop key="getAll">PROPAGATION_SUPPORTS</prop>
- <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ <prop key="*Exists">PROPAGATION_SUPPORTS</prop>
+ <prop key="addListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="checkConstraint">PROPAGATION_SUPPORTS</prop>
+ <prop
key="copy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="deep*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop
key="get*">PROPAGATION_SUPPORTS,+java.lang.SecurityException</prop>
+ <prop
key="getConstraintsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getNodeReapingInterval">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="getPermissionsEnabled">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="isDistributed">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="new*">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="notifyUpdatedNode">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeListener">PROPAGATION_NOT_SUPPORTED</prop>
+ <prop key="reset">PROPAGATION_NOT_SUPPORTED</prop>
<prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop
key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
- <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
- <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
- <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
</props>
</property>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
