Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to Database scanner, updater, task, consumers, and admin screens. 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@536680 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-05-09 22:03:49 +00:00
parent 21b1ac804b
commit 711bb6c0c6
41 changed files with 2421 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
View File

@ -574,7 +574,7 @@
</description> </description>
</field> </field>
<field> <field>
<name>goodConsumers</name> <name>knownContentConsumers</name>
<version>1.0.0+</version> <version>1.0.0+</version>
<required>true</required> <required>true</required>
<association> <association>
@ -582,11 +582,11 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
<description> <description>
The list of consumers for good content. The list of active consumers IDs for known content.
</description> </description>
</field> </field>
<field> <field>
<name>badConsumers</name> <name>invalidContentConsumers</name>
<version>1.0.0+</version> <version>1.0.0+</version>
<required>true</required> <required>true</required>
<association> <association>
@ -594,55 +594,10 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
<description> <description>
The list of consumer IDs for this file processor. The list of active consumer IDs for invalid content.
</description> </description>
</field> </field>
</fields> </fields>
<!--
<codeSegments>
<codeSegment>
<version>1.0.0+</version>
<code><![CDATA[
/**
* Get a specific file type by ID.
*
* @param id the id of the filetype to get. (null or empty will result in null return)
* @return the {@link FileType} or null if the id is not found.
*/
public FileType getFileTypeById( String id )
{
if ( id == null )
{
return null;
}
if ( id.trim().length() <= 0 )
{
return null;
}
java.util.List types = getFileTypes();
if ( types == null )
{
return null;
}
java.util.Iterator it = types.iterator();
while ( it.hasNext() )
{
FileType filetype = (FileType) it.next();
if ( id.equals( filetype.getId() ) )
{
return filetype;
}
}
return null;
}
]]></code>
</codeSegment>
</codeSegments>
-->
</class> </class>
<class> <class>
<name>FileType</name> <name>FileType</name>
@ -693,7 +648,7 @@
</description> </description>
</field> </field>
<field> <field>
<name>processedConsumers</name> <name>cleanupConsumers</name>
<version>1.0.0+</version> <version>1.0.0+</version>
<required>true</required> <required>true</required>
<association> <association>
@ -701,7 +656,9 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
<description> <description>
The list of consumers for previously processed ArchivaArtifact database objects. The list of consumers for previously processed ArchivaArtifact database
objects that no longer exist on the filesystem, and might need to
undergo a cleanup.
</description> </description>
</field> </field>
</fields> </fields>

36
archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
View File

@ -135,19 +135,19 @@
</patterns> </patterns>
</fileType> </fileType>
</fileTypes> </fileTypes>
<goodConsumers> <knownContentConsumers>
<goodConsumer>update-db-artifact</goodConsumer> <knownContentConsumer>update-db-artifact</knownContentConsumer>
<goodConsumer>create-missing-checksums</goodConsumer> <knownContentConsumer>create-missing-checksums</knownContentConsumer>
<goodConsumer>update-db-repository-metadata</goodConsumer> <knownContentConsumer>update-db-repository-metadata</knownContentConsumer>
<goodConsumer>validate-checksum</goodConsumer> <knownContentConsumer>validate-checksum</knownContentConsumer>
<goodConsumer>validate-signature</goodConsumer> <knownContentConsumer>validate-signature</knownContentConsumer>
<goodConsumer>index-content</goodConsumer> <knownContentConsumer>index-content</knownContentConsumer>
<goodConsumer>auto-remove</goodConsumer> <knownContentConsumer>auto-remove</knownContentConsumer>
<goodConsumer>auto-rename</goodConsumer> <knownContentConsumer>auto-rename</knownContentConsumer>
</goodConsumers> </knownContentConsumers>
<badConsumers> <invalidContentConsumers>
<badConsumer>update-db-bad-content</badConsumer> <invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
</badConsumers> </invalidContentConsumers>
</repositoryScanning> </repositoryScanning>
<databaseScanning> <databaseScanning>
@ -160,11 +160,11 @@
<unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer> <unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
<unprocessedConsumer>index-public-methods</unprocessedConsumer> <unprocessedConsumer>index-public-methods</unprocessedConsumer>
</unprocessedConsumers> </unprocessedConsumers>
<processedConsumers> <cleanupConsumers>
<processedConsumer>not-present-remove-db-artifact</processedConsumer> <cleanupConsumer>not-present-remove-db-artifact</cleanupConsumer>
<processedConsumer>not-present-remove-db-project</processedConsumer> <cleanupConsumer>not-present-remove-db-project</cleanupConsumer>
<processedConsumer>not-present-remove-indexed</processedConsumer> <cleanupConsumer>not-present-remove-indexed</cleanupConsumer>
</processedConsumers> </cleanupConsumers>
</databaseScanning> </databaseScanning>
</configuration> </configuration>

36
archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
View File

@ -147,19 +147,19 @@
</patterns> </patterns>
</fileType> </fileType>
</fileTypes> </fileTypes>
<goodConsumers> <knownContentConsumers>
<goodConsumer>update-db-artifact</goodConsumer> <knownContentConsumer>update-db-artifact</knownContentConsumer>
<goodConsumer>create-missing-checksums</goodConsumer> <knownContentConsumer>create-missing-checksums</knownContentConsumer>
<goodConsumer>update-db-repository-metadata</goodConsumer> <knownContentConsumer>update-db-repository-metadata</knownContentConsumer>
<goodConsumer>validate-checksum</goodConsumer> <knownContentConsumer>validate-checksum</knownContentConsumer>
<goodConsumer>validate-signature</goodConsumer> <knownContentConsumer>validate-signature</knownContentConsumer>
<goodConsumer>index-content</goodConsumer> <knownContentConsumer>index-content</knownContentConsumer>
<goodConsumer>auto-remove</goodConsumer> <knownContentConsumer>auto-remove</knownContentConsumer>
<goodConsumer>auto-rename</goodConsumer> <knownContentConsumer>auto-rename</knownContentConsumer>
</goodConsumers> </knownContentConsumers>
<badConsumers> <invalidContentConsumers>
<badConsumer>update-db-bad-content</badConsumer> <invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
</badConsumers> </invalidContentConsumers>
</repositoryScanning> </repositoryScanning>
<databaseScanning> <databaseScanning>
@ -172,11 +172,11 @@
<unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer> <unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
<unprocessedConsumer>index-public-methods</unprocessedConsumer> <unprocessedConsumer>index-public-methods</unprocessedConsumer>
</unprocessedConsumers> </unprocessedConsumers>
<processedConsumers> <cleanupConsumers>
<processedConsumer>not-present-remove-db-artifact</processedConsumer> <cleanupConsumer>not-present-remove-db-artifact</cleanupConsumer>
<processedConsumer>not-present-remove-db-project</processedConsumer> <cleanupConsumer>not-present-remove-db-project</cleanupConsumer>
<processedConsumer>not-present-remove-indexed</processedConsumer> <cleanupConsumer>not-present-remove-indexed</cleanupConsumer>
</processedConsumers> </cleanupConsumers>
</databaseScanning> </databaseScanning>
</configuration> </configuration>

6
archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
View File

