inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues so that RM 2.3 works against the latest HEAD-BUGFIX branch

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@83377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-09-04 15:59:12 +00:00
parent f3596bab55
commit 96b00bd6af
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -66,7 +66,7 @@
</modules> </modules>
<properties> <properties>
<alfresco.base.version>5.0.a</alfresco.base.version> <alfresco.base.version>5.0-BF-SNAPSHOT</alfresco.base.version>
<!-- Database properties - default values to be overridden in settings.xml --> <!-- Database properties - default values to be overridden in settings.xml -->
<db.driver>org.postgresql.Driver</db.driver> <db.driver>org.postgresql.Driver</db.driver>

7
rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="rmSqlSessionFactory" class="org.alfresco.ibatis.HierarchicalSqlSessionFactoryBean"> <bean id="rmSqlSessionFactory" class="org.alfresco.ibatis.HierarchicalSqlSessionFactoryBean">
<property name="useLocalCaches" value="${mybatis.useLocalCaches}"/>
<property name="resourceLoader" ref="dialectResourceLoader"/> <property name="resourceLoader" ref="dialectResourceLoader"/>
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
<property name="configLocation"> <property name="configLocation">
@@ -17,9 +16,9 @@
<constructor-arg index="0" ref="rmSqlSessionFactory"/> <constructor-arg index="0" ref="rmSqlSessionFactory"/>
</bean> </bean>
<bean id="recordsManagementQueryDAO" class="org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl"> <bean id="recordsManagementQueryDAO" class="org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl">
<property name="sqlSessionTemplate" ref="rmSqlSessionTemplate"/> <property name="sqlSessionTemplate" ref="rmSqlSessionTemplate"/>
<property name="qnameDAO" ref="qnameDAO"/> <property name="qnameDAO" ref="qnameDAO"/>
</bean> </bean>
</beans> </beans>

2
rm-server/pom.xml
View File

@@ -216,7 +216,7 @@
<dependency> <dependency>
<groupId>org.springframework.extensions.surf</groupId> <groupId>org.springframework.extensions.surf</groupId>
<artifactId>spring-webscripts</artifactId> <artifactId>spring-webscripts</artifactId>
<version>1.2.0</version> <version>${alfresco.base.version}</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>