Author: olamy
Date: Thu Apr 12 14:04:27 2012
New Revision: 1325266
URL: http://svn.apache.org/viewvc?rev=1325266&view=rev
Log:
fix modello plugin unit tests
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/pom.xml
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/pom.xml?rev=1325266&r1=1325265&r2=1325266&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/pom.xml
Thu Apr 12 14:04:27 2012
@@ -120,6 +120,7 @@
<configuration>
<systemPropertyVariables>
<registryVersion>${project.version}</registryVersion>
+ <slf4jVersion>${slf4jVersion}</slf4jVersion>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java?rev=1325266&r1=1325265&r2=1325266&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
Thu Apr 12 14:04:27 2012
@@ -79,13 +79,16 @@ public abstract class AbstractRegistryGe
String registryVersion = System.getProperty( "registryVersion" );
addDependency( "org.codehaus.modello", "modello-core",
getModelloVersion() );
- addDependency( "org.codehaus.plexus.registry", "plexus-registry-api",
"1.0-alpha-2" );
- addDependency( "org.codehaus.plexus.registry",
"plexus-registry-commons", "1.0-alpha-2" );
+ addDependency( "org.apache.archiva.redback.components.registry",
"spring-registry-api", registryVersion );
+ addDependency( "org.apache.archiva.redback.components.registry",
"spring-registry-commons", registryVersion );
addDependency( "org.codehaus.plexus", "plexus-container-default",
"1.0-alpha-30" );
addDependency( "commons-collections", "commons-collections", "3.1" );
addDependency( "commons-configuration", "commons-configuration", "1.3"
);
addDependency( "commons-lang", "commons-lang", "2.1" );
addDependency( "commons-logging", "commons-logging-api", "1.0.4" );
+ addDependency( "org.codehaus.plexus", "plexus-interpolation", "1.14" );
+ addDependency( "org.slf4j", "slf4j-api", System.getProperty(
"slf4jVersion" ) );
+
if ( "1.5".compareTo( System.getProperty( "java.specification.version"
) ) <= 0 )
{
// causes a conflict with JDK 1.4 => add this dependency only with
JDK 1.5+
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java?rev=1325266&r1=1325265&r2=1325266&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
Thu Apr 12 14:04:27 2012
@@ -29,8 +29,8 @@ import org.codehaus.modello.verifier.Ver
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry;
-import org.codehaus.plexus.registry.Registry;
+import
org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
+import org.apache.archiva.redback.components.registry.Registry;
import junit.framework.Assert;
@@ -48,8 +48,7 @@ public class RegistryReaderVerifier
throws Exception
{
Registry registry = new CommonsConfigurationRegistry();
- ( (CommonsConfigurationRegistry) registry ).enableLogging( new
ConsoleLogger( Logger.LEVEL_DISABLED, "" ) );
- ( (Initializable) registry ).initialize();
+ registry.initialize();
registry.addConfigurationFromFile( new File(
"src/test/verifiers/registry-reader/test.properties" ) );
registry.addConfigurationFromFile( new File(
"src/test/verifiers/registry-reader/test.xml" ) );
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java?rev=1325266&r1=1325265&r2=1325266&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
Thu Apr 12 14:04:27 2012
@@ -30,8 +30,8 @@ import org.codehaus.modello.verifier.Ver
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry;
-import org.codehaus.plexus.registry.Registry;
+import
org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
+import org.apache.archiva.redback.components.registry.Registry;
import junit.framework.Assert;
@@ -56,8 +56,7 @@ public class RegistryWriterVerifier
throws Exception
{
Registry registry = new CommonsConfigurationRegistry();
- ( (CommonsConfigurationRegistry) registry ).enableLogging( new
ConsoleLogger( Logger.LEVEL_DISABLED, "" ) );
- ( (Initializable) registry ).initialize();
+ registry.initialize();
Model model = new Model();
model.setName( "name" );