@ -60,8 +60,8 @@ public class ArchivaConfigurationTest extends PlexusTestCase
RepositoryScanningConfiguration repoScanning = configuration.getRepositoryScanning(); RepositoryScanningConfiguration repoScanning = configuration.getRepositoryScanning();
assertNotNull( "check repository scanning", repoScanning ); assertNotNull( "check repository scanning", repoScanning );
assertEquals( "check file types", 4, repoScanning.getFileTypes().size() ); assertEquals( "check file types", 4, repoScanning.getFileTypes().size() );
assertEquals( "check good consumers", 8, repoScanning.getGoodConsumers().size() ); assertEquals( "check known consumers", 8, repoScanning.getKnownContentConsumers().size() );
assertEquals( "check bad consumers", 1, repoScanning.getBadConsumers().size() ); assertEquals( "check invalid consumers", 1, repoScanning.getInvalidContentConsumers().size() );
List patterns = filetypes.getFileTypePatterns( "artifacts" ); List patterns = filetypes.getFileTypePatterns( "artifacts" );
assertNotNull( "check 'artifacts' file type", patterns ); assertNotNull( "check 'artifacts' file type", patterns );
@ -70,7 +70,7 @@ public class ArchivaConfigurationTest extends PlexusTestCase
DatabaseScanningConfiguration dbScanning = configuration.getDatabaseScanning(); DatabaseScanningConfiguration dbScanning = configuration.getDatabaseScanning();
assertNotNull( "check database scanning", dbScanning ); assertNotNull( "check database scanning", dbScanning );
assertEquals( "check unprocessed consumers", 6, dbScanning.getUnprocessedConsumers().size() ); assertEquals( "check unprocessed consumers", 6, dbScanning.getUnprocessedConsumers().size() );
assertEquals( "check processed consumers", 3, dbScanning.getProcessedConsumers().size() ); assertEquals( "check cleanup consumers", 3, dbScanning.getCleanupConsumers().size() );
RepositoryConfiguration repository = RepositoryConfiguration repository =
(RepositoryConfiguration) configuration.getRepositories().iterator().next(); (RepositoryConfiguration) configuration.getRepositories().iterator().next();

32
archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseCleanupConsumer.java Normal file
View File

@ -0,0 +1,32 @@
package org.apache.maven.archiva.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.
*/
/**
* DatabaseCleanupConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public interface DatabaseCleanupConsumer
extends ArchivaArtifactConsumer
{
}

32
archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseUnprocessedArtifactConsumer.java Normal file
View File

@ -0,0 +1,32 @@
package org.apache.maven.archiva.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.
*/
/**
* DatabaseUnprocessedArtifactConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public interface DatabaseUnprocessedArtifactConsumer
extends ArchivaArtifactConsumer
{
}

93
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.database;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* BytecodeStatsToDatabaseConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="update-db-bytecode-stats"
* instantiation-strategy="per-lookup"
*/
public class BytecodeStatsToDatabaseConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="update-db-bytecode-stats"
*/
private String id;
/**
* @plexus.configuration default-value="Update database with java bytecode stats."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.database;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* DatabaseCleanupRemoveArtifactConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
* role-hint="not-present-remove-db-artifact"
* instantiation-strategy="per-lookup"
*/
public class DatabaseCleanupRemoveArtifactConsumer
extends AbstractMonitoredConsumer
implements DatabaseCleanupConsumer
{
/**
* @plexus.configuration default-value="not-present-remove-db-artifact"
*/
private String id;
/**
* @plexus.configuration default-value="Remove artifact from database if not present on filesystem."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.database;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* DatabaseCleanupRemoveProjectConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
* role-hint="not-present-remove-db-project"
* instantiation-strategy="per-lookup"
*/
public class DatabaseCleanupRemoveProjectConsumer
extends AbstractMonitoredConsumer
implements DatabaseCleanupConsumer
{
/**
* @plexus.configuration default-value="not-present-remove-db-project"
*/
private String id;
/**
* @plexus.configuration default-value="Remove project from database if not present on filesystem."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.database;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* ProjectModelToDatabaseConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="update-db-project"
* instantiation-strategy="per-lookup"
*/
public class ProjectModelToDatabaseConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="update-db-project"
*/
private String id;
/**
* @plexus.configuration default-value="Update database with project model information."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.database;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* VerifyMetadataAgainstDatabaseConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="validate-repository-metadata"
* instantiation-strategy="per-lookup"
*/
public class VerifyMetadataAgainstDatabaseConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="validate-repository-metadata"
*/
private String id;
/**
* @plexus.configuration default-value="Verify repository metadata files against database."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.lucene;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* IndexArchiveTableOfContentsConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="index-archive-toc"
* instantiation-strategy="per-lookup"
*/
public class IndexArchiveTableOfContentsConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="index-archive-toc"
*/
private String id;
/**
* @plexus.configuration default-value="Index the archive table of contents for Full Text Search."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.lucene;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* IndexArtifactConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="index-artifact"
* instantiation-strategy="per-lookup"
*/
public class IndexArtifactConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="index-artifact"
*/
private String id;
/**
* @plexus.configuration default-value="Index the artifact details for Full Text Search."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

2
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
View File

@ -79,7 +79,7 @@ public class IndexContentConsumer
private FileTypes filetypes; private FileTypes filetypes;
/** /**
* @plexus.requirement * @plexus.requirement role-hint="lucene"
*/ */
private RepositoryContentIndexFactory indexFactory; private RepositoryContentIndexFactory indexFactory;

93
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.lucene;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* IndexJavaPublicMethodsConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
* role-hint="index-public-methods"
* instantiation-strategy="per-lookup"
*/
public class IndexJavaPublicMethodsConsumer
extends AbstractMonitoredConsumer
implements DatabaseUnprocessedArtifactConsumer
{
/**
* @plexus.configuration default-value="index-public-methods"
*/
private String id;
/**
* @plexus.configuration default-value="Index the java public methods for Full Text Search."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

93
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java Normal file
View File

@ -0,0 +1,93 @@
package org.apache.maven.archiva.consumers.lucene;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import java.util.List;
/**
* LuceneCleanupRemoveIndexedConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
* role-hint="not-present-remove-indexed"
* instantiation-strategy="per-lookup"
*/
public class LuceneCleanupRemoveIndexedConsumer
extends AbstractMonitoredConsumer
implements DatabaseCleanupConsumer
{
/**
* @plexus.configuration default-value="not-present-remove-indexed"
*/
private String id;
/**
* @plexus.configuration default-value="Remove indexed content if not present on filesystem."
*/
private String description;
public void beginScan()
{
// TODO Auto-generated method stub
}
public void completeScan()
{
// TODO Auto-generated method stub
}
public List getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
}
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
// TODO Auto-generated method stub
}
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isPermanent()
{
return false;
}
}

6
archiva-base/archiva-repository-layer/pom.xml
View File

@ -88,6 +88,12 @@
<version>1.0-alpha-2</version> <version>1.0-alpha-2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

2
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
View File

@ -51,7 +51,7 @@ public class DefaultRepositoryScanner
/** /**
* @plexus.requirement * @plexus.requirement
*/ */
private RepositoryContentConsumerUtil consumerUtil; private RepositoryContentConsumers consumerUtil;
public RepositoryContentStatistics scan( ArchivaRepository repository, long changesSince ) public RepositoryContentStatistics scan( ArchivaRepository repository, long changesSince )
throws RepositoryException throws RepositoryException

40
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtil.java → archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
View File

@ -41,9 +41,9 @@ import java.util.Map;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a> * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$ * @version $Id$
* *
* @plexus.component role="org.apache.maven.archiva.repository.scanner.RepositoryContentConsumerUtil" * @plexus.component role="org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers"
*/ */
public class RepositoryContentConsumerUtil public class RepositoryContentConsumers
{ {
/** /**
* @plexus.requirement * @plexus.requirement
@ -53,12 +53,12 @@ public class RepositoryContentConsumerUtil
/** /**
* @plexus.requirement role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" * @plexus.requirement role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
*/ */
private List availableGoodConsumers; private List availableKnownConsumers;
/** /**
* @plexus.requirement role="org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer" * @plexus.requirement role="org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer"
*/ */
private List availableBadConsumers; private List availableInvalidConsumers;
class SelectedKnownRepoConsumersPredicate class SelectedKnownRepoConsumersPredicate
implements Predicate implements Predicate
@ -72,7 +72,7 @@ public class RepositoryContentConsumerUtil
KnownRepositoryContentConsumer known = (KnownRepositoryContentConsumer) object; KnownRepositoryContentConsumer known = (KnownRepositoryContentConsumer) object;
Configuration config = archivaConfiguration.getConfiguration(); Configuration config = archivaConfiguration.getConfiguration();
return config.getRepositoryScanning().getGoodConsumers().contains( known.getId() ); return config.getRepositoryScanning().getKnownContentConsumers().contains( known.getId() );
} }
return satisfies; return satisfies;
@ -87,12 +87,12 @@ public class RepositoryContentConsumerUtil
{ {
boolean satisfies = false; boolean satisfies = false;
if ( object instanceof KnownRepositoryContentConsumer ) if ( object instanceof InvalidRepositoryContentConsumer )
{ {
InvalidRepositoryContentConsumer invalid = (InvalidRepositoryContentConsumer) object; InvalidRepositoryContentConsumer invalid = (InvalidRepositoryContentConsumer) object;
Configuration config = archivaConfiguration.getConfiguration(); Configuration config = archivaConfiguration.getConfiguration();
return config.getRepositoryScanning().getBadConsumers().contains( invalid.getId() ); return config.getRepositoryScanning().getInvalidContentConsumers().contains( invalid.getId() );
} }
return satisfies; return satisfies;
@ -129,24 +129,32 @@ public class RepositoryContentConsumerUtil
return new SelectedInvalidRepoConsumersPredicate(); return new SelectedInvalidRepoConsumersPredicate();
} }
public Map getSelectedKnownConsumersMap() public List getSelectedKnownConsumerIds()
{ {
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning(); RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
return scanning.getKnownContentConsumers();
}
public List getSelectedInvalidConsumerIds()
{
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
return scanning.getInvalidContentConsumers();
}
public Map getSelectedKnownConsumersMap()
{
RepoConsumerToMapClosure consumerMapClosure = new RepoConsumerToMapClosure(); RepoConsumerToMapClosure consumerMapClosure = new RepoConsumerToMapClosure();
Closure ifclosure = IfClosure.getInstance( getKnownSelectionPredicate(), consumerMapClosure ); Closure ifclosure = IfClosure.getInstance( getKnownSelectionPredicate(), consumerMapClosure );
CollectionUtils.forAllDo( scanning.getGoodConsumers(), ifclosure ); CollectionUtils.forAllDo( availableKnownConsumers, ifclosure );
return consumerMapClosure.getMap(); return consumerMapClosure.getMap();
} }
public Map getSelectedInvalidConsumersMap() public Map getSelectedInvalidConsumersMap()
{ {
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
RepoConsumerToMapClosure consumerMapClosure = new RepoConsumerToMapClosure(); RepoConsumerToMapClosure consumerMapClosure = new RepoConsumerToMapClosure();
Closure ifclosure = IfClosure.getInstance( getInvalidSelectionPredicate(), consumerMapClosure ); Closure ifclosure = IfClosure.getInstance( getInvalidSelectionPredicate(), consumerMapClosure );
CollectionUtils.forAllDo( scanning.getGoodConsumers(), ifclosure ); CollectionUtils.forAllDo( availableInvalidConsumers, ifclosure );
return consumerMapClosure.getMap(); return consumerMapClosure.getMap();
} }
@ -156,7 +164,7 @@ public class RepositoryContentConsumerUtil
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning(); RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
List ret = new ArrayList(); List ret = new ArrayList();
ret.addAll( CollectionUtils.select( scanning.getGoodConsumers(), getKnownSelectionPredicate() )); ret.addAll( CollectionUtils.select( scanning.getKnownContentConsumers(), getKnownSelectionPredicate() ));
return ret; return ret;
} }
@ -166,18 +174,18 @@ public class RepositoryContentConsumerUtil
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning(); RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
List ret = new ArrayList(); List ret = new ArrayList();
ret.addAll( CollectionUtils.select( scanning.getBadConsumers(), getInvalidSelectionPredicate() )); ret.addAll( CollectionUtils.select( scanning.getInvalidContentConsumers(), getInvalidSelectionPredicate() ));
return ret; return ret;
} }
public List getAvailableKnownConsumers() public List getAvailableKnownConsumers()
{ {
return availableGoodConsumers; return availableKnownConsumers;
} }
public List getAvailableInvalidConsumers() public List getAvailableInvalidConsumers()
{ {
return availableBadConsumers; return availableInvalidConsumers;
} }
} }

