Skip to content

Commit 46bea42

Browse files
yasindilekciyasindilekci
committed
Version 1.9.0 added
1 parent 7b7ca5f commit 46bea42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2028
-0
lines changed

‎Configuration/MANIFEST.MF

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Manifest-Version: 1.0
2+
Deploy-Class:
3+
Plugin-Name: ISAAC Configuration Plugin
4+
Plugin-Version: 1.0
5+
Author: ISAAC

‎Configuration/build.xml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<project name="configuration" default="build">
2+
<import file="../common.xml"/>
3+
</project>

‎Configuration/conf/Language-ext.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
javax.portlet.title.EXT_CONFIGURATION=Configuration Cache

‎Configuration/conf/portlet-ext.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<portlet>
2+
<portlet-name>EXT_CONFIGURATION</portlet-name>
3+
<display-name>Configuration Cache</display-name>
4+
<portlet-class>com.liferay.portlet.VelocityPortlet</portlet-class>
5+
<init-param>
6+
<name>view-template</name>
7+
<value>/static/plugins/configuration/configuration_portlet.vm</value>
8+
</init-param>
9+
<expiration-cache>0</expiration-cache>
10+
<supports>
11+
<mime-type>text/html</mime-type>
12+
</supports>
13+
<resource-bundle>com.liferay.portlet.StrutsResourceBundle</resource-bundle>
14+
<security-role-ref>
15+
<role-name>CMS User</role-name>
16+
</security-role-ref>
17+
</portlet>

‎Configuration/conf/toolbox-ext.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<tool>
2+
<key>configuration</key>
3+
<scope>request</scope>
4+
<class>nl.isaac.dotcms.plugin.configuration.viewtool.ConfigurationViewTool</class>
5+
</tool>
6+
7+
<tool>
8+
<key>configurationAdmin</key>
9+
<scope>application</scope>
10+
<class>nl.isaac.dotcms.plugin.configuration.viewtool.portlet.admin.ConfigurationAdminViewTool</class>
11+
</tool>
12+

