Version 1.9.0 added

Configuration/MANIFEST.MF

@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Deploy-Class: 
+Plugin-Name: ISAAC Configuration Plugin
+Plugin-Version: 1.0
+Author: ISAAC

Configuration/build.xml

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

Configuration/conf/Language-ext.properties

@@ -0,0 +1 @@
+javax.portlet.title.EXT_CONFIGURATION=Configuration Cache

Configuration/conf/portlet-ext.xml

@@ -0,0 +1,17 @@
+<portlet>
+	<portlet-name>EXT_CONFIGURATION</portlet-name>
+	<display-name>Configuration Cache</display-name>
+	<portlet-class>com.liferay.portlet.VelocityPortlet</portlet-class>
+	<init-param>
+			<name>view-template</name>
+			<value>/static/plugins/configuration/configuration_portlet.vm</value>
+	</init-param>
+	<expiration-cache>0</expiration-cache>
+	<supports>
+		<mime-type>text/html</mime-type>
+	</supports>
+	<resource-bundle>com.liferay.portlet.StrutsResourceBundle</resource-bundle>
+	<security-role-ref>
+		<role-name>CMS User</role-name>
+	</security-role-ref>
+</portlet>

Configuration/conf/toolbox-ext.xml

@@ -0,0 +1,12 @@
+	<tool>
+		<key>configuration</key>
+		<scope>request</scope>
+		<class>nl.isaac.dotcms.plugin.configuration.viewtool.ConfigurationViewTool</class>
+	</tool>
+
+	<tool>
+		<key>configurationAdmin</key>
+		<scope>application</scope>
+		<class>nl.isaac.dotcms.plugin.configuration.viewtool.portlet.admin.ConfigurationAdminViewTool</class>
+	</tool>
+

Configuration/conf/web-ext.xml

@@ -0,0 +1,25 @@
+	<filter>
+		<filter-name>ConfigurationRequestStoringFilter</filter-name>
+		<filter-class>nl.isaac.dotcms.plugin.configuration.filter.RequestStoringFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>ConfigurationRequestStoringFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>FORWARD</dispatcher>
+		<dispatcher>ERROR</dispatcher>
+	</filter-mapping>
+
+	<listener>
+		<listener-class>nl.isaac.dotcms.plugin.configuration.filter.SessionListener</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>ConfigurationAdminClear</servlet-name>
+		<servlet-class>nl.isaac.dotcms.plugin.configuration.web.servlet.admin.ClearCacheServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ConfigurationAdminClear</servlet-name>
+		<url-pattern>/servlets/configurationcache/clear/</url-pattern>
+	</servlet-mapping>

Configuration/lib_ori/build.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="create_dependency_libs" name="Create Jar for Project Minify plugin">
+    <target name="create_dependency_libs">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="jarjar-1.0.jar"/>
+        <jarjar destfile="../lib/commons-configuration-1.7_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-configuration-1.7.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/commons-logging-1.1.1_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-logging-1.1.1.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/commons-lang-2.6_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-lang-2.6.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/commons-collections-3.2.1_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-collections-3.2.1.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/commons-beanutils-1.7.0_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-beanutils-1.7.0.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/commons-beanutils-core-1.8.0_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="commons-beanutils-core-1.8.0.jar"/>
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+        <jarjar destfile="../lib/isaac-configuration-1.0.10-SNAPSHOT_dependency.jar" filesetmanifest="mergewithoutmain">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Class-Path" value="."/>
+            </manifest>
+            <zipfileset excludes="META-INF/*.SF" src="isaac-configuration-1.0.10-SNAPSHOT.jar"/>
+            <rule pattern="nl.isaac.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+            <rule pattern="org.apache.**" result="nl.isaac.dotcms.plugin.configuration.dependencies.@0" />
+        </jarjar>
+    </target>
+</project>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+
+	<xml fileName="${sys:catalina.home}/conf/applications/serverConfig.xml" />
+
+</configuration>

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

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

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+	<!-- Standard for all configurations! Same as config.xml -->
+	<xml fileName="${sys:catalina.home}/conf/applications/serverConfig.xml" />
+
+	<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/${param:ClientIPAddress}/pluginConfig.xml" optional="true" />
+	<properties fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/${param:ClientIPAddress}/plugin.properties" optional="true"/>
+
+	<xml fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/pluginConfig.xml" optional="true" />
+	<properties fileName="${sys:catalina.home}/conf/applications/${param:hostName}/${param:pluginName}/plugin.properties" optional="true"/>
+
+	<dotcms fileName="/config/${param:pluginName}/pluginConfig.xml" optional="true" />
+	<dotcms fileName="/config/${param:pluginName}/plugin.properties" optional="true"/>
+
+	<xml fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/pluginConfig.xml" optional="true" />
+	<properties fileName="${sys:catalina.home}/conf/applications/${param:pluginName}/plugin.properties" optional="true"/>
+
+  <!--  Indien een plugin gebruik makt van de configuratie plugin dan MOET een van onderstaande bestanden bestaan -->
+	<xml fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/pluginConfig.xml" optional="true"/>
+	<properties fileName="${sys:catalina.home}/../plugins/${param:pluginName}/conf/plugin.properties" optional="true"/>
+
+</configuration>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<config>
+	<environment>DEV</environment>
+</config>

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