103
archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java Normal file
View File

@ -0,0 +1,103 @@
package org.apache.maven.archiva.repository.scanner;
/*
* 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.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.codehaus.plexus.PlexusTestCase;
import java.util.List;
import java.util.Map;
/**
* RepositoryContentConsumerUtilTest
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class RepositoryContentConsumerUtilTest
extends PlexusTestCase
{
private RepositoryContentConsumers lookupRepositoryConsumerUtil()
throws Exception
{
RepositoryContentConsumers consumerUtil = (RepositoryContentConsumers) lookup( RepositoryContentConsumers.class
.getName() );
assertNotNull( "RepositoryContentConsumerUtil should not be null.", consumerUtil );
return consumerUtil;
}
public void testGetSelectedIds()
throws Exception
{
RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
List knownConsumers = consumerutil.getSelectedKnownConsumerIds();
assertNotNull( "Known Consumer IDs should not be null", knownConsumers );
assertEquals( "Known Consumer IDs.size", 9, knownConsumers.size() );
List invalidConsumers = consumerutil.getSelectedInvalidConsumerIds();
assertNotNull( "Invalid Consumer IDs should not be null", invalidConsumers );
assertEquals( "Invalid Consumer IDs.size", 1, invalidConsumers.size() );
}
public void testGetSelectedConsumersMaps()
throws Exception
{
RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
Map knownConsumerMap = consumerutil.getSelectedKnownConsumersMap();
assertNotNull( "Known Consumer Map should not be null", knownConsumerMap );
assertEquals( "Known Consumer Map.size", 1, knownConsumerMap.size() );
Object o = knownConsumerMap.get( "sample-known" );
assertNotNull( "Known[sample-known] should not be null.", o );
assertInstanceof( "Known[sample-known]", RepositoryContentConsumer.class, o );
assertInstanceof( "Known[sample-known]", KnownRepositoryContentConsumer.class, o );
Map invalidConsumerMap = consumerutil.getSelectedInvalidConsumersMap();
assertNotNull( "Invalid Consumer Map should not be null", invalidConsumerMap );
assertEquals( "Invalid Consumer Map.size", 0, invalidConsumerMap.size() );
}
private void assertInstanceof( String msg, Class clazz, Object o )
{
if ( clazz.isInstance( o ) == false )
{
fail( msg + ": Object [" + o.getClass().getName() + "] should have been an instanceof [" + clazz.getName()
+ "]" );
}
}
public void testGetAvailableLists()
throws Exception
{
RepositoryContentConsumers consumerutil = lookupRepositoryConsumerUtil();
List knownConsumers = consumerutil.getAvailableKnownConsumers();
assertNotNull( "known consumers should not be null.", knownConsumers );
assertEquals( "known consumers", 1, knownConsumers.size() );
assertInstanceof( "Available Known Consumers", RepositoryContentConsumer.class, knownConsumers.get( 0 ) );
List invalidConsumers = consumerutil.getAvailableInvalidConsumers();
assertNotNull( "invalid consumers should not be null.", invalidConsumers );
assertEquals( "invalid consumers", 0, invalidConsumers.size() );
}
}

83
archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java Normal file
View File

@ -0,0 +1,83 @@
package org.apache.maven.archiva.repository.scanner;
/*
* 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.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.model.ArchivaRepository;
import java.util.List;
/**
* SampleKnownConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="sample-known"
*/
public class SampleKnownConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer
{
public void beginScan( ArchivaRepository repository )
throws ConsumerException
{
/* nothing to do */
}
public void completeScan()
{
/* nothing to do */
}
public List getExcludes()
{
return null;
}
public List getIncludes()
{
return null;
}
public void processFile( String path )
throws ConsumerException
{
/* nothing to do */
}
public String getDescription()
{
return "Sample Known Consumer";
}
public String getId()
{
return "sample-known";
}
public boolean isPermanent()
{
return false;
}
}