‎Configuration/conf/web-ext.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<filter>
2+
<filter-name>ConfigurationRequestStoringFilter</filter-name>
3+
<filter-class>nl.isaac.dotcms.plugin.configuration.filter.RequestStoringFilter</filter-class>
4+
</filter>
5+
6+
<filter-mapping>
7+
<filter-name>ConfigurationRequestStoringFilter</filter-name>
8+
<url-pattern>/*</url-pattern>
9+
<dispatcher>REQUEST</dispatcher>
10+
<dispatcher>FORWARD</dispatcher>
11+
<dispatcher>ERROR</dispatcher>
12+
</filter-mapping>
13+
14+
<listener>
15+
<listener-class>nl.isaac.dotcms.plugin.configuration.filter.SessionListener</listener-class>
16+
</listener>
17+
18+
<servlet>
19+
<servlet-name>ConfigurationAdminClear</servlet-name>
20+
<servlet-class>nl.isaac.dotcms.plugin.configuration.web.servlet.admin.ClearCacheServlet</servlet-class>
21+
</servlet>
22+
<servlet-mapping>
23+
<servlet-name>ConfigurationAdminClear</servlet-name>
24+
<url-pattern>/servlets/configurationcache/clear/</url-pattern>
25+
</servlet-mapping>

‎Configuration/lib/commons-beanutils-1.7.0_dependency.jar

201 KB
Binary file not shown.

‎Configuration/lib/commons-beanutils-core-1.8.0_dependency.jar

221 KB
Binary file not shown.

‎Configuration/lib/commons-collections-3.2.1_dependency.jar

630 KB
Binary file not shown.

‎Configuration/lib/commons-configuration-1.7_dependency.jar

372 KB
Binary file not shown.

‎Configuration/lib/commons-lang-2.6_dependency.jar

299 KB
Binary file not shown.

‎Configuration/lib/commons-logging-1.1.1_dependency.jar

64.8 KB
Binary file not shown.

‎Configuration/lib/isaac-configuration-1.0.10-SNAPSHOT_dependency.jar

21.8 KB
Binary file not shown.

‎Configuration/lib_ori/build.xml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project default="create_dependency_libs" name="Create Jar for Project Minify plugin">
3+
<target name="create_dependency_libs">
4+
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="jarjar-1.0.jar"/>
5+
<jarjar destfile="../lib/commons-configuration-1.7_dependency.jar" filesetmanifest="mergewithoutmain">
6+
<manifest>
7+
<attribute name="Built-By" value="${user.name}"/>
8+
<attribute name="Class-Path" value="."/>
9+
</manifest>
10+
<zipfileset excludes="META-INF/*.SF" src="commons-configuration-1.7.jar"/>
11+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
12+
</jarjar>
13+
<jarjar destfile="../lib/commons-logging-1.1.1_dependency.jar" filesetmanifest="mergewithoutmain">
14+
<manifest>
15+
<attribute name="Built-By" value="${user.name}"/>
16+
<attribute name="Class-Path" value="."/>
17+
</manifest>
18+
<zipfileset excludes="META-INF/*.SF" src="commons-logging-1.1.1.jar"/>
19+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
20+
</jarjar>
21+
<jarjar destfile="../lib/commons-lang-2.6_dependency.jar" filesetmanifest="mergewithoutmain">
22+
<manifest>
23+
<attribute name="Built-By" value="${user.name}"/>
24+
<attribute name="Class-Path" value="."/>
25+
</manifest>
26+
<zipfileset excludes="META-INF/*.SF" src="commons-lang-2.6.jar"/>
27+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
28+
</jarjar>
29+
<jarjar destfile="../lib/commons-collections-3.2.1_dependency.jar" filesetmanifest="mergewithoutmain">
30+
<manifest>
31+
<attribute name="Built-By" value="${user.name}"/>
32+
<attribute name="Class-Path" value="."/>
33+
</manifest>
34+
<zipfileset excludes="META-INF/*.SF" src="commons-collections-3.2.1.jar"/>
35+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
36+
</jarjar>
37+
<jarjar destfile="../lib/commons-beanutils-1.7.0_dependency.jar" filesetmanifest="mergewithoutmain">
38+
<manifest>
39+
<attribute name="Built-By" value="${user.name}"/>
40+
<attribute name="Class-Path" value="."/>
41+
</manifest>
42+
<zipfileset excludes="META-INF/*.SF" src="commons-beanutils-1.7.0.jar"/>
43+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
44+
</jarjar>
45+
<jarjar destfile="../lib/commons-beanutils-core-1.8.0_dependency.jar" filesetmanifest="mergewithoutmain">
46+
<manifest>
47+
<attribute name="Built-By" value="${user.name}"/>
48+
<attribute name="Class-Path" value="."/>
49+
</manifest>
50+
<zipfileset excludes="META-INF/*.SF" src="commons-beanutils-core-1.8.0.jar"/>
51+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
52+
</jarjar>
53+
<jarjar destfile="../lib/isaac-configuration-1.0.10-SNAPSHOT_dependency.jar" filesetmanifest="mergewithoutmain">
54+
<manifest>
55+
<attribute name="Built-By" value="${user.name}"/>
56+
<attribute name="Class-Path" value="."/>
57+
</manifest>
58+
<zipfileset excludes="META-INF/*.SF" src="isaac-configuration-1.0.10-SNAPSHOT.jar"/>
59+
<rule pattern="nl.isaac.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
60+
<rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
61+
</jarjar>
62+
</target>
63+
</project>

‎Configuration/lib_ori/commons-beanutils-1.7.0.jar

184 KB
Binary file not shown.

‎Configuration/lib_ori/commons-beanutils-core-1.8.0.jar

201 KB
Binary file not shown.

‎Configuration/lib_ori/commons-collections-3.2.1.jar

562 KB
Binary file not shown.

‎Configuration/lib_ori/commons-configuration-1.7.jar

342 KB
Binary file not shown.

‎Configuration/lib_ori/commons-lang-2.6.jar

278 KB
Binary file not shown.

‎Configuration/lib_ori/commons-logging-1.1.1.jar

59.3 KB
Binary file not shown.

‎Configuration/lib_ori/isaac-configuration-1.0.10-SNAPSHOT.jar

18.8 KB
Binary file not shown.

‎Configuration/lib_ori/jarjar-1.0.jar

110 KB
Binary file not shown.

‎Configuration/server/tomcat/conf/applications/configurationPluginConfig.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<configuration>
3+
4+
<xml fileName="${sys:catalina.home}/conf/applications/serverConfig.xml" />
5+
6+
</configuration>

‎Configuration/server/tomcat/conf/applications/locationConfigHosts.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<configuration>
3+
<!-- Standard for all configurations! Same as config.xml -->
4+
<xml fileName="${sys:catalina.home}/conf/applications/serverConfig.xml" />
5+
6+
<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:ClientIPAddress}/hostConfig.xml" optional="true" />
7+
<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/hostConfig.xml" optional="true" />
8+
<dotcms fileName="/config/hostConfig.xml" optional="true" />
9+
</configuration>

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

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<configuration>
3+
<!-- Standard for all configurations! Same as config.xml -->
4+
<xml fileName="${sys:catalina.home}/conf/applications/serverConfig.xml" />
5+
6+
<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/${param:ClientIPAddress}/pluginConfig.xml" optional="true" />
7+
<properties fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/${param:ClientIPAddress}/plugin.properties" optional="true"/>
8+
9+
<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/pluginConfig.xml" optional="true" />
10+
<properties fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/plugin.properties" optional="true"/>
11+
12+
<dotcms fileName="/config/${param:pluginName}/pluginConfig.xml" optional="true" />
13+
<dotcms fileName="/config/${param:pluginName}/plugin.properties" optional="true"/>
14+
15+
<xml fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/pluginConfig.xml" optional="true" />
16+
<properties fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/plugin.properties" optional="true"/>
17+
18+
<!-- Indien een plugin gebruik makt van de configuratie plugin dan MOET een van onderstaande bestanden bestaan -->
19+
<xml fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/pluginConfig.xml" optional="true"/>
20+
<properties fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/plugin.properties" optional="true"/>
21+
22+
</configuration>

‎Configuration/server/tomcat/conf/applications/serverConfig.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<config>
3+
<environment>DEV</environment>
4+
</config>

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

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package com.dotmarketing.plugin.business;
2+
/**
3+
* dotCMS Configuration plugin by ISAAC - The Full Service Internet Agency is licensed
4+
* under a Creative Commons Attribution 3.0 Unported License
5+
* - http://creativecommons.org/licenses/by/3.0/
6+
* - http://www.geekyplugins.com/
7+
*
8+
* @copyright Copyright (c) 2011 ISAAC Software Solutions B.V. (http://www.isaac.nl)
9+
*/
10+
11+
import java.util.ArrayList;
12+
import java.util.Iterator;
13+
import java.util.List;
14+
import java.util.NoSuchElementException;
15+
16+
import nl.isaac.dotcms.plugin.configuration.ConfigurationService;
17+
import nl.isaac.dotcms.plugin.configuration.dependencies.nl.isaac.comp.configuration.CustomConfiguration;
18+
import nl.isaac.dotcms.plugin.configuration.dependencies.org.apache.commons.configuration.ConfigurationException;
19+
import nl.isaac.dotcms.plugin.configuration.exception.ConfigurationNotFoundException;
20+
21+
import com.dotmarketing.exception.DotDataException;
22+
import com.dotmarketing.util.Logger;
23+
import com.dotmarketing.util.UtilMethods;
24+
25+
public class PluginAPIImpl extends PluginAPIImplDotCMS {
26+
@Override
27+
public String loadProperty(String pluginId, String key)
28+
throws DotDataException {
29+
try {
30+
CustomConfiguration cc = ConfigurationService.getPluginConfiguration(pluginId);
31+
if(cc != null && cc.containsKey(key) && UtilMethods.isSet(cc.getString(key))) {
32+
return cc.getString(key);
33+
}
34+
} catch (ConfigurationException e) {
35+
Logger.warn(this.getClass(), "Exception while trying to retrieve config with key '" + key + "' for plugin '" + pluginId + "' in ConfigurationService", e);
36+
} catch (NoSuchElementException e) {
37+
Logger.debug(this.getClass(), "The key '" + key + "' can't be found. It's probably not set yet in a configuration file");
38+
} catch (ConfigurationNotFoundException e) {
39+
Logger.error(this.getClass(), "Can't load configuration property '" + key + "'", e);
40+
}
41+
return super.loadProperty(pluginId, key);
42+
}
43+
@Override
44+
public List<String> loadPluginConfigKeys(String pluginId) throws DotDataException {
45+
try {
46+
CustomConfiguration cc = ConfigurationService.getPluginConfiguration(pluginId);
47+
@SuppressWarnings("unchecked")
48+
Iterator<String> iter = cc.getKeys();
49+
List<String> keys = new ArrayList<String>();
50+
while (iter.hasNext()) {
51+
keys.add(iter.next());
52+
}
53+
return keys;
54+
} catch (ConfigurationException e) {
55+
Logger.warn(this.getClass(), "Exception while trying to retrieve config keys for plugin '" + pluginId + "' in ConfigurationService", e);
56+
} catch (NoSuchElementException e) {
57+
Logger.debug(this.getClass(), "The keys couldn't be found. There probably is no configuration file");
58+
} catch (ConfigurationNotFoundException e) {
59+
Logger.error(this.getClass(), "Can't load configuration property", e);
60+
}
61+
return super.loadPluginConfigKeys(pluginId);
62+
}
63+
}

0 commit comments

Comments
 (0)