Merged V2.2 to HEAD

7307: Re-enabled ability to perform deployments against new model
   7278: Added friendly server name property to model and refactored view deployment report dialog
   7272: Patch for new deployment features


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-11 13:19:19 +00:00
parent 14ef325e93
commit 751fcbb1fa
10 changed files with 731 additions and 122 deletions

View File

@@ -1125,7 +1125,7 @@
<property name="indexerAndSearcher">
<ref bean="indexerAndSearcherFactory" />
</property>
</bean>
</bean>
<bean id="patch.formsFolder" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
<property name="id"><value>patch.formsFolder</value></property>
@@ -1212,4 +1212,21 @@
</property>
</bean>
<bean id="patch.deploymentMigration" class="org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch" parent="basePatch" >
<property name="id"><value>patch.deploymentMigration</value></property>
<property name="description"><value>patch.deploymentMigration.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>116</value></property>
<property name="targetSchema"><value>117</value></property>
<property name="importerBootstrap">
<ref bean="spacesBootstrap" />
</property>
<property name="indexerAndSearcher">
<ref bean="indexerAndSearcherFactory" />
</property>
<property name="avmService">
<ref bean="avmService" />
</property>
</bean>
</beans>