53
archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.xml Normal file
View File

@ -0,0 +1,53 @@
<?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.
-->
<component-set>
<components>
<component>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
<implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>configured</role-hint>
</requirement>
</requirements>
</component>
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>configured</role-hint>
<implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
<system/>
<xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
</properties>
</configuration>
</component>
<component>
<role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
<role-hint>sample-known</role-hint>
<implementation>org.apache.maven.archiva.repository.scanner.SampleKnownConsumer</implementation>
</component>
</components>
</component-set>

110
archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml Normal file
View File

@ -0,0 +1,110 @@
<?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.
-->
<configuration>
<repositoryScanning>
<fileTypes>
<fileType>
<id>artifacts</id>
<patterns>
<pattern>**/*.pom</pattern>
<pattern>**/*.jar</pattern>
<pattern>**/*.ear</pattern>
<pattern>**/*.war</pattern>
<pattern>**/*.car</pattern>
<pattern>**/*.sar</pattern>
<pattern>**/*.mar</pattern>
<pattern>**/*.rar</pattern>
<pattern>**/*.dtd</pattern>
<pattern>**/*.tld</pattern>
<pattern>**/*.tar.gz</pattern>
<pattern>**/*.tar.bz2</pattern>
<pattern>**/*.zip</pattern>
</patterns>
</fileType>
<fileType>
<id>indexable-content</id>
<patterns>
<pattern>**/*.txt</pattern>
<pattern>**/*.TXT</pattern>
<pattern>**/*.block</pattern>
<pattern>**/*.config</pattern>
<pattern>**/*.pom</pattern>
<pattern>**/*.xml</pattern>
<pattern>**/*.xsd</pattern>
<pattern>**/*.dtd</pattern>
<pattern>**/*.tld</pattern>
</patterns>
</fileType>
<fileType>
<id>auto-remove</id>
<patterns>
<pattern>**/*.bak</pattern>
<pattern>**/*~</pattern>
<pattern>**/*-</pattern>
</patterns>
</fileType>
<fileType>
<id>ignored</id>
<patterns>
<pattern>**/.htaccess</pattern>
<pattern>**/KEYS</pattern>
<pattern>**/*.rb</pattern>
<pattern>**/*.sh</pattern>
<pattern>**/.svn/**</pattern>
<pattern>**/.DAV/**</pattern>
</patterns>
</fileType>
</fileTypes>
<knownContentConsumers>
<knownContentConsumer>sample-known</knownContentConsumer>
<knownContentConsumer>update-db-artifact</knownContentConsumer>
<knownContentConsumer>create-missing-checksums</knownContentConsumer>
<knownContentConsumer>update-db-repository-metadata</knownContentConsumer>
<knownContentConsumer>validate-checksum</knownContentConsumer>
<knownContentConsumer>validate-signature</knownContentConsumer>
<knownContentConsumer>index-content</knownContentConsumer>
<knownContentConsumer>auto-remove</knownContentConsumer>
<knownContentConsumer>auto-rename</knownContentConsumer>
</knownContentConsumers>
<invalidContentConsumers>
<invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
</invalidContentConsumers>
</repositoryScanning>
<databaseScanning>
<cronExpression>0 0 * * ?</cronExpression>
<unprocessedConsumers>
<unprocessedConsumer>index-artifact</unprocessedConsumer>
<unprocessedConsumer>update-db-project</unprocessedConsumer>
<unprocessedConsumer>validate-repository-metadata</unprocessedConsumer>
<unprocessedConsumer>index-archive-toc</unprocessedConsumer>
<unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
<unprocessedConsumer>index-public-methods</unprocessedConsumer>
</unprocessedConsumers>
<cleanupConsumers>
<cleanupConsumer>not-present-remove-db-artifact</cleanupConsumer>
<cleanupConsumer>not-present-remove-db-project</cleanupConsumer>
<cleanupConsumer>not-present-remove-indexed</cleanupConsumer>
</cleanupConsumers>
</databaseScanning>
</configuration>

157
archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java Normal file
View File

@ -0,0 +1,157 @@
package org.apache.maven.archiva.database.updater;
/*
* 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.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* DatabaseConsumers
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseConsumers"
*/
public class DatabaseConsumers
implements Initializable
{
/**
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
/**
* @plexus.requirement role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
*/
private List availableUnprocessedConsumers;
/**
* @plexus.requirement role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
*/
private List availableCleanupConsumers;
private SelectedCleanupConsumersPredicate selectedCleanupConsumers;
private SelectedUnprocessedConsumersPredicate selectedUnprocessedConsumers;
class SelectedUnprocessedConsumersPredicate
implements Predicate
{
public boolean evaluate( Object object )
{
boolean satisfies = false;
if ( object instanceof DatabaseUnprocessedArtifactConsumer )
{
DatabaseUnprocessedArtifactConsumer consumer = (DatabaseUnprocessedArtifactConsumer) object;
DatabaseScanningConfiguration config = archivaConfiguration.getConfiguration().getDatabaseScanning();
return config.getUnprocessedConsumers().contains( consumer.getId() );
}
return satisfies;
}
}
class SelectedCleanupConsumersPredicate
implements Predicate
{
public boolean evaluate( Object object )
{
boolean satisfies = false;
if ( object instanceof DatabaseCleanupConsumer )
{
DatabaseCleanupConsumer consumer = (DatabaseCleanupConsumer) object;
DatabaseScanningConfiguration config = archivaConfiguration.getConfiguration().getDatabaseScanning();
return config.getUnprocessedConsumers().contains( consumer.getId() );
}
return satisfies;
}
}
public void initialize()
throws InitializationException
{
selectedCleanupConsumers = new SelectedCleanupConsumersPredicate();
selectedUnprocessedConsumers = new SelectedUnprocessedConsumersPredicate();
}
/**
* Get the {@link List} of {@link DatabaseUnprocessedArtifactConsumer} objects
* for those consumers selected due to the configuration.
*
* @return the list of selected {@link DatabaseUnprocessedArtifactConsumer} objects.
*/
public List getSelectedUnprocessedConsumers()
{
List ret = new ArrayList();
ret.addAll( CollectionUtils.select( availableUnprocessedConsumers, selectedUnprocessedConsumers ) );
return ret;
}
/**
* Get the {@link List} of {@link DatabaseCleanupConsumer} objects for those
* consumers selected due to the configuration.
*
* @return the list of selected {@link DatabaseCleanupConsumer} objects.
*/
public List getSelectedCleanupConsumers()
{
List ret = new ArrayList();
ret.addAll( CollectionUtils.select( availableCleanupConsumers, selectedCleanupConsumers ) );
return ret;
}
/**
* Get the complete {@link List} of {@link DatabaseUnprocessedArtifactConsumer} objects
* that are available in the system, regardless of configuration.
*
* @return the list of all available {@link DatabaseUnprocessedArtifactConsumer} objects.
*/
public List getAvailableUnprocessedConsumers()
{
return Collections.unmodifiableList( this.availableUnprocessedConsumers );
}
/**
* Get the complete {@link List} of {@link DatabaseCleanupConsumer} objects
* that are available in the system, regardless of configuration.
*
* @return the list of all available {@link DatabaseCleanupConsumer} objects.
*/
public List getAvailableCleanupConsumers()
{
return Collections.unmodifiableList( this.availableCleanupConsumers );
}
}

