Skip to content

Commit f5fdbdf

Browse files
committed
Updated the code for dotCMS 2.1
1 parent b6b866e commit f5fdbdf

23 files changed

+186
-1412
lines changed
Binary file not shown.
Binary file not shown.

Configuration/server/tomcat/conf/applications/locationConfigPlugins.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
<properties fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/plugin.properties" optional="true"/>
1111

1212
<dotcms fileName="/config/${param:pluginName}/pluginConfig.xml" optional="true" />
13-
<dotcms fileName="/config/${param:pluginName}/plugin.properties" optional="true"/>
13+
14+
<!-- Because our class DotCMSFileConfiguration extends from XMLConfiguration,
15+
we can only use XML configfiles within the dotCMS file structure -->
16+
<!-- dotcms fileName="/config/${param:pluginName}/plugin.properties" optional="true"/ -->
1417

1518
<xml fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/pluginConfig.xml" optional="true" />
1619
<properties fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/plugin.properties" optional="true"/>
1720

1821
<!-- Indien een plugin gebruik makt van de configuratie plugin dan MOET een van onderstaande bestanden bestaan -->
1922
<xml fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/pluginConfig.xml" optional="true"/>
2023
<properties fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/plugin.properties" optional="true"/>
21-
2224
</configuration>

Configuration/src/com/dotmarketing/plugin/business/PluginAPIImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import java.util.List;
1414
import java.util.NoSuchElementException;
1515

16-
import nl.isaac.comp.configuration.CustomConfiguration;
1716
import nl.isaac.dotcms.plugin.configuration.ConfigurationService;
17+
import nl.isaac.dotcms.plugin.configuration.dependencies.nl.isaac.comp.configuration.CustomConfiguration;
1818
import nl.isaac.dotcms.plugin.configuration.dependencies.org.apache.commons.configuration.ConfigurationException;
1919
import nl.isaac.dotcms.plugin.configuration.exception.ConfigurationNotFoundException;
2020

Configuration/src/com/dotmarketing/plugin/business/PluginAPIImplDotCMS.java

+131-100
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)