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

Build fix

Browse Source 
- remove merge issues that causes a double bootstrap
- move bootstrap bean into the correct context

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2008-05-27 13:42:17 +00:00
parent db95d287ee
commit 9116330a10
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/alfresco/bootstrap-context.xml
View File

@@ -541,4 +541,18 @@
</property> </property>
</bean> </bean>
<!-- Repository helper class -->
<bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
<property name="transactionHelper" ref="retryingTransactionHelper" />
<property name="namespaceService" ref="namespaceService" />
<property name="nodeService" ref="nodeService" />
<property name="personService" ref="personService" />
<property name="fileFolderService" ref="fileFolderService" />
<property name="searchService" ref="searchService" />
<property name="tenantDeployerService" ref="tenantAdminService" />
<property name="avmService" ref="AVMService" />
<property name="companyHomeStore"><value>${spaces.store}</value></property>
<property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
</bean>
</beans> </beans>

14
config/alfresco/model-specific-services-context.xml
View File

@@ -112,19 +112,5 @@
<ref bean="fileFolderService" /> <ref bean="fileFolderService" />
</property> </property>
</bean> </bean>
<!-- Repository helper class -->
<bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
<property name="transactionHelper" ref="retryingTransactionHelper" />
<property name="namespaceService" ref="namespaceService" />
<property name="nodeService" ref="nodeService" />
<property name="personService" ref="personService" />
<property name="fileFolderService" ref="fileFolderService" />
<property name="searchService" ref="searchService" />
<property name="tenantDeployerService" ref="tenantAdminService" />
<property name="avmService" ref="AVMService" />
<property name="companyHomeStore"><value>${spaces.store}</value></property>
<property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
</bean>
</beans> </beans>

8
source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
View File

@@ -989,11 +989,13 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// thrown. If it is thrown, the the update needs to be rerun as it will probably generate no SQL // thrown. If it is thrown, the the update needs to be rerun as it will probably generate no SQL
// statements the second time around. // statements the second time around.
boolean updatedSchema = false; boolean updatedSchema = false;
boolean createdSchema = false;
for (int i = 0; i < schemaUpdateLockRetryCount; i++) for (int i = 0; i < schemaUpdateLockRetryCount; i++)
{ {
try try
{ {
updateSchema(cfg, session, connection); createdSchema = updateSchema(cfg, session, connection);
updatedSchema = true; updatedSchema = true;
break; break;
} }
@@ -1009,8 +1011,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
throw new AlfrescoRuntimeException(ERR_PREVIOUS_FAILED_BOOTSTRAP); throw new AlfrescoRuntimeException(ERR_PREVIOUS_FAILED_BOOTSTRAP);
} }
boolean create = updateSchema(cfg, session, connection);
// Copy the executed statements to the output file // Copy the executed statements to the output file
File schemaOutputFile = null; File schemaOutputFile = null;
if (schemaOuputFilename != null) if (schemaOuputFilename != null)
@@ -1035,7 +1035,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
LogUtil.info(logger, MSG_ALL_STATEMENTS, schemaOutputFile.getPath()); LogUtil.info(logger, MSG_ALL_STATEMENTS, schemaOutputFile.getPath());
} }
if (! create) if (! createdSchema)
{ {
// verify that all patches have been applied correctly // verify that all patches have been applied correctly
checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false); // check scripts checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false); // check scripts