2
archiva-database/src/main/java/org/apache/maven/archiva/database/updater/JdoDatabaseUpdater.java
View File

@ -217,7 +217,7 @@ public class JdoDatabaseUpdater
} }
this.activeUnprocessedConsumers.addAll( getActiveConsumerList( dbScanning.getUnprocessedConsumers() ) ); this.activeUnprocessedConsumers.addAll( getActiveConsumerList( dbScanning.getUnprocessedConsumers() ) );
this.activeProcessedConsumers.addAll( getActiveConsumerList( dbScanning.getProcessedConsumers() ) ); this.activeProcessedConsumers.addAll( getActiveConsumerList( dbScanning.getCleanupConsumers() ) );
} }
private List getActiveConsumerList( List potentialConsumerList ) private List getActiveConsumerList( List potentialConsumerList )

12
archiva-web/archiva-webapp/pom.xml
View File

@ -58,6 +58,18 @@
<groupId>org.apache.maven.archiva</groupId> <groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-security</artifactId> <artifactId>archiva-security</artifactId>
</dependency> </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.apache.maven.archiva</groupId>
<artifactId>archiva-signature-consumers</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.archiva</groupId> <groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-applet</artifactId> <artifactId>archiva-applet</artifactId>

67
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java Normal file
View File

@ -0,0 +1,67 @@
package org.apache.maven.archiva.web.action.admin.database;
/*
* 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.collections.Closure;
import org.apache.maven.archiva.consumers.ArchivaArtifactConsumer;
import java.util.ArrayList;
import java.util.List;
/**
* AddAdminDatabaseConsumerClosure
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AddAdminDatabaseConsumerClosure
implements Closure
{
private List list = new ArrayList();
private List selectedIds;
public AddAdminDatabaseConsumerClosure( List selectedIds )
{
this.selectedIds = selectedIds;
}
public void execute( Object input )
{
if ( input instanceof ArchivaArtifactConsumer )
{
ArchivaArtifactConsumer consumer = (ArchivaArtifactConsumer) input;
boolean enabled = this.selectedIds.contains( consumer.getId() );
AdminDatabaseConsumer adminconsumer = new AdminDatabaseConsumer();
adminconsumer.setEnabled( enabled );
adminconsumer.setId( consumer.getId() );
adminconsumer.setDescription( consumer.getDescription() );
list.add( adminconsumer );
}
}
public List getList()
{
return list;
}
}

65
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumer.java Normal file
View File

@ -0,0 +1,65 @@
package org.apache.maven.archiva.web.action.admin.database;
/*
* 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.
*/
/**
* AdminDatabaseConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AdminDatabaseConsumer
{
private boolean enabled = false;
private String id;
private String description;
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isEnabled()
{
return enabled;
}
public void setDescription( String description )
{
this.description = description;
}
public void setEnabled( boolean enabled )
{
this.enabled = enabled;
}
public void setId( String id )
{
this.id = id;
}
}

67
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java Normal file
View File

@ -0,0 +1,67 @@
package org.apache.maven.archiva.web.action.admin.database;
/*
* 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 java.util.Comparator;
/**
* AdminDatabaseConsumerComparator
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AdminDatabaseConsumerComparator
implements Comparator
{
private static AdminDatabaseConsumerComparator INSTANCE = new AdminDatabaseConsumerComparator();
public static AdminDatabaseConsumerComparator getInstance()
{
return INSTANCE;
}
public int compare( Object o1, Object o2 )
{
if ( o1 == null && o2 == null )
{
return 0;
}
if ( o1 == null && o2 != null )
{
return 1;
}
if ( o1 != null && o2 == null )
{
return -1;
}
if ( ( o1 instanceof AdminDatabaseConsumer ) && ( o2 instanceof AdminDatabaseConsumer ) )
{
String id1 = ( (AdminDatabaseConsumer) o1 ).getId();
String id2 = ( (AdminDatabaseConsumer) o2 ).getId();
return id1.compareToIgnoreCase( id2 );
}
return 0;
}
}

107
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
View File

@ -19,17 +19,23 @@ package org.apache.maven.archiva.web.action.admin.database;
* under the License. * under the License.
*/ */
import com.opensymphony.webwork.interceptor.ServletRequestAware;
import com.opensymphony.xwork.ModelDriven;
import com.opensymphony.xwork.Preparable; import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
import org.apache.maven.archiva.database.updater.DatabaseConsumers;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.admin.scanning.AdminRepositoryConsumerComparator;
import org.codehaus.plexus.security.rbac.Resource;
import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport; import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import javax.servlet.http.HttpServletRequest; import java.util.Collections;
import java.util.List;
/** /**
* DatabaseAction * DatabaseAction
@ -40,34 +46,101 @@ import javax.servlet.http.HttpServletRequest;
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="databaseAction" * @plexus.component role="com.opensymphony.xwork.Action" role-hint="databaseAction"
*/ */
public class DatabaseAction public class DatabaseAction
extends PlexusActionSupport extends PlexusActionSupport
implements ModelDriven, Preparable, Validateable, SecureAction, ServletRequestAware implements Preparable, SecureAction
{ {
/**
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
public Object getModel() /**
{ * @plexus.requirement
// TODO Auto-generated method stub */
return null; private DatabaseConsumers databaseConsumers;
}
private String cron;
/**
* List of {@link AdminDatabaseConsumer} objects for unprocessed artifacts.
*/
private List unprocessedConsumers;
/**
* List of {@link AdminDatabaseConsumer} objects for "to cleanup" artifacts.
*/
private List cleanupConsumers;
public void prepare() public void prepare()
throws Exception throws Exception
{ {
// TODO Auto-generated method stub Configuration config = archivaConfiguration.getConfiguration();
DatabaseScanningConfiguration dbscanning = config.getDatabaseScanning();
this.cron = dbscanning.getCronExpression();
AddAdminDatabaseConsumerClosure addAdminDbConsumer;
getLogger().info( "Total Available Unprocessed Consumers: " + databaseConsumers.getAvailableUnprocessedConsumers().size() );
getLogger().info( "Total Available Cleanup Consumers: " + databaseConsumers.getAvailableCleanupConsumers().size() );
addAdminDbConsumer = new AddAdminDatabaseConsumerClosure( dbscanning.getUnprocessedConsumers() );
CollectionUtils.forAllDo( databaseConsumers.getAvailableUnprocessedConsumers(), addAdminDbConsumer );
this.unprocessedConsumers = addAdminDbConsumer.getList();
Collections.sort( this.unprocessedConsumers, AdminRepositoryConsumerComparator.getInstance() );
addAdminDbConsumer = new AddAdminDatabaseConsumerClosure( dbscanning.getCleanupConsumers() );
CollectionUtils.forAllDo( databaseConsumers.getAvailableCleanupConsumers(), addAdminDbConsumer );
this.cleanupConsumers = addAdminDbConsumer.getList();
Collections.sort( this.cleanupConsumers, AdminRepositoryConsumerComparator.getInstance() );
}
public String updateUnprocessedConsumers()
{
getLogger().info( "updateUnprocesedConsumers()" );
return INPUT;
}
public String updateCleanupConsumers()
{
getLogger().info( "updateCleanupConsumers()" );
return INPUT;
}
public String updateSchedule()
{
getLogger().info( "updateSchedule()" );
return INPUT;
} }
public SecureActionBundle getSecureActionBundle() public SecureActionBundle getSecureActionBundle()
throws SecureActionException throws SecureActionException
{ {
// TODO Auto-generated method stub SecureActionBundle bundle = new SecureActionBundle();
return null;
bundle.setRequiresAuthentication( true );
bundle.addRequiredAuthorization( ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, Resource.GLOBAL );
return bundle;
} }
public void setServletRequest( HttpServletRequest request ) public String getCron()
{ {
// TODO Auto-generated method stub return cron;
} }
public void setCron( String cron )
{
this.cron = cron;
}
public List getCleanupConsumers()
{
return cleanupConsumers;
}
public List getUnprocessedConsumers()
{
return unprocessedConsumers;
}
} }

