WIP - Issue #14 - not compiling yet.

Author: khmarbaise

plexus-component-metadata/pom.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- $Id$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,10 +15,6 @@
   <description>A Maven plugin to generate Plexus Components descriptors from source javadoc tags and Java 5 class annotations.</description>
 
   <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-annotations</artifactId>

plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java

@@ -1,5 +1,12 @@
 package org.codehaus.plexus.component.repository;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.codehaus.classworlds.ClassRealm;
+
 /*
  * Copyright 2001-2006 Codehaus Foundation.
  *
@@ -17,14 +24,8 @@
  */
 
 import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-
 /**
  * Component instantiation description.
  *
@@ -41,7 +42,7 @@ public class ComponentDescriptor<T>
 
     private Class<? extends T> roleClass;
 
-    private String roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT;
+    private String roleHint = "default";
 
     private String implementation;
 
@@ -244,7 +245,7 @@ public void setRoleHint( String roleHint )
     {
         if ( ( roleHint == null ) || roleHint.trim().equals( "" ) )
         {
-            this.roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT;
+            this.roleHint = "default";
         }
         else
         {

pom.xml

@@ -21,7 +21,6 @@
     <module>plexus-component-annotations</module>
     <module>plexus-component-metadata</module>
     <module>plexus-component-javadoc</module>
-    <!--module>plexus-container-default</module--><!-- IoC not maintained any more: use Sisu -->
   </modules>
 
   <scm>
@@ -52,11 +51,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-annotations</artifactId>