portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r380300 - in /portals/jetspeed-2/trunk/etc: db-ojb/OJB.properties import/assembly/import-page-manager.xml import/assembly/repository-datasource-spring.xml import/import.properties
Date Fri, 24 Feb 2006 01:53:59 GMT
Author: taylor
Date: Thu Feb 23 17:53:59 2006
New Revision: 380300

URL: http://svn.apache.org/viewcvs?rev=380300&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-495
Trying different combinations of Connection Managers
no luck thus far, this is a fascinating trip into OJB, truly fascinating

Modified:
    portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
    portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
    portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
    portals/jetspeed-2/trunk/etc/import/import.properties

Modified: portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties?rev=380300&r1=380299&r2=380300&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties Thu Feb 23 17:53:59 2006
@@ -157,7 +157,7 @@
 # above as a fallback only).
 
 #ConnectionManagerClass=org.apache.ojb.broker.accesslayer.ConnectionManagerImpl
-ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
+ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManager2Impl
 
 #
 #

Modified: portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml?rev=380300&r1=380299&r2=380300&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml Thu Feb 23 17:53:59
2006
@@ -34,7 +34,7 @@
   </bean>
 
     <!-- Proxying -->
-    <bean id="org.apache.jetspeed.page.PageManager" name="dbPageManager" parent="baseTransactionProxy">
+    <bean id="org.apache.jetspeed.page.PageManager" name="dbPageManager" parent="PageManagerTransactionProxy">
         <property name="proxyInterfaces">
             <value>org.apache.jetspeed.page.PageManager</value>
         </property>

Modified: portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml?rev=380300&r1=380299&r2=380300&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml Thu Feb
23 17:53:59 2006
@@ -21,6 +21,25 @@
     
   <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>

      
+    <!-- 
+         Dynamically configures Database Platform for OJB by looking at the connection string
+         and figuring out the OJB platform using an OJB metadata utility
+         Its important to get this right otherwise you will be sending the wrong (most likely
HSQL)
+         flavor of SQL statements to the backend database.
+     -->
+     <bean id="PlatformConfigurator" 
+           class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+           init-method="init"
+      >
+    	<constructor-arg index='0'>
+    		<ref bean="JetspeedDS"/>
+    	</constructor-arg>         
+        <!-- JNDI Name -->
+    	<constructor-arg index='1'>
+    		<value>JetspeedDS</value>
+    	</constructor-arg>                  
+     </bean>
+    
   <!-- properties configurer used to pick up system properties -->
   <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 

Modified: portals/jetspeed-2/trunk/etc/import/import.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/import.properties?rev=380300&r1=380299&r2=380300&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/import.properties (original)
+++ portals/jetspeed-2/trunk/etc/import/import.properties Thu Feb 23 17:53:59 2006
@@ -1,7 +1,7 @@
 # comma-separated list of boot assemblies for Spring
 boot.assemblies =  repository-datasource-spring.xml
 # comma-separated list of assemblies for Spring
-assemblies = import-page-manager.xml, transaction.xml
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
 # root folder to start importing from
 root.folder = /
 # overwrite folders flag, set to true to replace existing folders



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