66
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java Normal file
View File

@ -0,0 +1,66 @@
package org.apache.maven.archiva.web.action.admin.scanning;
/*
* 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.collections.Closure;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import java.util.ArrayList;
import java.util.List;
/**
* AddAdminRepoConsumerClosure
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AddAdminRepoConsumerClosure
implements Closure
{
private List list = new ArrayList();
private List selectedIds;
public AddAdminRepoConsumerClosure( List selectedIds )
{
this.selectedIds = selectedIds;
}
public void execute( Object input )
{
if ( input instanceof RepositoryContentConsumer )
{
RepositoryContentConsumer consumer = (RepositoryContentConsumer) input;
boolean enabled = this.selectedIds.contains( consumer.getId() );
AdminRepositoryConsumer adminconsumer = new AdminRepositoryConsumer();
adminconsumer.setEnabled( enabled );
adminconsumer.setId( consumer.getId() );
adminconsumer.setDescription( consumer.getDescription() );
list.add( adminconsumer );
}
}
public List getList()
{
return list;
}
}

63
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumer.java Normal file
View File

@ -0,0 +1,63 @@
package org.apache.maven.archiva.web.action.admin.scanning;
/*
* 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.
*/
/**
* AdminRepositoryConsumer
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AdminRepositoryConsumer
{
private boolean enabled = false;
private String id;
private String description;
public String getDescription()
{
return description;
}
public String getId()
{
return id;
}
public boolean isEnabled()
{
return enabled;
}
public void setDescription( String description )
{
this.description = description;
}
public void setEnabled( boolean enabled )
{
this.enabled = enabled;
}
public void setId( String id )
{
this.id = id;
}
}

66
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java Normal file
View File

@ -0,0 +1,66 @@
package org.apache.maven.archiva.web.action.admin.scanning;
/*
* 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 java.util.Comparator;
/**
* AdminRepositoryConsumerComparator
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
public class AdminRepositoryConsumerComparator
implements Comparator
{
private static AdminRepositoryConsumerComparator INSTANCE = new AdminRepositoryConsumerComparator();
public static AdminRepositoryConsumerComparator getInstance()
{
return INSTANCE;
}
public int compare( Object o1, Object o2 )
{
if ( o1 == null && o2 == null )
{
return 0;
}
if ( o1 == null && o2 != null )
{
return 1;
}
if ( o1 != null && o2 == null )
{
return -1;
}
if ( ( o1 instanceof AdminRepositoryConsumer ) && ( o2 instanceof AdminRepositoryConsumer ) )
{
String id1 = ( (AdminRepositoryConsumer) o1 ).getId();
String id2 = ( (AdminRepositoryConsumer) o2 ).getId();
return id1.compareToIgnoreCase( id2 );
}
return 0;
}
}

62
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/ConfigureRepositoryScanningAction.java
View File

@ -1,62 +0,0 @@
package org.apache.maven.archiva.web.action.admin.scanning;
/*
* 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 com.opensymphony.xwork.Preparable;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.security.rbac.Resource;
import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* ConfigureRepositoryScanningAction
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureRepositoryScanningAction"
*/
public class ConfigureRepositoryScanningAction
extends PlexusActionSupport
implements SecureAction, Preparable
{
public SecureActionBundle getSecureActionBundle()
throws SecureActionException
{
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
bundle.addRequiredAuthorization( ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, Resource.GLOBAL );
return bundle;
}
public void prepare()
throws Exception
{
// TODO Auto-generated method stub
}
}

217
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java
View File

@ -23,10 +23,16 @@ import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable; import com.opensymphony.xwork.Validateable;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.FileType;
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.maven.archiva.configuration.functors.FiletypeSelectionPredicate;
import org.apache.maven.archiva.configuration.functors.FiletypeToMapClosure; import org.apache.maven.archiva.configuration.functors.FiletypeToMapClosure;
import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.security.rbac.Resource; import org.codehaus.plexus.security.rbac.Resource;
import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
@ -55,58 +61,100 @@ public class RepositoryScanningAction
*/ */
private ArchivaConfiguration archivaConfiguration; private ArchivaConfiguration archivaConfiguration;
/**
* @plexus.requirement
*/
private RepositoryContentConsumers repoconsumerUtil;
private Map fileTypeMap; private Map fileTypeMap;
private List fileTypeIds; private List fileTypeIds;
private List goodConsumers = new ArrayList(); /**
* List of {@link AdminRepositoryConsumer} objects for consumers of known content.
*/
private List knownContentConsumers = new ArrayList();
private List badConsumers = new ArrayList(); /**
* List of {@link AdminRepositoryConsumer} objects for consumers of invalid/unknown content.
*/
private List invalidContentConsumers = new ArrayList();
private String pattern; private String pattern;
private String fileTypeId; private String fileTypeId;
public void prepare() public void addActionError( String anErrorMessage )
throws Exception
{ {
Configuration config = archivaConfiguration.getConfiguration(); super.addActionError( anErrorMessage );
FiletypeToMapClosure filetypeToMapClosure = new FiletypeToMapClosure(); getLogger().warn( "[ActionError] " + anErrorMessage );
CollectionUtils.forAllDo( config.getRepositoryScanning().getFileTypes(), filetypeToMapClosure );
fileTypeMap = filetypeToMapClosure.getMap();
goodConsumers.clear();
goodConsumers.addAll( config.getRepositoryScanning().getGoodConsumers() );
badConsumers.clear();
badConsumers.addAll( config.getRepositoryScanning().getBadConsumers() );
fileTypeIds = new ArrayList();
fileTypeIds.addAll( fileTypeMap.keySet() );
Collections.sort( fileTypeIds );
} }
public String removeFiletypePattern() public void addActionMessage( String aMessage )
{ {
getLogger().info( "Remove File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); super.addActionMessage( aMessage );
getLogger().info( "[ActionMessage] " + aMessage );
// TODO: remove the filetype
// TODO: save configuration
return INPUT;
} }
public String addFiletypePattern() public String addFiletypePattern()
{ {
getLogger().info( "Add New File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); getLogger().info( "Add New File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" );
// TODO: add the filetype. if ( !isValidFiletypeCommand() )
// TODO: report error if filetype pattern already exists. {
// TODO: report success (message) if added successfully. return INPUT;
// TODO: save configuration each time. }
return INPUT; String id = getFileTypeId();
String pattern = getPattern();
FileType filetype = findFileType( id );
if ( filetype == null )
{
addActionError( "Pattern not added, unable to find filetype " + id );
return INPUT;
}
if ( filetype.getPatterns().contains( pattern ) )
{
addActionError( "Not adding pattern \"" + pattern + "\" to filetype " + id + " as it already exists." );
return INPUT;
}
filetype.addPattern( pattern );
addActionMessage( "Added pattern \"" + pattern + "\" to filetype " + id );
return saveConfiguration();
}
public String getFileTypeId()
{
return fileTypeId;
}
public List getFileTypeIds()
{
return fileTypeIds;
}
public Map getFileTypeMap()
{
return fileTypeMap;
}
public List getInvalidContentConsumers()
{
return invalidContentConsumers;
}
public List getKnownContentConsumers()
{
return knownContentConsumers;
}
public String getPattern()
{
return pattern;
} }
public SecureActionBundle getSecureActionBundle() public SecureActionBundle getSecureActionBundle()
@ -120,24 +168,55 @@ public class RepositoryScanningAction
return bundle; return bundle;
} }
public List getBadConsumers() public void prepare()
throws Exception
{ {
return badConsumers; Configuration config = archivaConfiguration.getConfiguration();
RepositoryScanningConfiguration reposcanning = config.getRepositoryScanning();
FiletypeToMapClosure filetypeToMapClosure = new FiletypeToMapClosure();
CollectionUtils.forAllDo( reposcanning.getFileTypes(), filetypeToMapClosure );
fileTypeMap = filetypeToMapClosure.getMap();
AddAdminRepoConsumerClosure addAdminRepoConsumer;
addAdminRepoConsumer = new AddAdminRepoConsumerClosure( reposcanning.getKnownContentConsumers() );
CollectionUtils.forAllDo( repoconsumerUtil.getAvailableKnownConsumers(), addAdminRepoConsumer );
knownContentConsumers.clear();
knownContentConsumers.addAll( addAdminRepoConsumer.getList() );
Collections.sort( knownContentConsumers, AdminRepositoryConsumerComparator.getInstance() );
addAdminRepoConsumer = new AddAdminRepoConsumerClosure( reposcanning.getInvalidContentConsumers() );
CollectionUtils.forAllDo( repoconsumerUtil.getAvailableInvalidConsumers(), addAdminRepoConsumer );
invalidContentConsumers.clear();
invalidContentConsumers.addAll( addAdminRepoConsumer.getList() );
Collections.sort( invalidContentConsumers, AdminRepositoryConsumerComparator.getInstance() );
fileTypeIds = new ArrayList();
fileTypeIds.addAll( fileTypeMap.keySet() );
Collections.sort( fileTypeIds );
} }
public Map getFileTypeMap() public String removeFiletypePattern()
{ {
return fileTypeMap; getLogger().info( "Remove File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" );
}
public List getGoodConsumers() if ( !isValidFiletypeCommand() )
{ {
return goodConsumers; return INPUT;
} }
public String getFileTypeId() FileType filetype = findFileType( getFileTypeId() );
{ if ( filetype == null )
return fileTypeId; {
addActionError( "Pattern not removed, unable to find filetype " + getFileTypeId() );
return INPUT;
}
filetype.removePattern( getPattern() );
return saveConfiguration();
} }
public void setFileTypeId( String fileTypeId ) public void setFileTypeId( String fileTypeId )
@ -145,18 +224,56 @@ public class RepositoryScanningAction
this.fileTypeId = fileTypeId; this.fileTypeId = fileTypeId;
} }
public String getPattern()
{
return pattern;
}
public void setPattern( String pattern ) public void setPattern( String pattern )
{ {
this.pattern = pattern; this.pattern = pattern;
} }
public List getFileTypeIds() public String updateInvalidConsumers()
{ {
return fileTypeIds; addActionMessage("Update Invalid Consumers");
return INPUT;
}
public String updateKnownConsumers()
{
addActionMessage("Update Known Consumers");
return INPUT;
}
private FileType findFileType( String id )
{
RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
return (FileType) CollectionUtils.find( scanning.getFileTypes(), new FiletypeSelectionPredicate( id ) );
}
private boolean isValidFiletypeCommand()
{
if ( StringUtils.isBlank( getFileTypeId() ) )
{
addActionError( "Unable to process blank filetype id." );
}
if ( StringUtils.isBlank( getPattern() ) )
{
addActionError( "Unable to process blank pattern." );
}
return !hasActionErrors();
}
private String saveConfiguration()
{
try
{
archivaConfiguration.save( archivaConfiguration.getConfiguration() );
addActionMessage( "Successfully saved configuration" );
}
catch ( RegistryException e )
{
addActionError( "Unable to save configuration: " + e.getMessage() );
}
return INPUT;
} }
} }

