Author: olamy
Date: Wed Dec 5 12:57:29 2012
New Revision: 1417398
URL: http://svn.apache.org/viewvc?rev=1417398&view=rev
Log:
use a new Exception registryException is an implementation detail exception
Added:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationException.java
- copied, changed from r1417397,
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1417398&r1=1417397&r2=1417398&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
Wed Dec 5 12:57:29 2012
@@ -66,34 +66,42 @@ public class DefaultUserConfiguration
@PostConstruct
public void initialize()
- throws RegistryException
+ throws UserConfigurationException
{
- performLegacyInitialization();
try
{
- registry.addConfigurationFromResource( DEFAULT_CONFIG_RESOURCE,
PREFIX );
- }
- catch ( RegistryException e )
- {
- // Ok, not found in context classloader; try the one in this jar.
+ performLegacyInitialization();
- ClassLoader prevCl =
Thread.currentThread().getContextClassLoader();
try
{
-
- Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
registry.addConfigurationFromResource(
DEFAULT_CONFIG_RESOURCE, PREFIX );
}
- finally
+ catch ( RegistryException e )
{
- Thread.currentThread().setContextClassLoader( prevCl );
+ // Ok, not found in context classloader; try the one in this
jar.
+
+ ClassLoader prevCl =
Thread.currentThread().getContextClassLoader();
+ try
+ {
+
+ Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
+ registry.addConfigurationFromResource(
DEFAULT_CONFIG_RESOURCE, PREFIX );
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( prevCl );
+ }
}
- }
- lookupRegistry = registry.getSubset( PREFIX );
+ lookupRegistry = registry.getSubset( PREFIX );
- log.debug( "User configuration {}", lookupRegistry.dump() );
+ log.debug( "User configuration {}", lookupRegistry.dump() );
+ }
+ catch ( RegistryException e )
+ {
+ throw new UserConfigurationException( e.getMessage(), e );
+ }
}
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java?rev=1417398&r1=1417397&r2=1417398&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
Wed Dec 5 12:57:29 2012
@@ -31,7 +31,7 @@ public interface UserConfiguration
{
void initialize()
- throws RegistryException;
+ throws UserConfigurationException;
String getString( String key );
Copied:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationException.java
(from r1417397,
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationException.java?p2=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationException.java&p1=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java&r1=1417397&r2=1417398&rev=1417398&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationException.java
Wed Dec 5 12:57:29 2012
@@ -8,7 +8,7 @@ package org.apache.archiva.redback.confi
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,34 +18,15 @@ package org.apache.archiva.redback.confi
* under the License.
*/
-import org.apache.archiva.redback.components.registry.RegistryException;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
/**
* @author Olivier Lamy
- * @since 2.1 moved to an interface
+ * @since 2.1
*/
-public interface UserConfiguration
+public class UserConfigurationException
+ extends Exception
{
-
- void initialize()
- throws RegistryException;
-
- String getString( String key );
-
- String getString( String key, String defaultValue );
-
- int getInt( String key );
-
- int getInt( String key, int defaultValue );
-
- boolean getBoolean( String key );
-
- boolean getBoolean( String key, boolean defaultValue );
-
- List<String> getList( String key );
-
- String getConcatenatedList( String key, String defaultValue );
+ public UserConfigurationException( String message, Throwable t )
+ {
+ super( message, t );
+ }
}
