diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
index ee0423036d..4c4521b5b5 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
@@ -33,4 +33,8 @@ public interface ArtifactHandler
     String getPackaging();
 
     boolean isIncludesDependencies();
+
+    String getLanguage();
+
+    boolean isAddedToClasspath();
 }
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
index f14058c8b5..311a5e969c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
@@ -35,6 +35,10 @@ public class DefaultArtifactHandler
 
     private boolean includesDependencies;
 
+    private String language;
+
+    private boolean addedToClasspath;
+
     public DefaultArtifactHandler()
     {
     }
@@ -85,4 +89,19 @@ public class DefaultArtifactHandler
     {
         return includesDependencies;
     }
+
+    public String getLanguage()
+    {
+        if ( language == null )
+        {
+            language = "none";
+        }
+
+        return language;
+    }
+
+    public boolean isAddedToClasspath()
+    {
+        return addedToClasspath;
+    }
 }
diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
index 977c4000a5..0a117a4c94 100644
--- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
@@ -35,6 +35,8 @@
       <configuration>
         <type>ejb</type>
         <extension>jar</extension>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
@@ -44,6 +46,8 @@
       <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
       <configuration>
         <type>jar</type>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
@@ -56,6 +60,8 @@
         <extension>jar</extension>
         <type>test-jar</type>
         <packaging>jar</packaging>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
@@ -66,6 +72,8 @@
       <configuration>
         <type>maven-plugin</type>
         <extension>jar</extension>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
@@ -85,6 +93,20 @@
       <configuration>
         <type>java-source</type>
         <extension>jar</extension>
+        <language>java</language>
+        <addedToClasspath>false</addedToClasspath>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>javadoc</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>javadoc</type>
+        <extension>jar</extension>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
@@ -95,6 +117,8 @@
       <configuration>
         <type>war</type>
         <includesDependencies>true</includesDependencies>
+        <language>java</language>
+        <addedToClasspath>false</addedToClasspath>
       </configuration>
     </component>
 
@@ -105,6 +129,8 @@
       <configuration>
         <type>ear</type>
         <includesDependencies>true</includesDependencies>
+        <language>java</language>
+        <addedToClasspath>false</addedToClasspath>
       </configuration>
     </component>
 
@@ -117,6 +143,8 @@
         <extension>jar</extension>
         <packaging>ejb</packaging>
         <classifier>client</classifier>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
       </configuration>
     </component>
 
diff --git a/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java b/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
index e89d9ef48c..1308fc1ad5 100644
--- a/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
+++ b/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
@@ -42,13 +42,13 @@ public class JarSourceMojo
      * @deprecated ICK! This needs to be generalized OUTSIDE of this mojo!
      */
     private static final List BANNED_PACKAGINGS;
-    
+
     static
     {
         List banned = new ArrayList();
-        
+
         banned.add( "pom" );
-        
+
         BANNED_PACKAGINGS = banned;
     }
 
@@ -63,7 +63,7 @@ public class JarSourceMojo
      * @parameter expression="${component.org.apache.maven.project.MavenProjectHelper}
      */
     private MavenProjectHelper projectHelper;
-    
+
     /**
      * @parameter expression="${project.packaging}"
      * @readonly
@@ -76,7 +76,7 @@ public class JarSourceMojo
      * @required
      */
     private String finalName;
-    
+
     /**
      * @parameter expression="${attach}" default-value="true"
      */
@@ -93,23 +93,17 @@ public class JarSourceMojo
      * @required
      */
     private File outputDirectory;
-    
+
     public void execute()
         throws MojoExecutionException
     {
-        if ( !attach )
-        {
-            getLog().info( "NOT adding java-sources to attached artifacts list." );
-            
-            return;
-        }
-        else if ( BANNED_PACKAGINGS.contains( packaging ) )
+        if ( BANNED_PACKAGINGS.contains( packaging ) )
         {
             getLog().info( "NOT adding java-sources to attached artifacts for packaging: \'" + packaging + "\'." );
-            
+
             return;
         }
-        
+
         // TODO: use a component lookup?
         JarArchiver archiver = new JarArchiver();
 
@@ -133,8 +127,16 @@ public class JarSourceMojo
             throw new MojoExecutionException( "Error building source JAR", e );
         }
 
-        // TODO: these introduced dependencies on the project are going to become problematic - can we export it
-        //  through metadata instead?
-        projectHelper.attachArtifact( project, "java-source", "sources", outputFile );
+        if ( !attach )
+        {
+            getLog().info( "NOT adding java-sources to attached artifacts list." );
+
+        }
+        else
+        {
+            // TODO: these introduced dependencies on the project are going to become problematic - can we export it
+            //  through metadata instead?
+            projectHelper.attachArtifact( project, "java-source", "sources", outputFile );
+        }
     }
 }
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
index f5cb281a77..4e13a6a39e 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
@@ -348,7 +348,7 @@ public class MavenProject
         {
             Artifact a = (Artifact) i.next();
 
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) ||
@@ -384,7 +384,7 @@ public class MavenProject
             Artifact a = (Artifact) i.next();
 
             // TODO: classpath check doesn't belong here - that's the other method
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) ||
@@ -442,7 +442,7 @@ public class MavenProject
         {
             Artifact a = (Artifact) i.next();
 
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 // NOTE: [jc] scope == 'test' is the widest possible scope, so we don't really need to perform
@@ -471,7 +471,7 @@ public class MavenProject
             Artifact a = (Artifact) i.next();
 
             // TODO: classpath check doesn't belong here - that's the other method
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 // NOTE: [jc] scope == 'test' is the widest possible scope, so we don't really need to perform
@@ -536,7 +536,7 @@ public class MavenProject
         {
             Artifact a = (Artifact) i.next();
 
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
@@ -562,7 +562,7 @@ public class MavenProject
             Artifact a = (Artifact) i.next();
 
             // TODO: classpath check doesn't belong here - that's the other method
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
@@ -618,7 +618,7 @@ public class MavenProject
         {
             Artifact a = (Artifact) i.next();
 
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
@@ -653,7 +653,7 @@ public class MavenProject
             Artifact a = (Artifact) i.next();
 
             // TODO: classpath check doesn't belong here - that's the other method
-            if ( isAddedToClasspath( a ) )
+            if ( a.getArtifactHandler().isAddedToClasspath() )
             {
                 // TODO: let the scope handler deal with this
                 if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
@@ -698,14 +698,6 @@ public class MavenProject
         return list;
     }
 
-    private static boolean isAddedToClasspath( Artifact artifact )
-    {
-        String type = artifact.getType();
-
-        // TODO: utilise type handler
-        return "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "test-jar".equals( type );
-    }
-
     // ----------------------------------------------------------------------
     // Delegate to the model
     // ----------------------------------------------------------------------