inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
80110: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79475: Merged DEV to V4.2-BUG-FIX (4.2.4)
         79324: MNT-11023 Admin Console:Search service. After enable noindex not possible to change search service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 15:22:43 +00:00
parent c717551907
commit 33334fef52
5 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/core-services-context.xml
View File

@@ -1121,7 +1121,7 @@
</property> </property>
</bean> </bean>
<bean id="noindex" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean"> <bean id="noindex" class="org.alfresco.repo.management.subsystems.NoIndexChildApplicationContextFactory" parent="abstractPropertyBackedBean">
<property name="autoStart"> <property name="autoStart">
<value>false</value> <value>false</value>
</property> </property>

4
source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
View File

@@ -91,9 +91,9 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
private DefaultResolver defaultResolver = new DefaultResolver(); private DefaultResolver defaultResolver = new DefaultResolver();
/** The lifecycle states. */ /** The lifecycle states. */
private enum RuntimeState {UNINITIALIZED, STOPPED, PENDING_BROADCAST_START, STARTED}; protected enum RuntimeState {UNINITIALIZED, STOPPED, PENDING_BROADCAST_START, STARTED};
private RuntimeState runtimeState = RuntimeState.UNINITIALIZED; protected RuntimeState runtimeState = RuntimeState.UNINITIALIZED;
/** The state. */ /** The state. */
private PropertyBackedBeanState state; private PropertyBackedBeanState state;

6
source/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
View File

@@ -35,6 +35,12 @@ public class LuceneChildApplicationContextFactory extends ChildApplicationContex
{ {
return new ApplicationContextState(true); return new ApplicationContextState(true);
} }
protected void destroy(boolean isPermanent)
{
super.destroy(isPermanent);
doInit();
}
} }

10
source/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java Normal file
View File

@@ -0,0 +1,10 @@
package org.alfresco.repo.management.subsystems;
public class NoIndexChildApplicationContextFactory extends ChildApplicationContextFactory
{
protected void destroy(boolean isPermanent)
{
super.destroy(isPermanent);
doInit();
}
}

8
source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
View File

@@ -328,5 +328,11 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
throw new IllegalStateException("Illegal write to property \"" + name + "\""); throw new IllegalStateException("Illegal write to property \"" + name + "\"");
} }
super.setProperty(name, value); super.setProperty(name, value);
} }
protected void destroy(boolean isPermanent)
{
super.destroy(isPermanent);
doInit();
}
} }