Author: joakime
Date: Mon Nov 20 11:37:16 2006
New Revision: 477305
URL: http://svn.apache.org/viewvc?view=rev&rev=477305
Log:
General cleanup from last refactoring.
Added:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerException.java
- copied, changed from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarException.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
- copied, changed from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzer.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/util/JarEntryComparator.java
- copied, changed from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarEntryComparator.java
Removed:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarEntryComparator.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarException.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzer.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/DefaultJarAnalyzerFactory.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerFactory.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java
maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/JarTest.java
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/DefaultJarAnalyzerFactory.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/DefaultJarAnalyzerFactory.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/DefaultJarAnalyzerFactory.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/DefaultJarAnalyzerFactory.java
Mon Nov 20 11:37:16 2006
@@ -41,11 +41,12 @@
private PlexusContainer container;
public JarAnalyzer getJarAnalyzer( File file )
- throws JarException
+ throws JarAnalyzerException
{
try
{
- JarAnalyzer jaranalyzer = (JarAnalyzer) container.lookup(
JarAnalyzer.ROLE );
+ Object o = container.lookup( JarAnalyzer.ROLE );
+ JarAnalyzer jaranalyzer = (JarAnalyzer) o;
jaranalyzer.setFile( file );
return jaranalyzer;
}
@@ -53,7 +54,7 @@
{
String emsg = "Unable to load Jar Analyzer for file " +
file.getAbsolutePath();
getLogger().warn( emsg, e );
- throw new JarException( emsg );
+ throw new JarAnalyzerException( emsg );
}
}
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
Mon Nov 20 11:37:16 2006
@@ -17,9 +17,10 @@
*/
import org.apache.maven.shared.jar.classes.JarClasses;
-import org.apache.maven.shared.jar.classes.JarClassesAnalyzer;
+import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
import org.apache.maven.shared.jar.identification.JarIdentification;
import org.apache.maven.shared.jar.identification.JarIdentificationAnalysis;
+import org.apache.maven.shared.jar.util.JarEntryComparator;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.digest.StreamingDigester;
@@ -68,18 +69,18 @@
/**
* @plexus.requirement
*/
- private JarClassesAnalyzer classesAnalyzer;
+ private JarClassesAnalysis classesAnalyzer;
/**
* @plexus.requirement
*/
private JarIdentificationAnalysis taxonAnalyzer;
- protected void setFile( File file ) throws JarException
+ protected void setFile( File file ) throws JarAnalyzerException
{
if ( file == null )
{
- throw new JarException( "file is null." );
+ throw new JarAnalyzerException( "file is null." );
}
init( file );
@@ -203,16 +204,16 @@
}
private void init( File jfile )
- throws JarException
+ throws JarAnalyzerException
{
if ( !jfile.exists() )
{
- throw new JarException( "File " + jfile.getAbsolutePath() + " does
not exist." );
+ throw new JarAnalyzerException( "File " + jfile.getAbsolutePath()
+ " does not exist." );
}
if ( !jfile.canRead() )
{
- throw new JarException( "No read access to file " +
jfile.getAbsolutePath() + "." );
+ throw new JarAnalyzerException( "No read access to file " +
jfile.getAbsolutePath() + "." );
}
try
@@ -222,7 +223,7 @@
}
catch ( IOException e )
{
- throw new JarException( "Unable to open artifact " +
jfile.getAbsolutePath(), e );
+ throw new JarAnalyzerException( "Unable to open artifact " +
jfile.getAbsolutePath(), e );
}
// Obtain entries list.
Copied:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerException.java
(from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarException.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerException.java?view=diff&rev=477305&p1=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarException.java&r1=477297&p2=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerException.java&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarException.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerException.java
Mon Nov 20 11:37:16 2006
@@ -19,25 +19,25 @@
/**
* Exceptions that occur during JarAnalyzer utility methods.
*/
-public class JarException
+public class JarAnalyzerException
extends Exception
{
- public JarException()
+ public JarAnalyzerException()
{
super();
}
- public JarException( String message, Throwable cause )
+ public JarAnalyzerException( String message, Throwable cause )
{
super( message, cause );
}
- public JarException( String message )
+ public JarAnalyzerException( String message )
{
super( message );
}
- public JarException( Throwable cause )
+ public JarAnalyzerException( Throwable cause )
{
super( cause );
}
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerFactory.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerFactory.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerFactory.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzerFactory.java
Mon Nov 20 11:37:16 2006
@@ -26,7 +26,7 @@
*/
public interface JarAnalyzerFactory
{
- public static final String ROLE = JarAnalyzer.class.getName();
+ public static final String ROLE = JarAnalyzerFactory.class.getName();
- public JarAnalyzer getJarAnalyzer(File file) throws JarException;
+ public JarAnalyzer getJarAnalyzer(File file) throws JarAnalyzerException;
}
Copied:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
(from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzer.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java?view=diff&rev=477305&p1=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzer.java&r1=477297&p2=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzer.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java
Mon Nov 20 11:37:16 2006
@@ -33,9 +33,9 @@
/**
* JarAnalyzer Classes Analyzer
*
- * @plexus.component role="org.apache.maven.shared.jar.JarAnalyzer"
role-hint="classes"
+ * @plexus.component
role="org.apache.maven.shared.jar.classes.JarClassesAnalysis"
*/
-public class JarClassesAnalyzer
+public class JarClassesAnalysis
extends AbstractLogEnabled
{
/**
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java
Mon Nov 20 11:37:16 2006
@@ -26,7 +26,7 @@
/**
* JarAnalyzer Taxon Analyzer
*
- * @plexus.component role="org.apache.maven.shared.jar.JarAnalyzer"
role-hint="taxon"
+ * @plexus.component
role="org.apache.maven.shared.jar.identification.JarIdentificationAnalysis"
*/
public class JarIdentificationAnalysis
{
Modified:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java
Mon Nov 20 11:37:16 2006
@@ -17,7 +17,7 @@
*/
import org.apache.maven.shared.jar.classes.JarClasses;
-import org.apache.maven.shared.jar.classes.JarClassesAnalyzer;
+import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
import
org.apache.maven.shared.jar.identification.AbstractJarIdentificationExposer;
import java.util.Iterator;
@@ -32,9 +32,9 @@
extends AbstractJarIdentificationExposer
{
/**
- * @plexus.requirement role-hint="classes"
+ * @plexus.requirement
*/
- private JarClassesAnalyzer analyzer;
+ private JarClassesAnalysis analyzer;
public String getExposerName()
{
Copied:
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/util/JarEntryComparator.java
(from r477297,
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarEntryComparator.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/util/JarEntryComparator.java?view=diff&rev=477305&p1=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarEntryComparator.java&r1=477297&p2=maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/util/JarEntryComparator.java&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarEntryComparator.java
(original)
+++
maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/util/JarEntryComparator.java
Mon Nov 20 11:37:16 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.jar;
+package org.apache.maven.shared.jar.util;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>
* @version $Id$
*/
-class JarEntryComparator
+public class JarEntryComparator
implements Comparator
{
Modified:
maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/JarTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/JarTest.java?view=diff&rev=477305&r1=477304&r2=477305
==============================================================================
---
maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/JarTest.java
(original)
+++
maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/JarTest.java
Mon Nov 20 11:37:16 2006
@@ -25,30 +25,29 @@
extends AbstractJarTestCase
{
private JarAnalyzer getJar( String filename )
- throws JarException
+ throws JarAnalyzerException
{
try
{
File jarfile = new File( getSampleJarsDirectory(), filename );
- JarAnalyzer jar = (JarAnalyzer) lookup( JarAnalyzer.ROLE );
- jar.setFile( jarfile );
+ JarAnalyzer jar = getJarAnalyzerFactory().getJarAnalyzer( jarfile
);
return jar;
}
catch ( Exception e )
{
- throw new JarException( "Can't load the JarAnalyzer component", e
);
+ throw new JarAnalyzerException( "Can't load the JarAnalyzer
component", e );
}
}
public void testSealed()
- throws JarException
+ throws JarAnalyzerException
{
JarAnalyzer evil = getJar( "evil-sealed-regex-1.0.jar" );
assertTrue( evil.isSealed() );
}
public void testNotSealed()
- throws JarException
+ throws JarAnalyzerException
{
JarAnalyzer codec = getJar( "codec.jar" );
assertFalse( codec.isSealed() );
