portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r539124 [2/2] - in /portals/jetspeed-2/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ applications/demo/ applications/gems/ applications/j2-admin/ applications/j2-admin/src/webapp/WEB-INF/view/ applications/rss/ applic...
Date Thu, 17 May 2007 21:34:00 GMT
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml Thu
May 17 14:33:57 2007
@@ -46,13 +46,21 @@
       </property>
       <property name="transactionAttributes">
           <props>
-              <prop key="*">PROPAGATION_SUPPORTS</prop>
-              <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="*">PROPAGATION_SUPPORTS</prop>              
+              <prop key="getPage*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="getLink*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="getFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="getContentPage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="getAll">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="getUserFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
               <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="create*">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="add*">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_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
               <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
               <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml Thu May 17 14:33:57
2007
@@ -27,7 +27,7 @@
         </property>
     </bean>
     		
-    <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/>

+    <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>

 
     <!-- 
          Dynamically configures Database Platform for OJB by looking at the connection string

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Thu May 17 14:33:57
2007
@@ -188,5 +188,9 @@
 
     <!-- HeaderResource Factory -->
     <bean id="org.apache.jetspeed.headerresource.HeaderResourceFactory" class="org.apache.jetspeed.headerresource.impl.HeaderResourceFactoryImpl"></bean>
+
+    <!-- Security: Session Manager -->
+    <bean id="org.apache.jetspeed.container.session.PortalSessionsManager" 
+  	   class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl"  />
         
 </beans>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/security-managers.xml Thu May 17
14:33:57 2007
@@ -38,11 +38,7 @@
   >  	   
   	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
  
   </bean>
-  
-  <!-- Security: Session Manager -->
-  <bean id="org.apache.jetspeed.container.session.PortalSessionsManager" 
-  	   class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl"  />
-    
+      
   <!-- Security: Permission Manager -->
   <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
   	   class="org.apache.jetspeed.security.impl.PermissionManagerImpl"  />

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml Thu May 17 14:33:57
2007
@@ -23,7 +23,7 @@
 <beans>
   
 	<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springmodules.orm.ojb.PersistenceBrokerTransactionManager"/>
+	<bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager"/>
 
 	<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource)
-->
 	<!--

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/decorator-macros.vm Thu
May 17 14:33:57 2007
@@ -16,7 +16,6 @@
 *#
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#	
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/decorator-macros.vm
Thu May 17 14:33:57 2007
@@ -39,18 +39,15 @@
 
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")
   #set($BOTTOM_TO_TOP = "BottomToTop")
 
-  #* Constants for layout control *#
   #set($TITLE_FIRST = "TitleFirst")
   #set($TITLE_LAST = "TitleLast")
   #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
 
-  #* Constants for JSCookMenu themes *#
   #set($JSCOOKMENU_JETSPEED_THEME = "ThemeJetspeed")
   #set($JSCOOKMENU_PANEL_THEME = "ThemePanel")
   #set($JSCOOKMENU_OFFICE_THEME = "ThemeOffice")

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/decorator-macros.vm Thu
May 17 14:33:57 2007
@@ -16,7 +16,6 @@
 *#
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#    
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/decorator-macros.vm Thu
May 17 14:33:57 2007
@@ -16,7 +16,6 @@
 *#
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#	
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/decorator-macros.vm
Thu May 17 14:33:57 2007
@@ -16,7 +16,6 @@
 *#
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#	
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm?view=diff&rev=539124&r1=539123&r2=539124
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/decorator-macros.vm Thu
May 17 14:33:57 2007
@@ -16,7 +16,6 @@
 *#
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#	
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message