repackage modello-plugin-jpox module
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1414988 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGenerator.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGenerator.java
similarity index 98%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGenerator.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGenerator.java
index 6e00bba..4e4ef9f 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGenerator.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,10 +28,10 @@
import org.codehaus.modello.model.ModelClass;
import org.codehaus.modello.model.ModelField;
import org.codehaus.modello.plugin.AbstractModelloGenerator;
-import org.codehaus.modello.plugin.jpox.metadata.JPoxAssociationMetadata;
-import org.codehaus.modello.plugin.jpox.metadata.JPoxClassMetadata;
-import org.codehaus.modello.plugin.jpox.metadata.JPoxFieldMetadata;
-import org.codehaus.modello.plugin.jpox.metadata.JPoxModelMetadata;
+import org.apache.archiva.redback.components.modello.jpox.metadata.JPoxAssociationMetadata;
+import org.apache.archiva.redback.components.modello.jpox.metadata.JPoxClassMetadata;
+import org.apache.archiva.redback.components.modello.jpox.metadata.JPoxFieldMetadata;
+import org.apache.archiva.redback.components.modello.jpox.metadata.JPoxModelMetadata;
import org.codehaus.modello.plugin.store.metadata.StoreAssociationMetadata;
import org.codehaus.modello.plugin.store.metadata.StoreFieldMetadata;
import org.codehaus.plexus.util.StringUtils;
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGenerator.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGenerator.java
similarity index 91%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGenerator.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGenerator.java
index 8929e08..fcce6ac 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGenerator.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -52,7 +52,7 @@
String packageName = model.getDefaultPackageName( isPackageWithVersion(), getGeneratedVersion() );
String className = model.getName() + "ModelloMetadata";
- writeClass( "org/codehaus/modello/plugin/jpox/templates/ModelloMetadata.java.vm", getOutputDirectory(),
+ writeClass( "org/apache/archiva/redback/components/modello/jpox/templates/ModelloMetadata.java.vm", getOutputDirectory(),
packageName, className, context );
}
}
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGenerator.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGenerator.java
similarity index 91%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGenerator.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGenerator.java
index be5f0ad..a6ac540 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGenerator.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGenerator.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -54,7 +54,7 @@
// Generate the JPoxStore
String className = model.getName() + "JPoxStore";
- writeClass( "org/codehaus/modello/plugin/jpox/templates/JPoxStore.java.vm", getOutputDirectory(), packageName,
+ writeClass( "org/apache/archiva/redback/components/modello/jpox/templates/JPoxStore.java.vm", getOutputDirectory(), packageName,
className, context );
}
}
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxAssociationMetadata.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxAssociationMetadata.java
similarity index 95%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxAssociationMetadata.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxAssociationMetadata.java
index c7769c3..f1a4815 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxAssociationMetadata.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxAssociationMetadata.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox.metadata;
+package org.apache.archiva.redback.components.modello.jpox.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxClassMetadata.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxClassMetadata.java
similarity index 97%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxClassMetadata.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxClassMetadata.java
index 67c39d7..472ac50 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxClassMetadata.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxClassMetadata.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox.metadata;
+package org.apache.archiva.redback.components.modello.jpox.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxFieldMetadata.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxFieldMetadata.java
similarity index 98%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxFieldMetadata.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxFieldMetadata.java
index cb2894c..e4e22cd 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxFieldMetadata.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxFieldMetadata.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox.metadata;
+package org.apache.archiva.redback.components.modello.jpox.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxMetadataPlugin.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxMetadataPlugin.java
similarity index 99%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxMetadataPlugin.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxMetadataPlugin.java
index 9887f3b..6e7a173 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxMetadataPlugin.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxMetadataPlugin.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox.metadata;
+package org.apache.archiva.redback.components.modello.jpox.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxModelMetadata.java b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxModelMetadata.java
similarity index 96%
rename from modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxModelMetadata.java
rename to modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxModelMetadata.java
index af0ebd4..5ca5e4d 100644
--- a/modello-plugin-jpox/src/main/java/org/codehaus/modello/plugin/jpox/metadata/JPoxModelMetadata.java
+++ b/modello-plugin-jpox/src/main/java/org/apache/archiva/redback/components/modello/jpox/metadata/JPoxModelMetadata.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox.metadata;
+package org.apache.archiva.redback.components.modello.jpox.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/main/resources/META-INF/plexus/components.xml b/modello-plugin-jpox/src/main/resources/META-INF/plexus/components.xml
index 355e89d..022be99 100644
--- a/modello-plugin-jpox/src/main/resources/META-INF/plexus/components.xml
+++ b/modello-plugin-jpox/src/main/resources/META-INF/plexus/components.xml
@@ -23,7 +23,7 @@
<component>
<role>org.codehaus.modello.plugin.ModelloGenerator</role>
<role-hint>jpox-store</role-hint>
- <implementation>org.codehaus.modello.plugin.jpox.JPoxStoreModelloGenerator</implementation>
+ <implementation>org.apache.archiva.redback.components.modello.jpox.JPoxStoreModelloGenerator</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.velocity.VelocityComponent</role>
@@ -34,7 +34,7 @@
<component>
<role>org.codehaus.modello.plugin.ModelloGenerator</role>
<role-hint>jpox-jdo-mapping</role-hint>
- <implementation>org.codehaus.modello.plugin.jpox.JPoxJdoMappingModelloGenerator</implementation>
+ <implementation>org.apache.archiva.redback.components.modello.jpox.JPoxJdoMappingModelloGenerator</implementation>
<requirements>
<requirement>
<role>org.apache.archiva.redback.components.modello.db.SQLReservedWords</role>
@@ -45,7 +45,7 @@
<component>
<role>org.codehaus.modello.plugin.ModelloGenerator</role>
<role-hint>jpox-metadata-class</role-hint>
- <implementation>org.codehaus.modello.plugin.jpox.JPoxMetadataClassModelloGenerator</implementation>
+ <implementation>org.apache.archiva.redback.components.modello.jpox.JPoxMetadataClassModelloGenerator</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.velocity.VelocityComponent</role>
@@ -56,7 +56,7 @@
<component>
<role>org.codehaus.modello.metadata.MetadataPlugin</role>
<role-hint>jpox</role-hint>
- <implementation>org.codehaus.modello.plugin.jpox.metadata.JPoxMetadataPlugin</implementation>
+ <implementation>org.apache.archiva.redback.components.modello.jpox.metadata.JPoxMetadataPlugin</implementation>
</component>
</components>
diff --git a/modello-plugin-jpox/src/main/resources/org/codehaus/modello/plugin/jpox/templates/JPoxStore.java.vm b/modello-plugin-jpox/src/main/resources/org/apache/archiva/redback/components/modello/jpox/templates/JPoxStore.java.vm
similarity index 100%
rename from modello-plugin-jpox/src/main/resources/org/codehaus/modello/plugin/jpox/templates/JPoxStore.java.vm
rename to modello-plugin-jpox/src/main/resources/org/apache/archiva/redback/components/modello/jpox/templates/JPoxStore.java.vm
diff --git a/modello-plugin-jpox/src/main/resources/org/codehaus/modello/plugin/jpox/templates/ModelloMetadata.java.vm b/modello-plugin-jpox/src/main/resources/org/apache/archiva/redback/components/modello/jpox/templates/ModelloMetadata.java.vm
similarity index 100%
rename from modello-plugin-jpox/src/main/resources/org/codehaus/modello/plugin/jpox/templates/ModelloMetadata.java.vm
rename to modello-plugin-jpox/src/main/resources/org/apache/archiva/redback/components/modello/jpox/templates/ModelloMetadata.java.vm
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/AbstractJpoxGeneratorTestCase.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/AbstractJpoxGeneratorTestCase.java
similarity index 99%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/AbstractJpoxGeneratorTestCase.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/AbstractJpoxGeneratorTestCase.java
index e6a7230..5c222d8 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/AbstractJpoxGeneratorTestCase.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/AbstractJpoxGeneratorTestCase.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java
similarity index 98%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java
index 081fec6..1e4a44d 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorPrefixedTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorTest.java
similarity index 98%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorTest.java
index 379b527..f862961 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxJdoMappingModelloGeneratorTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxJdoMappingModelloGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGeneratorTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGeneratorTest.java
similarity index 97%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGeneratorTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGeneratorTest.java
index 4f7d4b0..2cca24d 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxMetadataClassModelloGeneratorTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxMetadataClassModelloGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGeneratorTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGeneratorTest.java
similarity index 97%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGeneratorTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGeneratorTest.java
index 3487a6c..a2930d2 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JPoxStoreModelloGeneratorTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JPoxStoreModelloGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JdoEntityResolver.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JdoEntityResolver.java
similarity index 96%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JdoEntityResolver.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JdoEntityResolver.java
index 371fe48..434f622 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JdoEntityResolver.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JdoEntityResolver.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxDeleteModelTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxDeleteModelTest.java
similarity index 83%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxDeleteModelTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxDeleteModelTest.java
index c648068..3ae8428 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxDeleteModelTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxDeleteModelTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,14 +22,11 @@
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelClass;
import org.codehaus.modello.model.Version;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.ReaderFactory;
import java.util.List;
-import junit.framework.Assert;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -48,15 +45,15 @@
throws Throwable
{
Model model =
- modello.loadModel( ReaderFactory.newXmlReader( PlexusTestCase.getTestFile( "src/test/resources/test.mdo" ) ) );
+ modello.loadModel( ReaderFactory.newXmlReader( getTestFile( "src/test/resources/test.mdo" ) ) );
List classesList = model.getClasses( new Version( "1.0.0" ) );
- Assert.assertEquals( 5, classesList.size() );
+ assertEquals( 5, classesList.size() );
ModelClass clazz = (ModelClass) classesList.get( 0 );
- Assert.assertEquals( "JdoRole", clazz.getName() );
+ assertEquals( "JdoRole", clazz.getName() );
verifyModel( model, "org.codehaus.modello.plugin.jpox.JpoxVerifierDeleteModel" );
}
diff --git a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxVersionTest.java b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxVersionTest.java
similarity index 83%
rename from modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxVersionTest.java
rename to modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxVersionTest.java
index 22fc140..26706fb 100644
--- a/modello-plugin-jpox/src/test/java/org/codehaus/modello/plugin/jpox/JpoxVersionTest.java
+++ b/modello-plugin-jpox/src/test/java/org/apache/archiva/redback/components/modello/jpox/JpoxVersionTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.jpox;
+package org.apache.archiva.redback.components.modello.jpox;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,14 +22,11 @@
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelClass;
import org.codehaus.modello.model.Version;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.ReaderFactory;
import java.util.List;
-import junit.framework.Assert;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -48,15 +45,15 @@
throws Throwable
{
Model model =
- modello.loadModel( ReaderFactory.newXmlReader( PlexusTestCase.getTestFile( "src/test/resources/test.mdo" ) ) );
+ modello.loadModel( ReaderFactory.newXmlReader( getTestFile( "src/test/resources/test.mdo" ) ) );
List classesList = model.getClasses( new Version( "1.0.0" ) );
- Assert.assertEquals( 5, classesList.size() );
+ assertEquals( 5, classesList.size() );
ModelClass clazz = (ModelClass) classesList.get( 0 );
- Assert.assertEquals( "JdoRole", clazz.getName() );
+ assertEquals( "JdoRole", clazz.getName() );
verifyModel( model, "org.codehaus.modello.plugin.jpox.JpoxVerifierVersion" );
}
