portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r379711 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly: alternate/db-page-manager.xml boot/datasource.xml transaction.xml
Date Wed, 22 Feb 2006 06:28:04 GMT
Author: taylor
Date: Tue Feb 21 22:28:01 2006
New Revision: 379711

URL: http://svn.apache.org/viewcvs?rev=379711&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-495
configuring portal with Spring transactions to support commit and rollback

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?rev=379711&r1=379710&r2=379711&view=diff
==============================================================================
--- 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 Tue
Feb 21 22:28:01 2006
@@ -50,6 +50,7 @@
               <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.PageNotUpdatedException</prop>
+              <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.PageNotUpdatedException</prop>
             
               <prop key="deepCopyFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.PageNotUpdatedException</prop>
           </props>
       </property>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml?rev=379711&r1=379710&r2=379711&view=diff
==============================================================================
--- 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 Tue Feb 21 22:28:01
2006
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>		
-  <!-- 
+<beans>
+   <!-- 
+       Simply use the JNDI data source provided via Spring
+     -->           
+     <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="resourceRef"><value>false</value></property>

+        <property name="jndiName">
+            <value>java:comp/env/jdbc/jetspeed</value>
+        </property>
+    </bean>
+    		
+    <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>

+    
+  <!--       
       Creates a JNDI-based datasource bean name "JetspeedDS". The information
       provided here is merged with the basic configuration for the 
       jdbc-connection-descriptor with the matching jcd-alias property
@@ -21,11 +33,13 @@
       However, if you need to locate/modify these files in a running instance of jetspeed,
       they will be located under /WEB-INF/classes.
      -->
+    <!--
   <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <property name="jndiName">
       <value>java:comp/env/jdbc/jetspeed</value>
     </property>
   </bean>     
+       -->
   
   <!-- If would like use a commons DBCP Pooled datasource as opposed to the default 
        JNDI one above you can uncomment the configuration below and fill in 
@@ -36,22 +50,16 @@
        or to have
        ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
        This property is located in /etc/db-ojb/OJB.properties in the source tree.
+    -->    
+    
+<!--        
+    <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" 
+        destroy-method="close"
+        >
+                <property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+                <property name="url"><value>jdbc:mysql://localhost/j2test</value></property>
+                <property name="username"><value>j2</value></property>
+                <property name="password"><value>XXX</value></property>
+        </bean>    
     -->
-	<!--
-    <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
-    <property name="driverClassName">
-      <value>{my.drivers.class.name}</value>
-    </property>
-    <property name="url">
-      <value>{URL to my DB}</value>
-     </property>
-     <property name="username">
-       <value>{username}</value>
-     </property>
-     <property name="password">
-       <value>{password}</value>
-     </property>
-   </bean>      
-   -->
-  
 </beans>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml?rev=379711&r1=379710&r2=379711&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml Tue Feb 21 22:28:01
2006
@@ -14,8 +14,6 @@
 	<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
 	-->
 
-
-
 	<!--
 		- A parent bean definition which is a base definition for transaction proxies.
 		- It is markes as abstract, since it is never supposed to be instantiated itself.



---------------------------------------------------------------------
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