25
archiva-web/archiva-webapp/src/main/resources/xwork.xml
View File

@ -336,30 +336,6 @@
<result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result> <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
</action> </action>
<action name="addRepositoryScanning" class="configureScanningAction" method="add">
<result name="input">/WEB-INF/jsp/admin/addRepositoryScanning.jsp</result>
<result name="success" type="redirect-action">repositoryScanning</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="editRepositoryScanning" class="configureScanningAction" method="edit">
<result name="input">/WEB-INF/jsp/admin/editRepositoryScanning.jsp</result>
<result name="success" type="redirect-action">repositoryScanning</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="saveRepositoryScanning" class="configureScanningAction" method="save">
<result name="input">/WEB-INF/jsp/admin/editRepositoryScanning.jsp</result>
<result name="success" type="redirect-action">repositoryScanning</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="deleteRepositoryScanning" class="configureScanningAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/deleteRepositoryScanning.jsp</result>
<result name="success" type="redirect-action">repositoryScanning</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<!-- .\ DATABASE \.________________________________________________ --> <!-- .\ DATABASE \.________________________________________________ -->
<action name="database" class="databaseAction" method="input"> <action name="database" class="databaseAction" method="input">
@ -368,7 +344,6 @@
<!-- .\ CONFIGURATION \.___________________________________________ --> <!-- .\ CONFIGURATION \.___________________________________________ -->
<action name="configure" class="configureAction" method="input"> <action name="configure" class="configureAction" method="input">
<result name="input">/WEB-INF/jsp/admin/configure.jsp</result> <result name="input">/WEB-INF/jsp/admin/configure.jsp</result>
<interceptor-ref name="unconfiguredArchivaStack"/> <interceptor-ref name="unconfiguredArchivaStack"/>

173
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp Normal file
View File

@ -0,0 +1,173 @@
<%--
~ 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.
--%>
<%@ taglib prefix="ww" uri="/webwork"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="pss" uri="/plexusSecuritySystem"%>
<%@ taglib prefix="archiva" uri="http://maven.apache.org/archiva"%>
<html>
<head>
<title>Administration - Database</title>
<ww:head />
</head>
<body>
<h1>Administration - Database</h1>
<div id="contentArea">
<ww:actionerror />
<ww:actionmessage />
<c:url var="iconDeleteUrl" value="/images/icons/delete.gif" />
<c:url var="iconCreateUrl" value="/images/icons/create.png" />
<div class="admin">
<h2>Database - Unprocessed Artifacts Scanning</h2>
<ww:form method="post" action="database!updateSchedule"
namespace="/admin" validate="false" theme="simple">
<table>
<ww:textfield name="cron" label="Cron" size="40" theme="xhtml" />
<tr>
<td colspan="2">
<ww:submit value="Update Cron" />
</td>
</tr>
</table>
</ww:form>
<h2>Database - Unprocessed Artifacts Scanning</h2>
<c:choose>
<c:when test="${empty(unprocessedConsumers)}">
<%-- No Consumers. Eeek! --%>
<strong>There are no consumers for unprocessed artifacts.</strong>
</c:when>
<c:otherwise>
<%-- Display the consumers. --%>
<ww:form method="post" action="database!updateUnprocessedConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
<th>&nbsp;</th>
<th>Enabled?</th>
<th>ID</th>
<th>Description</th>
</tr>
<c:forEach items="${unprocessedConsumers}" var="consumer" varStatus="i">
<c:choose>
<c:when test='${(i.index)%2 eq 0}'>
<c:set var="bgcolor" value="even" scope="page" />
</c:when>
<c:otherwise>
<c:set var="bgcolor" value="odd" scope="page" />
</c:otherwise>
</c:choose>
<tr>
<td class="${bgcolor}">
<ww:checkbox name="enabledUnprocessedConsumer[]" theme="simple" value="${consumer.enabled}" />
</td>
<td class="${bgcolor}">
<c:if test="${consumer.enabled}">
<strong>enabled</strong>
</c:if>
</td>
<td class="${bgcolor}">
<code>${consumer.id}</code>
</td>
<td class="${bgcolor}">${consumer.description}</td>
</tr>
</c:forEach>
<tr>
<td colspan="4">
<ww:submit value="Update Consumers" />
</td>
</tr>
</table>
</ww:form>
</c:otherwise>
</c:choose>
<h2>Database - Artifact Cleanup Scanning</h2>
<c:choose>
<c:when test="${empty(cleanupConsumers)}">
<%-- No Consumers. Eeek! --%>
<strong>There are no consumers for artifact cleanup.</strong>
</c:when>
<c:otherwise>
<%-- Display the consumers. --%>
<ww:form method="post" action="database!updateCleanupConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
<th>&nbsp;</th>
<th>Enabled?</th>
<th>ID</th>
<th>Description</th>
</tr>
<c:forEach items="${cleanupConsumers}" var="consumer" varStatus="i">
<c:choose>
<c:when test='${(i.index)%2 eq 0}'>
<c:set var="bgcolor" value="even" scope="page" />
</c:when>
<c:otherwise>
<c:set var="bgcolor" value="odd" scope="page" />
</c:otherwise>
</c:choose>
<tr>
<td class="${bgcolor}">
<ww:checkbox name="enabledCleanupConsumer[]" theme="simple" value="${consumer.enabled}" />
</td>
<td class="${bgcolor}">
<c:if test="${consumer.enabled}">
<strong>enabled</strong>
</c:if>
</td>
<td class="${bgcolor}">
<code>${consumer.id}</code>
</td>
<td class="${bgcolor}">${consumer.description}</td>
</tr>
</c:forEach>
<tr>
<td colspan="4">
<ww:submit value="Update Consumers" />
</td>
</tr>
</table>
</ww:form>
</c:otherwise>
</c:choose>
</div>
</body>
</html>

