Author: tv
Date: Wed Aug 1 20:30:15 2018
New Revision: 1837261
URL: http://svn.apache.org/viewvc?rev=1837261&view=rev
Log:
Update dependency commons-configuration to 2.2
This is a PITA. I don't see how this can be considered an improvement.
Modified:
turbine/core/trunk/conf/test/ConfigurationBuilder.xml
turbine/core/trunk/conf/test/Log4j.properties
turbine/core/trunk/conf/test/usersettings.properties
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseService.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
turbine/core/trunk/src/java/org/apache/turbine/services/Service.java
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java
Modified: turbine/core/trunk/conf/test/ConfigurationBuilder.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/ConfigurationBuilder.xml?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/ConfigurationBuilder.xml (original)
+++ turbine/core/trunk/conf/test/ConfigurationBuilder.xml Wed Aug 1 20:30:15
2018
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<configuration>
- <header>
+ <header>
<!-- Meta data about the resulting combined configuration -->
</header>
<override><!-- only allowed configurations are user and turbine, relative
paths -->
<properties config-name="user"
fileName="conf/test/usersettings.properties" config-optional="true"
config-forceCreate="true"/>
<xml fileName="conf/test/TurbineResources.xml"/>
<properties config-name="turbine"
fileName="conf/test/TemplateService.properties" throwExceptionOnMissing="true"/>
- </override>
+ </override>
<additional>
<!-- Configuration declarations that form a union configuration, always
provide a unique config-name attribute -->
</additional>
Modified: turbine/core/trunk/conf/test/Log4j.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/Log4j.properties?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/Log4j.properties (original)
+++ turbine/core/trunk/conf/test/Log4j.properties Wed Aug 1 20:30:15 2018
@@ -19,18 +19,14 @@ log4j.rootLogger = ERROR, logfile
# Make sure that all isDebugEnabled() branches are hit during testing
log4j.category.org.apache.turbine=DEBUG, logfile
+log4j.additivity.org.apache.turbine = false
# we want to see any errors thrown by Turbine.java, primarily in the
handleException method
# log4j.category.org.apache.turbine.Turbine=DEBUG, logfile
-log4j.appender.log = org.apache.log4j.ConsoleAppender
-log4j.appender.log.target = System.out
-log4j.appender.log.layout = org.apache.log4j.PatternLayout
-log4j.appender.log.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-
log4j.appender.logfile=org.apache.log4j.FileAppender
log4j.appender.logfile.File=target/turbine.log
-log4j.appender.logfile.Append=false
+log4j.appender.logfile.append=false
log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
log4j.appender.logfile.layout.conversionPattern = %d [%t] %-5p %c - %m%n
Modified: turbine/core/trunk/conf/test/usersettings.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/usersettings.properties?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/usersettings.properties (original)
+++ turbine/core/trunk/conf/test/usersettings.properties Wed Aug 1 20:30:15
2018
@@ -1,3 +1,3 @@
module.cache=false
-include = testinclude.properties
+include = conf/test/testinclude.properties
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Wed Aug 1
20:30:15 2018
@@ -41,9 +41,14 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import javax.xml.parsers.FactoryConfigurationError;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import
org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.io.HomeDirectoryLocationStrategy;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.logging.Log;
@@ -68,24 +73,22 @@ import org.apache.turbine.util.TurbineEx
import org.apache.turbine.util.uri.URIConstants;
/**
- * Turbine is the main servlet for the entire system. It is <code>final</code>
- * because you should <i>not</i> ever need to subclass this servlet. If you
+ * Turbine is the main servlet for the entire system. If you
* need to perform initialization of a service, then you should implement the
* Services API and let your code be initialized by it.
- * If you need to override something in the <code>doGet()</code> or
- * <code>doPost()</code> methods, edit the TurbineResources.properties file and
- * specify your own classes there.
* <p>
* Turbine servlet recognizes the following initialization parameters.
* <ul>
* <li><code>properties</code> the path to TurbineResources.properties file
- * used by the default implementation of <code>ResourceService</code>, relative
+ * used to configure Turbine, relative to the application root.</li>
+ * <li><code>configuration</code> the path to TurbineConfiguration.xml file
+ * used to configure Turbine from various sources, relative
+ * to the application root.</li>
+ * <li><code>applicationRoot</code> this parameter defaults to the web context
+ * of the servlet container. You can use this parameter to specify the
directory
+ * within the server's filesystem, that is the base of your web
application.</li>
+ * <li><code>loggingRoot</code> the path to Turbine log files, relative
* to the application root.</li>
- * <li><code>basedir</code> this parameter is used <strong>only</strong> if
your
- * application server does not support web applications, or the or does not
- * support <code>ServletContext.getRealPath(String)</code> method correctly.
- * You can use this parameter to specify the directory within the server's
- * filesystem, that is the base of your web application.</li>
* </ul>
*
* @author <a href="mailto:[email protected]";>Jon S. Stevens</a>
@@ -335,7 +338,11 @@ public class Turbine extends HttpServlet
TurbineConfig.PROPERTIES_PATH_DEFAULT);
confStyle = ConfigurationStyle.PROPERTIES;
}
+
// now begin loading
+ Parameters params = new Parameters();
+ String confPath = new File(getApplicationRoot()).getCanonicalPath();
+
switch (confStyle)
{
case XML:
@@ -343,16 +350,26 @@ public class Turbine extends HttpServlet
{
confFile = confFile.substring( 1 ); // cft. RFC2396 should
not start with a slash, if not absolute path
}
- DefaultConfigurationBuilder configurationBuilder = new
DefaultConfigurationBuilder(confFile);
// relative base path used for this and child configuration
files
- String confPath = new
File(getApplicationRoot()).toURI().toString();
- configurationBuilder.setBasePath(confPath);
- configuration = configurationBuilder.getConfiguration();
+ CombinedConfigurationBuilder combinedBuilder = new
CombinedConfigurationBuilder()
+ .configure(params.fileBased()
+ .setFileName(confFile)
+ .setListDelimiterHandler(new
DefaultListDelimiterHandler(','))
+ .setLocationStrategy(new
HomeDirectoryLocationStrategy(confPath, false)));
+ configuration = combinedBuilder.getConfiguration();
break;
+
case PROPERTIES:
- configuration = new
PropertiesConfiguration(getRealPath(confFile));
+ FileBasedConfigurationBuilder<FileBasedConfiguration>
propertiesBuilder =
+ new
FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class)
+ .configure(params.properties()
+ .setFileName(confFile)
+ .setListDelimiterHandler(new
DefaultListDelimiterHandler(','))
+ .setLocationStrategy(new
HomeDirectoryLocationStrategy(confPath, false)));
+ configuration = propertiesBuilder.getConfiguration();
break;
+
default:
break;
}
@@ -454,11 +471,9 @@ public class Turbine extends HttpServlet
// fix up the Application root
//
Properties p = new Properties();
- FileInputStream fis = null;
- try
+ try (FileInputStream fis = new FileInputStream(log4jFile))
{
- fis = new FileInputStream(log4jFile);
p.load(fis);
p.setProperty(TurbineConstants.APPLICATION_ROOT_KEY,
getApplicationRoot());
PropertyConfigurator.configure(p);
@@ -470,13 +485,6 @@ public class Turbine extends HttpServlet
+ log4jFile + ": ");
fnf.printStackTrace();
}
- finally
- {
- if (fis != null)
- {
- fis.close();
- }
- }
}
if (success)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
Wed Aug 1 20:30:15 2018
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
Wed Aug 1 20:30:15 2018
@@ -27,7 +27,7 @@ import java.util.Properties;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.modules.Action;
import org.apache.turbine.pipeline.PipelineData;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
Wed Aug 1 20:30:15 2018
@@ -25,10 +25,8 @@ import org.apache.commons.logging.LogFac
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
-import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
-import org.apache.turbine.services.security.SecurityService;
import org.apache.turbine.util.RunData;
/**
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
Wed Aug 1 20:30:15 2018
@@ -68,7 +68,7 @@ public class DefaultUserImpl implements
public DefaultUserImpl(TurbineUser user)
{
super();
- setUserDelegate( user );;
+ setUserDelegate( user );
setCreateDate(new Date());
tempStorage = new HashMap<String, Object>(10);
setHasLoggedIn(Boolean.FALSE);
@@ -289,7 +289,7 @@ public class DefaultUserImpl implements
* Get the User/Group/Role set associated with this entity
*
* @return a set of User/Group/Role relations
- * @throws DataBackendException
+ * @throws DataBackendException
*/
@Override
public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet()
throws DataBackendException
@@ -314,7 +314,7 @@ public class DefaultUserImpl implements
*
* @param userGroupRole
* a User/Group/Role relation to add
- * @throws DataBackendException
+ * @throws DataBackendException
*/
@Override
public void addUserGroupRole(TurbineUserGroupRole userGroupRole) throws
DataBackendException
@@ -327,7 +327,7 @@ public class DefaultUserImpl implements
*
* @param userGroupRole
* a User/Group/Role relation to remove
- * @throws DataBackendException
+ * @throws DataBackendException
*/
@Override
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole) throws
DataBackendException
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
Wed Aug 1 20:30:15 2018
@@ -115,7 +115,6 @@ public class DefaultLoginValve
// and "turbine.acl".
if (actionName.equalsIgnoreCase(actionLogin))
{
- @SuppressWarnings("unchecked")
Enumeration<String> names =
data.getSession().getAttributeNames();
if (names != null)
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/BaseService.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/BaseService.java
Wed Aug 1 20:30:15 2018
@@ -23,8 +23,8 @@ package org.apache.turbine.services;
import java.util.Properties;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationConverter;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationConverter;
/**
* This class is a generic implementation of <code>Service</code>.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
Wed Aug 1 20:30:15 2018
@@ -29,7 +29,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
Wed Aug 1 20:30:15 2018
@@ -25,8 +25,8 @@ import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Properties;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationConverter;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationConverter;
/**
* A base implementation of an {@link java.rmi.server.UnicastRemoteObject}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/Service.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/Service.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/Service.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/Service.java Wed
Aug 1 20:30:15 2018
@@ -23,7 +23,7 @@ package org.apache.turbine.services;
import java.util.Properties;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
/**
* <code>Services</code> are <code>Initables</code> that have a name,
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
Wed Aug 1 20:30:15 2018
@@ -21,7 +21,7 @@ package org.apache.turbine.services;
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
/**
* Classes that implement this interface can act as a broker for
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ServiceManager.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ServiceManager.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ServiceManager.java
Wed Aug 1 20:30:15 2018
@@ -21,7 +21,7 @@ package org.apache.turbine.services;
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
/**
* Classes that implement this interface can act as a manager for
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
Wed Aug 1 20:30:15 2018
@@ -23,7 +23,7 @@ package org.apache.turbine.services.asse
import java.io.File;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
Wed Aug 1 20:30:15 2018
@@ -27,7 +27,7 @@ import org.apache.avalon.framework.activ
import org.apache.avalon.framework.logger.CommonsLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Wed Aug 1 20:30:15 2018
@@ -27,7 +27,7 @@ import java.io.IOException;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
Wed Aug 1 20:30:15 2018
@@ -30,7 +30,7 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.Turbine;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Wed Aug 1 20:30:15 2018
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.pool.PoolService;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
Wed Aug 1 20:30:15 2018
@@ -22,7 +22,7 @@ package org.apache.turbine.services.pull
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.turbine.Turbine;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.pull.ApplicationTool;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
Wed Aug 1 20:30:15 2018
@@ -21,7 +21,7 @@ package org.apache.turbine.services.pull
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.parser.ParameterParser;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Wed Aug 1 20:30:15 2018
@@ -29,7 +29,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.DefaultCookieParser;
import org.apache.fulcrum.parser.DefaultParameterParser;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
Wed Aug 1 20:30:15 2018
@@ -404,7 +404,7 @@ public class QuartzSchedulerService
* {@value JobEntryQuartz#DEFAULT_JOB_GROUP_NAME}, if adding triggers/jobs.
*
* @param trigger a Quartz {@link Trigger}.
- * @param jd a Quartz {@link JobDetail} (built from a {@link Job} with
{@link JobBuilder}).
+ * @param jd a Quartz {@link JobDetail} (built from a {@link
org.quartz.Job} with {@link JobBuilder}).
* @return A JobEntryQuartz.
*/
public JobEntryQuartz buildJobEntry(Trigger trigger, JobDetail jd) {
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Wed Aug 1 20:30:15 2018
@@ -22,7 +22,7 @@ package org.apache.turbine.services.sche
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.turbine.util.TurbineException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
Wed Aug 1 20:30:15 2018
@@ -21,7 +21,7 @@ package org.apache.turbine.services.secu
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.GroupManager;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
Wed Aug 1 20:30:15 2018
@@ -24,7 +24,7 @@ package org.apache.turbine.services.secu
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.factory.FactoryService;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
Wed Aug 1 20:30:15 2018
@@ -21,7 +21,7 @@ package org.apache.turbine.services.secu
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
@@ -181,6 +181,7 @@ public interface UserManager
*
* @param user the object describing account to be created.
* @param initialPassword password for the new user
+ * @throws UnknownEntityException if the user account cannot be created.
* @throws DataBackendException if there was an error accessing the data
* backend.
* @throws EntityExistsException if the user account already exists.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
Wed Aug 1 20:30:15 2018
@@ -23,7 +23,7 @@ package org.apache.turbine.services.secu
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
Wed Aug 1 20:30:15 2018
@@ -23,7 +23,7 @@ package org.apache.turbine.services.temp
import java.util.Hashtable;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Wed Aug 1 20:30:15 2018
@@ -25,7 +25,7 @@ import java.io.File;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
Wed Aug 1 20:30:15 2018
@@ -25,7 +25,7 @@ import java.io.InputStream;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Wed Aug 1 20:30:15 2018
@@ -29,7 +29,7 @@ import java.io.Writer;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java Wed
Aug 1 20:30:15 2018
@@ -28,9 +28,9 @@ import static org.junit.Assert.assertNot
import java.io.File;
import java.net.URL;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.FileSystem;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.io.FileLocatorUtils;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineXmlConfig;
@@ -119,7 +119,7 @@ public class ConfigurationTest extends B
String confPath = Turbine.getRealPath(
"/conf/test/usersettings.properties" );
try
{
- Configuration configuration = new
PropertiesConfiguration(confPath);
+ Configuration configuration = new
Configurations().properties(confPath);
assertNotNull("No Configuration Object found!", configuration);
assertFalse("Make sure we have values", configuration.isEmpty());
@@ -172,7 +172,7 @@ public class ConfigurationTest extends B
assertEquals("Read a config value " + key + ", received:" +
configuration.getBoolean(key), false, configuration.getBoolean(key));
// converts to URL, cft. RFC2396
- URL testURL = FileSystem.getDefaultFileSystem().locateFromURL(new
File( Turbine.getApplicationRoot()).toURI().toString() ,
configurationRessourcePath);
+ URL testURL =
FileLocatorUtils.DEFAULT_FILE_SYSTEM.locateFromURL(new File(
Turbine.getApplicationRoot()).toURI().toString() , configurationRessourcePath);
assertNotNull( "Should be a valid URL",testURL);
}
finally
Modified:
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
Wed Aug 1 20:30:15 2018
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNot
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.factory.FactoryService;
import org.apache.turbine.modules.Screen;
import org.apache.turbine.modules.ScreenLoader;
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
Wed Aug 1 20:30:15 2018
@@ -24,8 +24,8 @@ package org.apache.turbine.services.aval
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java?rev=1837261&r1=1837260&r2=1837261&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java
Wed Aug 1 20:30:15 2018
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNot
import java.io.File;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
