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

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

Browse Source 
41454: ALF-15881: Disabling clustering in community
   41500: ALF-15883: Move configuration files
   41503: ALF-15884: Move cluster package to enterprise repository project
   41504: ALF-15884: Move cluster package to enterprise repository project
   41519: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only
   41523: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only
   41525: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only
   41527: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only
   41530: ALF-15886: remove import for class no longer in project.
   41532: ALF-15887: LockStoreFactoryImpl must be separated into community and enterprise versions
   41535: ALF-15883: Move configuration files
   41561: ALF-15886: factory class to create key fileserver config beans.
   41578: ALF-15888: separate transactional and shared cache bean definitions.
   41623: ALF-15888: first pass at DefaultSimpleCache implementation.
   41646: ALF-15888: move ehcache-default.xml
   41651: ALF-15888: update javadoc to reflect changes
   41762: ALF-15888: improve cache test to prove that null values are stored correctly.
   41812: ALF-15888: added new cache provider for use by hibernate: DefaultCacheProvider.
   41830: ALF-15888: make DefaultSimpleCache BeanNameAware to help with debugging etc.
   41831: ALF-15888: missing file from commit - adds enterprise override capability for hibernate-cfg.properties
   41850: ALF-15888: move tickets cache to cache-context.xml
   41857: ALF-15888: make RemoteAlfrescoTicketServiceImpl cache implementation agnostic.
   41866: ALF-15888: extract caches from fileservers and web-client and provide enterprise overrides
   41881: ALF-15888: replace use of EhCacheAdapter with DefaultSimpleCache and SimpleCache interface.
   41884: ALF-15888: added DefaultSimpleCache configuration to CachingContentStore sample XML.
   41885: ALF-15888: move EhCacheAdapter to new package.
   41886: ALF-15888: correct absolute class names in config for EhCacheAdapter.
   41892: ALF-15888: fix CachingContentStore tests.
   41897: ALF-15888: move CacheTest and config to new package.
   41898: ALF-15888: remove redundant directory
   41899: ALF-15889: move EhCacheManagerFactoryBean to new package.
   41902: ALF-15889: moved EhCacheTracerJob to new package.
   41913: ALF-15889: move InternalEhCacheManagerFactoryBean to new package.
   41916: ALF-15889: move AlfrescoCacheManagerPeerProviderFactory to new package.
   41937: ALF-15889: decouple TransactionalCache from EhCache
   41966: ALF-15889: decouple RetryingTransactionHelper from ehcache.
   41989: ALF-15889: added ContextListener test.
   41996: ALF-15889: moved cache test to its own class.
   41998: ALF-15889: move ehcache jars.
   41999: ALF-15889: modify .classpath to reflect jar moves.
   42037: ALF-15889: update poms to reflect lib moves.
   42038: ALF-15889: add eclipse library reference to enterprise projects.
   42093: ALF-15916: moved core properties to enterprise
   42114: ALF-15888: externalized cache sizes to repository.properties.
   42127: ALF-16136: move re-indexing configuration
   42140: ALF-16136: move cluster check property.
   42186: ALF-15889: removing seemingly redundant test config file.
   42187: ALF-15888: tidy up config changes.
   42189: ALF-15888: cleanup config
   42190: ALF-15888: config cleanup
   42191: ALF-15888: config cleanup
   42198: ALF-16136: restored lost property



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-10-01 12:17:53 +00:00
parent 131080b564
commit 511af90d5c
79 changed files with 1471 additions and 7954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
source/java/org/alfresco/repo/cluster/HazelcastConfigFactoryBean.java
View File

@@ -1,172 +0,0 @@
/*
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.cluster;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.util.Properties;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import com.hazelcast.config.Config;
import com.hazelcast.config.InMemoryXmlConfig;
/**
* FactoryBean used to create Hazelcast {@link Config} objects. A configuration file is supplied
* in the form of a Spring {@link Resource} and a set of {@link Properties} can also be provided. The
* XML file is processed so that property placeholders of the form ${property.name} are substitued for
* the corresponding property value before the XML is parsed into the Hazelcast configuration object.
*
* @author Matt Ward
*/
public class HazelcastConfigFactoryBean implements InitializingBean, FactoryBean<Config>
{
private static final String PLACEHOLDER_END = "}";
private static final String PLACEHOLDER_START = "${";
private Resource configFile;
private Config config;
private Properties properties;
/**
* Set the Hazelcast XML configuration file to use. This will be merged with the supplied
* Properties and parsed to produce a final {@link Config} object.
* @param configFile the configFile to set
*/
public void setConfigFile(Resource configFile)
{
this.configFile = configFile;
}
/**
* Used to supply the set of Properties that the configuration file can reference.
*
* @param properties the properties to set
*/
public void setProperties(Properties properties)
{
this.properties = properties;
}
/**
* Spring {@link InitializingBean} lifecycle method. Substitutes property placeholders for their
* corresponding values and creates a {@link Config Hazelcast configuration} with the post-processed
* XML file - ready for the {@link #getObject()} factory method to be used to retrieve it.
*/
@Override
public void afterPropertiesSet() throws Exception
{
if (configFile == null)
{
throw new IllegalArgumentException("No configuration file specified.");
}
if (properties == null)
{
properties = new Properties();
}
// These configXML strings will be large and are therefore intended
// to be thrown away. We only want to keep the final Config object.
String rawConfigXML = getConfigFileContents();
String configXML = substituteProperties(rawConfigXML);
config = new InMemoryXmlConfig(configXML);
}
/**
* For the method parameter <code>text</code>, replaces all occurrences of placeholders having
* the form ${property.name} with the value of the property having the key "property.name". The
* properties are supplied using {@link #setProperties(Properties)}.
*
* @param text The String to apply property substitutions to.
* @return String after substitutions have been applied.
*/
private String substituteProperties(String text)
{
for (String propName : properties.stringPropertyNames())
{
String propValue = properties.getProperty(propName);
String quotedPropName = Pattern.quote(PLACEHOLDER_START + propName + PLACEHOLDER_END);
text = text.replaceAll(quotedPropName, propValue);
}
return text;
}
/**
* Opens the configFile {@link Resource} and reads the contents into a String.
*
* @return the contents of the configFile resource.
*/
private String getConfigFileContents()
{
StringWriter writer = new StringWriter();
InputStream inputStream = null;
try
{
inputStream = configFile.getInputStream();
IOUtils.copy(inputStream, writer, "UTF-8");
return writer.toString();
}
catch (IOException e)
{
throw new RuntimeException("Couldn't read configuration: " + configFile, e);
}
finally
{
try
{
if (inputStream != null)
{
inputStream.close();
}
}
catch (IOException e)
{
throw new RuntimeException("Couldn't close stream", e);
}
}
}
/**
* FactoryBean's factory method. Returns the config with the property key/value
* substitutions in place.
*/
@Override
public Config getObject() throws Exception
{
return config;
}
@Override
public Class<?> getObjectType()
{
return Config.class;
}
@Override
public boolean isSingleton()
{
return true;
}
}