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

REPO-2724 Add repository.properties to ServerDescriptor configuration

Browse Source
This commit is contained in:
Alex Mukha
2017-08-04 13:17:34 +01:00
parent 497217a560
commit e6a93099bd
2 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
View File

@@ -1,28 +1,28 @@
/* /*
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2016 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.repo.descriptor; package org.alfresco.repo.descriptor;
import java.io.IOException; import java.io.IOException;
@@ -62,22 +62,25 @@ public class ServerDescriptorDAOImpl implements DescriptorDAO
/** /**
* Sets the server descriptor from a resource file. * Sets the server descriptor from a resource file.
* *
* @param descriptorResource * @param locations
* resource containing server descriptor meta-data * resources containing server descriptor meta-data
* @throws IOException * @throws IOException
* Signals that an I/O exception has occurred. * Signals that an I/O exception has occurred.
*/ */
public void setResource(final Resource descriptorResource) throws IOException public void setResource(final Resource[] locations) throws IOException
{ {
this.serverProperties = new Properties(); this.serverProperties = new Properties();
InputStream is = descriptorResource.getInputStream(); for (int i=0; i< locations.length; i++)
try
{ {
this.serverProperties.load(is); InputStream is = locations[i].getInputStream();
} try
finally {
{ this.serverProperties.load(is);
if (is != null) try { is.close(); } catch (IOException e) {} }
finally
{
if (is != null) try { is.close(); } catch (IOException e) {}
}
} }
} }

15
src/main/resources/alfresco/core-services-context.xml
View File

@@ -855,12 +855,15 @@
</bean> </bean>
<bean id="serverDescriptorDAO" class="org.alfresco.repo.descriptor.ServerDescriptorDAOImpl"> <bean id="serverDescriptorDAO" class="org.alfresco.repo.descriptor.ServerDescriptorDAOImpl">
<property name="repositoryName"> <property name="repositoryName">
<value>${repository.name}</value> <value>${repository.name}</value>
</property> </property>
<property name="resource"> <property name="resource">
<value>classpath:alfresco/version.properties</value> <list>
</property> <value>classpath:alfresco/version.properties</value>
<value>classpath:alfresco/repository.properties</value>
</list>
</property>
</bean> </bean>
<bean id="currentRepoDescriptorDAO" class="org.alfresco.repo.descriptor.RepositoryDescriptorDAOImpl"> <bean id="currentRepoDescriptorDAO" class="org.alfresco.repo.descriptor.RepositoryDescriptorDAOImpl">