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

Fix some merge errors: removing clustering references not valid in community.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-03-25 17:54:01 +00:00
parent e89652d129
commit 2f551e5e7d
11 changed files with 1 additions and 1410 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;
}
}

69
source/java/org/alfresco/repo/cluster/HazelcastConfigFactoryBeanTest.java
View File

@@ -1,69 +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 static org.junit.Assert.assertEquals;
import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import com.hazelcast.config.Config;
/**
* Tests for the HazelcastConfigFactoryBean class.
*
* @author Matt Ward
*/
public class HazelcastConfigFactoryBeanTest
{
private HazelcastConfigFactoryBean configFactory;
private Resource resource;
private Properties properties;
@Before
public void setUp() throws Exception
{
configFactory = new HazelcastConfigFactoryBean();
resource = new ClassPathResource("cluster-test/placeholder-test.xml");
configFactory.setConfigFile(resource);
properties = new Properties();
properties.setProperty("alfresco.hazelcast.password", "let-me-in");
properties.setProperty("alfresco.cluster.name", "cluster-name");
configFactory.setProperties(properties);
// Trigger the spring post-bean creation lifecycle method
configFactory.afterPropertiesSet();
}
@Test
public void testConfigHasNewPropertyValues() throws Exception
{
// Invoke the factory method.
Config config = configFactory.getObject();
assertEquals("let-me-in", config.getGroupConfig().getPassword());
assertEquals("cluster-name", config.getGroupConfig().getName());
}
}

139
source/java/org/alfresco/repo/cluster/HazelcastInstanceFactory.java
View File

@@ -1,139 +0,0 @@
/*
* Copyright (C) 2005-2013 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.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.util.PropertyCheck;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
/**
* Provides a way of lazily creating HazelcastInstances for a given configuration.
* The HazelcastInstance will not be created until {@link #getInstance()} is called.
* <p>
* An intermediary class such as this is required in order to avoid starting
* Hazelcast instances when clustering is not configured/required. Otherwise
* simply by defining a HazelcastInstance bean clustering would spring into life.
* <p>
* Please note this class provides non-static access deliberately, and should be
* injected into any clients that require its services.
*
* @author Matt Ward
*/
public class HazelcastInstanceFactory
{
private Config config;
private HazelcastInstance hazelcastInstance;
/** Guards {@link #config} and {@link #hazelcastInstance} */
private ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
public HazelcastInstance getInstance()
{
rwLock.readLock().lock();
try
{
if (hazelcastInstance != null)
{
return hazelcastInstance;
}
}
finally
{
rwLock.readLock().unlock();
}
// hazelcastInstance is null, so create it.
rwLock.writeLock().lock();
try
{
// Double check condition hasn't changed in between locks.
if (hazelcastInstance == null)
{
hazelcastInstance = Hazelcast.newHazelcastInstance(config);
}
return hazelcastInstance;
}
finally
{
rwLock.writeLock().unlock();
}
}
/**
* Checks whether hazelcast has been given a valid cluster name. If so,
* then clustering is considered enabled. This condition should be checked
* before calling {@link #getInstance()}.
*
* @return true if clustering is enabled, false otherwise.
*/
public boolean isClusteringEnabled()
{
rwLock.readLock().lock();
try
{
String clusterName = config.getGroupConfig().getName();
return (PropertyCheck.isValidPropertyString(clusterName));
}
finally
{
rwLock.readLock().unlock();
}
}
/**
* Retrieve the name of the cluster for the configuration used by this factory.
*
* @return String - the cluster name.
*/
public String getClusterName()
{
rwLock.readLock().lock();
try
{
String clusterName = config.getGroupConfig().getName();
return clusterName;
}
finally
{
rwLock.readLock().unlock();
}
}
/**
* Sets the Hazelcast configuration that will be used by this factory when
* creating the HazelcastInstance.
*
* @param config Hazelcast configuration
*/
public void setConfig(Config config)
{
rwLock.writeLock().lock();
try
{
this.config = config;
}
finally
{
rwLock.writeLock().unlock();
}
}
}

79
source/java/org/alfresco/repo/webdav/LockStoreFactoryImpl.java
View File

@@ -1,79 +0,0 @@
/*
* Copyright (C) 2005-2013 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.webdav;
import java.util.concurrent.ConcurrentMap;
import org.alfresco.repo.cluster.HazelcastInstanceFactory;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.PropertyCheck;
import com.hazelcast.core.HazelcastInstance;
/**
* Default implementation of the {@link LockStoreFactory} interface. Creates {@link LockStore}s
* backed by a Hazelcast distributed Map if the clusterName property is set,
* otherwise it creates a non-clustered {@link SimpleLockStore}.
*
* @see LockStoreFactory
* @see LockStoreImpl
* @author Matt Ward
*/
public class LockStoreFactoryImpl implements LockStoreFactory
{
private static final String HAZELCAST_MAP_NAME = "webdav-locks";
private HazelcastInstanceFactory hazelcastInstanceFactory;
private String clusterName;
/**
* This method should be used sparingly and the created {@link LockStore}s should be
* retained (this factory does not cache instances of them).
*/
@Override
public synchronized LockStore createLockStore()
{
if (!PropertyCheck.isValidPropertyString(clusterName))
{
return new SimpleLockStore();
}
else
{
HazelcastInstance instance = hazelcastInstanceFactory.getInstance();
ConcurrentMap<NodeRef, LockInfo> map = instance.getMap(HAZELCAST_MAP_NAME);
return new LockStoreImpl(map);
}
}
/**
* @param hazelcastInstanceFactory the factory that will create a HazelcastInstance if required.
*/
public synchronized void setHazelcastInstanceFactory(HazelcastInstanceFactory hazelcastInstanceFactory)
{
this.hazelcastInstanceFactory = hazelcastInstanceFactory;
}
/**
* @param clusterName the clusterName to set
*/
public synchronized void setClusterName(String clusterName)
{
this.clusterName = clusterName;
}
}