working archiva-ali again

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@528525 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 58 insertions, 63 deletions

diff --git a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
index a914ce712..a8034a847 100644
--- a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
+++ b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
@@ -27,6 +27,8 @@ import org.codehaus.plexus.registry.RegistryListener;
  */
 public interface ArchivaConfiguration
 {
+    public static final String ROLE = ArchivaConfiguration.class.getName();
+    
     /**
      * Get the configuration.
      *
@@ -50,4 +52,6 @@ public interface ArchivaConfiguration
      * @param listener the listener
      */
     void addChangeListener( RegistryListener listener );
+    
 }
+
diff --git a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index ab64a661d..1b62c3f4b 100644
--- a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -33,7 +33,7 @@ import java.util.Iterator;
 /**
  * Implementation of configuration holder that retrieves it from the registry.
  *
- * @plexus.component
+ * @plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
  */
 public class DefaultArchivaConfiguration
     implements ArchivaConfiguration, RegistryListener, Initializable
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index ded6638b0..c6397dc0a 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -41,14 +41,6 @@
       <artifactId>archiva-core-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-database-consumers</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-lucene-consumers</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-digest</artifactId>
     </dependency>
@@ -93,7 +85,8 @@
        <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
+        <version>1.3.5</version>
+         <executions>
           <execution>
             <id>merge</id>
             <goals>
diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
index ae4e87826..e69189d2f 100644
--- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
@@ -298,8 +298,8 @@ public class ArchivaCli
     }
     
     private void dumpConfiguration( PlexusContainer plexus ) throws ComponentLookupException
-    {
-        archivaConfiguration = (ArchivaConfiguration) plexus.lookup( ArchivaConfiguration.ROLE );
+    {    
+        archivaConfiguration = (ArchivaConfiguration) plexus.lookup( ArchivaConfiguration.ROLE, "cli" );
         
         System.out.println( "File Type Count: " + archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().size() );
     }
diff --git a/archiva-cli/src/main/resources/META-INF/plexus/components.xml b/archiva-cli/src/main/resources/META-INF/plexus/components.xml
index 6873d9f8f..ad355c655 100644
--- a/archiva-cli/src/main/resources/META-INF/plexus/components.xml
+++ b/archiva-cli/src/main/resources/META-INF/plexus/components.xml
@@ -1,52 +1,50 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-  
-<components>
-   <component>
-      <role>org.codehaus.plexus.registry.Registry</role>
-      <implementation>
-         org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry
-      </implementation>
-      <role-hint>commons-configuration</role-hint>
-      <configuration>
-         <properties>
-            <system />
-            <xml fileName="${user.home}/.m2/archiva.xml"
-               config-optional="true"
-               config-name="org.apache.maven.archiva.user"
-               config-at="org.apache.maven.archiva" />
-            <xml fileName="${user.home}/.m2/shared.xml"
-               config-optional="true"
-               config-name="org.apache.maven.shared.app.user"
-               config-at="org.apache.maven.shared.app"
-               config-forceCreate="true" />
-            <properties fileName="${user.home}/.m2/security.properties"
-               config-optional="true"
-               config-at="org.codehaus.plexus.security" />
-            <properties fileName="${user.home}/.m2/archiva.properties"
-               config-optional="true"
-               config-at="org.codehaus.plexus.security" />
-            <xml fileName="org/apache/maven/archiva/configuration/default-archiva.xml" 
-               config-optional="true"
-               config-at="org.apache.maven.archiva"/>    
-         </properties>
-      </configuration>
-   </component>
-</components>
+   ~ Licensed to the Apache Software Foundation (ASF) under one
+   ~ or more contributor license agreements.  See the NOTICE file
+   ~ distributed with this work for additional information
+   ~ regarding copyright ownership.  The ASF licenses this file
+   ~ to you under the Apache License, Version 2.0 (the
+   ~ "License"); you may not use this file except in compliance
+   ~ with the License.  You may obtain a copy of the License at
+   ~
+   ~   http://www.apache.org/licenses/LICENSE-2.0
+   ~
+   ~ Unless required by applicable law or agreed to in writing,
+   ~ software distributed under the License is distributed on an
+   ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   ~ KIND, either express or implied.  See the License for the
+   ~ specific language governing permissions and limitations
+   ~ under the License.
+-->
+<component-set>
+   <components>
+      <component>
+         <role>org.codehaus.plexus.registry.Registry</role>
+         <implementation>
+            org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry
+         </implementation>
+         <role-hint>commons-configuration</role-hint>
+         <configuration>
+            <properties>
+               <system />
+               <xml fileName="${appserver.base}/conf/archiva.xml"
+                  config-optional="true"
+                  config-name="org.apache.maven.archiva.base"
+                  config-at="org.apache.maven.archiva" />
+               <xml fileName="${appserver.home}/conf/archiva.xml"
+                  config-optional="true"
+                  config-at="org.apache.maven.archiva" />
+               <xml fileName="${user.home}/.m2/archiva.xml"
+                  config-optional="true"
+                  config-name="org.apache.maven.archiva.user"
+                  config-at="org.apache.maven.archiva" />
+               <xml
+                  fileName="org/apache/maven/archiva/configuration/default-archiva.xml"
+                  config-optional="true"
+                  config-at="org.apache.maven.archiva" />
+            </properties>
+         </configuration>
+      </component>
+   </components>
+</component-set>
\ No newline at end of file
diff --git a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 701a4f3dd..a470eae16 100644
--- a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -50,7 +50,7 @@
           <xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
                config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
-          <properties fileName="org/apache/maven/archiva/configuration/default-archiva.properties" config-at="org.apache.maven.archiva.base"/>
+          <xml fileName="org/apache/maven/archiva/configuration/default-archiva.xml" config-at="org.apache.maven.archiva.base"/>
           <properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
           <properties fileName="org/apache/maven/archiva/security.properties" config-at="org.codehaus.plexus.security"/>