You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/02/14 23:26:38 UTC
svn commit: r507719 - in /maven/archiva/branches/archiva-MRM-239: ./
archiva-converter/ archiva-converter/src/test/resources/ archiva-core/
archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/
archiva-core/src/test/java/org/apache/m...
Author: joakime
Date: Wed Feb 14 14:26:37 2007
New Revision: 507719
URL: http://svn.apache.org/viewvc?view=rev&rev=507719
Log:
Correcting more Test failures.
Added:
maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/resources/log4j.properties
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml
- copied, changed from r506385, maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java (with props)
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java (with props)
Removed:
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/LegacyRepositoryConverterTest.java
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml
Modified:
maven/archiva/branches/archiva-MRM-239/archiva-converter/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.java
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/DefaultLayoutArtifactBuilder.java
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/LegacyLayoutArtifactBuilder.java
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/consumers/GenericRepositoryMetadataConsumer.java
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AbstractLayoutArtifactBuilderTestCase.java
maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml
maven/archiva/branches/archiva-MRM-239/pom.xml
Modified: maven/archiva/branches/archiva-MRM-239/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-converter/pom.xml?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-converter/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-converter/pom.xml Wed Feb 14 14:26:37 2007
@@ -58,6 +58,13 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- TEST DEPS -->
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.7.3.3</version>
+ <scope>test</scope>
+ </dependency>
<!-- Needed for PlexusTestCase -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Added: maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/resources/log4j.properties?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/resources/log4j.properties (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-converter/src/test/resources/log4j.properties Wed Feb 14 14:26:37 2007
@@ -0,0 +1,10 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=WARN, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml Wed Feb 14 14:26:37 2007
@@ -72,6 +72,13 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <!-- TEST DEPS -->
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.7.3.3</version>
+ <scope>test</scope>
+ </dependency>
<!-- needed for PlexusTestCase -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -82,16 +89,22 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <!-- TODO! add unit tests -->
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>**/**</exclude>
- </excludes>
- </instrumentation>
- </configuration>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>merge</id>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+ <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java Wed Feb 14 14:26:37 2007
@@ -67,7 +67,7 @@
private ConfiguredRepositoryFactory repoFactory;
/**
- * @plexus.configuration default-value="index-artifact"
+ * @plexus.configuration
*/
private List consumerNames;
Added: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,44 @@
+package org.apache.maven.archiva;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests - added to allow IDE users to pull all tests into their tool.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva" );
+ //$JUnit-BEGIN$
+ suite.addTest( org.apache.maven.archiva.repositories.AllTests.suite() );
+ suite.addTest( org.apache.maven.archiva.scheduler.executors.AllTests.suite() );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,43 @@
+package org.apache.maven.archiva.repositories;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.repositories" );
+ //$JUnit-BEGIN$
+ suite.addTestSuite( DefaultActiveManagedRepositoriesTest.class );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/repositories/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,43 @@
+package org.apache.maven.archiva.scheduler.executors;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.scheduler.executors" );
+ //$JUnit-BEGIN$
+ suite.addTestSuite( DataRefreshExecutorTest.class );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.java Wed Feb 14 14:26:37 2007
@@ -58,7 +58,7 @@
}
}
- public void testIndexer()
+ public void testExecutor()
throws TaskExecutionException
{
taskExecutor.executeTask( new TestDataRefreshTask() );
Copied: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml (from r506385, maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml)
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml?view=diff&rev=507719&p1=maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml&r1=506385&p2=maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml Wed Feb 14 14:26:37 2007
@@ -31,5 +31,92 @@
</properties>
</configuration>
</component>
+
+ <component>
+ <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+ <role-hint>data-refresh</role-hint>
+ <implementation>org.apache.maven.archiva.scheduler.executors.DataRefreshExecutor</implementation>
+ <description>DataRefreshExecutor</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
+ <field-name>archivaConfiguration</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory</role>
+ <field-name>repoFactory</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.discoverer.Discoverer</role>
+ <field-name>discoverer</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.discoverer.DiscovererConsumerFactory</role>
+ <field-name>consumerFactory</field-name>
+ </requirement>
+ </requirements>
+ <configuration>
+ <consumer-names>
+ <consumer-name>index-artifact</consumer-name>
+ <consumer-name>artifact-health</consumer-name>
+ <consumer-name>metadata-health</consumer-name>
+ </consumer-names>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.codehaus.plexus.jdo.JdoFactory</role>
+ <role-hint>archiva</role-hint>
+ <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+
+ <configuration>
+ <!-- Database Configuration -->
+ <driverName>org.hsqldb.jdbcDriver</driverName>
+ <url>jdbc:hsqldb:mem:TESTDB</url>
+ <userName>sa</userName>
+ <password></password>
+
+ <!-- JPOX and JDO configuration -->
+ <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+ <otherProperties>
+ <property>
+ <name>javax.jdo.PersistenceManagerFactoryClass</name>
+ <value>org.jpox.PersistenceManagerFactoryImpl</value>
+ </property>
+ <property>
+ <name>org.jpox.autoCreateSchema</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateConstraints</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateColumns</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.autoStartMechanism</name>
+ <value>None</value>
+ </property>
+ <property>
+ <name>org.jpox.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.poid.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.rdbms.dateTimezone</name>
+ <value>JDK_DEFAULT_TIMEZONE</value>
+ </property>
+ </otherProperties>
+ </configuration>
+ </component>
</components>
</component-set>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/DefaultLayoutArtifactBuilder.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/DefaultLayoutArtifactBuilder.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/DefaultLayoutArtifactBuilder.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/DefaultLayoutArtifactBuilder.java Wed Feb 14 14:26:37 2007
@@ -56,6 +56,11 @@
public Artifact build( String pathToArtifact )
throws BuilderException, DiscovererException
{
+ if( artifactFactory == null )
+ {
+ throw new IllegalStateException( "Unable to build artifact with a null artifactFactory." );
+ }
+
List pathParts = new ArrayList();
StringTokenizer st = new StringTokenizer( pathToArtifact, "/\\" );
while ( st.hasMoreTokens() )
Modified: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/LegacyLayoutArtifactBuilder.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/LegacyLayoutArtifactBuilder.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/LegacyLayoutArtifactBuilder.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/builders/LegacyLayoutArtifactBuilder.java Wed Feb 14 14:26:37 2007
@@ -54,6 +54,11 @@
public Artifact build( String pathToArtifact )
throws BuilderException, DiscovererException
{
+ if( artifactFactory == null )
+ {
+ throw new IllegalStateException( "Unable to build legacy artifact with a null artifactFactory." );
+ }
+
StringTokenizer tokens = new StringTokenizer( pathToArtifact, "/\\" );
Artifact result;
Modified: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/consumers/GenericRepositoryMetadataConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/consumers/GenericRepositoryMetadataConsumer.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/consumers/GenericRepositoryMetadataConsumer.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/consumers/GenericRepositoryMetadataConsumer.java Wed Feb 14 14:26:37 2007
@@ -91,30 +91,29 @@
throws DiscovererException
{
String relpath = PathUtil.getRelative( repository.getBasedir(), file );
- RepositoryMetadata metadata = buildMetadata( repository.getBasedir(), relpath );
+ RepositoryMetadata metadata = buildMetadata( file, relpath );
processRepositoryMetadata( metadata, file );
}
- private RepositoryMetadata buildMetadata( String repo, String metadataPath )
+ private RepositoryMetadata buildMetadata( File metadataFile, String metadataPath )
throws DiscovererException
{
Metadata m;
- File f = new File( repo, metadataPath );
Reader reader = null;
try
{
- reader = new FileReader( f );
+ reader = new FileReader( metadataFile );
MetadataXpp3Reader metadataReader = new MetadataXpp3Reader();
m = metadataReader.read( reader );
}
catch ( XmlPullParserException e )
{
- throw new DiscovererException( "Error parsing metadata file '" + f + "': " + e.getMessage(), e );
+ throw new DiscovererException( "Error parsing metadata file '" + metadataFile + "': " + e.getMessage(), e );
}
catch ( IOException e )
{
- throw new DiscovererException( "Error reading metadata file '" + f + "': " + e.getMessage(), e );
+ throw new DiscovererException( "Error reading metadata file '" + metadataFile + "': " + e.getMessage(), e );
}
finally
{
@@ -166,6 +165,12 @@
{
artifact = artifactFactory.createProjectArtifact( metaGroupId, metaArtifactId, metaVersion );
}
+ else
+ {
+ getLogger().info(
+ "Skipping Create Project Artifact due to no Version defined in [" + m.getGroupId() + ":"
+ + m.getArtifactId() + ":" + m.getVersion() + "]." );
+ }
// snapshotMetadata
RepositoryMetadata metadata = null;
@@ -211,6 +216,17 @@
if ( metaGroupId != null && metaGroupId.equals( groupDir ) )
{
metadata = new GroupRepositoryMetadata( metaGroupId );
+ }
+ else
+ {
+ /* If we reached this point, we have some bad metadata.
+ * We have a metadata file, with values for groupId / artifactId / version.
+ * But the information it is providing does not exist relative to the file location.
+ *
+ * See ${basedir}/src/test/repository/javax/maven-metadata.xml for example
+ *
+ * TODO: document the bad metadata ??
+ */
}
}
Added: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,45 @@
+package org.apache.maven.archiva.discoverer;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests - added to allow IDE users to pull all tests into their tool.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.discoverer" );
+ //$JUnit-BEGIN$
+ suite.addTest( org.apache.maven.archiva.discoverer.builders.AllTests.suite() );
+ suite.addTest( org.apache.maven.archiva.discoverer.consumers.AllTests.suite() );
+ suite.addTestSuite( PathUtilTest.class );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,38 @@
+package org.apache.maven.archiva.discoverer;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * PathUtilTest
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class PathUtilTest
+ extends TestCase
+{
+ public void testToRelative()
+ {
+ assertEquals( "path/to/resource.xml", PathUtil.getRelative( "/home/user/foo/repository",
+ "/home/user/foo/repository/path/to/resource.xml" ) );
+ }
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/PathUtilTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AbstractLayoutArtifactBuilderTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AbstractLayoutArtifactBuilderTestCase.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AbstractLayoutArtifactBuilderTestCase.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AbstractLayoutArtifactBuilderTestCase.java Wed Feb 14 14:26:37 2007
@@ -1,10 +1,35 @@
package org.apache.maven.archiva.discoverer.builders;
+/*
+ * 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.
+ */
+
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.PlexusTestCase;
-public class AbstractLayoutArtifactBuilderTestCase
+/**
+ * AbstractLayoutArtifactBuilderTestCase
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public abstract class AbstractLayoutArtifactBuilderTestCase
extends PlexusTestCase
{
Added: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,44 @@
+package org.apache.maven.archiva.discoverer.builders;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.discoverer.builders" );
+ //$JUnit-BEGIN$
+ suite.addTestSuite( DefaultLayoutArtifactBuilderTest.class );
+ suite.addTestSuite( LegacyLayoutArtifactBuilderTest.class );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/builders/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java?view=auto&rev=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java Wed Feb 14 14:26:37 2007
@@ -0,0 +1,45 @@
+package org.apache.maven.archiva.discoverer.consumers;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * AllTests
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class AllTests
+{
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.discoverer.consumers" );
+ //$JUnit-BEGIN$
+ suite.addTestSuite( GenericArtifactConsumerTest.class );
+ suite.addTestSuite( GenericRepositoryMetadataConsumerTest.class );
+ suite.addTestSuite( GenericModelConsumerTest.class );
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/consumers/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/repository/javax/maven-metadata.xml?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/repository/javax/maven-metadata.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-discoverer/src/test/repository/javax/maven-metadata.xml Wed Feb 14 14:26:37 2007
@@ -18,6 +18,7 @@
~ under the License.
-->
+<!-- This metdata is intentionally wrong. -->
<metadata>
<groupId>javax.sql</groupId>
<artifactId>jdbc</artifactId>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java Wed Feb 14 14:26:37 2007
@@ -21,8 +21,8 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
import org.apache.maven.archiva.discoverer.DiscovererException;
+import org.apache.maven.archiva.discoverer.builders.LayoutArtifactBuilder;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -85,17 +85,17 @@
* @plexus.requirement
*/
private ArtifactFactory factory;
-
+
/**
* @plexus.requirement role-hint="default"
- * @todo use a map, and have priorities in them
+ * @todo use a map, and have priorities in them.
*/
- private ArtifactDiscoverer defaultArtifactDiscoverer;
-
+ private LayoutArtifactBuilder defaultArtifactBuilder;
+
/**
* @plexus.requirement role-hint="legacy"
*/
- private ArtifactDiscoverer legacyArtifactDiscoverer;
+ private LayoutArtifactBuilder legacyArtifactBuilder;
/**
* @plexus.requirement role="org.apache.maven.wagon.Wagon"
@@ -159,7 +159,7 @@
Artifact artifact = null;
try
{
- artifact = defaultArtifactDiscoverer.buildArtifact( artifactPath );
+ artifact = defaultArtifactBuilder.build( artifactPath );
getLogger().debug( "Artifact requested is: " + artifact );
}
catch ( DiscovererException e )
@@ -171,7 +171,7 @@
{
try
{
- artifact = legacyArtifactDiscoverer.buildArtifact( artifactPath );
+ artifact = legacyArtifactBuilder.build( artifactPath );
getLogger().debug( "Artifact requested is: " + artifact );
}
catch ( DiscovererException e )
Modified: maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml Wed Feb 14 14:26:37 2007
@@ -28,7 +28,6 @@
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.console.ConsoleLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
-
<configuration>
<threshold>ERROR</threshold>
</configuration>
Modified: maven/archiva/branches/archiva-MRM-239/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/pom.xml?view=diff&rev=507719&r1=507718&r2=507719
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/pom.xml Wed Feb 14 14:26:37 2007
@@ -81,9 +81,9 @@
<version>1.3.3</version>
<executions>
<execution>
+ <id>generate</id>
<goals>
<goal>descriptor</goal>
- <goal>merge-descriptors</goal>
</goals>
</execution>
</executions>
@@ -154,30 +154,6 @@
<artifactId>maven-app-configuration-web</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <!--
- Rejected Plexus Container / Component Versions:
- 1.0-alpha-11
- 2007-01-17 11:40:40.371::WARN: Failed startup of context org.mortbay.jetty.webapp.WebAppContext@553763
- {/,/home/joakim/code/maven/trunks/archiva/archiva-webapp/src/main/webapp}
- java.lang.NullPointerException
- at org.codehaus.plexus.classworlds.strategy.DefaultStrategy.getResource(DefaultStrategy.java:99)
- at org.codehaus.plexus.classworlds.strategy.ForeignStrategy.getResource(ForeignStrategy.java:54)
- at org.codehaus.plexus.classworlds.strategy.DefaultStrategy.getResourceAsStream(DefaultStrategy.java:107)
- at org.codehaus.plexus.classworlds.realm.ClassRealm.getResourceAsStream(ClassRealm.java:207)
- at org.codehaus.plexus.DefaultPlexusContainer.<init>(DefaultPlexusContainer.java:244)
-
- 1.0-alpha-12
- 1.0-alpha-13
- 1.0-alpha-14
- Caused by: org.codehaus.plexus.PlexusContainerException: The specified user configuration
- 'file:/home/joakim/code/maven/trunks/archiva/archiva-webapp/src/main/webapp/WEB-INF/classes/META-INF/plexus/application.xml' is null.
-
- 1.0-alpha-15
- The resolution of ${configuration.store.file} is never attempted.
-
- 1.0-alpha-16-SNAPSHOT
- Incompatible with plexus-xwork-integration
- -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -520,12 +496,6 @@
</profile>
</profiles>
<!-- TODO: remove once modello is released -->
- <pluginRepositories>
- <pluginRepository>
- <id>codehaus.org</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </pluginRepository>
- </pluginRepositories>
<!-- TODO: remove once ehcache, p-sec, registry, webdav, xwork, naming released -->
<repositories>
<repository>
@@ -539,6 +509,7 @@
</snapshots>
</repository>
</repositories>
+ <!-- TODO: remove once modello is released -->
<pluginRepositories>
<pluginRepository>
<id>codehaus.org</id>