svn commit: r630094 - in /maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src: main/java/org/apache/maven/archiva/repository/content/ test/java/org/apache/maven/archiva/repository/content/

[brett]

Author: brett
Date: Thu Feb 21 21:28:53 2008
New Revision: 630094

URL: http://svn.apache.org/viewvc?rev=630094&view=rev
Log:
[MRM-674] remove redundant code

Modified:
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyPathParser.java
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyPathParser.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyPathParser.java?rev=630094&r1=630093&r2=630094&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyPathParser.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyPathParser.java
 Thu Feb 21 21:28:53 2008
@@ -204,13 +204,6 @@
                     + "] and layout specified type [" + expectedType + "] 
(which maps to extension: ["
                     + expectedExtension + "]) on path [" + path + "]" );
             }
-
-//            if ( classifier != null && !filename.endsWith( "-" + classifier 
+ "." + extension ) )
-//            {
-//                throw new LayoutException( INVALID_ARTIFACT_PATH + "mismatch 
on filename [" + filename
-//                    + "] and layout specified type [" + expectedType + "] 
(which maps to classifier: ["
-//                    + classifier + "]) on path [" + path + "]" );
-//            }
         }
 
         return artifact;

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java?rev=630094&r1=630093&r2=630094&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java
 Thu Feb 21 21:28:53 2008
@@ -239,17 +239,9 @@
     public void testBadClassifierFooLibSources()
         throws LayoutException
     {
-        String path = "com.foo.lib/java-sources/foo-lib-2.1-alpha-1.jar";
-
-        try
-        {
-            parser.toArtifactReference( path );
-            fail( "Expected an exception" );
-        }
-        catch ( LayoutException e )
-        {
-            assertTrue( true );
-        }
+        assertBadPath( "com.foo.lib/java-sources/foo-lib-2.1-alpha-1.jar", 
"missing required classifier" );
+        assertBadPath( 
"com.foo.lib/java-sources/foo-lib-2.1-alpha-1-javadoc.jar", "incorrect 
classifier" );
+        assertBadPath( 
"com.foo.lib/java-sources/foo-lib-2.1-alpha-1-other.jar", "incorrect 
classifier" );
     }
 
     /**