@@ -0,0 +1,63 @@
+package com.dotmarketing.plugin.business;
+/**
+* dotCMS Configuration plugin by ISAAC - The Full Service Internet Agency is licensed 
+* under a Creative Commons Attribution 3.0 Unported License
+* - http://creativecommons.org/licenses/by/3.0/
+* - http://www.geekyplugins.com/
+* 
+* @copyright Copyright (c) 2011 ISAAC Software Solutions B.V. (http://www.isaac.nl)
+*/
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import nl.isaac.dotcms.plugin.configuration.ConfigurationService;
+import nl.isaac.dotcms.plugin.configuration.dependencies.nl.isaac.comp.configuration.CustomConfiguration;
+import nl.isaac.dotcms.plugin.configuration.dependencies.org.apache.commons.configuration.ConfigurationException;
+import nl.isaac.dotcms.plugin.configuration.exception.ConfigurationNotFoundException;
+
+import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.UtilMethods;
+
+public class PluginAPIImpl extends PluginAPIImplDotCMS {
+	@Override
+	public String loadProperty(String pluginId, String key)
+			throws DotDataException {
+		try {
+			CustomConfiguration cc = ConfigurationService.getPluginConfiguration(pluginId);
+			if(cc != null && cc.containsKey(key) && UtilMethods.isSet(cc.getString(key))) {
+				return cc.getString(key);
+			}
+		} catch (ConfigurationException e) {
+			Logger.warn(this.getClass(), "Exception while trying to retrieve config with key '" + key + "' for plugin '" + pluginId + "' in ConfigurationService", e);
+		} catch (NoSuchElementException e) {
+			Logger.debug(this.getClass(), "The key '" + key + "' can't be found. It's probably not set yet in a configuration file");
+		} catch (ConfigurationNotFoundException e) {
+			Logger.error(this.getClass(), "Can't load configuration property '" + key + "'", e);
+		}
+		return super.loadProperty(pluginId, key);
+	}
+	@Override
+	public List<String> loadPluginConfigKeys(String pluginId) throws DotDataException {
+		try {
+			CustomConfiguration cc = ConfigurationService.getPluginConfiguration(pluginId);
+			@SuppressWarnings("unchecked")
+			Iterator<String> iter = cc.getKeys();
+			List<String> keys = new ArrayList<String>();
+			while (iter.hasNext()) {
+				keys.add(iter.next());
+			}
+			return keys;
+		} catch (ConfigurationException e) {
+			Logger.warn(this.getClass(), "Exception while trying to retrieve config keys for plugin '" + pluginId + "' in ConfigurationService", e);
+		} catch (NoSuchElementException e) {
+			Logger.debug(this.getClass(), "The keys couldn't be found. There probably is no configuration file");
+		} catch (ConfigurationNotFoundException e) {
+			Logger.error(this.getClass(), "Can't load configuration property", e);
+		}
+		return super.loadPluginConfigKeys(pluginId);
+	}
+}