86
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
View File

@ -144,65 +144,113 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<h2>Repository Scanning - Consumers of Good Content</h2> <h2>Repository Scanning - Consumers of Known Content</h2>
<c:choose> <c:choose>
<c:when test="${empty(goodConsumers)}"> <c:when test="${empty(knownContentConsumers)}">
<%-- No Good Consumers. Eeek! --%> <%-- No Good Consumers. Eeek! --%>
<strong>There are no good consumers configured.</strong> <strong>There are no consumers of known content available.</strong>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<%-- Display the consumers. --%> <%-- Display the consumers. --%>
<table> <ww:form method="post" action="repositoryScanning!updateKnownConsumers"
<c:forEach items="${goodConsumers}" var="consumer" varStatus="i"> namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
<th>&nbsp;</th>
<th>Enabled?</th>
<th>ID</th>
<th>Description</th>
</tr>
<c:forEach items="${knownContentConsumers}" var="consumer" varStatus="i">
<c:choose> <c:choose>
<c:when test='${(i.index)%2 eq 0}'> <c:when test='${(i.index)%2 eq 0}'>
<c:set var="rowColor" value="dark" scope="page" /> <c:set var="bgcolor" value="even" scope="page" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="rowColor" value="lite" scope="page" /> <c:set var="bgcolor" value="odd" scope="page" />
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<tr> <tr>
<td><code>${consumer}</code></td> <td class="${bgcolor}">
<td><img src="<c:url value="/images/icons/delete.gif" />" /></td> <ww:checkbox name="enabledKnownConsumer[]" theme="simple" value="${consumer.enabled}" />
</td>
<td class="${bgcolor}">
<c:if test="${consumer.enabled}">
<strong>enabled</strong>
</c:if>
</td>
<td class="${bgcolor}">
<code>${consumer.id}</code>
</td>
<td class="${bgcolor}">${consumer.description}</td>
</tr> </tr>
</c:forEach> </c:forEach>
<tr>
<td colspan="4">
<ww:submit value="Update Consumers" />
</td>
</tr>
</table> </table>
</ww:form>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<h2>Repository Scanning - Consumers of Bad Content</h2> <h2>Repository Scanning - Consumers of Invalid Content</h2>
<c:choose> <c:choose>
<c:when test="${empty(badConsumers)}"> <c:when test="${empty(invalidContentConsumers)}">
<%-- No Bad Consumers. Eeek! --%> <%-- No Consumers. Eeek! --%>
<strong>There are no bad consumers configured.</strong> <strong>There are no consumers of invalid content available.</strong>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<%-- Display the consumers. --%> <%-- Display the consumers. --%>
<table> <ww:form method="post" action="repositoryScanning!updateInvalidConsumers"
<c:forEach items="${badConsumers}" var="consumer" varStatus="i"> namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
<th>&nbsp;</th>
<th>Enabled?</th>
<th>ID</th>
<th>Description</th>
</tr>
<c:forEach items="${invalidContentConsumers}" var="consumer" varStatus="i">
<c:choose> <c:choose>
<c:when test='${(i.index)%2 eq 0}'> <c:when test='${(i.index)%2 eq 0}'>
<c:set var="rowColor" value="dark" scope="page" /> <c:set var="bgcolor" value="even" scope="page" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="rowColor" value="lite" scope="page" /> <c:set var="bgcolor" value="odd" scope="page" />
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<tr> <tr>
<td><code>${consumer}</code></td> <td class="${bgcolor}">
<td><img src="<c:url value="/images/icons/delete.gif" />" /></td> <ww:checkbox name="enabledUnknownConsumer[]" theme="simple" value="${consumer.enabled}" />
</td>
<td class="${bgcolor}">
<c:if test="${consumer.enabled}">
<strong>enabled</strong>
</c:if>
</td>
<td class="${bgcolor}">
<code>${consumer.id}</code>
</td>
<td class="${bgcolor}">${consumer.description}</td>
</tr> </tr>
</c:forEach> </c:forEach>
<tr>
<td colspan="4">
<ww:submit value="Update Consumers" />
</td>
</tr>
</table> </table>
</ww:form>
</c:otherwise> </c:otherwise>
</c:choose></div> </c:choose></div>

2
archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
View File

@ -63,12 +63,10 @@ div.clear hr {
.xleft, #bannerLeft img { .xleft, #bannerLeft img {
float: left; float: left;
text-shadow: #7CFC00;
} }
.xright, #bannerRight img { .xright, #bannerRight img {
float: right; float: right;
text-shadow: #7CFC00;
} }
#banner { #banner {

23
archiva-web/archiva-webapp/src/main/webapp/css/site.css
View File

@ -43,7 +43,6 @@
float: right; float: right;
font-size: small; font-size: small;
font-weight: bold; font-weight: bold;
xmargin: 0px auto;
margin: 15px auto 0px auto; margin: 15px auto 0px auto;
height: auto; height: auto;
width: 150px; width: 150px;
@ -148,7 +147,9 @@
} }
.actionMessage { .actionMessage {
font-size: 1.0em;
font-weight: bold; font-weight: bold;
color: blue;
} }
.errorBullet { .errorBullet {
@ -318,11 +319,27 @@ div.filetype table td.controls {
width: 5%; width: 5%;
} }
div.filetype table td.odd { div.filetype table td.odd,
div.admin table.consumers td.odd {
background-color: #dddddd; background-color: #dddddd;
} }
div.filetype table td.event { div.filetype table td.even,
div.admin table.consumers td.even {
background-color: white; background-color: white;
} }
div.admin table.consumers {
margin-left: 15px;
border: 1px solid gray;
}
div.admin table.consumers th {
font-size: 1.0em;
background-color: #cccccc;
text-align: left;
}
div.admin table.consumers td strong {
font-size: 0.8em;
}

5
pom.xml
View File

@ -323,6 +323,11 @@
<artifactId>archiva-lucene-consumers</artifactId> <artifactId>archiva-lucene-consumers</artifactId>
<version>${archiva.version}</version> <version>${archiva.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-signature-consumers</artifactId>
<version>${archiva.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.archiva</groupId> <groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-model</artifactId> <artifactId>archiva-model</artifactId>