Author: olamy
Date: Tue Jun 11 13:18:25 2013
New Revision: 1491787
URL: http://svn.apache.org/r1491787
Log:
create cassandra entity manager only on start
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java Tue Jun 11 13:18:25 2013
@@ -20,6 +20,13 @@ package org.apache.archiva.metadata.repo
*/
import com.netflix.astyanax.Keyspace;
+import com.netflix.astyanax.entitystore.EntityManager;
+import org.apache.archiva.metadata.repository.cassandra.model.ArtifactMetadataModel;
+import org.apache.archiva.metadata.repository.cassandra.model.MetadataFacetModel;
+import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
+import org.apache.archiva.metadata.repository.cassandra.model.Project;
+import org.apache.archiva.metadata.repository.cassandra.model.ProjectVersionMetadataModel;
+import org.apache.archiva.metadata.repository.cassandra.model.Repository;
/**
* @author Olivier Lamy
@@ -28,4 +35,17 @@ public interface CassandraEntityManagerF
{
Keyspace getKeyspace();
+ EntityManager<Repository, String> getRepositoryEntityManager();
+
+ EntityManager<Namespace, String> getNamespaceEntityManager();
+
+ EntityManager<Project, String> getProjectEntityManager();
+
+ EntityManager<ArtifactMetadataModel, String> getArtifactMetadataModelEntityManager();
+
+ EntityManager<MetadataFacetModel, String> getMetadataFacetModelEntityManager();
+
+ EntityManager<ProjectVersionMetadataModel, String> getProjectVersionMetadataModelEntityManager();
+
+
}
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Tue Jun 11 13:18:25 2013
@@ -75,190 +75,46 @@ public class CassandraMetadataRepository
private final Map<String, MetadataFacetFactory> metadataFacetFactories;
- private Keyspace keyspace;
-
- private EntityManager<Repository, String> repositoryEntityManager;
-
- private EntityManager<Namespace, String> namespaceEntityManager;
-
- private EntityManager<Project, String> projectEntityManager;
-
- private EntityManager<ArtifactMetadataModel, String> artifactMetadataModelEntityManager;
-
- private EntityManager<MetadataFacetModel, String> metadataFacetModelEntityManager;
-
- private EntityManager<ProjectVersionMetadataModel, String> projectVersionMetadataModelEntityManager;
+ private CassandraEntityManagerFactory cassandraEntityManagerFactory;
public CassandraMetadataRepository( Map<String, MetadataFacetFactory> metadataFacetFactories,
- ArchivaConfiguration configuration, Keyspace keyspace )
+ ArchivaConfiguration configuration, CassandraEntityManagerFactory cassandraEntityManagerFactory )
{
this.metadataFacetFactories = metadataFacetFactories;
this.configuration = configuration;
-
- this.keyspace = keyspace;
-
- try
- {
- Properties properties = keyspace.getKeyspaceProperties();
- logger.info( "keyspace properties: {}", properties );
- }
- catch ( ConnectionException e )
- {
- // FIXME better logging !
- logger.warn( e.getMessage(), e );
- }
-
- try
- {
- repositoryEntityManager =
- new DefaultEntityManager.Builder<Repository, String>().withEntityType( Repository.class ).withKeyspace(
- keyspace ).build();
- boolean exists = columnFamilyExists( "repository" );
- // TODO very basic test we must test model change too
- if ( !exists )
- {
- repositoryEntityManager.createStorage( null );
- }
-
- namespaceEntityManager =
- new DefaultEntityManager.Builder<Namespace, String>().withEntityType( Namespace.class ).withKeyspace(
- keyspace ).build();
-
- exists = columnFamilyExists( "namespace" );
- if ( !exists )
- {
- namespaceEntityManager.createStorage( null );
- }
-
- projectEntityManager =
- new DefaultEntityManager.Builder<Project, String>().withEntityType( Project.class ).withKeyspace(
- keyspace ).build();
-
- exists = columnFamilyExists( "project" );
- if ( !exists )
- {
- projectEntityManager.createStorage( null );
- }
-
- artifactMetadataModelEntityManager =
- new DefaultEntityManager.Builder<ArtifactMetadataModel, String>().withEntityType(
- ArtifactMetadataModel.class ).withKeyspace( keyspace ).build();
-
- exists = columnFamilyExists( "artifactmetadatamodel" );
- if ( !exists )
- {
- artifactMetadataModelEntityManager.createStorage( null );
- }
-
- metadataFacetModelEntityManager =
- new DefaultEntityManager.Builder<MetadataFacetModel, String>().withEntityType(
- MetadataFacetModel.class ).withKeyspace( keyspace ).build();
-
- exists = columnFamilyExists( "metadatafacetmodel" );
- if ( !exists )
- {
- metadataFacetModelEntityManager.createStorage( null );
- }
-
- projectVersionMetadataModelEntityManager =
- new DefaultEntityManager.Builder<ProjectVersionMetadataModel, String>().withEntityType(
- ProjectVersionMetadataModel.class ).withKeyspace( keyspace ).build();
-
- exists = columnFamilyExists( "projectversionmetadatamodel" );
- if ( !exists )
- {
- projectVersionMetadataModelEntityManager.createStorage( null );
- }
-
- }
- catch ( PersistenceException e )
- {
- // FIXME report exception
- logger.error( e.getMessage(), e );
- }
- catch ( ConnectionException e )
- {
- // FIXME report exception
- logger.error( e.getMessage(), e );
- }
+ this.cassandraEntityManagerFactory = cassandraEntityManagerFactory;
}
- private boolean columnFamilyExists( String columnFamilyName )
- throws ConnectionException
- {
- try
- {
- Properties properties = keyspace.getColumnFamilyProperties( columnFamilyName );
- logger.debug( "getColumnFamilyProperties for {}: {}", columnFamilyName, properties );
- return true;
- }
- catch ( NotFoundException e )
- {
- return false;
- }
- }
+
public EntityManager<Repository, String> getRepositoryEntityManager()
{
- return repositoryEntityManager;
+ return this.cassandraEntityManagerFactory.getRepositoryEntityManager();
}
public EntityManager<Namespace, String> getNamespaceEntityManager()
{
- return namespaceEntityManager;
- }
-
- public void setRepositoryEntityManager( EntityManager<Repository, String> repositoryEntityManager )
- {
- this.repositoryEntityManager = repositoryEntityManager;
- }
-
- public void setNamespaceEntityManager( EntityManager<Namespace, String> namespaceEntityManager )
- {
- this.namespaceEntityManager = namespaceEntityManager;
+ return this.cassandraEntityManagerFactory.getNamespaceEntityManager();
}
public EntityManager<Project, String> getProjectEntityManager()
{
- return projectEntityManager;
- }
-
- public void setProjectEntityManager( EntityManager<Project, String> projectEntityManager )
- {
- this.projectEntityManager = projectEntityManager;
+ return this.cassandraEntityManagerFactory.getProjectEntityManager();
}
public EntityManager<ArtifactMetadataModel, String> getArtifactMetadataModelEntityManager()
{
- return artifactMetadataModelEntityManager;
- }
-
- public void setArtifactMetadataModelEntityManager(
- EntityManager<ArtifactMetadataModel, String> artifactMetadataModelEntityManager )
- {
- this.artifactMetadataModelEntityManager = artifactMetadataModelEntityManager;
+ return cassandraEntityManagerFactory.getArtifactMetadataModelEntityManager();
}
public EntityManager<MetadataFacetModel, String> getMetadataFacetModelEntityManager()
{
- return metadataFacetModelEntityManager;
- }
-
- public void setMetadataFacetModelEntityManager(
- EntityManager<MetadataFacetModel, String> metadataFacetModelEntityManager )
- {
- this.metadataFacetModelEntityManager = metadataFacetModelEntityManager;
+ return this.cassandraEntityManagerFactory.getMetadataFacetModelEntityManager();
}
public EntityManager<ProjectVersionMetadataModel, String> getProjectVersionMetadataModelEntityManager()
{
- return projectVersionMetadataModelEntityManager;
- }
-
- public void setProjectVersionMetadataModelEntityManager(
- EntityManager<ProjectVersionMetadataModel, String> projectVersionMetadataModelEntityManager )
- {
- this.projectVersionMetadataModelEntityManager = projectVersionMetadataModelEntityManager;
+ return this.cassandraEntityManagerFactory.getProjectVersionMetadataModelEntityManager();
}
@Override
@@ -274,24 +130,24 @@ public class CassandraMetadataRepository
{
try
{
- Repository repository = this.repositoryEntityManager.get( repositoryId );
+ Repository repository = this.getRepositoryEntityManager().get( repositoryId );
if ( repository == null )
{
repository = new Repository( repositoryId );
Namespace namespace = new Namespace( namespaceId, repository );
- this.repositoryEntityManager.put( repository );
+ this.getRepositoryEntityManager().put( repository );
- this.namespaceEntityManager.put( namespace );
+ this.getNamespaceEntityManager().put( namespace );
}
// FIXME add a Namespace id builder
- Namespace namespace = namespaceEntityManager.get(
+ Namespace namespace = getNamespaceEntityManager().get(
new Namespace.KeyBuilder().withNamespace( namespaceId ).withRepositoryId( repositoryId ).build() );
if ( namespace == null )
{
namespace = new Namespace( namespaceId, repository );
- namespaceEntityManager.put( namespace );
+ getNamespaceEntityManager().put( namespace );
}
return namespace;
}
@@ -309,11 +165,11 @@ public class CassandraMetadataRepository
{
try
{
- Namespace namespace = namespaceEntityManager.get(
+ Namespace namespace = getNamespaceEntityManager().get(
new Namespace.KeyBuilder().withNamespace( namespaceId ).withRepositoryId( repositoryId ).build() );
if ( namespace != null )
{
- namespaceEntityManager.remove( namespace );
+ getNamespaceEntityManager().remove( namespace );
}
}
catch ( PersistenceException e )
@@ -332,7 +188,7 @@ public class CassandraMetadataRepository
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
// remove data related to the repository
- this.artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ this.getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -348,11 +204,11 @@ public class CassandraMetadataRepository
}
} );
- artifactMetadataModelEntityManager.remove( artifactMetadataModels );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModels );
final List<Namespace> namespaces = new ArrayList<Namespace>();
- namespaceEntityManager.visitAll( new Function<Namespace, Boolean>()
+ getNamespaceEntityManager().visitAll( new Function<Namespace, Boolean>()
{
@Override
public Boolean apply( Namespace namespace )
@@ -368,10 +224,10 @@ public class CassandraMetadataRepository
}
} );
- namespaceEntityManager.remove( namespaces );
+ getNamespaceEntityManager().remove( namespaces );
final List<Project> projects = new ArrayList<Project>();
- projectEntityManager.visitAll( new Function<Project, Boolean>()
+ getProjectEntityManager().visitAll( new Function<Project, Boolean>()
{
@Override
public Boolean apply( Project project )
@@ -387,16 +243,16 @@ public class CassandraMetadataRepository
}
} );
- projectEntityManager.remove( projects );
+ getProjectEntityManager().remove( projects );
// TODO cleanup or not
//final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>( );
- //metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ //getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
final List<ProjectVersionMetadataModel> projectVersionMetadataModels =
new ArrayList<ProjectVersionMetadataModel>();
- projectVersionMetadataModelEntityManager.visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
+ getProjectVersionMetadataModelEntityManager().visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
{
@Override
public Boolean apply( ProjectVersionMetadataModel projectVersionMetadataModel )
@@ -413,12 +269,12 @@ public class CassandraMetadataRepository
}
} );
- projectVersionMetadataModelEntityManager.remove( projectVersionMetadataModels );
+ getProjectVersionMetadataModelEntityManager().remove( projectVersionMetadataModels );
- Repository repository = repositoryEntityManager.get( repositoryId );
+ Repository repository = getRepositoryEntityManager().get( repositoryId );
if ( repository != null )
{
- repositoryEntityManager.remove( repository );
+ getRepositoryEntityManager().remove( repository );
}
}
@@ -436,7 +292,7 @@ public class CassandraMetadataRepository
{
logger.debug( "getRepositories" );
- List<Repository> repositories = repositoryEntityManager.getAll();
+ List<Repository> repositories = getRepositoryEntityManager().getAll();
if ( repositories == null )
{
return Collections.emptyList();
@@ -465,7 +321,7 @@ public class CassandraMetadataRepository
{
final Set<String> namespaces = new HashSet<String>();
- namespaceEntityManager.visitAll( new Function<Namespace, Boolean>()
+ getNamespaceEntityManager().visitAll( new Function<Namespace, Boolean>()
{
// @Nullable add dependency ?
@Override
@@ -500,7 +356,7 @@ public class CassandraMetadataRepository
{
final Set<String> namespaces = new HashSet<String>();
- namespaceEntityManager.visitAll( new Function<Namespace, Boolean>()
+ getNamespaceEntityManager().visitAll( new Function<Namespace, Boolean>()
{
// @Nullable add dependency ?
@Override
@@ -550,7 +406,7 @@ public class CassandraMetadataRepository
//List<Repository> namespaces = typedQuery.setParameter( "id", repoId ).getResultList();
- Repository repository = repositoryEntityManager.get( repoId );
+ Repository repository = getRepositoryEntityManager().get( repoId );
if ( repository == null )
{
@@ -560,11 +416,11 @@ public class CassandraMetadataRepository
// FIXME find correct cql query
//String query = "select * from namespace where repository.id = '" + repoId + "';";
- //List<Namespace> namespaces = namespaceEntityManager.find( query );
+ //List<Namespace> namespaces = getNamespaceEntityManager().find( query );
final Set<Namespace> namespaces = new HashSet<Namespace>();
- namespaceEntityManager.visitAll( new Function<Namespace, Boolean>()
+ getNamespaceEntityManager().visitAll( new Function<Namespace, Boolean>()
{
// @Nullable add dependency ?
@Override
@@ -611,7 +467,7 @@ public class CassandraMetadataRepository
String projectKey = new Project.KeyBuilder().withProjectId( projectMetadata.getId() ).withNamespace(
new Namespace( projectMetadata.getNamespace(), new Repository( repositoryId ) ) ).build();
- Project project = projectEntityManager.get( projectKey );
+ Project project = getProjectEntityManager().get( projectKey );
if ( project != null )
{
return;
@@ -619,7 +475,7 @@ public class CassandraMetadataRepository
String namespaceKey = new Namespace.KeyBuilder().withRepositoryId( repositoryId ).withNamespace(
projectMetadata.getNamespace() ).build();
- Namespace namespace = namespaceEntityManager.get( namespaceKey );
+ Namespace namespace = getNamespaceEntityManager().get( namespaceKey );
if ( namespace == null )
{
namespace = updateOrAddNamespace( repositoryId, projectMetadata.getNamespace() );
@@ -629,7 +485,7 @@ public class CassandraMetadataRepository
try
{
- projectEntityManager.put( project );
+ getProjectEntityManager().put( project );
}
catch ( PersistenceException e )
{
@@ -646,7 +502,7 @@ public class CassandraMetadataRepository
// cleanup ArtifactMetadataModel
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -664,14 +520,14 @@ public class CassandraMetadataRepository
}
} );
- artifactMetadataModelEntityManager.remove( artifactMetadataModels );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModels );
Namespace namespace = new Namespace( namespaceId, new Repository( repositoryId ) );
final List<ProjectVersionMetadataModel> projectVersionMetadataModels =
new ArrayList<ProjectVersionMetadataModel>();
- projectVersionMetadataModelEntityManager.visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
+ getProjectVersionMetadataModelEntityManager().visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
{
@Override
public Boolean apply( ProjectVersionMetadataModel projectVersionMetadataModel )
@@ -692,12 +548,12 @@ public class CassandraMetadataRepository
if ( !projectVersionMetadataModels.isEmpty() )
{
- projectVersionMetadataModelEntityManager.remove( projectVersionMetadataModels );
+ getProjectVersionMetadataModelEntityManager().remove( projectVersionMetadataModels );
}
String key = new Project.KeyBuilder().withNamespace( namespace ).withProjectId( projectId ).build();
- Project project = projectEntityManager.get( key );
+ Project project = getProjectEntityManager().get( key );
if ( project == null )
{
logger.debug( "removeProject notfound" );
@@ -705,7 +561,7 @@ public class CassandraMetadataRepository
}
logger.debug( "removeProject {}", project );
- projectEntityManager.remove( project );
+ getProjectEntityManager().remove( project );
}
@Override
@@ -713,7 +569,7 @@ public class CassandraMetadataRepository
throws MetadataResolutionException
{
final Set<String> versions = new HashSet<String>();
- projectVersionMetadataModelEntityManager.visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
+ getProjectVersionMetadataModelEntityManager().visitAll( new Function<ProjectVersionMetadataModel, Boolean>()
{
@Override
public Boolean apply( ProjectVersionMetadataModel projectVersionMetadataModel )
@@ -732,7 +588,7 @@ public class CassandraMetadataRepository
}
} );
// FIXME use cql query
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -761,7 +617,7 @@ public class CassandraMetadataRepository
String namespaceKey =
new Namespace.KeyBuilder().withRepositoryId( repositoryId ).withNamespace( namespaceId ).build();
// create the namespace if not exists
- Namespace namespace = namespaceEntityManager.get( namespaceKey );
+ Namespace namespace = getNamespaceEntityManager().get( namespaceKey );
if ( namespace == null )
{
namespace = updateOrAddNamespace( repositoryId, namespaceId );
@@ -770,13 +626,13 @@ public class CassandraMetadataRepository
// create the project if not exist
String projectKey = new Project.KeyBuilder().withNamespace( namespace ).withProjectId( projectId ).build();
- Project project = projectEntityManager.get( projectKey );
+ Project project = getProjectEntityManager().get( projectKey );
if ( project == null )
{
project = new Project( projectKey, projectId, namespace );
try
{
- projectEntityManager.put( project );
+ getProjectEntityManager().put( project );
}
catch ( PersistenceException e )
{
@@ -787,7 +643,7 @@ public class CassandraMetadataRepository
String key = new ArtifactMetadataModel.KeyBuilder().withNamespace( namespace ).withProject( projectId ).withId(
artifactMeta.getId() ).withProjectVersion( projectVersion ).build();
- ArtifactMetadataModel artifactMetadataModel = artifactMetadataModelEntityManager.get( key );
+ ArtifactMetadataModel artifactMetadataModel = getArtifactMetadataModelEntityManager().get( key );
if ( artifactMetadataModel == null )
{
artifactMetadataModel = new ArtifactMetadataModel( key, artifactMeta.getId(), repositoryId, namespaceId,
@@ -810,7 +666,7 @@ public class CassandraMetadataRepository
try
{
- artifactMetadataModelEntityManager.put( artifactMetadataModel );
+ getArtifactMetadataModelEntityManager().put( artifactMetadataModel );
}
catch ( PersistenceException e )
{
@@ -820,7 +676,7 @@ public class CassandraMetadataRepository
key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repositoryId ).withNamespace(
namespace ).withProjectId( projectId ).withId( projectVersion ).build();
- ProjectVersionMetadataModel projectVersionMetadataModel = projectVersionMetadataModelEntityManager.get( key );
+ ProjectVersionMetadataModel projectVersionMetadataModel = getProjectVersionMetadataModelEntityManager().get( key );
if ( projectVersionMetadataModel == null )
{
@@ -830,7 +686,7 @@ public class CassandraMetadataRepository
projectVersionMetadataModel.setId( projectVersion );
projectVersionMetadataModel.setNamespace( namespace );
- projectVersionMetadataModelEntityManager.put( projectVersionMetadataModel );
+ getProjectVersionMetadataModelEntityManager().put( projectVersionMetadataModel );
}
@@ -846,7 +702,7 @@ public class CassandraMetadataRepository
{
final Set<String> versions = new HashSet<String>();
// FIXME use cql query
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -889,7 +745,7 @@ public class CassandraMetadataRepository
final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -906,7 +762,7 @@ public class CassandraMetadataRepository
}
} );
- metadataFacetModelEntityManager.remove( metadataFacetModels );
+ getMetadataFacetModelEntityManager().remove( metadataFacetModels );
Map<String, String> properties = metadataFacet.toProperties();
@@ -923,7 +779,7 @@ public class CassandraMetadataRepository
metadataFacetModelsToAdd.add( metadataFacetModel );
}
- metadataFacetModelEntityManager.put( metadataFacetModelsToAdd );
+ getMetadataFacetModelEntityManager().put( metadataFacetModelsToAdd );
}
}
@@ -935,7 +791,7 @@ public class CassandraMetadataRepository
{
String namespaceKey =
new Namespace.KeyBuilder().withRepositoryId( repositoryId ).withNamespace( namespaceId ).build();
- Namespace namespace = namespaceEntityManager.get( namespaceKey );
+ Namespace namespace = getNamespaceEntityManager().get( namespaceKey );
if ( namespace == null )
{
namespace = updateOrAddNamespace( repositoryId, namespaceId );
@@ -943,18 +799,18 @@ public class CassandraMetadataRepository
String key = new Project.KeyBuilder().withNamespace( namespace ).withProjectId( projectId ).build();
- Project project = projectEntityManager.get( key );
+ Project project = getProjectEntityManager().get( key );
if ( project == null )
{
project = new Project( key, projectId, namespace );
- projectEntityManager.put( project );
+ getProjectEntityManager().put( project );
}
// we don't test of repository and namespace really exist !
key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repositoryId ).withNamespace(
namespaceId ).withProjectId( projectId ).withId( versionMetadata.getId() ).build();
- ProjectVersionMetadataModel projectVersionMetadataModel = projectVersionMetadataModelEntityManager.get( key );
+ ProjectVersionMetadataModel projectVersionMetadataModel = getProjectVersionMetadataModelEntityManager().get( key );
if ( projectVersionMetadataModel == null )
{
@@ -976,7 +832,7 @@ public class CassandraMetadataRepository
try
{
- projectVersionMetadataModelEntityManager.put( projectVersionMetadataModel );
+ getProjectVersionMetadataModelEntityManager().put( projectVersionMetadataModel );
ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
artifactMetadataModel.setArtifactMetadataModelId(
@@ -1009,7 +865,7 @@ public class CassandraMetadataRepository
{
// FIXME use cql query !!
final List<String> facets = new ArrayList<String>();
- this.metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ this.getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1044,7 +900,7 @@ public class CassandraMetadataRepository
{
// FIXME use cql query !!
final List<MetadataFacetModel> facets = new ArrayList<MetadataFacetModel>();
- this.metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ this.getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1097,7 +953,7 @@ public class CassandraMetadataRepository
{
String key = new MetadataFacetModel.KeyBuilder().withRepositoryId( repositoryId ).withFacetId(
metadataFacet.getFacetId() ).withName( metadataFacet.getName() ).build();
- MetadataFacetModel metadataFacetModel = metadataFacetModelEntityManager.get( key );
+ MetadataFacetModel metadataFacetModel = getMetadataFacetModelEntityManager().get( key );
if ( metadataFacetModel == null )
{
metadataFacetModel = new MetadataFacetModel();
@@ -1112,7 +968,7 @@ public class CassandraMetadataRepository
try
{
- metadataFacetModelEntityManager.put( metadataFacetModel );
+ getMetadataFacetModelEntityManager().put( metadataFacetModel );
}
catch ( PersistenceException e )
{
@@ -1127,7 +983,7 @@ public class CassandraMetadataRepository
String key = new MetadataFacetModel.KeyBuilder().withRepositoryId( repositoryId ).withFacetId(
metadataFacet.getFacetId() ).withName( metadataFacet.getName() ).withKey( entry.getKey() ).build();
- MetadataFacetModel metadataFacetModel = metadataFacetModelEntityManager.get( key );
+ MetadataFacetModel metadataFacetModel = getMetadataFacetModelEntityManager().get( key );
if ( metadataFacetModel == null )
{
metadataFacetModel = new MetadataFacetModel();
@@ -1143,7 +999,7 @@ public class CassandraMetadataRepository
metadataFacetModel.setValue( entry.getValue() );
try
{
- metadataFacetModelEntityManager.put( metadataFacetModel );
+ getMetadataFacetModelEntityManager().put( metadataFacetModel );
}
catch ( PersistenceException e )
{
@@ -1162,7 +1018,7 @@ public class CassandraMetadataRepository
final List<MetadataFacetModel> toRemove = new ArrayList<MetadataFacetModel>();
// FIXME cql query
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1181,7 +1037,7 @@ public class CassandraMetadataRepository
} );
logger.debug( "removeMetadataFacets repositoryId: '{}', facetId: '{}', toRemove: {}", repositoryId, facetId,
toRemove );
- metadataFacetModelEntityManager.remove( toRemove );
+ getMetadataFacetModelEntityManager().remove( toRemove );
}
@Override
@@ -1192,7 +1048,7 @@ public class CassandraMetadataRepository
final List<MetadataFacetModel> toRemove = new ArrayList<MetadataFacetModel>();
// FIXME cql query
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1212,7 +1068,7 @@ public class CassandraMetadataRepository
} );
logger.debug( "removeMetadataFacets repositoryId: '{}', facetId: '{}', toRemove: {}", repositoryId, facetId,
toRemove );
- metadataFacetModelEntityManager.remove( toRemove );
+ getMetadataFacetModelEntityManager().remove( toRemove );
}
@Override
@@ -1224,7 +1080,7 @@ public class CassandraMetadataRepository
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
// FIXME cql query
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1269,7 +1125,7 @@ public class CassandraMetadataRepository
{
final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1329,11 +1185,11 @@ public class CassandraMetadataRepository
if ( logger.isDebugEnabled() )
{
- logger.debug( "all ArtifactMetadataModel: {}", artifactMetadataModelEntityManager.getAll() );
+ logger.debug( "all ArtifactMetadataModel: {}", getArtifactMetadataModelEntityManager().getAll() );
}
// FIXME cql query
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1384,7 +1240,7 @@ public class CassandraMetadataRepository
ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
artifactMetadataModel.setArtifactMetadataModelId( key );
- artifactMetadataModelEntityManager.remove( artifactMetadataModel );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModel );
key =
new ProjectVersionMetadataModel.KeyBuilder().withId( version ).withRepository( repositoryId ).withNamespace(
@@ -1393,7 +1249,7 @@ public class CassandraMetadataRepository
ProjectVersionMetadataModel projectVersionMetadataModel = new ProjectVersionMetadataModel();
projectVersionMetadataModel.setRowId( key );
- projectVersionMetadataModelEntityManager.remove( projectVersionMetadataModel );
+ getProjectVersionMetadataModelEntityManager().remove( projectVersionMetadataModel );
}
@Override
@@ -1411,7 +1267,7 @@ public class CassandraMetadataRepository
ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
artifactMetadataModel.setArtifactMetadataModelId( key );
- artifactMetadataModelEntityManager.remove( artifactMetadataModel );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModel );
}
@Override
@@ -1420,7 +1276,7 @@ public class CassandraMetadataRepository
throws MetadataRepositoryException
{
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1438,9 +1294,9 @@ public class CassandraMetadataRepository
return Boolean.TRUE;
}
} );
- artifactMetadataModelEntityManager.remove( artifactMetadataModels );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModels );
/*
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1466,7 +1322,7 @@ public class CassandraMetadataRepository
return Boolean.TRUE;
}
} );
- metadataFacetModelEntityManager.remove( metadataFacetModels );
+ getMetadataFacetModelEntityManager().remove( metadataFacetModels );
*/
}
@@ -1477,7 +1333,7 @@ public class CassandraMetadataRepository
{
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
// FIXME use cql query !
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1515,7 +1371,7 @@ public class CassandraMetadataRepository
final BooleanHolder booleanHolder = new BooleanHolder();
- projectEntityManager.visitAll( new Function<Project, Boolean>()
+ getProjectEntityManager().visitAll( new Function<Project, Boolean>()
{
@Override
public Boolean apply( Project project )
@@ -1556,7 +1412,7 @@ public class CassandraMetadataRepository
String key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repoId ).withNamespace(
namespace ).withProjectId( projectId ).withId( projectVersion ).build();
- ProjectVersionMetadataModel projectVersionMetadataModel = projectVersionMetadataModelEntityManager.get( key );
+ ProjectVersionMetadataModel projectVersionMetadataModel = getProjectVersionMetadataModelEntityManager().get( key );
if ( projectVersionMetadataModel == null )
{
@@ -1582,7 +1438,7 @@ public class CassandraMetadataRepository
// facets
final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
// FIXME use cql query
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
@@ -1649,7 +1505,7 @@ public class CassandraMetadataRepository
final Set<String> projects = new HashSet<String>();
// FIXME use cql query
- projectEntityManager.visitAll( new Function<Project, Boolean>()
+ getProjectEntityManager().visitAll( new Function<Project, Boolean>()
{
@Override
public Boolean apply( Project project )
@@ -1667,7 +1523,7 @@ public class CassandraMetadataRepository
} );
/*
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1698,7 +1554,7 @@ public class CassandraMetadataRepository
// FIXME use cql query
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1723,7 +1579,7 @@ public class CassandraMetadataRepository
return;
}
- artifactMetadataModelEntityManager.remove( artifactMetadataModels );
+ getArtifactMetadataModelEntityManager().remove( artifactMetadataModels );
String key = new ProjectVersionMetadataModel.KeyBuilder().withProjectId( projectId ).withId(
projectVersion ).withRepository( repoId ).withNamespace( namespace ).build();
@@ -1731,7 +1587,7 @@ public class CassandraMetadataRepository
ProjectVersionMetadataModel projectVersionMetadataModel = new ProjectVersionMetadataModel();
projectVersionMetadataModel.setRowId( key );
- projectVersionMetadataModelEntityManager.remove( projectVersionMetadataModel );
+ getProjectVersionMetadataModelEntityManager().remove( projectVersionMetadataModel );
}
@Override
@@ -1741,7 +1597,7 @@ public class CassandraMetadataRepository
{
final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
// FIXME use cql query !
- artifactMetadataModelEntityManager.visitAll( new Function<ArtifactMetadataModel, Boolean>()
+ getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
@@ -1772,7 +1628,7 @@ public class CassandraMetadataRepository
// retrieve facets
final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
- metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
{
@Override
public Boolean apply( MetadataFacetModel metadataFacetModel )
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java Tue Jun 11 13:18:25 2013
@@ -37,7 +37,7 @@ import java.util.Map;
/**
* @author Olivier Lamy
*/
-@Service( "repositorySessionFactory#cassandra" )
+@Service("repositorySessionFactory#cassandra")
public class CassandraRepositorySessionFactory
implements RepositorySessionFactory
{
@@ -45,7 +45,7 @@ public class CassandraRepositorySessionF
private Map<String, MetadataFacetFactory> metadataFacetFactories;
@Inject
- @Named( value = "archivaConfiguration#default" )
+ @Named(value = "archivaConfiguration#default")
private ArchivaConfiguration configuration;
@Inject
@@ -79,8 +79,7 @@ public class CassandraRepositorySessionF
public RepositorySession createSession()
{
CassandraMetadataRepository metadataRepository =
- new CassandraMetadataRepository( metadataFacetFactories, configuration,
- cassandraEntityManagerFactory.getKeyspace() );
+ new CassandraMetadataRepository( metadataFacetFactories, configuration, cassandraEntityManagerFactory );
return new RepositorySession( metadataRepository, metadataResolver );
}
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java Tue Jun 11 13:18:25 2013
@@ -24,17 +24,30 @@ import com.netflix.astyanax.AstyanaxCont
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
+import com.netflix.astyanax.connectionpool.exceptions.NotFoundException;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolType;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
import com.netflix.astyanax.ddl.KeyspaceDefinition;
+import com.netflix.astyanax.entitystore.DefaultEntityManager;
+import com.netflix.astyanax.entitystore.EntityManager;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;
+import org.apache.archiva.metadata.repository.cassandra.model.ArtifactMetadataModel;
+import org.apache.archiva.metadata.repository.cassandra.model.MetadataFacetModel;
+import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
+import org.apache.archiva.metadata.repository.cassandra.model.Project;
+import org.apache.archiva.metadata.repository.cassandra.model.ProjectVersionMetadataModel;
+import org.apache.archiva.metadata.repository.cassandra.model.Repository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import javax.persistence.PersistenceException;
+import java.util.Properties;
/**
* FIXME make all configuration not hardcoded :-)
@@ -46,6 +59,8 @@ public class DefaultCassandraEntityManag
implements CassandraEntityManagerFactory
{
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
@Inject
private ApplicationContext applicationContext;
@@ -53,9 +68,21 @@ public class DefaultCassandraEntityManag
private static final String KEYSPACE_NAME = "ArchivaKeySpace";
+ private AstyanaxContext<Keyspace> keyspaceContext;
+
private Keyspace keyspace;
- private AstyanaxContext<Keyspace> keyspaceContext;
+ private EntityManager<Repository, String> repositoryEntityManager;
+
+ private EntityManager<Namespace, String> namespaceEntityManager;
+
+ private EntityManager<Project, String> projectEntityManager;
+
+ private EntityManager<ArtifactMetadataModel, String> artifactMetadataModelEntityManager;
+
+ private EntityManager<MetadataFacetModel, String> metadataFacetModelEntityManager;
+
+ private EntityManager<ProjectVersionMetadataModel, String> projectVersionMetadataModelEntityManager;
@PostConstruct
@@ -104,6 +131,106 @@ public class DefaultCassandraEntityManag
}
+
+ try
+ {
+ Properties properties = keyspace.getKeyspaceProperties();
+ logger.info( "keyspace properties: {}", properties );
+ }
+ catch ( ConnectionException e )
+ {
+ // FIXME better logging !
+ logger.warn( e.getMessage(), e );
+ }
+
+ try
+ {
+ repositoryEntityManager =
+ new DefaultEntityManager.Builder<Repository, String>().withEntityType( Repository.class ).withKeyspace(
+ keyspace ).build();
+ boolean exists = columnFamilyExists( "repository" );
+ // TODO very basic test we must test model change too
+ if ( !exists )
+ {
+ repositoryEntityManager.createStorage( null );
+ }
+
+ namespaceEntityManager =
+ new DefaultEntityManager.Builder<Namespace, String>().withEntityType( Namespace.class ).withKeyspace(
+ keyspace ).build();
+
+ exists = columnFamilyExists( "namespace" );
+ if ( !exists )
+ {
+ namespaceEntityManager.createStorage( null );
+ }
+
+ projectEntityManager =
+ new DefaultEntityManager.Builder<Project, String>().withEntityType( Project.class ).withKeyspace(
+ keyspace ).build();
+
+ exists = columnFamilyExists( "project" );
+ if ( !exists )
+ {
+ projectEntityManager.createStorage( null );
+ }
+
+ artifactMetadataModelEntityManager =
+ new DefaultEntityManager.Builder<ArtifactMetadataModel, String>().withEntityType(
+ ArtifactMetadataModel.class ).withKeyspace( keyspace ).build();
+
+ exists = columnFamilyExists( "artifactmetadatamodel" );
+ if ( !exists )
+ {
+ artifactMetadataModelEntityManager.createStorage( null );
+ }
+
+ metadataFacetModelEntityManager =
+ new DefaultEntityManager.Builder<MetadataFacetModel, String>().withEntityType(
+ MetadataFacetModel.class ).withKeyspace( keyspace ).build();
+
+ exists = columnFamilyExists( "metadatafacetmodel" );
+ if ( !exists )
+ {
+ metadataFacetModelEntityManager.createStorage( null );
+ }
+
+ projectVersionMetadataModelEntityManager =
+ new DefaultEntityManager.Builder<ProjectVersionMetadataModel, String>().withEntityType(
+ ProjectVersionMetadataModel.class ).withKeyspace( keyspace ).build();
+
+ exists = columnFamilyExists( "projectversionmetadatamodel" );
+ if ( !exists )
+ {
+ projectVersionMetadataModelEntityManager.createStorage( null );
+ }
+
+ }
+ catch ( PersistenceException e )
+ {
+ // FIXME report exception
+ logger.error( e.getMessage(), e );
+ }
+ catch ( ConnectionException e )
+ {
+ // FIXME report exception
+ logger.error( e.getMessage(), e );
+ }
+ }
+
+ private boolean columnFamilyExists( String columnFamilyName )
+ throws ConnectionException
+ {
+ try
+ {
+ Properties properties = keyspace.getColumnFamilyProperties( columnFamilyName );
+ logger.debug( "getColumnFamilyProperties for {}: {}", columnFamilyName, properties );
+ return true;
+ }
+ catch ( NotFoundException e )
+ {
+ return false;
+ }
}
@@ -112,4 +239,67 @@ public class DefaultCassandraEntityManag
{
return keyspace;
}
+
+ public EntityManager<Repository, String> getRepositoryEntityManager()
+ {
+ return repositoryEntityManager;
+ }
+
+ public void setRepositoryEntityManager( EntityManager<Repository, String> repositoryEntityManager )
+ {
+ this.repositoryEntityManager = repositoryEntityManager;
+ }
+
+ public EntityManager<Namespace, String> getNamespaceEntityManager()
+ {
+ return namespaceEntityManager;
+ }
+
+ public void setNamespaceEntityManager( EntityManager<Namespace, String> namespaceEntityManager )
+ {
+ this.namespaceEntityManager = namespaceEntityManager;
+ }
+
+ public EntityManager<Project, String> getProjectEntityManager()
+ {
+ return projectEntityManager;
+ }
+
+ public void setProjectEntityManager( EntityManager<Project, String> projectEntityManager )
+ {
+ this.projectEntityManager = projectEntityManager;
+ }
+
+ public EntityManager<ArtifactMetadataModel, String> getArtifactMetadataModelEntityManager()
+ {
+ return artifactMetadataModelEntityManager;
+ }
+
+ public void setArtifactMetadataModelEntityManager(
+ EntityManager<ArtifactMetadataModel, String> artifactMetadataModelEntityManager )
+ {
+ this.artifactMetadataModelEntityManager = artifactMetadataModelEntityManager;
+ }
+
+ public EntityManager<MetadataFacetModel, String> getMetadataFacetModelEntityManager()
+ {
+ return metadataFacetModelEntityManager;
+ }
+
+ public void setMetadataFacetModelEntityManager(
+ EntityManager<MetadataFacetModel, String> metadataFacetModelEntityManager )
+ {
+ this.metadataFacetModelEntityManager = metadataFacetModelEntityManager;
+ }
+
+ public EntityManager<ProjectVersionMetadataModel, String> getProjectVersionMetadataModelEntityManager()
+ {
+ return projectVersionMetadataModelEntityManager;
+ }
+
+ public void setProjectVersionMetadataModelEntityManager(
+ EntityManager<ProjectVersionMetadataModel, String> projectVersionMetadataModelEntityManager )
+ {
+ this.projectVersionMetadataModelEntityManager = projectVersionMetadataModelEntityManager;
+ }
}
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java Tue Jun 11 13:18:25 2013
@@ -67,7 +67,7 @@ public class CassandraMetadataRepository
Map<String, MetadataFacetFactory> factories = createTestMetadataFacetFactories();
- this.cmr = new CassandraMetadataRepository( factories, null, cassandraEntityManagerFactory.getKeyspace() );
+ this.cmr = new CassandraMetadataRepository( factories, null, cassandraEntityManagerFactory );
this.repository = this.cmr;
clearReposAndNamespace();
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1491787&r1=1491786&r2=1491787&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java Tue Jun 11 13:18:25 2013
@@ -58,7 +58,7 @@ public class RepositoriesNamespaceTest
throws Exception
{
- cmr = new CassandraMetadataRepository( null, null, cassandraEntityManagerFactory.getKeyspace() );
+ cmr = new CassandraMetadataRepository( null, null, cassandraEntityManagerFactory );
clearReposAndNamespace();
}
Author: olamy
Date: Tue Jun 11 12:58:32 2013
New Revision: 1491777
URL: http://svn.apache.org/r1491777
Log:
comment metadata repo cassandra to ease testing
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1491777&r1=1491776&r2=1491777&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Jun 11 12:58:32 2013
@@ -118,10 +118,17 @@
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-jcr</artifactId>
</dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-cassandra</artifactId>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
@@ -1018,6 +1025,8 @@
not needed as we use asyncLogger in configuration
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>
-->
+ <cassandraHost>localhost</cassandraHost>
+ <cassandraPort>9160</cassandraPort>
</systemProperties>
<additionalClasspathDirs>
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1491777&r1=1491776&r2=1491777&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Tue Jun 11 12:58:32 2013
@@ -37,6 +37,9 @@
<alias name="repositoryStatisticsManager#default" alias="repositoryStatisticsManager"/>
<!-- TODO olamy need to find a more dynamic way if using jcr impl -->
<alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
+ <!--
+ <alias name="repositorySessionFactory#cassandra" alias="repositorySessionFactory"/>
+ -->
<alias name="environmentCheck#archiva-locked-admin-check" alias="environmentCheck#locked-admin-check"/>
<alias name="userManager#archiva" alias="userManager#default"/>
Author: olamy
Date: Tue Jun 11 12:58:12 2013
New Revision: 1491776
URL: http://svn.apache.org/r1491776
Log:
remove unused import
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491776&r1=1491775&r2=1491776&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
(original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Tue Jun 11 12:58:12 2013
@@ -23,7 +23,6 @@ import com.google.common.collect.Immutab
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
-import com.netflix.astyanax.connectionpool.exceptions.BadRequestException;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolType;
Author: olamy
Date: Tue Jun 11 12:57:47 2013
New Revision: 1491774
URL: http://svn.apache.org/r1491774
Log:
use dynamic ports for all cassandra ports
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491774&r1=1491773&r2=1491774&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 12:57:47
2013
@@ -229,6 +229,7 @@
com.netflix.astyanax.connectionpool.impl,
com.netflix.astyanax.entitystore,
com.netflix.astyanax.impl,
+ com.netflix.astyanax.ddl,
com.netflix.astyanax.thrift,
net.sf.beanlib.provider.replicator,
org.apache.archiva.metadata.model;version=${project.version},
@@ -255,6 +256,8 @@
<configuration>
<portNames>
<portName>cassandraPort</portName>
+ <portName>cassandra.storagePort</portName>
+ <portName>cassandra.stopPort</portName>
</portNames>
</configuration>
</execution>
@@ -275,6 +278,8 @@
</goals>
<configuration>
<rpcPort>${cassandraPort}</rpcPort>
+ <storagePort>${cassandra.storagePort}</storagePort>
+ <stopPort>${cassandra.stopPort}</stopPort>
<addMainClasspath>false</addMainClasspath>
<addTestClasspath>false</addTestClasspath>
</configuration>
Author: olamy
Date: Tue Jun 11 12:57:32 2013
New Revision: 1491773
URL: http://svn.apache.org/r1491773
Log:
exclude servlet-api
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491773&r1=1491772&r2=1491773&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 12:57:32
2013
@@ -133,6 +133,10 @@
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Author: olamy
Date: Tue Jun 11 12:57:17 2013
New Revision: 1491772
URL: http://svn.apache.org/r1491772
Log:
add metadata-store-cassandra in deptMngt in top pom
Modified:
archiva/trunk/pom.xml
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1491772&r1=1491771&r2=1491772&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jun 11 12:57:17 2013
@@ -211,6 +211,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>repository-statistics</artifactId>
<version>${project.version}</version>
</dependency>
Author: olamy
Date: Tue Jun 11 12:57:01 2013
New Revision: 1491771
URL: http://svn.apache.org/r1491771
Log:
do not create keyspace if exists
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491771&r1=1491770&r2=1491771&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
(original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Tue Jun 11 12:57:01 2013
@@ -23,10 +23,12 @@ import com.google.common.collect.Immutab
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
+import com.netflix.astyanax.connectionpool.exceptions.BadRequestException;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolType;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
+import com.netflix.astyanax.ddl.KeyspaceDefinition;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;
import org.springframework.context.ApplicationContext;
@@ -40,7 +42,7 @@ import javax.inject.Inject;
*
* @author Olivier Lamy
*/
-@Service("archivaEntityManagerFactory#cassandra")
+@Service( "archivaEntityManagerFactory#cassandra" )
public class DefaultCassandraEntityManagerFactory
implements CassandraEntityManagerFactory
{
@@ -82,7 +84,26 @@ public class DefaultCassandraEntityManag
"1" ).build() ).put(
"strategy_class", "SimpleStrategy" ).build();
- keyspace.createKeyspace( options );
+ // test if the namespace already exists if exception or null create it
+ boolean keyspaceExists = false;
+ try
+ {
+ KeyspaceDefinition keyspaceDefinition = keyspace.describeKeyspace();
+ if ( keyspaceDefinition != null )
+ {
+ keyspaceExists = true;
+ }
+
+ }
+ catch ( ConnectionException e )
+ {
+ }
+
+ if ( !keyspaceExists )
+ {
+ keyspace.createKeyspace( options );
+ }
+
}
Author: olamy
Date: Tue Jun 11 11:38:30 2013
New Revision: 1491750
URL: http://svn.apache.org/r1491750
Log:
remove commented code
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1491750&r1=1491749&r2=1491750&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Tue Jun 11 11:38:30 2013
@@ -250,12 +250,10 @@ public abstract class AbstractMetadataRe
Assertions.assertThat( mailingLists ).isNotNull().isNotEmpty().hasSize( 1 );
- //assertEquals( 1, metadata.getMailingLists().size() );
mailingList = metadata.getMailingLists().get( 0 );
assertEquals( "Foo List", mailingList.getName() );
List<String> others = mailingList.getOtherArchives();
- //assertEquals( Collections.<String>emptyList(), mailingList.getOtherArchives()
);
Assertions.assertThat( others ).isNotNull().isEmpty();
}
@@ -451,7 +449,7 @@ public abstract class AbstractMetadataRe
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
- //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+
Assertions.assertThat( metadata.getFacetIds() ).isNotNull().isNotEmpty().hasSize(
1 ).contains( TEST_FACET_ID );
TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID
);
@@ -467,7 +465,7 @@ public abstract class AbstractMetadataRe
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
- //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+
Assertions.assertThat( metadata.getFacetIds() ).isNotNull().isNotEmpty().hasSize(
1 ).contains( TEST_FACET_ID );
testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
@@ -520,10 +518,10 @@ public abstract class AbstractMetadataRe
Collection<ArtifactMetadata> artifacts =
repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION
);
- //assertEquals( 1, artifacts.size() );
+
Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
metadata = artifacts.iterator().next();
- //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+
Collection<String> ids = metadata.getFacetIds();
Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID
);
@@ -540,15 +538,15 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION,
metadata );
artifacts = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
- //assertEquals( 1, artifacts.size() );
+
Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
metadata = artifacts.iterator().next();
- //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+
ids = metadata.getFacetIds();
Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID
);
testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- //assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+
Map<String, String> props = testFacet.toProperties();
Assertions.assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
}
@@ -842,7 +840,6 @@ public abstract class AbstractMetadataRe
Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1 ).containsExactly(
TEST_PROJECT_VERSION );
- //assertEquals( Collections.singleton( TEST_PROJECT_VERSION ), versions );
}
@Test
@@ -945,8 +942,6 @@ public abstract class AbstractMetadataRe
List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID,
null, upper );
- //assertTrue( .isEmpty() );
-
Assertions.assertThat( artifacts ).isNotNull().isEmpty();
}
@@ -1030,18 +1025,14 @@ public abstract class AbstractMetadataRe
Collection<String> namespaces = repository.getRootNamespaces( TEST_REPO_ID
);
- //assertEquals( Arrays.asList( "org" ), repository.getRootNamespaces( TEST_REPO_ID
) );
Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
"org" );
- //assertEquals( Arrays.asList( "apache" ), repository.getNamespaces( TEST_REPO_ID,
"org" ) );
namespaces = repository.getNamespaces( TEST_REPO_ID, "org" );
Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
"apache" );
- //assertEquals( Arrays.asList( "maven" ), repository.getNamespaces( TEST_REPO_ID,
"org.apache" ) );
namespaces = repository.getNamespaces( TEST_REPO_ID, "org.apache" );
Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
"maven" );
- //assertEquals( Arrays.asList( "shared" ), repository.getNamespaces( TEST_REPO_ID,
"org.apache.maven" ) );
namespaces = repository.getNamespaces( TEST_REPO_ID, "org.apache.maven" );
Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
"shared" );
}
@@ -1061,7 +1052,6 @@ public abstract class AbstractMetadataRe
Assertions.assertThat( namespaces ).isNotNull().isEmpty();
- //assertEquals( Collections.<String>emptyList(), );
}
@Test
@@ -1344,9 +1334,6 @@ public abstract class AbstractMetadataRe
log.info( "artifactMetadatas: {}", artifactMetadatas );
- //assertEquals( Collections.singletonList( artifact ), new ArrayList<ArtifactMetadata>(
- // repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT"
) ) );
-
repository.removeArtifact( artifactOne, "2.0-SNAPSHOT" );
artifactMetadatas = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
"2.0-SNAPSHOT" );
Author: olamy
Date: Tue Jun 11 11:29:12 2013
New Revision: 1491747
URL: http://svn.apache.org/r1491747
Log:
fix cassandra plugin version
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491747&r1=1491746&r2=1491747&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 11:29:12
2013
@@ -261,7 +261,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cassandra-maven-plugin</artifactId>
- <version>1.2.1-2-SNAPSHOT</version>
+ <version>1.2.5-1-SNAPSHOT</version>
<executions>
<execution>
<id>start-cassandra</id>
Author: olamy
Date: Tue Jun 11 11:16:31 2013
New Revision: 1491740
URL: http://svn.apache.org/r1491740
Log:
use slf4j-simple to have cassandra server logging
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491740&r1=1491739&r2=1491740&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 11:16:31
2013
@@ -156,10 +156,7 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -274,6 +271,8 @@
</goals>
<configuration>
<rpcPort>${cassandraPort}</rpcPort>
+ <addMainClasspath>false</addMainClasspath>
+ <addTestClasspath>false</addTestClasspath>
</configuration>
</execution>
<execution>
@@ -284,6 +283,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
<pluginManagement>
Author: olamy
Date: Tue Jun 11 10:43:47 2013
New Revision: 1491730
URL: http://svn.apache.org/r1491730
Log:
add codehaus mojo snapshot repository
Modified:
archiva/trunk/pom.xml
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1491730&r1=1491729&r2=1491730&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jun 11 10:43:47 2013
@@ -1879,6 +1879,17 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>mojo.snapshots</id>
+ <name>Codehaus Mojo Snapshots</name>
+ <url>https://nexus.codehaus.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</project>
Author: olamy
Date: Tue Jun 11 10:43:32 2013
New Revision: 1491729
URL: http://svn.apache.org/r1491729
Log:
not anymore needed repository
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491729&r1=1491728&r2=1491729&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 10:43:32
2013
@@ -301,17 +301,4 @@
</pluginManagement>
</build>
- <repositories>
- <repository>
- <id>archiva.snapshots</id>
- <url>https://archiva-repository.apache.org/archiva/repository/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
Author: olamy
Date: Tue Jun 11 10:39:11 2013
New Revision: 1491728
URL: http://svn.apache.org/r1491728
Log:
cassandra-maven-plugin version 1.2.1-2-SNAPSHOT to fix MCASSANDRA-26
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491728&r1=1491727&r2=1491728&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue Jun 11 10:39:11
2013
@@ -264,7 +264,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cassandra-maven-plugin</artifactId>
- <version>1.2.1-1</version>
+ <version>1.2.1-2-SNAPSHOT</version>
<executions>
<execution>
<id>start-cassandra</id>
@@ -284,13 +284,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${cassandraVersion}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<pluginManagement>
Author: olamy
Date: Tue Jun 11 02:24:07 2013
New Revision: 1491675
URL: http://svn.apache.org/r1491675
Log:
use surefire 2.15
Modified:
archiva/parent/pom.xml
Modified: archiva/parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1491675&r1=1491674&r2=1491675&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Tue Jun 11 02:24:07 2013
@@ -64,7 +64,7 @@
<releaseDeployId>archiva-repository.releases</releaseDeployId>
<gpg.useagent>true</gpg.useagent>
- <surefireVersion>2.14.1</surefireVersion>
+ <surefireVersion>2.15</surefireVersion>
<!-- svnsubpub configuration -->
Author: skygo
Date: Mon Jun 10 19:31:01 2013
New Revision: 1491572
URL: http://svn.apache.org/r1491572
Log:
fill Import package section to make clean install pass. (Not sure if done correct)
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1491572&r1=1491571&r2=1491572&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Mon Jun 10 19:31:01
2013
@@ -217,7 +217,26 @@
org.apache.archiva.metadata.repository.cassandra;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
-
+ javax.annotation,
+ javax.inject,
+ javax.persistence,
+ com.google.common.base,
+ com.google.common.collect,
+ com.netflix.astyanax,
+ com.netflix.astyanax.connectionpool,
+ com.netflix.astyanax.connectionpool.exceptions,
+ com.netflix.astyanax.connectionpool.impl,
+ com.netflix.astyanax.entitystore,
+ com.netflix.astyanax.impl,
+ com.netflix.astyanax.thrift,
+ net.sf.beanlib.provider.replicator,
+ org.apache.archiva.metadata.model;version=${project.version},
+ org.apache.archiva.metadata.repository;version=${project.version},
+ org.apache.archiva.configuration,
+ org.apache.commons.lang;version="[2.4,3)",
+ org.slf4j;resolution:=optional,
+ org.springframework.context,
+ org.springframework.stereotype
</Import-Package>
</instructions>
</configuration>
Author: olamy
Date: Mon Jun 10 11:17:17 2013
New Revision: 1491416
URL: http://svn.apache.org/r1491416
Log:
enable metadata-store-cassandra module
Modified:
archiva/trunk/archiva-modules/plugins/pom.xml
Modified: archiva/trunk/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/pom.xml?rev=1491416&r1=1491415&r2=1491416&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/pom.xml Mon Jun 10 11:17:17 2013
@@ -39,5 +39,6 @@
<module>stage-repository-merge</module>
<module>generic-metadata-support</module>
<module>metadata-store-jcr</module>
+ <module>metadata-store-cassandra</module>
</modules>
</project>
Author: olamy
Date: Mon Jun 10 10:59:20 2013
New Revision: 1491410
URL: http://svn.apache.org/r1491410
Log:
all tests pass so move out metadata-store-cassandra from sandbox
Added:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/
- copied from r1491408, archiva/sandbox/trunk/metadata-store-cassandra/
Removed:
archiva/sandbox/trunk/metadata-store-cassandra/
Author: olamy
Date: Mon Jun 10 10:44:25 2013
New Revision: 1491405
URL: http://svn.apache.org/r1491405
Log:
cassandra host from system property
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491405&r1=1491404&r2=1491405&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Mon Jun 10 10:44:25 2013
@@ -37,6 +37,7 @@ import javax.inject.Inject;
/**
* FIXME make all configuration not hardcoded :-)
+ *
* @author Olivier Lamy
*/
@Service("archivaEntityManagerFactory#cassandra")
@@ -60,6 +61,7 @@ public class DefaultCassandraEntityManag
public void initialize()
throws ConnectionException
{
+ String cassandraHost = System.getProperty( "cassandraHost", "localhost" );
String cassandraPort = System.getProperty( "cassandraPort" );
keyspaceContext = new AstyanaxContext.Builder().forCluster( CLUSTER_NAME ).forKeyspace(
KEYSPACE_NAME ).withAstyanaxConfiguration(
@@ -67,8 +69,8 @@ public class DefaultCassandraEntityManag
ConnectionPoolType.TOKEN_AWARE ) ).withConnectionPoolConfiguration(
new ConnectionPoolConfigurationImpl( CLUSTER_NAME + "_" + KEYSPACE_NAME ).setSocketTimeout(
30000 ).setMaxTimeoutWhenExhausted( 2000 ).setMaxConnsPerHost( 20 ).setInitConnsPerHost(
10 ).setSeeds(
- "localhost:"+ cassandraPort ) ).withConnectionPoolMonitor( new CountingConnectionPoolMonitor()
).buildKeyspace(
- ThriftFamilyFactory.getInstance() );
+ cassandraHost + ":" + cassandraPort ) ).withConnectionPoolMonitor(
+ new CountingConnectionPoolMonitor() ).buildKeyspace( ThriftFamilyFactory.getInstance()
);
keyspaceContext.start();
Author: olamy
Date: Mon Jun 10 10:44:06 2013
New Revision: 1491404
URL: http://svn.apache.org/r1491404
Log:
use dynamic port for cassandra testing
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/pom.xml?rev=1491404&r1=1491403&r2=1491404&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/pom.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/pom.xml Mon Jun 10 10:44:06 2013
@@ -222,6 +222,24 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-ports</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <configuration>
+ <portNames>
+ <portName>cassandraPort</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- TODO use dynamic port -->
<plugin>
@@ -235,6 +253,9 @@
<goals>
<goal>start</goal>
</goals>
+ <configuration>
+ <rpcPort>${cassandraPort}</rpcPort>
+ </configuration>
</execution>
<execution>
<id>stop-cassandra</id>
@@ -253,6 +274,19 @@
</dependencies>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <cassandraPort>${cassandraPort}</cassandraPort>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<repositories>
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491404&r1=1491403&r2=1491404&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Mon Jun 10 10:44:06 2013
@@ -60,14 +60,14 @@ public class DefaultCassandraEntityManag
public void initialize()
throws ConnectionException
{
-
+ String cassandraPort = System.getProperty( "cassandraPort" );
keyspaceContext = new AstyanaxContext.Builder().forCluster( CLUSTER_NAME ).forKeyspace(
KEYSPACE_NAME ).withAstyanaxConfiguration(
new AstyanaxConfigurationImpl().setDiscoveryType( NodeDiscoveryType.RING_DESCRIBE
).setConnectionPoolType(
ConnectionPoolType.TOKEN_AWARE ) ).withConnectionPoolConfiguration(
new ConnectionPoolConfigurationImpl( CLUSTER_NAME + "_" + KEYSPACE_NAME ).setSocketTimeout(
30000 ).setMaxTimeoutWhenExhausted( 2000 ).setMaxConnsPerHost( 20 ).setInitConnsPerHost(
10 ).setSeeds(
- "localhost:9160" ) ).withConnectionPoolMonitor( new CountingConnectionPoolMonitor()
).buildKeyspace(
+ "localhost:"+ cassandraPort ) ).withConnectionPoolMonitor( new CountingConnectionPoolMonitor()
).buildKeyspace(
ThriftFamilyFactory.getInstance() );
keyspaceContext.start();
Author: olamy
Date: Mon Jun 10 10:43:45 2013
New Revision: 1491403
URL: http://svn.apache.org/r1491403
Log:
remove non needed file
Removed:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/persistence.xml
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml?rev=1491403&r1=1491402&r2=1491403&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
Mon Jun 10 10:43:45 2013
@@ -30,6 +30,4 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository.cassandra"/>
-
-
</beans>
\ No newline at end of file
Author: olamy
Date: Mon Jun 10 10:43:31 2013
New Revision: 1491402
URL: http://svn.apache.org/r1491402
Log:
move cassandra version to a property
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
Modified: archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/pom.xml?rev=1491402&r1=1491401&r2=1491402&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/pom.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/pom.xml Mon Jun 10 10:43:31 2013
@@ -30,6 +30,10 @@
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Cassandra JPA Storage for Metadata</name>
+ <properties>
+ <cassandraVersion>1.2.5</cassandraVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -135,7 +139,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>1.2.5</version>
+ <version>${cassandraVersion}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -240,6 +244,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
+ <version>${cassandraVersion}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Author: olamy
Date: Mon Jun 10 10:43:19 2013
New Revision: 1491401
URL: http://svn.apache.org/r1491401
Log:
fix pom
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
Modified: archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/pom.xml?rev=1491401&r1=1491400&r2=1491401&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/pom.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/pom.xml Mon Jun 10 10:43:19 2013
@@ -77,33 +77,6 @@
</exclusions>
</dependency>
- <!--
- <dependency>
- <groupId>com.impetus.client</groupId>
- <artifactId>kundera-cassandra</artifactId>
- <version>2.6-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -219,11 +192,7 @@
<artifactId>jackson-mapper-asl</artifactId>
<scope>test</scope>
</dependency>
- <!--dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>maven2-repository</artifactId>
- <scope>test</scope>
- </dependency-->
+
</dependencies>
<build>
<testResources>
@@ -241,7 +210,7 @@
<Bundle-SymbolicName>org.apache.archiva.metadata.repository.cassandra</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>
- org.apache.archiva.metadata.repository.jpa;version=${project.version};-split-package:=merge-first
+ org.apache.archiva.metadata.repository.cassandra;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
Author: olamy
Date: Mon Jun 10 07:58:58 2013
New Revision: 1491363
URL: http://svn.apache.org/r1491363
Log:
fix unit test
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1491363&r1=1491362&r2=1491363&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Mon Jun 10 07:58:58 2013
@@ -70,7 +70,7 @@ public class CassandraMetadataRepository
this.cmr = new CassandraMetadataRepository( factories, null, cassandraEntityManagerFactory.getKeyspace()
);
this.repository = this.cmr;
- //clearReposAndNamespace();
+ clearReposAndNamespace();
}
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1491363&r1=1491362&r2=1491363&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Mon Jun 10 07:58:58 2013
@@ -91,7 +91,7 @@ public class RepositoriesNamespaceTest
Assertions.assertThat( cmr.getRepositories() ).isNotEmpty().hasSize( 1 );
Assertions.assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize(
1 );
- n = cmr.getNamespaceEntityManager().get( "org" + "-" + "release" );
+ n = cmr.getNamespaceEntityManager().get( "release" + "-" + "org" );
Assertions.assertThat( n ).isNotNull();
Assertions.assertThat( n.getRepository() ).isNotNull();
Author: olamy
Date: Mon Jun 10 07:44:08 2013
New Revision: 1491360
URL: http://svn.apache.org/r1491360
Log:
fix typo which fix test :-)
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java?rev=1491360&r1=1491359&r2=1491360&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
Mon Jun 10 07:44:08 2013
@@ -73,7 +73,7 @@ public class ProjectVersionMetadataModel
@Column(name = "scm")
private Scm scm;
- @Column(name = "issueManagement")
+ @Column(name = "ciManagement")
private CiManagement ciManagement;
// FIXME store those values in a separate table
@@ -240,6 +240,7 @@ public class ProjectVersionMetadataModel
this.dependencies = dependencies;
}
+
@Override
public String toString()
{
Author: olamy
Date: Mon Jun 10 07:43:39 2013
New Revision: 1491359
URL: http://svn.apache.org/r1491359
Log:
fix collection for ProjectVersionMetadataModel
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491359&r1=1491358&r2=1491359&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Mon Jun 10 07:43:39 2013
@@ -829,8 +829,9 @@ public class CassandraMetadataRepository
projectVersionMetadataModel.setProjectId( projectId );
projectVersionMetadataModel.setId( projectVersion );
projectVersionMetadataModel.setNamespace( namespace );
+
projectVersionMetadataModelEntityManager.put( projectVersionMetadataModel );
- // FIXME collections ???
+
}
// now facets
@@ -967,7 +968,11 @@ public class CassandraMetadataRepository
projectVersionMetadataModel.setIssueManagement( versionMetadata.getIssueManagement()
);
projectVersionMetadataModel.setOrganization( versionMetadata.getOrganization() );
projectVersionMetadataModel.setScm( versionMetadata.getScm() );
- // FIXME collections !!
+
+ projectVersionMetadataModel.setMailingLists( versionMetadata.getMailingLists() );
+ projectVersionMetadataModel.setDependencies( versionMetadata.getDependencies() );
+ projectVersionMetadataModel.setLicenses( versionMetadata.getLicenses() );
+
try
{
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java?rev=1491359&r1=1491358&r2=1491359&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
Mon Jun 10 07:43:39 2013
@@ -20,13 +20,18 @@ package org.apache.archiva.metadata.repo
*/
import org.apache.archiva.metadata.model.CiManagement;
+import org.apache.archiva.metadata.model.Dependency;
import org.apache.archiva.metadata.model.IssueManagement;
+import org.apache.archiva.metadata.model.License;
+import org.apache.archiva.metadata.model.MailingList;
import org.apache.archiva.metadata.model.Organization;
import org.apache.archiva.metadata.model.Scm;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Olivier Lamy
@@ -72,11 +77,14 @@ public class ProjectVersionMetadataModel
private CiManagement ciManagement;
// FIXME store those values in a separate table
- //private List<License> licenses = new ArrayList<License>();
+ @Column(name = "licenses")
+ private List<License> licenses = new ArrayList<License>();
- //private List<MailingList> mailingLists = new ArrayList<MailingList>();
+ @Column(name = "mailingLists")
+ private List<MailingList> mailingLists = new ArrayList<MailingList>();
- //private List<Dependency> dependencies = new ArrayList<Dependency>();
+ @Column(name = "dependencies")
+ private List<Dependency> dependencies = new ArrayList<Dependency>();
@Column(name = "incomplete")
private boolean incomplete;
@@ -202,6 +210,36 @@ public class ProjectVersionMetadataModel
this.namespace = namespace;
}
+ public List<License> getLicenses()
+ {
+ return licenses;
+ }
+
+ public void setLicenses( List<License> licenses )
+ {
+ this.licenses = licenses;
+ }
+
+ public List<MailingList> getMailingLists()
+ {
+ return mailingLists;
+ }
+
+ public void setMailingLists( List<MailingList> mailingLists )
+ {
+ this.mailingLists = mailingLists;
+ }
+
+ public List<Dependency> getDependencies()
+ {
+ return dependencies;
+ }
+
+ public void setDependencies( List<Dependency> dependencies )
+ {
+ this.dependencies = dependencies;
+ }
+
@Override
public String toString()
{
Author: olamy
Date: Mon Jun 10 07:40:14 2013
New Revision: 1491357
URL: http://svn.apache.org/r1491357
Log:
those beans are not entity so remove annotation
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java?rev=1491357&r1=1491356&r2=1491357&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
Mon Jun 10 07:40:14 2013
@@ -29,7 +29,6 @@ import java.io.Serializable;
* @todo considering moving this to a facet - avoid referring to it externally
*/
@XmlRootElement(name = "ciManagement")
-@Entity
public class CiManagement
implements Serializable
{
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java?rev=1491357&r1=1491356&r2=1491357&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
Mon Jun 10 07:40:14 2013
@@ -29,7 +29,6 @@ import java.io.Serializable;
* @todo considering moving this to a facet - avoid referring to it externally
*/
@XmlRootElement(name = "issueManagement")
-@Entity
public class IssueManagement
implements Serializable
{
@@ -62,4 +61,5 @@ public class IssueManagement
{
this.system = system;
}
+
}
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java?rev=1491357&r1=1491356&r2=1491357&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
Mon Jun 10 07:40:14 2013
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRoot
import java.io.Serializable;
@XmlRootElement(name = "organization")
-@Entity
public class Organization
implements Serializable
{
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java?rev=1491357&r1=1491356&r2=1491357&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
Mon Jun 10 07:40:14 2013
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRoot
import java.io.Serializable;
@XmlRootElement(name = "scm")
-@Entity
public class Scm
implements Serializable
{
Author: olamy
Date: Sun Jun 9 13:07:24 2013
New Revision: 1491212
URL: http://svn.apache.org/r1491212
Log:
use fest assert to prevent issue with different collection impl
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1491212&r1=1491211&r2=1491212&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Sun Jun 9 13:07:24 2013
@@ -271,8 +271,8 @@ public abstract class AbstractMetadataRe
MailingList mailingList = new MailingList();
mailingList.setName( "Foo List" );
- mailingList.setOtherArchives( Collections.singletonList( "other archive" ) );
- metadata.setMailingLists( Collections.singletonList( mailingList ) );
+ mailingList.setOtherArchives( Arrays.asList( "other archive" ) );
+ metadata.setMailingLists( Arrays.asList( mailingList ) );
Scm scm = new Scm();
scm.setConnection( "connection" );
@@ -322,7 +322,8 @@ public abstract class AbstractMetadataRe
assertEquals( 1, metadata.getMailingLists().size() );
mailingList = metadata.getMailingLists().get( 0 );
assertEquals( "Foo List", mailingList.getName() );
- assertEquals( Collections.singletonList( "other archive" ), mailingList.getOtherArchives()
);
+ //assertEquals( Collections.singletonList( "other archive" ), mailingList.getOtherArchives()
);
+ Assertions.assertThat( mailingList.getOtherArchives() ).isNotNull().isNotEmpty().hasSize(
1 ).contains( "other archive" );
assertEquals( "connection", metadata.getScm().getConnection() );
assertEquals( "dev conn", metadata.getScm().getDeveloperConnection() );
Author: olamy
Date: Sun Jun 9 12:44:28 2013
New Revision: 1491204
URL: http://svn.apache.org/r1491204
Log:
use fest assert to prevent issue with different collection impl
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1491204&r1=1491203&r2=1491204&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Sun Jun 9 12:44:28 2013
@@ -240,15 +240,23 @@ public abstract class AbstractMetadataRe
MailingList mailingList = new MailingList();
mailingList.setName( "Foo List" );
mailingList.setOtherArchives( Collections.<String>emptyList() );
- metadata.setMailingLists( Collections.singletonList( mailingList ) );
+ metadata.setMailingLists( Arrays.asList( mailingList ) );
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
- assertEquals( 1, metadata.getMailingLists().size() );
+
+ List<MailingList> mailingLists = metadata.getMailingLists();
+
+ Assertions.assertThat( mailingLists ).isNotNull().isNotEmpty().hasSize( 1 );
+
+ //assertEquals( 1, metadata.getMailingLists().size() );
mailingList = metadata.getMailingLists().get( 0 );
assertEquals( "Foo List", mailingList.getName() );
- assertEquals( Collections.<String>emptyList(), mailingList.getOtherArchives()
);
+
+ List<String> others = mailingList.getOtherArchives();
+ //assertEquals( Collections.<String>emptyList(), mailingList.getOtherArchives()
);
+ Assertions.assertThat( others ).isNotNull().isEmpty();
}
@Test
@@ -540,7 +548,7 @@ public abstract class AbstractMetadataRe
testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
//assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
- Map<String,String> props = testFacet.toProperties();
+ Map<String, String> props = testFacet.toProperties();
Assertions.assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
}
Author: olamy
Date: Sun Jun 9 12:26:33 2013
New Revision: 1491199
URL: http://svn.apache.org/r1491199
Log:
fix retrieve facets when searching artifact
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491199&r1=1491198&r2=1491199&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Sun Jun 9 12:26:33 2013
@@ -20,6 +20,8 @@ package org.apache.archiva.metadata.repo
*/
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import com.netflix.astyanax.connectionpool.exceptions.NotFoundException;
@@ -54,6 +56,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -1762,6 +1765,87 @@ public class CassandraMetadataRepository
artifactMetadatas.add( artifactMetadata );
}
+ // retrieve facets
+ final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
+ metadataFacetModelEntityManager.visitAll( new Function<MetadataFacetModel, Boolean>()
+ {
+ @Override
+ public Boolean apply( MetadataFacetModel metadataFacetModel )
+ {
+ if ( metadataFacetModel != null )
+ {
+ if ( StringUtils.equals( repoId, metadataFacetModel.getArtifactMetadataModel().getRepositoryId()
)
+ && StringUtils.equals( namespace, metadataFacetModel.getArtifactMetadataModel().getNamespace()
)
+ && StringUtils.equals( projectId, metadataFacetModel.getArtifactMetadataModel().getProject()
)
+ && StringUtils.equals( projectVersion,
+ metadataFacetModel.getArtifactMetadataModel().getProjectVersion()
) )
+ {
+ metadataFacetModels.add( metadataFacetModel );
+ }
+
+ }
+ return Boolean.TRUE;
+ }
+ } );
+
+ // rebuild MetadataFacet for artifacts
+
+ for ( final ArtifactMetadata artifactMetadata : artifactMetadatas )
+ {
+ Iterable<MetadataFacetModel> metadataFacetModelIterable =
+ Iterables.filter( metadataFacetModels, new Predicate<MetadataFacetModel>()
+ {
+ @Override
+ public boolean apply( MetadataFacetModel metadataFacetModel )
+ {
+ if ( metadataFacetModel != null )
+ {
+ return StringUtils.equals( artifactMetadata.getVersion(),
+ metadataFacetModel.getArtifactMetadataModel().getVersion()
);
+ }
+ return false;
+ }
+ } );
+ Iterator<MetadataFacetModel> iterator = metadataFacetModelIterable.iterator();
+ Map<String, List<MetadataFacetModel>> metadataFacetValuesPerFacetId
=
+ new HashMap<String, List<MetadataFacetModel>>();
+ while ( iterator.hasNext() )
+ {
+ MetadataFacetModel metadataFacetModel = iterator.next();
+ List<MetadataFacetModel> values = metadataFacetValuesPerFacetId.get(
metadataFacetModel.getName() );
+ if ( values == null )
+ {
+ values = new ArrayList<MetadataFacetModel>();
+ metadataFacetValuesPerFacetId.put( metadataFacetModel.getFacetId(), values
);
+ }
+ values.add( metadataFacetModel );
+
+ }
+
+ for ( Map.Entry<String, List<MetadataFacetModel>> entry : metadataFacetValuesPerFacetId.entrySet()
)
+ {
+ MetadataFacetFactory metadataFacetFactory = metadataFacetFactories.get( entry.getKey()
);
+ if ( metadataFacetFactory != null )
+ {
+ List<MetadataFacetModel> facetModels = entry.getValue();
+ if ( !facetModels.isEmpty() )
+ {
+ MetadataFacet metadataFacet =
+ metadataFacetFactory.createMetadataFacet( repoId, facetModels.get(
0 ).getName() );
+ Map<String, String> props = new HashMap<String, String>(
facetModels.size() );
+ for ( MetadataFacetModel metadataFacetModel : facetModels )
+ {
+ props.put( metadataFacetModel.getKey(), metadataFacetModel.getValue()
);
+ }
+ metadataFacet.fromProperties( props );
+ artifactMetadata.addFacet( metadataFacet );
+ }
+ }
+ }
+
+
+ }
+
return artifactMetadatas;
}
Author: olamy
Date: Sun Jun 9 12:25:45 2013
New Revision: 1491198
URL: http://svn.apache.org/r1491198
Log:
fix storage of metadatafacet
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491198&r1=1491197&r2=1491198&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Sun Jun 9 12:25:45 2013
@@ -1130,7 +1130,7 @@ public class CassandraMetadataRepository
metadataFacetModel.setId( key );
metadataFacetModel.setKey( entry.getKey() );
metadataFacetModel.setFacetId( metadataFacet.getFacetId() );
- metadataFacetModel.setName( metadataFacetModel.getName() );
+ metadataFacetModel.setName( metadataFacet.getName() );
}
metadataFacetModel.setValue( entry.getValue() );
try
Author: olamy
Date: Sun Jun 9 12:24:49 2013
New Revision: 1491197
URL: http://svn.apache.org/r1491197
Log:
fix storage of metadatafacet
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491197&r1=1491196&r2=1491197&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Sun Jun 9 12:24:49 2013
@@ -1100,7 +1100,7 @@ public class CassandraMetadataRepository
metadataFacetModel.setArtifactMetadataModel( artifactMetadataModel );
metadataFacetModel.setId( key );
metadataFacetModel.setFacetId( metadataFacet.getFacetId() );
- metadataFacetModel.setName( metadataFacetModel.getName() );
+ metadataFacetModel.setName( metadataFacet.getName() );
try
{
Author: olamy
Date: Sun Jun 9 12:23:56 2013
New Revision: 1491196
URL: http://svn.apache.org/r1491196
Log:
fix storing MetadataFacet at repository level with empty values
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1491196&r1=1491195&r2=1491196&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Sun Jun 9 12:23:56 2013
@@ -1080,30 +1080,28 @@ public class CassandraMetadataRepository
throws MetadataRepositoryException
{
- if ( metadataFacet == null || metadataFacet.toProperties() == null || metadataFacet.toProperties().isEmpty()
)
+ if ( metadataFacet == null )
{
return;
}
- for ( Map.Entry<String, String> entry : metadataFacet.toProperties().entrySet()
)
- {
+ if ( metadataFacet.toProperties().isEmpty() )
+ {
String key = new MetadataFacetModel.KeyBuilder().withRepositoryId( repositoryId
).withFacetId(
- metadataFacet.getFacetId() ).withName( metadataFacet.getName() ).withKey(
entry.getKey() ).build();
-
+ metadataFacet.getFacetId() ).withName( metadataFacet.getName() ).build();
MetadataFacetModel metadataFacetModel = metadataFacetModelEntityManager.get(
key );
if ( metadataFacetModel == null )
{
metadataFacetModel = new MetadataFacetModel();
- // we need to store the repositoryId
- ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
- artifactMetadataModel.setRepositoryId( repositoryId );
- metadataFacetModel.setArtifactMetadataModel( artifactMetadataModel );
- metadataFacetModel.setId( key );
- metadataFacetModel.setKey( entry.getKey() );
- metadataFacetModel.setFacetId( metadataFacet.getFacetId() );
- metadataFacetModel.setName( metadataFacetModel.getName() );
}
- metadataFacetModel.setValue( entry.getValue() );
+ // we need to store the repositoryId
+ ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
+ artifactMetadataModel.setRepositoryId( repositoryId );
+ metadataFacetModel.setArtifactMetadataModel( artifactMetadataModel );
+ metadataFacetModel.setId( key );
+ metadataFacetModel.setFacetId( metadataFacet.getFacetId() );
+ metadataFacetModel.setName( metadataFacetModel.getName() );
+
try
{
metadataFacetModelEntityManager.put( metadataFacetModel );
@@ -1112,7 +1110,39 @@ public class CassandraMetadataRepository
{
throw new MetadataRepositoryException( e.getMessage(), e );
}
+ }
+ else
+ {
+ for ( Map.Entry<String, String> entry : metadataFacet.toProperties().entrySet()
)
+ {
+
+ String key = new MetadataFacetModel.KeyBuilder().withRepositoryId( repositoryId
).withFacetId(
+ metadataFacet.getFacetId() ).withName( metadataFacet.getName() ).withKey(
entry.getKey() ).build();
+ MetadataFacetModel metadataFacetModel = metadataFacetModelEntityManager.get(
key );
+ if ( metadataFacetModel == null )
+ {
+ metadataFacetModel = new MetadataFacetModel();
+ // we need to store the repositoryId
+ ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
+ artifactMetadataModel.setRepositoryId( repositoryId );
+ metadataFacetModel.setArtifactMetadataModel( artifactMetadataModel );
+ metadataFacetModel.setId( key );
+ metadataFacetModel.setKey( entry.getKey() );
+ metadataFacetModel.setFacetId( metadataFacet.getFacetId() );
+ metadataFacetModel.setName( metadataFacetModel.getName() );
+ }
+ metadataFacetModel.setValue( entry.getValue() );
+ try
+ {
+ metadataFacetModelEntityManager.put( metadataFacetModel );
+ }
+ catch ( PersistenceException e )
+ {
+ throw new MetadataRepositoryException( e.getMessage(), e );
+ }
+
+ }
}
}
Author: olamy
Date: Sun Jun 9 12:22:30 2013
New Revision: 1491195
URL: http://svn.apache.org/r1491195
Log:
use fest assert
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1491195&r1=1491194&r2=1491195&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Sun Jun 9 12:22:30 2013
@@ -511,9 +511,12 @@ public abstract class AbstractMetadataRe
Collection<ArtifactMetadata> artifacts =
repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION
);
- assertEquals( 1, artifacts.size() );
+ //assertEquals( 1, artifacts.size() );
+ Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
metadata = artifacts.iterator().next();
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+ //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+ Collection<String> ids = metadata.getFacetIds();
+ Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID
);
TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID
);
Map<String, String> facetProperties = testFacet.toProperties();
@@ -528,11 +531,17 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION,
metadata );
artifacts = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
- assertEquals( 1, artifacts.size() );
+ //assertEquals( 1, artifacts.size() );
+ Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
metadata = artifacts.iterator().next();
- assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+ //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+ ids = metadata.getFacetIds();
+ Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID
);
+
testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
- assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+ //assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+ Map<String,String> props = testFacet.toProperties();
+ Assertions.assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
}
@Test
Author: olamy
Date: Sun Jun 9 12:21:34 2013
New Revision: 1491194
URL: http://svn.apache.org/r1491194
Log:
to ease debugging
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1491194&r1=1491193&r2=1491194&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Sun Jun 9 12:21:34 2013
@@ -611,8 +611,9 @@ public abstract class AbstractMetadataRe
{
repository.addMetadataFacet( TEST_REPO_ID, new TestMetadataFacet( null ) );
- assertEquals( new TestMetadataFacet( TEST_METADATA_VALUE ),
- repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME
) );
+ MetadataFacet metadataFacet = repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID,
TEST_NAME );
+
+ assertEquals( new TestMetadataFacet( TEST_METADATA_VALUE ), metadataFacet );
}
@Test
@@ -1009,7 +1010,7 @@ public abstract class AbstractMetadataRe
{
repository.updateNamespace( TEST_REPO_ID, "org.apache.maven.shared" );
- Collection<String> namespaces = repository.getRootNamespaces( TEST_REPO_ID
);
+ Collection<String> namespaces = repository.getRootNamespaces( TEST_REPO_ID
);
//assertEquals( Arrays.asList( "org" ), repository.getRootNamespaces( TEST_REPO_ID
) );
Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
"org" );
Author: olamy
Date: Sun Jun 9 06:22:21 2013
New Revision: 1491144
URL: http://svn.apache.org/r1491144
Log:
last log4j2 beta7
Modified:
archiva/trunk/pom.xml
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1491144&r1=1491143&r2=1491144&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sun Jun 9 06:22:21 2013
@@ -74,7 +74,7 @@
<redback.spring-utils.version>2.0</redback.spring-utils.version>
<redback.taskqueue.version>2.0</redback.taskqueue.version>
<slf4j.version>1.7.5</slf4j.version>
- <log4j.version>2.0-beta6</log4j.version>
+ <log4j.version>2.0-beta7</log4j.version>
<spring.version>3.2.3.RELEASE</spring.version>
Author: skygo
Date: Sat Jun 8 21:19:08 2013
New Revision: 1491062
URL: http://svn.apache.org/r1491062
Log:
more work on test // need to feed fake artifact for testing MRM1766 and others
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
- copied, changed from r1490987, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
(from r1490987, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java&r1=1490987&r2=1491062&rev=1491062&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
Sat Jun 8 21:19:08 2013
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUt
import org.fluentlenium.adapter.FluentTest;
import org.fluentlenium.core.domain.FluentList;
import org.fluentlenium.core.domain.FluentWebElement;
+import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
@@ -43,8 +44,8 @@ import org.junit.Before;
/**
* @author Olivier Lamy
*/
-public class WebDriverTest
- extends FluentTest
+public class WebDriverBrowseTest
+ extends FluentTest
{
@Override
@@ -63,36 +64,66 @@ public class WebDriverTest
}
return super.takeScreenShot( fileName );
}
-
+
@Before
public void init()
{
setSnapshotMode( Mode.TAKE_SNAPSHOT_ON_FAIL );
setSnapshotPath( new File( "target", "errorshtmlsnap" ).getAbsolutePath() );
}
-
+
@Test
public void simpletest()
- throws Exception
+ throws Exception
{
-
+ Properties p = new Properties();
+ p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" )
);
+
Properties tomcatPortProperties = new Properties();
tomcatPortProperties.load(
- new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath"
) ) ) );
+ new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath"
) ) ) );
int tomcatPort = Integer.parseInt( tomcatPortProperties.getProperty( "tomcat.maven.http.port"
) );
goTo( "http://localhost:" + tomcatPort + "/archiva/index.html?request_lang=en" );
-
+
// wait until topbar-menu-container is feeded
- await().atMost(5, TimeUnit.SECONDS).until("#topbar-menu").isPresent();
-
+ await().atMost( 5, TimeUnit.SECONDS ).until( "#topbar-menu" ).isPresent();
+
FluentList<FluentWebElement> elements = find( "#create-admin-link-a" );
if ( !elements.isEmpty() && elements.get( 0 ).isDisplayed() )
{
WebElement webElement = elements.get( 0 ).getElement();
Assert.assertEquals( "Create Admin User", webElement.getText() );
+
+ webElement.click();
+ await().atMost( 2, TimeUnit.SECONDS ).until( "#user-create" ).isPresent();
+ assertThat( find( "#username" ).getValue().equals( "admin" ) );
+ assertThat( find( "#password" ).getValue().isEmpty() );
+ assertThat( find( "#confirmPassword" ).getValue().isEmpty() );
+ assertThat( find( "#email" ).getValue().isEmpty() );
+
+ fill( "#fullname" ).with( p.getProperty( "ADMIN_FULLNAME" ) );
+ fill( "#email" ).with( p.getProperty( "ADMIN_EMAIL" ) );
+ fill( "#password" ).with( p.getProperty( "ADMIN_PASSWORD" ) );
+ fill( "#confirmPassword" ).with( p.getProperty( "ADMIN_PASSWORD" ) );
+ find( "#user-create-form-register-button" ).click();
+
+ await().atMost( 2, TimeUnit.SECONDS ).until( "#logout-link" ).isPresent();
+
+ FluentList<FluentWebElement> elementss = find( "#menu-find-browse-a" );
+ WebElement webElsement = elementss.get( 0 ).getElement();
+ webElsement.click();
+ await().atMost( 2, TimeUnit.SECONDS ).until( "#main_browse_result" ).isPresent();
+ // give me search page :( not browse page
+
+ takeScreenShot( "search" );
+
+ goTo( "http://localhost:" + tomcatPort + "/archiva/index.html#browse?request_lang=en"
);
+ takeScreenShot( "browse" );
+ // give me a browse page
+
}
else
{
@@ -122,7 +153,7 @@ public class WebDriverTest
{
return new InternetExplorerDriver();
}
-
+
return new FirefoxDriver();
}
Author: skygo
Date: Sat Jun 8 14:19:36 2013
New Revision: 1490988
URL: http://svn.apache.org/r1490988
Log:
Update doap file version
1.3.6 info and path
1.4M4 info and path
Modified:
archiva/trunk/doap_Archiva.rdf
Modified: archiva/trunk/doap_Archiva.rdf
URL: http://svn.apache.org/viewvc/archiva/trunk/doap_Archiva.rdf?rev=1490988&r1=1490987&r2=1490988&view=diff
==============================================================================
--- archiva/trunk/doap_Archiva.rdf (original)
+++ archiva/trunk/doap_Archiva.rdf Sat Jun 8 14:19:36 2013
@@ -37,20 +37,20 @@ security access management, build artifa
<category rdf:resource="http://projects.apache.org/category/build-management" />
<release>
<Version>
- <name>Apache Archiva 1.3.5</name>
- <created>2011-05-17</created>
- <revision>1.3.5</revision>
- <file-release>http://www.us.apache.org/dist/archiva/1.3.5/binaries/apache-archiva-1.3.5-bin.zip</file-release>
- <file-release>http://www.us.apache.org/dist/archiva/1.3.5/war/apache-archiva-1.3.5.war</file-release>
+ <name>Apache Archiva 1.3.6</name>
+ <created>2013-01-07</created>
+ <revision>1.3.6</revision>
+ <file-release>http://www.us.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip</file-release>
+ <file-release>http://www.us.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war</file-release>
</Version>
</release>
<release>
<Version>
- <name>Apache Archiva 1.4-M3</name>
- <created>2012-10-07</created>
- <revision>1.4-M3</revision>
- <file-release>http://www.us.apache.org/dist/archiva/1.4-M3/binaries/apache-archiva-1.4-M3-js-bin.zip</file-release>
- <file-release>http://www.us.apache.org/dist/archiva/1.4-M3/binaries/apache-archiva-1.4-M3.war</file-release>
+ <name>Apache Archiva 1.4-M4</name>
+ <created>2013-05-27</created>
+ <revision>1.4-M4</revision>
+ <file-release>http://www.us.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip</file-release>
+ <file-release>http://www.us.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war</file-release>
</Version>
</release>
<repository>
Modified: archiva/site-content/index.html
URL: http://svn.apache.org/viewvc/archiva/site-content/index.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/index.html (original)
+++ archiva/site-content/index.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Brett Porter" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva -
The Build Artifact Repository Manager</title>
@@ -207,7 +207,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -233,97 +233,151 @@
~ specific language governing permissions and limitations
~ under the License. -->
- <div class="newsBox">
- <div class="hero-unit">
+
+<div class="newsBox">
+
+<div class="hero-unit">
<span class="bignumber badge badge-warning">NEW</span>
- <p><b>1st Jun 2013 release of 1.4-M4 with user management new features see screenshots below
+
+<p><b>1st Jun 2013 release of 1.4-M4 with user management new features see screenshots below
and <a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/adminguide/redback-runtime-configuration.html">documentation</a></b></p>
</div>
</div>
- <div id="carousel-main">
+
+<div id="carousel-main">
- <div id="screenshots-carousel" class="carousel slide span10">
+
+<div id="screenshots-carousel" class="carousel slide span10">
<!-- Carousel items -->
- <div class="carousel-inner">
- <div class="item active">
+
+<div class="carousel-inner">
+
+<div class="item active">
<img src="http://archiva.apache.org/docs/1.4-M4/images/ldap-configuration.png" alt="" height="120px" />
- <div class="carousel-caption">
- <p>Dynamic LDAP Configuration.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/adminguide/redback-runtime-configuration.html">View all.</a></p>
+
+<div class="carousel-caption">
+
+<p>Dynamic LDAP Configuration.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/adminguide/redback-runtime-configuration.html">View all.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/ldap-group-roles-mapping.png" alt="" />
- <div class="carousel-caption">
- <p>Dynamic LDAP Group-Roles mapping Configuration.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/adminguide/redback-runtime-configuration.html">View all.</a></p>
+
+<div class="carousel-caption">
+
+<p>Dynamic LDAP Group-Roles mapping Configuration.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/adminguide/redback-runtime-configuration.html">View all.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/project-info.png" alt="" />
- <div class="carousel-caption">
- <p>Informative display for artifacts stored in the repository.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Informative display for artifacts stored in the repository.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/search-form.png" alt="" />
- <div class="carousel-caption">
- <p>User-friendly browsing interface, and powerful search functionalities.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>User-friendly browsing interface, and powerful search functionalities.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/search-results.png" alt="" />
- <div class="carousel-caption">
- <p>Filterable search results.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Filterable search results.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/browse.png" alt="" />
- <div class="carousel-caption">
- <p>Browse interface.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Browse interface.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/remote-proxy-cache.png" alt="" />
- <div class="carousel-caption">
- <p>Drag & drop remote proxies ordering.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Drag & drop remote proxies ordering.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/upload-files.png" alt="" />
- <div class="carousel-caption">
- <p>Drag & drop upload artifacts via UI.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Drag & drop upload artifacts via UI.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/tour/graphical-admin.png" alt="" />
- <div class="carousel-caption">
- <p>Comprehensive web-based administration interface.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Comprehensive web-based administration interface.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
- <div class="item">
+
+<div class="item">
<img src="http://archiva.apache.org/docs/1.4-M4/images/proxy-connectors-rules.png" alt="" />
- <div class="carousel-caption">
- <p>Bulk update of your black/while list when fetching remote repositories.</p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
- <p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
+
+<div class="carousel-caption">
+
+<p>Bulk update of your black/while list when fetching remote repositories.</p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/tour/index.html">View all.</a></p>
+
+<p><a class="externalLink" href="http://archiva.apache.org/docs/1.4-M4/index.html">View new documentation.</a></p>
</div>
</div>
@@ -334,8 +388,11 @@
<a name="carousel-next" class="right carousel-control" id="carousel-next">›</a>
</div>
</div>
- <div class="section"><h2>Apache Archiva™: The Build Artifact Repository Manager<a name="Apache_Archiva:_The_Build_Artifact_Repository_Manager"></a></h2>
- <p>
+
+<div class="section">
+<h2>Apache Archiva™: The Build Artifact Repository Manager<a name="Apache_Archiva:_The_Build_Artifact_Repository_Manager"></a></h2>
+
+<p>
Apache Archiva™ is an extensible repository management software that
helps taking care of your own personal or enterprise-wide build
artifact repository. It is the perfect companion for build tools such
@@ -344,25 +401,31 @@
and <a class="externalLink" href="http://ant.apache.org/">ANT</a>.
</p>
- <p>
+
+<p>
Archiva offers several capabilities, amongst which remote repository proxying,
security access management, build artifact storage, delivery, browsing, indexing
and usage reporting, extensible scanning functionality… and many more! Get the
latest updates, follow us on twitter <a class="externalLink" href="http://twitter.com/archiva">@archiva</a>.
</p>
- <p>
+
+<p>
And in case you were wondering, it is pronounced <i>ahr-kahy-vuh</i>, like <i>archive</i> but with an <i>a</i>!
</p>
- <div class="mainBox">
- <div class="hero-unit">
+
+<div class="mainBox">
+
+<div class="hero-unit">
<span class="bignumber badge badge-warning">1</span>
- <p>
+
+<p>
<a href="docs/1.3.6/tour/index.html">Take a look around</a>
</p>
- <p>
+
+<p>
<!-- Commenting out while we still don't have a live demo
Try out the live demo, or take a look at the screenshots in the feature walkthrough. -->
Take a look at the screenshots in the feature walkthrough.
@@ -370,14 +433,18 @@
<br style="clear: left" />
</div>
</div>
- <div class="mainBox">
- <div class="hero-unit">
+
+<div class="mainBox">
+
+<div class="hero-unit">
<span class="bignumber badge badge-warning">2</span>
- <p>
+
+<p>
<a href="download.html">Download Archiva</a>
</p>
- <p>
+
+<p>
<span class="expand" style="width: 200px; display: block; float: left;">
<img src="images/collapsed.gif" width="7" height="7" alt="" />
<b>Latest stable release:</b>
@@ -404,14 +471,18 @@
</div>
</div>
- <div class="mainBox">
- <div class="hero-unit">
+
+<div class="mainBox">
+
+<div class="hero-unit">
<span class="bignumber badge badge-warning">3</span>
- <p>
+
+<p>
<a href="docs/1.3.6/index.html">Documentation</a>
</p>
- <p>
+
+<p>
<img src="images/collapsed.gif" width="7" height="7" alt="" />
Simple out of the box configuration and <a href="docs/1.3.6/quick-start.html">quick start guide</a>
<br />
@@ -426,64 +497,98 @@
</p>
</div>
</div>
- <div class="mainBox">
- <div class="hero-unit">
+
+<div class="mainBox">
+
+<div class="hero-unit">
<span class="bignumber badge badge-warning">4</span>
- <p>
+
+<p>
<a href="get-involved.html">Get involved</a>
</p>
- <p>
+
+<p>
Get support from the <a href="mail-lists.html">mailing lists</a> and <a class="externalLink" href="http://cwiki.apache.org/confluence/display/ARCHIVA/">wiki</a>, file <a href="issue-tracking.html">issues</a>, and even <a href="get-involved.html">get involved</a> in the development.
</p>
<br style="clear: left" />
</div>
</div>
- <div>
- <div class="section"><h2>Videos<a name="Videos"></a></h2>
- <div class="section"><div class="section"><h4>Quick start<a name="Quick_start"></a></h4>
- <p align="center">
+
+<div>
+
+<div class="section">
+<h2>Videos<a name="Videos"></a></h2>
+
+<div class="section">
+<div class="section">
+<h4>Quick start<a name="Quick_start"></a></h4>
+
+<p align="center">
<iframe width="420" height="315" src="http://www.youtube.com/embed/kG349qooN8E" frameborder="0" allowfullscreen=""></iframe>
</p>
- </div><div class="section"><h4>Browsing/Uploading/Searching<a name="BrowsingUploadingSearching"></a></h4>
- <p align="center">
+ </div>
+<div class="section">
+<h4>Browsing/Uploading/Searching<a name="BrowsingUploadingSearching"></a></h4>
+
+<p align="center">
<iframe width="420" height="315" src="http://www.youtube.com/embed/y4DoLCfYR-A" frameborder="0" allowfullscreen=""></iframe>
</p>
</div>
</div></div></div>
- <div class="section"><h2>License<a name="License"></a></h2>
- <p>
+
+<div class="section">
+<h2>License<a name="License"></a></h2>
+
+<p>
Archiva is distributed under the <a class="externalLink" href="http://www.apache.org/licenses/">Apache License, version 2.0</a>
</p>
</div>
- <div class="section"><h2>Thanks<a name="Thanks"></a></h2>
- <p>
+
+<div class="section">
+<h2>Thanks<a name="Thanks"></a></h2>
+
+<p>
We would like to thank all the <a class="externalLink" href="http://www.apache.org/foundation/thanks.html">sponsors that provide financial assistance to the Apache Software Foundation</a>.
For more information on how you can support the foundation, see the <a class="externalLink" href="http://www.apache.org/foundation/sponsorship.html">sponsorship</a> page.
</p>
</div>
- <div class="section"><h2>Events<a name="Events"></a></h2>
- <div class="section"><h3>ApacheCon NA 2013<a name="ApacheCon_NA_2013"></a></h3>
- <p>
+
+<div class="section">
+<h2>Events<a name="Events"></a></h2>
+
+<div class="section">
+<h3>ApacheCon NA 2013<a name="ApacheCon_NA_2013"></a></h3>
+
+<p>
<a class="poweredBy" href="http://www.apache.org/events/current-event.html" title="ApacheCon">
<img src="http://www.apache.org/events/logos-banners/ApacheCon-2013-NorthAmerica/NA_square_20.png" class="poweredBy" alt="ApacheCon" title="Apache Con NA" />
</a>
</p>
</div></div>
- <div class="section"><h2>Resources<a name="Resources"></a></h2>
- <p>
+
+<div class="section">
+<h2>Resources<a name="Resources"></a></h2>
+
+<p>
Need more? Try some of these resources.
</p>
- <div>
- <div class="section"><h3>Books<a name="Books"></a></h3>
- <div style="margin-left: auto; margin-right: auto; text-align: center">
- <div style="float: left; width: 50%;">
- <p>
+
+<div>
+
+<div class="section">
+<h3>Books<a name="Books"></a></h3>
+
+<div style="margin-left: auto; margin-right: auto; text-align: center">
+
+<div style="float: left; width: 50%;">
+
+<p>
<a class="externalLink" href="http://www.packtpub.com/apache-maven-2-effective-implementations/book"><img src="images/books/apache_maven_2_effective_implementation.jpg" alt="" /></a><br />
<a class="externalLink" href="http://www.packtpub.com/apache-maven-2-effective-implementations/book">Apache Maven 2: Effective Implementation</a> (Maria Odea Ching, Brett Porter; September 2009)<br />
<span style="font-size: 0.8em">
@@ -491,8 +596,10 @@
</span>
</p>
</div>
- <div style="float: left; width: 50%;">
- <p>
+
+<div style="float: left; width: 50%;">
+
+<p>
<a class="externalLink" href="http://www.wakaleo.com/java-power-tools"><img src="images/books/java_power_tools.gif" alt="" /></a><br />
<a class="externalLink" href="http://www.wakaleo.com/java-power-tools">Java Power Tools</a> (John Smart; April 2008)<br />
<span style="font-size: 0.8em">
@@ -502,50 +609,79 @@
</div>
</div>
</div>
- <div style="clear: left">
- </div><div class="section"><h3>Articles, Presentations and Tutorials<a name="Articles_Presentations_and_Tutorials"></a></h3>
- <ul>
- <li>
+
+<div style="clear: left">
+ </div>
+<div class="section">
+<h3>Articles, Presentations and Tutorials<a name="Articles_Presentations_and_Tutorials"></a></h3>
+
+<ul>
+
+<li>
<a class="externalLink" href="http://www.adictosaltrabajo.com/tutoriales/tutoriales.php?pagina=archiva">Archiva 1.1.1 Tutorial in Spanish!</a> - Video also available <a class="externalLink" href="http://www.adictosaltrabajo.com/detalle-noticia.php?noticia=61">here</a> - (Ángel García Jerez; September 2008)
</li>
</ul>
</div>
</div></div>
- <div id="dialogRelease" class="modal hide fade">
- <div class="modal-header">
+
+<div id="dialogRelease" class="modal hide fade">
+
+<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">[×]</button>
- <h1>Archiva 1.3.6</h1>
+
+<h1>Archiva 1.3.6</h1>
</div>
- <div class="modal-body">
- <p>
+
+<div class="modal-body">
+
+<p>
This is the recommended latest release of Archiva.
</p>
- <table border="0" class="table table-striped">
- <tr class="a">
- <th> </th>
- <th>Mirrors</th>
- <th>Checksum</th>
- <th>Signature</th>
+
+<table border="0" class="table table-striped">
+
+<tr class="a">
+
+<th> </th>
+
+<th>Mirrors</th>
+
+<th>Checksum</th>
+
+<th>Signature</th>
</tr>
- <tr class="b">
- <td>Archiva 1.3.6 Standalone</td>
- <td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip">zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.3.6 Standalone</td>
+
+<td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip">zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.asc">asc</a></td>
</tr>
- <tr class="a">
- <td>Archiva 1.3.6 WAR</td>
- <td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6.war">war</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.asc">asc</a></td>
+
+<tr class="a">
+
+<td>Archiva 1.3.6 WAR</td>
+
+<td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6.war">war</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.asc">asc</a></td>
</tr>
</table>
</div>
- <div class="modal-footer">
- <div class="row">
- <div class="pull-rigth">
+
+<div class="modal-footer">
+
+<div class="row">
+
+<div class="pull-rigth">
<a href="docs/1.3.6/release-notes.html">Release Notes</a> | <a href="download.html">More downloads or change mirror.</a>
</div>
<!-- add mirror change option -->
@@ -575,36 +711,59 @@
</div>
</div>
</div>
- <div id="dialogPreview" class="modal hide fade">
- <div class="modal-header">
+
+<div id="dialogPreview" class="modal hide fade">
+
+<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">[×]</button>
- <h1>Archiva 1.4-M4</h1>
+
+<h1>Archiva 1.4-M4</h1>
</div>
- <div class="modal-body">
- <p>This is a preview of the next release of Archiva.</p>
- <table border="0" class="table table-striped">
- <tr class="a">
- <th> </th>
- <th>Mirrors</th>
- <th>Checksum</th>
- <th>Signature</th>
+
+<div class="modal-body">
+
+<p>This is a preview of the next release of Archiva.</p>
+
+<table border="0" class="table table-striped">
+
+<tr class="a">
+
+<th> </th>
+
+<th>Mirrors</th>
+
+<th>Checksum</th>
+
+<th>Signature</th>
</tr>
- <tr class="b">
- <td>Archiva 1.4-M4 Standalone</td>
- <td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip">zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.4-M4 Standalone</td>
+
+<td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip">zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.asc">asc</a></td>
</tr>
- <tr class="a">
- <td>Archiva 1.4-M4 WAR</td>
- <td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war">war</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.asc">asc</a></td>
+
+<tr class="a">
+
+<td>Archiva 1.4-M4 WAR</td>
+
+<td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war">war</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.asc">asc</a></td>
</tr>
</table>
</div>
- <div class="modal-footer">
- <p><a href="docs/1.4-M4/release-notes.html">Release Notes</a> | <a href="download.html">More downloads or change mirror.</a></p>
+
+<div class="modal-footer">
+
+<p><a href="docs/1.4-M4/release-notes.html">Release Notes</a> | <a href="download.html">More downloads or change mirror.</a></p>
</div>
</div>
Modified: archiva/site-content/integration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/integration.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/integration.html (original)
+++ archiva/site-content/integration.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Continuous Integration</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,17 @@
<div id="bodyColumn" >
- <div class="section"><h2>Overview<a name="Overview"></a></h2><a name="Overview"></a><p>This project uses <a class="externalLink" href="http://jenkins-ci.org/">Jenkins</a>.</p></div><div class="section"><h2>Access<a name="Access"></a></h2><a name="Access"></a><p>The following is a link to the continuous integration system used by the project.</p><div class="source"><pre class="prettyprint"><a class="externalLink" href="https://builds.apache.org/view/A-F/view/Archiva/">https://builds.apache.org/view/A-F/view/Archiva/</a></pre></div></div><div class="section"><h2>Notifiers<a name="Notifiers"></a></h2><a name="Notifiers"></a><p>No notifiers are defined. Please check back at a later date.</p></div>
+ <div class="section">
+<h2>Overview<a name="Overview"></a></h2><a name="Overview"></a>
+<p>This project uses <a class="externalLink" href="http://jenkins-ci.org/">Jenkins</a>.</p></div>
+<div class="section">
+<h2>Access<a name="Access"></a></h2><a name="Access"></a>
+<p>The following is a link to the continuous integration system used by the project.</p>
+<div class="source">
+<pre><a class="externalLink" href="https://builds.apache.org/view/A-F/view/Archiva/">https://builds.apache.org/view/A-F/view/Archiva/</a></pre></div></div>
+<div class="section">
+<h2>Notifiers<a name="Notifiers"></a></h2><a name="Notifiers"></a>
+<p>No notifiers are defined. Please check back at a later date.</p></div>
</div>
</div>
Modified: archiva/site-content/issue-tracking.html
URL: http://svn.apache.org/viewvc/archiva/site-content/issue-tracking.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/issue-tracking.html (original)
+++ archiva/site-content/issue-tracking.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Issue Tracking</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,14 @@
<div id="bodyColumn" >
- <div class="section"><h2>Overview<a name="Overview"></a></h2><a name="Overview"></a><p>This project uses <a class="externalLink" href="http://www.atlassian.com/software/jira">JIRA</a> a J2EE-based, issue tracking and project management application.</p></div><div class="section"><h2>Issue Tracking<a name="Issue_Tracking"></a></h2><a name="Issue_Tracking"></a><p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p><div class="source"><pre class="prettyprint"><a class="externalLink" href="http://jira.codehaus.org/browse/MRM">http://jira.codehaus.org/browse/MRM</a></pre></div></div>
+ <div class="section">
+<h2>Overview<a name="Overview"></a></h2><a name="Overview"></a>
+<p>This project uses <a class="externalLink" href="http://www.atlassian.com/software/jira">JIRA</a> a J2EE-based, issue tracking and project management application.</p></div>
+<div class="section">
+<h2>Issue Tracking<a name="Issue_Tracking"></a></h2><a name="Issue_Tracking"></a>
+<p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p>
+<div class="source">
+<pre><a class="externalLink" href="http://jira.codehaus.org/browse/MRM">http://jira.codehaus.org/browse/MRM</a></pre></div></div>
</div>
</div>
Modified: archiva/site-content/jsui/generics-js.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/generics-js.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/generics-js.html (original)
+++ archiva/site-content/jsui/generics-js.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva -
Generics Javascript</title>
@@ -207,7 +207,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -239,16 +239,34 @@
<link rel="stylesheet" href="../css/jquery.fancybox-2.1.0.css" type="text/css" media="screen" />
<script type="text/javascript" src="../js/fancy-box-activation.js"></script>
- <ul><li><a href="#Generics_Javascript">Generics Javascript</a><ul><li><a href="#User_messages">User messages</a></li><li><a href="#Success_message">Success message</a></li><li><a href="#Error_message">Error message</a></li><li><a href="#Modal_Confirm_dialog">Modal Confirm dialog</a></li></ul></li></ul>
+
+<ul>
+<li><a href="#Generics_Javascript">Generics Javascript</a>
+<ul>
+<li><a href="#User_messages">User messages</a></li>
+<li><a href="#Success_message">Success message</a></li>
+<li><a href="#Error_message">Error message</a></li>
+<li><a href="#Modal_Confirm_dialog">Modal Confirm dialog</a></li></ul></li></ul>
- <div class="section"><h2>Generics Javascript<a name="Generics_Javascript"></a></h2>
- <p>Some common/generic javascript methods are available.</p>
- <div class="section"><h3>User messages<a name="User_messages"></a></h3>
- <p>A div "user-messages" is reserved for user messages.</p>
- </div><div class="section"><h3>Success message<a name="Success_message"></a></h3>
- <p>
+
+<div class="section">
+<h2>Generics Javascript<a name="Generics_Javascript"></a></h2>
+
+<p>Some common/generic javascript methods are available.</p>
+
+<div class="section">
+<h3>User messages<a name="User_messages"></a></h3>
+
+<p>A div "user-messages" is reserved for user messages.</p>
+ </div>
+<div class="section">
+<h3>Success message<a name="Success_message"></a></h3>
+
+<p>
Javascript function:
- </p><div class="source"><pre class="prettyprint">
+ </p>
+<div class="source">
+<pre>
displaySuccessMessage($.i18n.prop('managedrepository.added'));
// the second parameter is optionnal by default #user-messages id is used
displaySuccessMessage=function(text,idToAppend){
@@ -260,10 +278,15 @@ displaySuccessMessage=function(text,idTo
</div>
- <div class="section"><h3>Error message<a name="Error_message"></a></h3>
- <p>
+
+<div class="section">
+<h3>Error message<a name="Error_message"></a></h3>
+
+<p>
Javascript function:
- </p><div class="source"><pre class="prettyprint">
+ </p>
+<div class="source">
+<pre>
displayErrorMessage($.i18n.prop('managedrepository.added'));
// the second parameter is optionnal by default #user-messages id is used
displayErrorMessage=function(text,idToAppend){
@@ -275,10 +298,15 @@ displayErrorMessage=function(text,idToAp
</div>
- <div class="section"><h3>Modal Confirm dialog<a name="Modal_Confirm_dialog"></a></h3>
- <p>
+
+<div class="section">
+<h3>Modal Confirm dialog<a name="Modal_Confirm_dialog"></a></h3>
+
+<p>
Javascript function:
- </p><div class="source"><pre class="prettyprint">
+ </p>
+<div class="source">
+<pre>
/**
* open a confirm dialog based on bootstrap modal
* @param okFn callback function to call on ok confirm
Modified: archiva/site-content/jsui/i18n.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/i18n.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/i18n.html (original)
+++ archiva/site-content/jsui/i18n.html Sat Jun 8 14:05:28 2013
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - i18n</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -215,11 +215,29 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>i18n management<a name="i18n_management"></a></h2><p>The js library <a class="externalLink" href="http://code.google.com/p/jquery-i18n-properties">jquery-i18n-properties</a> is used for i18n.</p><p>On application loading, i18n properties are loaded by calling a REST services with the browser lang or with the requested language specified by the request parameter : ?request_lang=en.</p><p>This service will load properties in this order:</p><ul><li>redback properties in en then in specified language</li><li>archiva properties (from org/apache/archiva/i18n/default.properties) in en then in specified language</li></ul><div class="section"><h3>Javascript method<a name="Javascript_method"></a></h3><p>Simple i18n value without any value</p><div class="source"><pre class="prettyprint">Javascript code :
-$.i18n.prop("save") will return the value for key save</pre></div><p>You can pass some values too (sample for property managedrepository.deleted=Managed Repository " {0} " deleted. )</p><div class="source"><pre class="prettyprint">Javascript code :
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>i18n management<a name="i18n_management"></a></h2>
+<p>The js library <a class="externalLink" href="http://code.google.com/p/jquery-i18n-properties">jquery-i18n-properties</a> is used for i18n.</p>
+<p>On application loading, i18n properties are loaded by calling a REST services with the browser lang or with the requested language specified by the request parameter : ?request_lang=en.</p>
+<p>This service will load properties in this order:</p>
+<ul>
+<li>redback properties in en then in specified language</li>
+<li>archiva properties (from org/apache/archiva/i18n/default.properties) in en then in specified language</li></ul>
+<div class="section">
+<h3>Javascript method<a name="Javascript_method"></a></h3>
+<p>Simple i18n value without any value</p>
+<div class="source">
+<pre>Javascript code :
+$.i18n.prop("save") will return the value for key save</pre></div>
+<p>You can pass some values too (sample for property managedrepository.deleted=Managed Repository " {0} " deleted. )</p>
+<div class="source">
+<pre>Javascript code :
$.i18n.prop("managedrepository.deleted",managedRepository.name())
if managedRepository.name() is "foo"
-response will be Managed Repository " foo " deleted.</pre></div></div><div class="section"><h3>Missing properties<a name="Missing_properties"></a></h3><p>In case of missing property, the key is returned.</p></div></div>
+response will be Managed Repository " foo " deleted.</pre></div></div>
+<div class="section">
+<h3>Missing properties<a name="Missing_properties"></a></h3>
+<p>In case of missing property, the key is returned.</p></div></div>
</div>
</div>
Modified: archiva/site-content/jsui/index.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/index.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/index.html (original)
+++ archiva/site-content/jsui/index.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva -
Archiva Javascript application General design</title>
@@ -207,7 +207,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -240,11 +240,26 @@
<script type="text/javascript" src="../js/fancy-box-activation.js"></script>
- <ul><li><a href="#Archiva_Javascript_Web_Application">Archiva Javascript Web Application</a><ul><li><a href="#General_design">General design</a></li><li><a href="#Runtime_Properties">Runtime Properties</a></li><li><a href="#Used_Javascript_frameworks">Used Javascript frameworks</a></li><li><a href="#Sources_organisation">Sources organisation</a></li><li><a href="#js_directory">js directory</a></li><li><a href="#Start_page">Start page</a></li><li><a href="#Gridedit_model">Grid/edit model</a></li></ul></li></ul>
+
+<ul>
+<li><a href="#Archiva_Javascript_Web_Application">Archiva Javascript Web Application</a>
+<ul>
+<li><a href="#General_design">General design</a></li>
+<li><a href="#Runtime_Properties">Runtime Properties</a></li>
+<li><a href="#Used_Javascript_frameworks">Used Javascript frameworks</a></li>
+<li><a href="#Sources_organisation">Sources organisation</a></li>
+<li><a href="#js_directory">js directory</a></li>
+<li><a href="#Start_page">Start page</a></li>
+<li><a href="#Gridedit_model">Grid/edit model</a></li></ul></li></ul>
- <div class="section"><h2>Archiva Javascript Web Application<a name="Archiva_Javascript_Web_Application"></a></h2>
- <div class="section"><h3>General design<a name="General_design"></a></h3>
- <p>
+
+<div class="section">
+<h2>Archiva Javascript Web Application<a name="Archiva_Javascript_Web_Application"></a></h2>
+
+<div class="section">
+<h3>General design<a name="General_design"></a></h3>
+
+<p>
The goal is to have a "one page loading" javascript application.
<br />
For this the only html page will contains a div with id "main-content" this div will be populated
@@ -257,82 +272,125 @@
As we are not designer :-), the application will use the <a class="externalLink" href="http://twitter.github.com/bootstrap" target="_blank">twitter bootstrap css</a>.
</p>
</div>
- <div class="section"><h3>Runtime Properties<a name="Runtime_Properties"></a></h3>
- <p>The application is designed to use http cache mechanism for css, javascript. Except REST call to get datas which will never use cache as a query timestamp parameter is used.
+
+<div class="section">
+<h3>Runtime Properties<a name="Runtime_Properties"></a></h3>
+
+<p>The application is designed to use http cache mechanism for css, javascript. Except REST call to get datas which will never use cache as a query timestamp parameter is used.
But as this can cause issue in developpement phase, two system properties (disabled by default) prevent can prevent caching and/or help debuging
- </p><ul>
- <li>archiva.devMode=true/false: if true will add a timestamp query parameter for loading js and html templates.</li>
- <li>archiva.javascriptLog=true/false: will activate javascript log, method available with $.log(msg)</li>
- <li>archiva.logMissingI18n=true/false: will activate remote logging of missing i18n key in the servlet container log: INFO archivaMissingi18n.logger - missing i18n key : 'proxy-connectors.grid.managedrepo.title'</li>
+ </p>
+<ul>
+
+<li>archiva.devMode=true/false: if true will add a timestamp query parameter for loading js and html templates.</li>
+
+<li>archiva.javascriptLog=true/false: will activate javascript log, method available with $.log(msg)</li>
+
+<li>archiva.logMissingI18n=true/false: will activate remote logging of missing i18n key in the servlet container log: INFO archivaMissingi18n.logger - missing i18n key : 'proxy-connectors.grid.managedrepo.title'</li>
</ul>
</div>
- <div class="section"><h3>Used Javascript frameworks<a name="Used_Javascript_frameworks"></a></h3>
- <p>
+
+<div class="section">
+<h3>Used Javascript frameworks<a name="Used_Javascript_frameworks"></a></h3>
+
+<p>
We use some well known javascript framework librairies :
- </p><ul>
- <li><a class="externalLink" href="http://jquery.com/" target="_blank">jquery</a>.</li>
+ </p>
+<ul>
+
+<li><a class="externalLink" href="http://jquery.com/" target="_blank">jquery</a>.</li>
- <li><a class="externalLink" href="http://sammyjs.org" target="_blank">sammyjs for hash navigation</a></li>
+
+<li><a class="externalLink" href="http://sammyjs.org" target="_blank">sammyjs for hash navigation</a></li>
- <li><a class="externalLink" href="http://requirejs.org" target="_blank">requirejs</a> for template loading (see <a href="./template-loading.html">details</a>).</li>
+
+<li><a class="externalLink" href="http://requirejs.org" target="_blank">requirejs</a> for template loading (see <a href="./template-loading.html">details</a>).</li>
- <li><a class="externalLink" href="http://code.google.com/p/jquery-i18n-properties" target="_blank">jquery-i18n-properties</a> for i18n loading (see <a href="./i18n.html">details</a>).</li>
+
+<li><a class="externalLink" href="http://code.google.com/p/jquery-i18n-properties" target="_blank">jquery-i18n-properties</a> for i18n loading (see <a href="./i18n.html">details</a>).</li>
- <li><a class="externalLink" href="http://knockoutjs.com" target="_blank">knockoutjs</a> as we use a MVVM pattern (see <a href="./knockout-binding.html">knockout binding</a>).</li>
+
+<li><a class="externalLink" href="http://knockoutjs.com" target="_blank">knockoutjs</a> as we use a MVVM pattern (see <a href="./knockout-binding.html">knockout binding</a>).</li>
- <li><a class="externalLink" href="http://twitter.github.com/bootstrap/javascript.html" target="_blank">twitter bootstrap js</a> to magnify the ui.</li>
+
+<li><a class="externalLink" href="http://twitter.github.com/bootstrap/javascript.html" target="_blank">twitter bootstrap js</a> to magnify the ui.</li>
- <li><a class="externalLink" href="http://bassistance.de/jquery-plugins/jquery-plugin-validation" target="_blank">jquery validate</a> for form validation.</li>
+
+<li><a class="externalLink" href="http://bassistance.de/jquery-plugins/jquery-plugin-validation" target="_blank">jquery validate</a> for form validation.</li>
</ul>
</div>
- <div class="section"><h3>Sources organisation<a name="Sources_organisation"></a></h3>
- <p>
+
+<div class="section">
+<h3>Sources organisation<a name="Sources_organisation"></a></h3>
+
+<p>
Sources are located in <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/" target="_blank">src/main/webapp</a> :
- </p><ul>
- <li>css</li>
- <li>images</li>
- <li>js</li>
+ </p>
+<ul>
+
+<li>css</li>
+
+<li>images</li>
+
+<li>js</li>
</ul>
- </div><div class="section"><h3>js directory<a name="js_directory"></a></h3>
- <p>
+ </div>
+<div class="section">
+<h3>js directory<a name="js_directory"></a></h3>
+
+<p>
Root directory contains external libraries.
</p>
- <p>
+
+<p>
archiva directory contains archiva js files with a subdirectory templates which contains templates
</p>
- <p>
+
+<p>
redback directory contains redback js files with a subdirectory templates which contains templates
</p>
</div>
- <div class="section"><h3>Start page<a name="Start_page"></a></h3>
- <p>
+
+<div class="section">
+<h3>Start page<a name="Start_page"></a></h3>
+
+<p>
The main page will load javascript files, load <a href="./i18n.html">i18n</a>, <a href="./template-loading.html">load templates</a> and insert menu.
<br />
This main page is divided in 3 parts:
- <p>
+
+<p>
<a href="../images/start-screen.png" class="single_image" title="Start Page">
<img src="../images/start-screen.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br />
Start Page
</a>
</p>
- <p>
- </p><ul>
- <li>#topbar-menu-container is populated with the template js/archiva/templates/topbar.html.</li>
- <li>#sidebar-content is populated with the template js/archiva/templates/menu.html.</li>
- <li>#main-content is the place where screen will appear.</li>
- <li>hidden #html-fragments will contains loaded templates.</li>
+
+<p>
+ </p>
+<ul>
+
+<li>#topbar-menu-container is populated with the template js/archiva/templates/topbar.html.</li>
+
+<li>#sidebar-content is populated with the template js/archiva/templates/menu.html.</li>
+
+<li>#main-content is the place where screen will appear.</li>
+
+<li>hidden #html-fragments will contains loaded templates.</li>
</ul>
- <p>
+
+<p>
Link are visible/hide depending on needed redback karmas.
You can configure redback operations needed for a link using the attribute redback-permissions in your html element
(by default element needed karma must be marked display: none):
- </p><div class="source"><pre class="prettyprint">
+ </p>
+<div class="source">
+<pre>
Support array: at least one operation is needed:
<div .... redback-permissions="{permissions: ['archiva-manage-users','archiva-manage-configuration']}" style="display: none">
@@ -345,17 +403,23 @@ Support single value:
</div>
- <div class="section"><h3>Grid/edit model<a name="Gridedit_model"></a></h3>
- <p>We use a tab/pill models to display grid of datas and edit/add form:
- </p><ul>
- <li>
+
+<div class="section">
+<h3>Grid/edit model<a name="Gridedit_model"></a></h3>
+
+<p>We use a tab/pill models to display grid of datas and edit/add form:
+ </p>
+<ul>
+
+<li>
One tab/pill display the grid
<a href="../images/repo-grids.png" class="single_image" title="Repositories Grid">
<img src="../images/repo-grids.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br />
Repositories Grid
</a>
</li>
- <li>
+
+<li>
One tab/pill display the edit/add form. <b>As we use knockout framework grid will be updated with new value from add/edit form automatically.</b>
<a href="../images/repo-edit.png" class="single_image" title="Repositories Edit/Add">
<img src="../images/repo-edit.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br />
Modified: archiva/site-content/jsui/knockout-binding.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/knockout-binding.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/knockout-binding.html (original)
+++ archiva/site-content/jsui/knockout-binding.html Sat Jun 8 14:05:28 2013
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Knockout binding</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -215,7 +215,27 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Knockout binding<a name="Knockout_binding"></a></h2><p>Explanation on the managed repositories list/edit/add screen.</p><ul><li><a href="#Knockout_binding">Knockout binding</a><ul><li><a href="#Javascript_Beans">Javascript Beans</a></li><li><a href="#View_Model">View Model</a><ul><li><a href="#First_you_must_insert_your_template_in_the_main-content_div">First you must insert your template in the #main-content div</a></li><li><a href="#You_can_now_create_your_view_model.">You can now create your view model.</a></li><li><a href="#Grid_binding">Grid binding</a></li></ul></li><li><a href="#View_definition">View definition</a><ul><li><a href="#Binding_definition">Binding definition</a></li><li><a href="#Template_content">Template content</a></li></ul></li></ul></li></ul><div class="section"><h3>Javascript Beans<a name="Javascript_Beans"></a></h3><p>First you must map the json response on a Javascript bean (a bit borying task :-
) )</p><div class="source"><pre class="prettyprint">Java class with fields
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Knockout binding<a name="Knockout_binding"></a></h2>
+<p>Explanation on the managed repositories list/edit/add screen.</p>
+<ul>
+<li><a href="#Knockout_binding">Knockout binding</a>
+<ul>
+<li><a href="#Javascript_Beans">Javascript Beans</a></li>
+<li><a href="#View_Model">View Model</a>
+<ul>
+<li><a href="#First_you_must_insert_your_template_in_the_main-content_div">First you must insert your template in the #main-content div</a></li>
+<li><a href="#You_can_now_create_your_view_model.">You can now create your view model.</a></li>
+<li><a href="#Grid_binding">Grid binding</a></li></ul></li>
+<li><a href="#View_definition">View definition</a>
+<ul>
+<li><a href="#Binding_definition">Binding definition</a></li>
+<li><a href="#Template_content">Template content</a></li></ul></li></ul></li></ul>
+<div class="section">
+<h3>Javascript Beans<a name="Javascript_Beans"></a></h3>
+<p>First you must map the json response on a Javascript bean (a bit borying task :-) )</p>
+<div class="source">
+<pre>Java class with fields
public class ManagedRepository
//private String id;
@@ -246,8 +266,19 @@ mapping function (to map the json result
data.blockRedeployments,data.cronExpression,
data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,data.stageRepoNeeded);
}
-</pre></div><p><tt>NOTE to have access to field values you must now managedRepository.name() </tt></p></div><div class="section"><h3>View Model<a name="View_Model"></a></h3><div class="section"><h4>First you must insert your template in the #main-content div<a name="First_you_must_insert_your_template_in_the_main-content_div"></a></h4><div class="source"><pre class="prettyprint">// it's a jquery template as we do some i18n transformations
-$("#main-content").html($("#repositoriesMain").tmpl());</pre></div></div><div class="section"><h4>You can now create your view model.<a name="You_can_now_create_your_view_model."></a></h4><div class="source"><pre class="prettyprint">ManagedRepositoriesViewModel=function(){
+</pre></div>
+<p><tt>NOTE to have access to field values you must now managedRepository.name() </tt></p></div>
+<div class="section">
+<h3>View Model<a name="View_Model"></a></h3>
+<div class="section">
+<h4>First you must insert your template in the #main-content div<a name="First_you_must_insert_your_template_in_the_main-content_div"></a></h4>
+<div class="source">
+<pre>// it's a jquery template as we do some i18n transformations
+$("#main-content").html($("#repositoriesMain").tmpl());</pre></div></div>
+<div class="section">
+<h4>You can now create your view model.<a name="You_can_now_create_your_view_model."></a></h4>
+<div class="source">
+<pre>ManagedRepositoriesViewModel=function(){
//field which will receive values
this.managedRepositories=ko.observableArray([]);
// method which will edit an entry: an other view model is created
@@ -261,7 +292,13 @@ $("#main-content").html($(&quo
removeManagedRepository=function(managedRepository){
......
}
-}</pre></div></div><div class="section"><h4>Grid binding<a name="Grid_binding"></a></h4><p>The ManagedRepositoriesViewModel is used as it with a custom grid binding (knockout has a feature to create own binding so we use one called <tt>simpleGrid</tt> which will display grids.</p><p>Grid view initialisation code (some details omitted) :</p><div class="source"><pre class="prettyprint"> var managedRepositoriesViewModel = new ManagedRepositoriesViewModel();
+}</pre></div></div>
+<div class="section">
+<h4>Grid binding<a name="Grid_binding"></a></h4>
+<p>The ManagedRepositoriesViewModel is used as it with a custom grid binding (knockout has a feature to create own binding so we use one called <tt>simpleGrid</tt> which will display grids.</p>
+<p>Grid view initialisation code (some details omitted) :</p>
+<div class="source">
+<pre> var managedRepositoriesViewModel = new ManagedRepositoriesViewModel();
$.ajax("restServices/archivaServices/managedRepositoriesService/getManagedRepositories", {
type: "GET",
@@ -299,9 +336,26 @@ $("#main-content").html($(&quo
ko.applyBindings(managedRepositoriesViewModel,$("#main-content #managed-repositories-table").get(0));
}
}
- );</pre></div></div></div><div class="section"><h3>View definition<a name="View_definition"></a></h3><div class="section"><h4>Binding definition<a name="Binding_definition"></a></h4><p>We have applyed binding on the node with id "#managed-repositories-table". The binding definition is:</p><div class="source"><pre class="prettyprint"> <table class="bordered-table zebra-striped" id="managed-repositories-table"
+ );</pre></div></div></div>
+<div class="section">
+<h3>View definition<a name="View_definition"></a></h3>
+<div class="section">
+<h4>Binding definition<a name="Binding_definition"></a></h4>
+<p>We have applyed binding on the node with id "#managed-repositories-table". The binding definition is:</p>
+<div class="source">
+<pre> <table class="bordered-table zebra-striped" id="managed-repositories-table"
data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_managed-repositoriesGrid',pageLinksId:'managed-repositoriesPagination',data:'managedRepositories'">
- </table></pre></div><ul><li>simpleGrid: gridViewModel = field name for the view model (see sample above)</li><li>simpleGridTemplate:'ko_managed-repositoriesGrid' = name of the template to use (see below)</li><li>pageLinksId:'managed-repositoriesPagination' = name of the template to use for pagination.</li><li>data:'managedRepositories' = fields which contains data to pass to pass to the template</li></ul></div><div class="section"><h4>Template content<a name="Template_content"></a></h4><p>Template used for grid display (some details omitted).</p><div class="source"><pre class="prettyprint"><script id='ko_managed-repositoriesGrid' type='text/x-jquery-tmpl'>
+ </table></pre></div>
+<ul>
+<li>simpleGrid: gridViewModel = field name for the view model (see sample above)</li>
+<li>simpleGridTemplate:'ko_managed-repositoriesGrid' = name of the template to use (see below)</li>
+<li>pageLinksId:'managed-repositoriesPagination' = name of the template to use for pagination.</li>
+<li>data:'managedRepositories' = fields which contains data to pass to pass to the template</li></ul></div>
+<div class="section">
+<h4>Template content<a name="Template_content"></a></h4>
+<p>Template used for grid display (some details omitted).</p>
+<div class="source">
+<pre><script id='ko_managed-repositoriesGrid' type='text/x-jquery-tmpl'>
<thead>
<tr>
// display read only fields defined in ko.simpleGrid.viewModel.columns (see above)
Modified: archiva/site-content/jsui/rest.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/rest.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/rest.html (original)
+++ archiva/site-content/jsui/rest.html Sat Jun 8 14:05:28 2013
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - REST Services</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -215,12 +215,48 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Expose Rest Services<a name="Expose_Rest_Services"></a></h2><p>The <a class="externalLink" href="http://cxf.apache.org">Apache CXF</a> is used to expose some classes/methods as REST Services.</p><p>Services use the standard interface/implementation pattern:</p><ul><li>interfaces and beans are located in archiva-rest-api maven module</li><li>implementation are located in archiva-rest-services maven module</li></ul><ul><li><a href="#Expose_Rest_Services">Expose Rest Services</a><ul><li><a href="#Steps_to_expose_your_class_as_a_REST_Service.">Steps to expose your class as a REST Service.</a><ul><li><a href="#Interface_and_data_beans">Interface and data beans</a><ul><li><a href="#Beans">Beans</a></li><li><a href="#JAXRS_annotations">JAXRS annotations</a></li></ul></li><li><a href="#CXFSpring_configuration">CXF/Spring configuration</a></li><li><a href="#Redback_security_annotation">Redback security annotation</a></li></ul></li>
</ul></li></ul><div class="section"><h3>Steps to expose your class as a REST Service.<a name="Steps_to_expose_your_class_as_a_REST_Service."></a></h3><p>Here all the steps to expose a new class as a REST service.</p><div class="section"><h4>Interface and data beans<a name="Interface_and_data_beans"></a></h4><p>All interfaces and data beans are added in the module archiva-rest-api:</p><ul><li>interface in the package: org.apache.archiva.rest.api.services .</li><li>data beans in the package: org.apache.archiva.rest.api.model .</li></ul><div class="section"><h5>Beans<a name="Beans"></a></h5><p>As we want to be able to expose result as json or xml type, all beans use javax.xml.bind.annotation root element :</p><div class="source"><pre class="prettyprint">@XmlRootElement( name = "artifact" )
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Expose Rest Services<a name="Expose_Rest_Services"></a></h2>
+<p>The <a class="externalLink" href="http://cxf.apache.org">Apache CXF</a> is used to expose some classes/methods as REST Services.</p>
+<p>Services use the standard interface/implementation pattern:</p>
+<ul>
+<li>interfaces and beans are located in archiva-rest-api maven module</li>
+<li>implementation are located in archiva-rest-services maven module</li></ul>
+<ul>
+<li><a href="#Expose_Rest_Services">Expose Rest Services</a>
+<ul>
+<li><a href="#Steps_to_expose_your_class_as_a_REST_Service.">Steps to expose your class as a REST Service.</a>
+<ul>
+<li><a href="#Interface_and_data_beans">Interface and data beans</a>
+<ul>
+<li><a href="#Beans">Beans</a></li>
+<li><a href="#JAXRS_annotations">JAXRS annotations</a></li></ul></li>
+<li><a href="#CXFSpring_configuration">CXF/Spring configuration</a></li>
+<li><a href="#Redback_security_annotation">Redback security annotation</a></li></ul></li></ul></li></ul>
+<div class="section">
+<h3>Steps to expose your class as a REST Service.<a name="Steps_to_expose_your_class_as_a_REST_Service."></a></h3>
+<p>Here all the steps to expose a new class as a REST service.</p>
+<div class="section">
+<h4>Interface and data beans<a name="Interface_and_data_beans"></a></h4>
+<p>All interfaces and data beans are added in the module archiva-rest-api:</p>
+<ul>
+<li>interface in the package: org.apache.archiva.rest.api.services .</li>
+<li>data beans in the package: org.apache.archiva.rest.api.model .</li></ul>
+<div class="section">
+<h5>Beans<a name="Beans"></a></h5>
+<p>As we want to be able to expose result as json or xml type, all beans use javax.xml.bind.annotation root element :</p>
+<div class="source">
+<pre>@XmlRootElement( name = "artifact" )
public class Artifact
implements Serializable
All services will be able to return json or xml
-@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )</pre></div></div><div class="section"><h5>JAXRS annotations<a name="JAXRS_annotations"></a></h5><p>As we use interfaces/implementations pattern jaxrs annotations are only in interfaces level.</p><div class="source"><pre class="prettyprint">@Path( "/managedRepositoriesService/" )
+@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )</pre></div></div>
+<div class="section">
+<h5>JAXRS annotations<a name="JAXRS_annotations"></a></h5>
+<p>As we use interfaces/implementations pattern jaxrs annotations are only in interfaces level.</p>
+<div class="source">
+<pre>@Path( "/managedRepositoriesService/" )
public interface ManagedRepositoriesService
{
// simple GET method no parameter
@@ -245,12 +281,20 @@ public interface ManagedRepositoriesServ
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
ManagedRepository addManagedRepository( ManagedRepository managedRepository )
- throws ArchivaRestServiceException;</pre></div></div></div><div class="section"><h4>CXF/Spring configuration<a name="CXFSpring_configuration"></a></h4><p>REST services implementations are marked with the Spring annotation @Service</p><div class="source"><pre class="prettyprint">package org.apache.archiva.rest.services;
+ throws ArchivaRestServiceException;</pre></div></div></div>
+<div class="section">
+<h4>CXF/Spring configuration<a name="CXFSpring_configuration"></a></h4>
+<p>REST services implementations are marked with the Spring annotation @Service</p>
+<div class="source">
+<pre>package org.apache.archiva.rest.services;
......
@Service( "managedRepositoriesService#rest" )
public class DefaultManagedRepositoriesService
extends AbstractRestService
- implements ManagedRepositoriesService</pre></div><p>Spring beans are declared as REST/CXF services in the Spring configuration</p><div class="source"><pre class="prettyprint"> <jaxrs:server id="archivaServices" address="/archivaServices">
+ implements ManagedRepositoriesService</pre></div>
+<p>Spring beans are declared as REST/CXF services in the Spring configuration</p>
+<div class="source">
+<pre> <jaxrs:server id="archivaServices" address="/archivaServices">
.....
<jaxrs:serviceBeans>
<ref bean="managedRepositoriesService#rest"/>
@@ -271,7 +315,10 @@ public class DefaultManagedRepositoriesS
base-package="org.apache.archiva.rest.services"/>
...
-</beans></pre></div><p>CXF servlet is declared as:</p><div class="source"><pre class="prettyprint"> <servlet>
+</beans></pre></div>
+<p>CXF servlet is declared as:</p>
+<div class="source">
+<pre> <servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@@ -280,10 +327,18 @@ public class DefaultManagedRepositoriesS
<servlet-mapping>
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/restServices/*</url-pattern>
- </servlet-mapping></pre></div><p>So as it, REST services are availble in the following url <b>restServices/archivaServices/</b>.</p></div><div class="section"><h4>Redback security annotation<a name="Redback_security_annotation"></a></h4><p>Some REST methods need some karma, so to prevent anonymous access methods can be marked as it:</p><div class="source"><pre class="prettyprint">
+ </servlet-mapping></pre></div>
+<p>So as it, REST services are availble in the following url <b>restServices/archivaServices/</b>.</p></div>
+<div class="section">
+<h4>Redback security annotation<a name="Redback_security_annotation"></a></h4>
+<p>Some REST methods need some karma, so to prevent anonymous access methods can be marked as it:</p>
+<div class="source">
+<pre>
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
ManagedRepository addManagedRepository( ManagedRepository managedRepository )
- throws ArchivaRestServiceException;</pre></div><p>This method will need the current user to have the operation manage-configuration level.</p><p>For more details, have a look at <a class="externalLink" href="http://archiva.apache.org/redback/integration/rest.html">Redback REST</a>.</p></div></div></div>
+ throws ArchivaRestServiceException;</pre></div>
+<p>This method will need the current user to have the operation manage-configuration level.</p>
+<p>For more details, have a look at <a class="externalLink" href="http://archiva.apache.org/redback/integration/rest.html">Redback REST</a>.</p></div></div></div>
</div>
</div>
Modified: archiva/site-content/jsui/template-loading.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/template-loading.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/jsui/template-loading.html (original)
+++ archiva/site-content/jsui/template-loading.html Sat Jun 8 14:05:28 2013
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Olivier Lamy" />
<meta name="Date-Creation-yyyymmdd" content="20120914" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Javascript template loading</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -215,7 +215,13 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Html/Javascript templates loading<a name="HtmlJavascript_templates_loading"></a></h2><p>Templates are loaded on application loaded and added in the hidden div <b>#html-fragments</b>.</p><p>They are loaded using requirejs and the text plugin.</p><p>archiva templates are loaded as it <tt>NOTE: the no cache is activated only on dev mode</tt></p><div class="source"><pre class="prettyprint">require(['jquery',"jquery.tmpl",'i18n',"utils","text!templates/archiva/menu.html",
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Html/Javascript templates loading<a name="HtmlJavascript_templates_loading"></a></h2>
+<p>Templates are loaded on application loaded and added in the hidden div <b>#html-fragments</b>.</p>
+<p>They are loaded using requirejs and the text plugin.</p>
+<p>archiva templates are loaded as it <tt>NOTE: the no cache is activated only on dev mode</tt></p>
+<div class="source">
+<pre>require(['jquery',"jquery.tmpl",'i18n',"utils","text!templates/archiva/menu.html",
"text!templates/archiva/generics.html",
"text!templates/archiva/modal.html",
"text!templates/archiva/repositories.html",
@@ -235,12 +241,23 @@
$.log("main-tmpl.js loaded");
}
}
-);</pre></div><div class="section"><h3>i18n in templates<a name="i18n_in_templates"></a></h3><div class="section"><h4>static templates<a name="static_templates"></a></h4><p>Some templates which are only simple html which only need i18n are executed immediatly.</p><p>Simply use:</p><div class="source"><pre class="prettyprint"> $.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
+);</pre></div>
+<div class="section">
+<h3>i18n in templates<a name="i18n_in_templates"></a></h3>
+<div class="section">
+<h4>static templates<a name="static_templates"></a></h4>
+<p>Some templates which are only simple html which only need i18n are executed immediatly.</p>
+<p>Simply use:</p>
+<div class="source">
+<pre> $.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
to get i18n values in your template you can use
${register} or ${$.i18n.prop('register')}
Note if you use the simple form ${register} and the property is not available, the template system will try to use if exists the function register
-</pre></div></div><div class="section"><h4>dynamic templates<a name="dynamic_templates"></a></h4><p>The others are only inserted in #html-fragments.</p></div></div></div>
+</pre></div></div>
+<div class="section">
+<h4>dynamic templates<a name="dynamic_templates"></a></h4>
+<p>The others are only inserted in #html-fragments.</p></div></div></div>
</div>
</div>
Modified: archiva/site-content/known-issues.html
URL: http://svn.apache.org/viewvc/archiva/site-content/known-issues.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/known-issues.html (original)
+++ archiva/site-content/known-issues.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Known Issues and Errata</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,7 +214,9 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Known Issues and Errata<a name="Known_Issues_and_Errata"></a></h2><p>For a list of all JIRA issues reported against released versions of Archiva, see <a class="externalLink" href="http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+MRM+AND+resolution+%3D+Unresolved+and+affectedVersion+in+releasedVersions()"> JIRA</a>.</p></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Known Issues and Errata<a name="Known_Issues_and_Errata"></a></h2>
+<p>For a list of all JIRA issues reported against released versions of Archiva, see <a class="externalLink" href="http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+MRM+AND+resolution+%3D+Unresolved+and+affectedVersion+in+releasedVersions()"> JIRA</a>.</p></div>
</div>
</div>
Author: olamy
Date: Sat Jun 8 14:05:28 2013
New Revision: 1490981
URL: http://svn.apache.org/r1490981
Log:
Apache Archiva Main site deployment
Modified:
archiva/site-content/developers/building.html
archiva/site-content/developers/how-we-do-things.html
archiva/site-content/developers/publishing-site.html
archiva/site-content/developers/releasing.html
archiva/site-content/download.html
archiva/site-content/errors/404.html
archiva/site-content/get-involved.html
archiva/site-content/index.html
archiva/site-content/integration.html
archiva/site-content/issue-tracking.html
archiva/site-content/jsui/generics-js.html
archiva/site-content/jsui/i18n.html
archiva/site-content/jsui/index.html
archiva/site-content/jsui/knockout-binding.html
archiva/site-content/jsui/rest.html
archiva/site-content/jsui/template-loading.html
archiva/site-content/known-issues.html
archiva/site-content/license.html
archiva/site-content/mail-lists.html
archiva/site-content/privacy-policy.html
archiva/site-content/project-info.html
archiva/site-content/security.html
archiva/site-content/source-repository.html
archiva/site-content/team-list.html
archiva/site-content/versions.html
Modified: archiva/site-content/developers/building.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/building.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/developers/building.html (original)
+++ archiva/site-content/developers/building.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Building Archiva</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,13 +214,41 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Building Archiva<a name="Building_Archiva"></a></h2><p>To build the very latest code available... </p><ol style="list-style-type: decimal"><li>Check out the source code as described on the <a href="../source-repository.html">Source Repository</a> page.</li><li>In the 'parent' directory, execute <tt>mvn clean install</tt> to build the parent pom.</li><li>In the 'archiva' directory, execute <tt>mvn clean install</tt> to build the Archiva modules and distribution.</li></ol><p>After the build completes, you can find the Archiva distribution in <tt>archiva-jetty/target</tt> and the Archiva webapp in <tt>archiva-modules/archiva-web/archiva-webapp/target</tt></p><p>Usually, it's that simple. :) Occasionally, Archiva may depend on a snapshot of another project such as <a class="externalLink" href="http://archiva.apache.org/redback">Redback</a>, and you may need to build that first, or configure a snapshot repository. If you're hav
ing trouble building Archiva, ask on the <a href="../mail-lists.html">Development mailing list</a> and we'll point you in the right direction.</p></div><div class="section"><h2>Documentation<a name="Documentation"></a></h2><p>The version-specific documentation for the latest version of Archiva can be found in <tt>archiva/archiva-docs</tt>, and the top-level Archiva website --including the page you're reading now -- is in the <tt>site</tt> directory.</p><p>To work on the documentation, execute <tt>mvn site:run</tt> in one of these directories, and then visit http://localhost:8080 to view pages as you edit them. When you're done, submit a patch in the <a href="../issue-tracking.html">issue tracker</a>.</p></div><div class="section"><h2>svn<a name="svn"></a></h2><p>You use checkout all trunks.</p><div class="source"><pre class="prettyprint">svn co https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div><div class="section"><h2>git clone<a name="git_clone"></a>
</h2><p>You can use git svn clone. See <a class="externalLink" href="http://git.apache.org/">Apache Documentation</a>.</p><div class="source"><pre class="prettyprint">git clone git://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Building Archiva<a name="Building_Archiva"></a></h2>
+<p>To build the very latest code available... </p>
+<ol style="list-style-type: decimal">
+<li>Check out the source code as described on the <a href="../source-repository.html">Source Repository</a> page.</li>
+<li>In the 'parent' directory, execute <tt>mvn clean install</tt> to build the parent pom.</li>
+<li>In the 'archiva' directory, execute <tt>mvn clean install</tt> to build the Archiva modules and distribution.</li></ol>
+<p>After the build completes, you can find the Archiva distribution in <tt>archiva-jetty/target</tt> and the Archiva webapp in <tt>archiva-modules/archiva-web/archiva-webapp/target</tt></p>
+<p>Usually, it's that simple. :) Occasionally, Archiva may depend on a snapshot of another project such as <a class="externalLink" href="http://archiva.apache.org/redback">Redback</a>, and you may need to build that first, or configure a snapshot repository. If you're having trouble building Archiva, ask on the <a href="../mail-lists.html">Development mailing list</a> and we'll point you in the right direction.</p></div>
+<div class="section">
+<h2>Documentation<a name="Documentation"></a></h2>
+<p>The version-specific documentation for the latest version of Archiva can be found in <tt>archiva/archiva-docs</tt>, and the top-level Archiva website --including the page you're reading now -- is in the <tt>site</tt> directory.</p>
+<p>To work on the documentation, execute <tt>mvn site:run</tt> in one of these directories, and then visit http://localhost:8080 to view pages as you edit them. When you're done, submit a patch in the <a href="../issue-tracking.html">issue tracker</a>.</p></div>
+<div class="section">
+<h2>svn<a name="svn"></a></h2>
+<p>You use checkout all trunks.</p>
+<div class="source">
+<pre>svn co https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div>
+<div class="section">
+<h2>git clone<a name="git_clone"></a></h2>
+<p>You can use git svn clone. See <a class="externalLink" href="http://git.apache.org/">Apache Documentation</a>.</p>
+<div class="source">
+<pre>git clone git://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh
or trough https
-git clone https://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh</pre></div></div><div class="section"><h2>Running Javascript webapp with tomcat-maven-plugin<a name="Running_Javascript_webapp_with_tomcat-maven-plugin"></a></h2><p>You can use <a class="externalLink" href="http://tomcat.apache.org/maven-plugin.html">tomcat-maven-plugin</a> to run the webapp without installing the war in a container. With maven3 in the top directory :</p><div class="source"><pre class="prettyprint">mvn tomcat7:run -pl :archiva-webapp -am
+git clone https://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh</pre></div></div>
+<div class="section">
+<h2>Running Javascript webapp with tomcat-maven-plugin<a name="Running_Javascript_webapp_with_tomcat-maven-plugin"></a></h2>
+<p>You can use <a class="externalLink" href="http://tomcat.apache.org/maven-plugin.html">tomcat-maven-plugin</a> to run the webapp without installing the war in a container. With maven3 in the top directory :</p>
+<div class="source">
+<pre>mvn tomcat7:run -pl :archiva-webapp -am
or
mvn tomcat6:run -pl :archiva-webapp -am
or
-sh ./t7.sh</pre></div><p>Hit your browser : http://localhost:9091/archiva/index.html</p></div>
+sh ./t7.sh</pre></div>
+<p>Hit your browser : http://localhost:9091/archiva/index.html</p></div>
</div>
</div>
Modified: archiva/site-content/developers/how-we-do-things.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/how-we-do-things.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/developers/how-we-do-things.html (original)
+++ archiva/site-content/developers/how-we-do-things.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="Date-Creation-yyyymmdd" content="20121008" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - How We Do Things</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,7 +214,41 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>How We Do Things<a name="How_We_Do_Things"></a></h2><p>Below are the conventions we follow in Archiva.</p><div class="section"><h3>Continuous Integration<a name="Continuous_Integration"></a></h3><p>We use the Jenkins Apache instance for building Archiva (and redback dependencies) on scm changes.</p><p>See the tab with various builds: <a class="externalLink" href="https://builds.apache.org/view/A-D/view/Archiva/">Archiva tab</a></p><p>You can test fresh builds with downloading from this Jenkins job <a class="externalLink" href="https://builds.apache.org/archiva-all-maven-3.x-jdk-1.6/">archiva-all-maven-3.x-jdk-1.6</a>:</p><ul><li><a class="externalLink" href="https://builds.apache.org/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-modules/archiva-web/archiva-webapp/target/archiva-webapp-1.4.0-SNAPSHOT.war">war webapp js</a></li><li><a class="externalLink" href="https://builds.apache.org/job/archiva-a
ll-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-jetty/target/apache-archiva-js-1.4.0-SNAPSHOT-bin.zip">standalone with embeded jetty</a> (unzip then cd bin;./archiva start running on 8080)</li></ul></div><div class="section"><h3>Code Style<a name="Code_Style"></a></h3><p>There isn't any code style that needs to be followed as long as it is consistent, can be checked in checkstyle, can be formatted in Eclipse, IDEA and NetBeans. And the following rules must be followed:</p><ol style="list-style-type: decimal"><li>Use spaces, not tabs<ul><li>4 spaces for Java</li><li>2 spaces for XML</li></ul></li><li>120 column wrap, not 80</li><li>Wrap on spaces, not on '.' in a method call<p>You can use the existing codestyle files:</p><ul><li><a href="./archiva-idea-codestyle.xml">idea</a></li><li><a href="./archiva-eclipse-codestyle.xml">eclipse</a></li></ul></li></ol></div><div class="section"><h3>Versioning<a name="Versioning"></a></h3><p>It has been established in the communi
ty that the following style would be followed for the versioning of releases:</p><div><pre>Milestones -> Final -> Patch releases (e.g. 1.1-M1, 1.1-M2, 1.1, 1.1.1, 1.1.2 )</pre></div><p>As much as possible, the team is aiming for frequent releases. If the roadmap for the current development version is big, milestone releases can be applied until the final release. But if the roadmap is composed of just a small number of issues, we could proceed immediately to preparing a release candidate and push it out as the final release once it passes the vote.</p></div><div class="section"><h3>References<a name="References"></a></h3><ul><li><a class="externalLink" href="http://old.nabble.com/Fwd%3A-What-do-we-need-to-establish--td17098487.html"> Mailing list discussion regarding conventions</a></li></ul></div></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>How We Do Things<a name="How_We_Do_Things"></a></h2>
+<p>Below are the conventions we follow in Archiva.</p>
+<div class="section">
+<h3>Continuous Integration<a name="Continuous_Integration"></a></h3>
+<p>We use the Jenkins Apache instance for building Archiva (and redback dependencies) on scm changes.</p>
+<p>See the tab with various builds: <a class="externalLink" href="https://builds.apache.org/view/A-D/view/Archiva/">Archiva tab</a></p>
+<p>You can test fresh builds with downloading from this Jenkins job <a class="externalLink" href="https://builds.apache.org/archiva-all-maven-3.x-jdk-1.6/">archiva-all-maven-3.x-jdk-1.6</a>:</p>
+<ul>
+<li><a class="externalLink" href="https://builds.apache.org/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-modules/archiva-web/archiva-webapp/target/archiva-webapp-1.4.0-SNAPSHOT.war">war webapp js</a></li>
+<li><a class="externalLink" href="https://builds.apache.org/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-jetty/target/apache-archiva-js-1.4.0-SNAPSHOT-bin.zip">standalone with embeded jetty</a> (unzip then cd bin;./archiva start running on 8080)</li></ul></div>
+<div class="section">
+<h3>Code Style<a name="Code_Style"></a></h3>
+<p>There isn't any code style that needs to be followed as long as it is consistent, can be checked in checkstyle, can be formatted in Eclipse, IDEA and NetBeans. And the following rules must be followed:</p>
+<ol style="list-style-type: decimal">
+<li>Use spaces, not tabs
+<ul>
+<li>4 spaces for Java</li>
+<li>2 spaces for XML</li></ul></li>
+<li>120 column wrap, not 80</li>
+<li>Wrap on spaces, not on '.' in a method call
+<p>You can use the existing codestyle files:</p>
+<ul>
+<li><a href="./archiva-idea-codestyle.xml">idea</a></li>
+<li><a href="./archiva-eclipse-codestyle.xml">eclipse</a></li></ul></li></ol></div>
+<div class="section">
+<h3>Versioning<a name="Versioning"></a></h3>
+<p>It has been established in the community that the following style would be followed for the versioning of releases:</p>
+<div>
+<pre>Milestones -> Final -> Patch releases (e.g. 1.1-M1, 1.1-M2, 1.1, 1.1.1, 1.1.2 )</pre></div>
+<p>As much as possible, the team is aiming for frequent releases. If the roadmap for the current development version is big, milestone releases can be applied until the final release. But if the roadmap is composed of just a small number of issues, we could proceed immediately to preparing a release candidate and push it out as the final release once it passes the vote.</p></div>
+<div class="section">
+<h3>References<a name="References"></a></h3>
+<ul>
+<li><a class="externalLink" href="http://old.nabble.com/Fwd%3A-What-do-we-need-to-establish--td17098487.html"> Mailing list discussion regarding conventions</a></li></ul></div></div>
</div>
</div>
Modified: archiva/site-content/developers/publishing-site.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/publishing-site.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/developers/publishing-site.html (original)
+++ archiva/site-content/developers/publishing-site.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Archiva Sites Publishing</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,12 +213,67 @@
<div id="bodyColumn" >
- <div class="section"><h2>Publishing the Archiva Site<a name="Publishing_the_Archiva_Site"></a></h2><p>The Archiva site, documentation and reference documentation are now published to <tt>http://archiva.apache.org/</tt> using the <a class="externalLink" href="http://www.apache.org/dev/project-site.html#svnpubsub"> ASF's svnpubsub</a> service.</p><p>The files published to the site are all stored under the Subversion repository at <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/site-content/">http://svn.apache.org/repos/asf/archiva/site-content/</a>.</p><p>This mostly operates like a normal site deployment, though there are some specific customisations and special instructions for the reference library. The processes follow those described for the <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/">Maven SCM Publish Plugin</a> for <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publis
h-plugin/examples/one-module-configuration.html"> Single module projects</a> and <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/multi-module-configuration.html"> Multi-module projects</a> as applicable.</p><p>Each site checks out the production site data into the <tt>site-publish</tt> directory of the current project, to avoid being cleaned as part of the build. It is ignored by <tt>svn</tt> operations, but you should ensure that the checkout is clean if you ever cancel or have a failure during a publish operation. You can check it is clean by ensuring there is no data from <tt>svn status</tt> in that directory, or by removing it and having it get checked out again.</p><div class="section"><h3>Editing and Publishing the Main Site<a name="Editing_and_Publishing_the_Main_Site"></a></h3><p>The site displayed at the root of <a class="externalLink" href="http://archiva.apache.org">http://archiva.apache.org</a> (where you are readin
g this) has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/site">https://svn.apache.org/repos/asf/archiva/site</a>.</p><p>To edit and publish the site, do the following:</p><ol style="list-style-type: decimal"><li>Checkout the source code from Subversion (if you follow the instructions in <a href="./building.html"> Building Archiva</a>, you will already have it.</li><li>Make edits and check them using <tt>mvn site</tt> or <tt>mvn site:run</tt> until satisfied.</li><li>Commit your changes (making sure your working copy is completely up to date first)</li><li>Publish the site:<div><pre>mvn site-deploy</pre></div></li></ol><p>This site deployment can be done at any time, and is not tied to releases.</p><p>Note that since the main site also contains the (large!) <tt>docs</tt> and <tt>ref</tt> directories in the <tt>site-publish</tt> directory, there is a special <tt>setup-checkout</tt> profile in place to get the initial c
heckout without those directories. This will normally be activated whenever the <tt>site-publish</tt> directory is missing - if you happen to have active profiles from your <tt>settings.xml</tt> you may need to enable it explicitly whenever you do a deployment and that checkout is missing: <tt>mvn site-deploy -Psetup-checkout</tt> </p></div><div class="section"><h3>Editing and Publishing the Archiva Documentation<a name="Editing_and_Publishing_the_Archiva_Documentation"></a></h3><p>The documentation displayed under the subdirectories of <a class="externalLink" href="http://archiva.apache.org/docs/">http://archiva.apache.org/docs/</a> has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs">https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs</a>, which is part of the main project checkout.</p><p>The instructions for managing the documentation is the same as for the main site, being published from t
he directory using:</p><div><pre>mvn site-deploy</pre></div><p>However, in this case it is typically done as part of a release process - see <a href="./releasing.html"> Releasing Archiva</a> for instructions on doing this.</p><p>The documentation remains versioned based on the release it is related to. To best manage this with svnpubsub, the site is always published into a directory <tt>docs/latest</tt>, only requiring a small number of modifications to be made. Then, as part of the release instructions, the <tt>latest</tt> directory is copied to the versioned location - for example, <tt>http://svn.apache.org/repos/asf/archiva/site-content/docs/1.4-M4</tt>.</p><p>For <tt>site:stage</tt> to apply correctly without needing a full checkout, a workaround is applied by setting the <tt>distributionManagement/site/url</tt> element to match that of the parent site. The value is then overridden with the correct value in the <tt>maven-scm-publish-plugin</tt> configuration. This avoids
the Site plugin attempting to relativize links incorrectly.</p></div><div class="section"><h3>Editing and Publishing the Reference Documentation<a name="Editing_and_Publishing_the_Reference_Documentation"></a></h3><p>The reference documentation, including JavaDocs and source cross-reference, is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/ref">http://archiva.apache.org/ref</a>. At this time, only the latest reference documents are retained. They require quite a lot of space, and historical information is of less relevance to Archiva developers or users.</p><p>To publish the latest reference documents, you need to run:</p><div><pre>cd archiva-modules
+ <div class="section">
+<h2>Publishing the Archiva Site<a name="Publishing_the_Archiva_Site"></a></h2>
+<p>The Archiva site, documentation and reference documentation are now published to <tt>http://archiva.apache.org/</tt> using the <a class="externalLink" href="http://www.apache.org/dev/project-site.html#svnpubsub"> ASF's svnpubsub</a> service.</p>
+<p>The files published to the site are all stored under the Subversion repository at <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/site-content/">http://svn.apache.org/repos/asf/archiva/site-content/</a>.</p>
+<p>This mostly operates like a normal site deployment, though there are some specific customisations and special instructions for the reference library. The processes follow those described for the <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/">Maven SCM Publish Plugin</a> for <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html"> Single module projects</a> and <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/multi-module-configuration.html"> Multi-module projects</a> as applicable.</p>
+<p>Each site checks out the production site data into the <tt>site-publish</tt> directory of the current project, to avoid being cleaned as part of the build. It is ignored by <tt>svn</tt> operations, but you should ensure that the checkout is clean if you ever cancel or have a failure during a publish operation. You can check it is clean by ensuring there is no data from <tt>svn status</tt> in that directory, or by removing it and having it get checked out again.</p>
+<div class="section">
+<h3>Editing and Publishing the Main Site<a name="Editing_and_Publishing_the_Main_Site"></a></h3>
+<p>The site displayed at the root of <a class="externalLink" href="http://archiva.apache.org">http://archiva.apache.org</a> (where you are reading this) has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/site">https://svn.apache.org/repos/asf/archiva/site</a>.</p>
+<p>To edit and publish the site, do the following:</p>
+<ol style="list-style-type: decimal">
+<li>Checkout the source code from Subversion (if you follow the instructions in <a href="./building.html"> Building Archiva</a>, you will already have it.</li>
+<li>Make edits and check them using <tt>mvn site</tt> or <tt>mvn site:run</tt> until satisfied.</li>
+<li>Commit your changes (making sure your working copy is completely up to date first)</li>
+<li>Publish the site:
+<div>
+<pre>mvn site-deploy</pre></div></li></ol>
+<p>This site deployment can be done at any time, and is not tied to releases.</p>
+<p>Note that since the main site also contains the (large!) <tt>docs</tt> and <tt>ref</tt> directories in the <tt>site-publish</tt> directory, there is a special <tt>setup-checkout</tt> profile in place to get the initial checkout without those directories. This will normally be activated whenever the <tt>site-publish</tt> directory is missing - if you happen to have active profiles from your <tt>settings.xml</tt> you may need to enable it explicitly whenever you do a deployment and that checkout is missing: <tt>mvn site-deploy -Psetup-checkout</tt> </p></div>
+<div class="section">
+<h3>Editing and Publishing the Archiva Documentation<a name="Editing_and_Publishing_the_Archiva_Documentation"></a></h3>
+<p>The documentation displayed under the subdirectories of <a class="externalLink" href="http://archiva.apache.org/docs/">http://archiva.apache.org/docs/</a> has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs">https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs</a>, which is part of the main project checkout.</p>
+<p>The instructions for managing the documentation is the same as for the main site, being published from the directory using:</p>
+<div>
+<pre>mvn site-deploy</pre></div>
+<p>However, in this case it is typically done as part of a release process - see <a href="./releasing.html"> Releasing Archiva</a> for instructions on doing this.</p>
+<p>The documentation remains versioned based on the release it is related to. To best manage this with svnpubsub, the site is always published into a directory <tt>docs/latest</tt>, only requiring a small number of modifications to be made. Then, as part of the release instructions, the <tt>latest</tt> directory is copied to the versioned location - for example, <tt>http://svn.apache.org/repos/asf/archiva/site-content/docs/1.4-M4</tt>.</p>
+<p>For <tt>site:stage</tt> to apply correctly without needing a full checkout, a workaround is applied by setting the <tt>distributionManagement/site/url</tt> element to match that of the parent site. The value is then overridden with the correct value in the <tt>maven-scm-publish-plugin</tt> configuration. This avoids the Site plugin attempting to relativize links incorrectly.</p></div>
+<div class="section">
+<h3>Editing and Publishing the Reference Documentation<a name="Editing_and_Publishing_the_Reference_Documentation"></a></h3>
+<p>The reference documentation, including JavaDocs and source cross-reference, is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/ref">http://archiva.apache.org/ref</a>. At this time, only the latest reference documents are retained. They require quite a lot of space, and historical information is of less relevance to Archiva developers or users.</p>
+<p>To publish the latest reference documents, you need to run:</p>
+<div>
+<pre>cd archiva-modules
mvn site site:stage scm-publish:publish-scm
or
-sh ./deploySite.sh</pre></div><p>This will likely cause a very large commit, and should be done infrequently. Once per release is likely to be adequate.</p></div><div class="section"><h3>Publishing Redback site<a name="Publishing_Redback_site"></a></h3><p>The redback is stored under the Subversion repository at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk">https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk</a>.</p><p>It's displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback">http://archiva.apache.org/redback</a>.</p><p>To publish documentation, you need to run:</p><div><pre>mvn site-deploy</pre></div></div><div class="section"><h3>Publishing Redback Core reference<a name="Publishing_Redback_Core_reference"></a></h3><p>The Redback core reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/core">http://archiva.apache.org/redbac
k/core</a>.</p><p>It contains javadoc for Redback core.</p><p>To publish documentation, you need to run:</p><div><pre>mvn clean site-deploy scm-publish:publish-scm
+sh ./deploySite.sh</pre></div>
+<p>This will likely cause a very large commit, and should be done infrequently. Once per release is likely to be adequate.</p></div>
+<div class="section">
+<h3>Publishing Redback site<a name="Publishing_Redback_site"></a></h3>
+<p>The redback is stored under the Subversion repository at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk">https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk</a>.</p>
+<p>It's displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback">http://archiva.apache.org/redback</a>.</p>
+<p>To publish documentation, you need to run:</p>
+<div>
+<pre>mvn site-deploy</pre></div></div>
+<div class="section">
+<h3>Publishing Redback Core reference<a name="Publishing_Redback_Core_reference"></a></h3>
+<p>The Redback core reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/core">http://archiva.apache.org/redback/core</a>.</p>
+<p>It contains javadoc for Redback core.</p>
+<p>To publish documentation, you need to run:</p>
+<div>
+<pre>mvn clean site-deploy scm-publish:publish-scm
or
-sh ./deploySite.sh</pre></div></div><div class="section"><h3>Publishing Redback Components reference<a name="Publishing_Redback_Components_reference"></a></h3><p>The Redback components reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/components">http://archiva.apache.org/redback/components</a>.</p><p>It contains javadoc for Redback components.</p><p>To publish documentation, you need to run:</p><div><pre>mvn clean site-deploy scm-publish:publish-scm
+sh ./deploySite.sh</pre></div></div>
+<div class="section">
+<h3>Publishing Redback Components reference<a name="Publishing_Redback_Components_reference"></a></h3>
+<p>The Redback components reference is displayed under the URL <a class="externalLink" href="http://archiva.apache.org/redback/components">http://archiva.apache.org/redback/components</a>.</p>
+<p>It contains javadoc for Redback components.</p>
+<p>To publish documentation, you need to run:</p>
+<div>
+<pre>mvn clean site-deploy scm-publish:publish-scm
or
sh ./deploySite.sh</pre></div></div></div>
</div>
Modified: archiva/site-content/developers/releasing.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/releasing.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/developers/releasing.html (original)
+++ archiva/site-content/developers/releasing.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Archiva release process</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,24 +214,57 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Archiva release process<a name="Archiva_release_process"></a></h2><ol style="list-style-type: decimal"><li>Post to the dev list a few days before you plan to do an Archiva release</li><li>Recreate the staging repository on archiva-repository.apache.org - make sure that it is not scanned (so that .index* is not created). Your maven setting must contains the entry to be able to deploy.<div class="source"><pre class="prettyprint"> <server>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Archiva release process<a name="Archiva_release_process"></a></h2>
+<ol style="list-style-type: decimal">
+<li>Post to the dev list a few days before you plan to do an Archiva release</li>
+<li>Recreate the staging repository on archiva-repository.apache.org - make sure that it is not scanned (so that .index* is not created). Your maven setting must contains the entry to be able to deploy.
+<div class="source">
+<pre> <server>
<id>archiva-repository.releases</id>
<username></username>
<password></password>
- </server></pre></div></li><li>If there are changes in the parent pom, release parent pom – https://svn.apache.org/repos/asf/archiva/parent<ul><li>mvn release:prepare (verify that it has been properly tagged) * mvn release:perform (verify that it has been deployed correctly in the staging repo)</li></ul></li><li>Update the parent pom version of archiva – https://svn.apache.org/repos/asf/archiva/trunk<ul><li>change the parent pom version to the archiva-parent version that has just been released * commit the changes made</li></ul></li><li>Update the release notes and the site.xml for version changes in archiva-docs</li><li>Verify that the webapp-tests are building successfully. Since it is in a separate profile but inside the Archiva source tree, it will not be released but will still be included in the release tag. If some tests are failing, comment it out first so that only the passing tests are executed when the webapp-tests module are built from the t
ag.</li><li>Release archiva You should have a GPG agent running (preferred), and confirm it works by running "gpg -ab" (type some text and press Ctrl-D). If you do not have a GPG agent running, make sure that you have the "apache-release" profile set in your settings.xml as shown below.<div class="source"><pre class="prettyprint"><profile>
+ </server></pre></div></li>
+<li>If there are changes in the parent pom, release parent pom – https://svn.apache.org/repos/asf/archiva/parent
+<ul>
+<li>mvn release:prepare (verify that it has been properly tagged) * mvn release:perform (verify that it has been deployed correctly in the staging repo)</li></ul></li>
+<li>Update the parent pom version of archiva – https://svn.apache.org/repos/asf/archiva/trunk
+<ul>
+<li>change the parent pom version to the archiva-parent version that has just been released * commit the changes made</li></ul></li>
+<li>Update the release notes and the site.xml for version changes in archiva-docs</li>
+<li>Verify that the webapp-tests are building successfully. Since it is in a separate profile but inside the Archiva source tree, it will not be released but will still be included in the release tag. If some tests are failing, comment it out first so that only the passing tests are executed when the webapp-tests module are built from the tag.</li>
+<li>Release archiva You should have a GPG agent running (preferred), and confirm it works by running "gpg -ab" (type some text and press Ctrl-D). If you do not have a GPG agent running, make sure that you have the "apache-release" profile set in your settings.xml as shown below.
+<div class="source">
+<pre><profile>
<id>apache-release</id>
<properties>
<gpg.passphrase>[GPG_PASSWORD]</gpg.passphrase>
</properties>
-</profile></pre></div><p>Set your user credentials for the stage repo in the <i>servers</i> section of your settings.xml for vmbuild.staging Execute mvn release:prepare (check that it has been properly tagged. the tag name must be.. archiva-[VERSION]) Then execute mvn release:perform Download the uploaded files via wget:</p><div class="source"><pre class="prettyprint">ex.
+</profile></pre></div>
+<p>Set your user credentials for the stage repo in the <i>servers</i> section of your settings.xml for vmbuild.staging Execute mvn release:prepare (check that it has been properly tagged. the tag name must be.. archiva-[VERSION]) Then execute mvn release:perform Download the uploaded files via wget:</p>
+<div class="source">
+<pre>ex.
wget http://archiva-repository.apache.org/archiva/repository/staged-releases/org/apache/archiva/archiva-jetty/1.3/archiva-jetty-1.3-bin.tar.gz
Verify the signatures:
ex.
-gpg -v archiva-jetty-1.3-bin.zip.asc</pre></div><p>The documentation is deployed as part of the process to the final location for review in the vote: http://archiva.apache.org/docs/1.3/. If the vote doesn't pass, the documentation will need to be removed from the server for redeployment. Commit the sources and binaries from org/apache/archiva/archiva-jetty, and org/apache/archiva/archiva to the svn distribution tree. First in dev tree: https://dist.apache.org/repos/dist/dev/archiva/ (if the vote pass they will be copied to release tree) https://dist.apache.org/repos/dist/release/archiva</p><div class="source"><pre class="prettyprint">svn co https://dist.apache.org/repos/dist/dev/archiva/ archiva-dev-release
+gpg -v archiva-jetty-1.3-bin.zip.asc</pre></div>
+<p>The documentation is deployed as part of the process to the final location for review in the vote: http://archiva.apache.org/docs/1.3/. If the vote doesn't pass, the documentation will need to be removed from the server for redeployment. Commit the sources and binaries from org/apache/archiva/archiva-jetty, and org/apache/archiva/archiva to the svn distribution tree. First in dev tree: https://dist.apache.org/repos/dist/dev/archiva/ (if the vote pass they will be copied to release tree) https://dist.apache.org/repos/dist/release/archiva</p>
+<div class="source">
+<pre>svn co https://dist.apache.org/repos/dist/dev/archiva/ archiva-dev-release
cd archiva-dev-release
-sh ./release-script-svn.sh VERSION STAGING_URL</pre></div><p>Call for a vote in the dev list and wait for 72 hrs. for the vote results. 3 binding votes are necessary for the release to be finalized. example If the vote fails or needs to be canceled, the version number should not be re-used if the version was made available for public download. After the vote has passed, move the files from dist dev to dist release: svn mv https://dist.apache.org/repos/dist/dev/archiva/ to https://dist.apache.org/repos/dist/relase/archiva/ To sync the jars to ibiblio, execute:</p><p><b>NOTE: the stage plugin doesn't work with maven3 you must use maven 2.2.1</b></p><div class="source"><pre class="prettyprint"> mvn stage:copy -Dsource="https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/"
+sh ./release-script-svn.sh VERSION STAGING_URL</pre></div>
+<p>Call for a vote in the dev list and wait for 72 hrs. for the vote results. 3 binding votes are necessary for the release to be finalized. example If the vote fails or needs to be canceled, the version number should not be re-used if the version was made available for public download. After the vote has passed, move the files from dist dev to dist release: svn mv https://dist.apache.org/repos/dist/dev/archiva/ to https://dist.apache.org/repos/dist/relase/archiva/ To sync the jars to ibiblio, execute:</p>
+<p><b>NOTE: the stage plugin doesn't work with maven3 you must use maven 2.2.1</b></p>
+<div class="source">
+<pre> mvn stage:copy -Dsource="https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/"
-Dtarget="scp://[APACHE_USERNAME]@people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"
- -Dversion=1.3 -DrepositoryId=apache.releases</pre></div><p>mark the appropriate release version in JIRA as complete Update the archiva site (https://svn.apache.org/repos/asf/archiva/site/) for the versions and release notes URL and run mvn site-deploy. The 3 properties to change are at the bottom of pom.xml before generating the site. Remove old versions from /www/www.apache.org/dist/archiva Publish the reference docs (sh ./deploySite.sh in the archiva-modules directory) from the release tag. You may have to exclude the archiva-webapp module to do this, and will require MAVEN_OPTS=-Xmx256m. You may need to use Maven 2.2.1 instead of Maven 3.x for this.</p><p>Send out an announcement of the release to:</p><ul><li>users@archiva.apache.org</li><li>users@maven.apache.org</li><li>announce@apache.org</li></ul></li></ol></div>
+ -Dversion=1.3 -DrepositoryId=apache.releases</pre></div>
+<p>mark the appropriate release version in JIRA as complete Update the archiva site (https://svn.apache.org/repos/asf/archiva/site/) for the versions and release notes URL and run mvn site-deploy. The 3 properties to change are at the bottom of pom.xml before generating the site. Remove old versions from /www/www.apache.org/dist/archiva Publish the reference docs (sh ./deploySite.sh in the archiva-modules directory) from the release tag. You may have to exclude the archiva-webapp module to do this, and will require MAVEN_OPTS=-Xmx256m. You may need to use Maven 2.2.1 instead of Maven 3.x for this.</p>
+<p>Send out an announcement of the release to:</p>
+<ul>
+<li>users@archiva.apache.org</li>
+<li>users@maven.apache.org</li>
+<li>announce@apache.org</li></ul></li></ol></div>
</div>
</div>
Modified: archiva/site-content/download.html
URL: http://svn.apache.org/viewvc/archiva/site-content/download.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/download.html (original)
+++ archiva/site-content/download.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva -
Download Apache Archiva</title>
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -232,28 +232,45 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License. -->
- <div class="section"><h2>Download Apache Archiva 1.3.6<a name="Download_Apache_Archiva_1.3.6"></a></h2>
- <p>Archiva is distributed under the <a class="externalLink" href="http://archiva.apache.org/license.html}">Apache License, version 2.0</a>.</p>
- <div class="section"><h3>System Requirements<a name="System_Requirements"></a></h3>
- <table border="0" class="table table-striped">
- <tr class="a">
- <td><b>JDK</b></td>
- <td>1.6 or above</td>
+ <div class="section">
+<h2>Download Apache Archiva 1.3.6<a name="Download_Apache_Archiva_1.3.6"></a></h2>
+
+<p>Archiva is distributed under the <a class="externalLink" href="http://archiva.apache.org/license.html}">Apache License, version 2.0</a>.</p>
+
+<div class="section">
+<h3>System Requirements<a name="System_Requirements"></a></h3>
+
+<table border="0" class="table table-striped">
+
+<tr class="a">
+
+<td><b>JDK</b></td>
+
+<td>1.6 or above</td>
</tr>
- <tr class="b">
- <td><b>No minimum requirement</b></td>
- <td>The Archiva application is in itself about 20MB but will use more disk space to store repository contents</td>
+
+<tr class="b">
+
+<td><b>No minimum requirement</b></td>
+
+<td>The Archiva application is in itself about 20MB but will use more disk space to store repository contents</td>
</tr>
- <tr class="a">
- <td><b>Operating System</b></td>
- <td>Support for Linux, Mac OS, Solaris and Windows. Tested on Windows XP SP2, Ubuntu Linux, and Mac OS X.</td>
+
+<tr class="a">
+
+<td><b>Operating System</b></td>
+
+<td>Support for Linux, Mac OS, Solaris and Windows. Tested on Windows XP SP2, Ubuntu Linux, and Mac OS X.</td>
</tr>
</table>
</div>
<a name="mirror"></a>
- <div class="section"><h3>Mirror<a name="Mirror"></a></h3>
+
+<div class="section">
+<h3>Mirror<a name="Mirror"></a></h3>
- <p>
+
+<p>
[if-any logo]
<a href="[link]">
<img src="[logo]" align="right" border="0" alt="logo" />
@@ -291,63 +308,103 @@ under the License. -->
<input type="submit" value="Change" class="btn" />
</form>
- <p>
+
+<p>
You may also consult the
<a class="externalLink" href="http://www.apache.org/mirrors/">complete list of
mirrors.</a>
</p>
</div>
- <div class="section"><h3>Current Release: Archiva 1.3.6<a name="Current_Release:_Archiva_1.3.6"></a></h3>
- <p>
+
+<div class="section">
+<h3>Current Release: Archiva 1.3.6<a name="Current_Release:_Archiva_1.3.6"></a></h3>
+
+<p>
This is the currently recommended version of Archiva.
- </p><ul>
- <li><a href="./docs/1.3.6/release-notes.html">Release Notes</a></li>
- <li><a href="./known-issues.html">Known Issues and Errata</a></li>
- <li><a href="./security.html">Security Reports</a></li>
+ </p>
+<ul>
+
+<li><a href="./docs/1.3.6/release-notes.html">Release Notes</a></li>
+
+<li><a href="./known-issues.html">Known Issues and Errata</a></li>
+
+<li><a href="./security.html">Security Reports</a></li>
</ul>
- <p>
- </p><table border="0" class="table table-striped">
+
+<p>
+ </p>
+<table border="0" class="table table-striped">
<thead>
- <tr class="a">
- <th>Archiva 1.3.6 </th>
- <th>Mirrors</th>
- <th>Checksum</th>
- <th>Signature</th>
+
+<tr class="a">
+
+<th>Archiva 1.3.6 </th>
+
+<th>Mirrors</th>
+
+<th>Checksum</th>
+
+<th>Signature</th>
</tr>
</thead>
<tbody>
- <tr class="b">
- <td>Archiva 1.3.6 Standalone</td>
- <td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz">tar.gz</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dyn/closer.cgi/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.3.6 Standalone</td>
+
+<td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz">tar.gz</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dyn/closer.cgi/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.tar.gz.asc">asc</a></td>
</tr>
- <tr class="a">
- <td></td>
- <td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip">zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.asc">asc</a></td>
+
+<tr class="a">
+
+<td></td>
+
+<td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip">zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6-bin.zip.asc">asc</a></td>
</tr>
- <tr class="b">
- <td>Archiva 1.3.6 WAR</td>
- <td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6.war">war</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.3.6 WAR</td>
+
+<td><a href="[preferred]archiva/1.3.6/binaries/apache-archiva-1.3.6.war">war</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/binaries/apache-archiva-1.3.6.war.asc">asc</a></td>
</tr>
- <tr class="a">
- <td>Archiva 1.3.6 Documentation</td>
- <td><a href="[preferred]archiva/1.3.6/docs/1.3.6/apache-archiva-1.3.6-docs.zip">docs zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/docs/apache-archiva-1.3.6-docs.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/docs/apache-archiva-1.3.6-docs.zip.asc">asc</a></td>
+
+<tr class="a">
+
+<td>Archiva 1.3.6 Documentation</td>
+
+<td><a href="[preferred]archiva/1.3.6/docs/1.3.6/apache-archiva-1.3.6-docs.zip">docs zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/docs/apache-archiva-1.3.6-docs.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/docs/apache-archiva-1.3.6-docs.zip.asc">asc</a></td>
</tr>
- <tr class="b">
- <td>Archiva 1.3.6 Sources</td>
- <td><a href="[preferred]archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip">source zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.3.6 Sources</td>
+
+<td><a href="[preferred]archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip">source zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.3.6/src/1.3.6/apache-archiva-1.3.6-src.zip.asc">asc</a></td>
</tr>
</tbody>
</table>
@@ -355,49 +412,83 @@ under the License. -->
</div>
- <div class="section"><h3>Preview Release: Archiva 1.4-M4<a name="Preview_Release:_Archiva_1.4-M4"></a></h3>
- <p>
+
+<div class="section">
+<h3>Preview Release: Archiva 1.4-M4<a name="Preview_Release:_Archiva_1.4-M4"></a></h3>
+
+<p>
This is a preview release of the next version of Archiva.
- </p><ul>
- <li><a href="./docs/1.4-M4/release-notes.html">Release Notes</a></li>
- <li><a href="./known-issues.html">Known Issues and Errata</a></li>
- <li><a href="./security.html">Security Reports</a></li>
+ </p>
+<ul>
+
+<li><a href="./docs/1.4-M4/release-notes.html">Release Notes</a></li>
+
+<li><a href="./known-issues.html">Known Issues and Errata</a></li>
+
+<li><a href="./security.html">Security Reports</a></li>
</ul>
- <p>
- </p><table border="0" class="table table-striped">
+
+<p>
+ </p>
+<table border="0" class="table table-striped">
<thead>
- <tr class="a">
- <th>Archiva 1.4-M4 </th>
- <th>Mirros</th>
- <th>Checksum</th>
- <th>Signature</th>
+
+<tr class="a">
+
+<th>Archiva 1.4-M4 </th>
+
+<th>Mirros</th>
+
+<th>Checksum</th>
+
+<th>Signature</th>
</tr>
</thead>
<tbody>
- <tr class="b">
- <td>Archiva 1.4-M4 Standalone</td>
- <td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz">tar.gz</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.4-M4 Standalone</td>
+
+<td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz">tar.gz</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.tar.gz.asc">asc</a></td>
</tr>
- <tr class="a">
- <td></td>
- <td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip">zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.asc">asc</a></td>
+
+<tr class="a">
+
+<td></td>
+
+<td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip">zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4-bin.zip.asc">asc</a></td>
</tr>
- <tr class="b">
- <td>Archiva 1.4-M4 WAR</td>
- <td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war">war</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.asc">asc</a></td>
+
+<tr class="b">
+
+<td>Archiva 1.4-M4 WAR</td>
+
+<td><a href="[preferred]archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war">war</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/binaries/apache-archiva-1.4-M4.war.asc">asc</a></td>
</tr>
- <tr class="a">
- <td>Archiva 1.4-M4 Sources</td>
- <td><a href="[preferred]archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip">source zip</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip.md5">md5</a></td>
- <td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip.asc">asc</a></td>
+
+<tr class="a">
+
+<td>Archiva 1.4-M4 Sources</td>
+
+<td><a href="[preferred]archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip">source zip</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip.md5">md5</a></td>
+
+<td><a class="externalLink" href="http://www.apache.org/dist/archiva/1.4-M4/src/apache-archiva-1.4-M4-src.zip.asc">asc</a></td>
</tr>
</tbody>
</table>
@@ -405,14 +496,20 @@ under the License. -->
</div>
- <div class="section"><h3>Previous Versions<a name="Previous_Versions"></a></h3>
- <p>
+
+<div class="section">
+<h3>Previous Versions<a name="Previous_Versions"></a></h3>
+
+<p>
More releases are available in the <a class="externalLink" href="http://archive.apache.org/dist/archiva/binaries/">Apache Archiva Archives</a>
or prior to the graduation from Maven, in the <a class="externalLink" href="http://archive.apache.org/dist/maven/binaries/">Apache Maven Archives</a>.
</p>
</div>
- <div class="section"><h3>Verify the integrity of the files<a name="Verify_the_integrity_of_the_files"></a></h3>
- <p>
+
+<div class="section">
+<h3>Verify the integrity of the files<a name="Verify_the_integrity_of_the_files"></a></h3>
+
+<p>
We recommend that you verify the integrity of the downloaded files using the PGP signatures and MD5 checksums.
The PGP signatures can be verified using PGP or GPG. First download the <a class="externalLink" href="http://www.apache.org/dist/archiva/KEYS">KEYS</a>
@@ -421,7 +518,9 @@ under the License. -->
rather than from a mirror. <br />
Then verify the signatures using:
</p>
- <div><pre>
+
+<div>
+<pre>
% pgpk -a KEYS
% pgpv $filename.tar.gz.asc
or
@@ -431,7 +530,8 @@ under the License. -->
% gpg --import KEYS
% gpg --verify $filename.tar.gz.asc
</pre></div>
- <p>
+
+<p>
You can also verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many
Unix distributions. It is also available as part of <a class="externalLink" href="http://www.gnu.org/software/coreutils/">GNU Coreutils</a>.
Windows users can get binary md5 programs from <a class="externalLink" href="http://www.fourmilab.ch/md5/">Fourmilab</a>,
Modified: archiva/site-content/errors/404.html
URL: http://svn.apache.org/viewvc/archiva/site-content/errors/404.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/errors/404.html (original)
+++ archiva/site-content/errors/404.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Page Not found</title>
<link rel="stylesheet" href="../css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,14 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Page Not Found<a name="Page_Not_Found"></a></h2><p>We're sorry, but the page you requested cannot be found. This may be because:</p><ul><li>The page has moved, was outdated, or has not been created yet</li><li>You typed the address incorrectly</li><li>You followed a link from another site that pointed to this page</li></ul><p>If you came to this page by following a broken link on our site, you can report the <a class="externalLink" href="http://jira.codehaus.org/browse/MRM"> problem</a>.</p></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Page Not Found<a name="Page_Not_Found"></a></h2>
+<p>We're sorry, but the page you requested cannot be found. This may be because:</p>
+<ul>
+<li>The page has moved, was outdated, or has not been created yet</li>
+<li>You typed the address incorrectly</li>
+<li>You followed a link from another site that pointed to this page</li></ul>
+<p>If you came to this page by following a broken link on our site, you can report the <a class="externalLink" href="http://jira.codehaus.org/browse/MRM"> problem</a>.</p></div>
</div>
</div>
Modified: archiva/site-content/get-involved.html
URL: http://svn.apache.org/viewvc/archiva/site-content/get-involved.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/get-involved.html (original)
+++ archiva/site-content/get-involved.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="Date-Creation-yyyymmdd" content="20120119" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Archiva Community - Get Involved</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,7 +214,41 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Getting Involved in the Archiva Project<a name="Getting_Involved_in_the_Archiva_Project"></a></h2><p>Archiva is an open source project and relies heavily on an active community. If you need help, you should look to the community. Equally, please look for ways that you may contribute back.</p><p>This page provides some pointers for receiving help and contributing to the Archiva community.</p><div class="section"><h3>Getting Help<a name="Getting_Help"></a></h3><p>There are a number of ways to find help if you have an issue. </p><ul><li><b>Read the documentation</b><br />Read the <a class="externalLink" href="http://archiva.apache.org/docs/1.4.0-SNAPSHOT/userguide">user</a> and <a class="externalLink" href="http://archiva.apache.org/docs/1.4.0-SNAPSHOT/adminguide">administration</a> documentation. </li><li><b>Search the Wiki</b><br />Search the <a class="externalLink" href="http://cwiki.apache.org/confluence/display/ARCHIVA">
Archiva Wiki</a>. Lots of useful information has been contributed by users here.</li><li><b>Submit an issue</b><br />Search the <a href="./issue-tracking.html">Jira</a> issue tracking system. The problem you are experiencing may be a known issue and others may have suggested work-arounds. If the issue is new, you should consider submitting a report.</li><li><b>Search the mailing lists</b><br />Search the mailing lists. Look <a href="./mail-lists.html">here</a> for a list of Archiva mailing lists. If you cannot find everything you need, ask a question on the appropriate list.</li></ul><div class="section"><h4>More Information<a name="More_Information"></a></h4><p>If you are new to Archiva (or Maven), there are a number of helpful resources on the Maven website which provide step-by-step guides to getting help, useful information regarding etiquette, and lots of other resources.</p><p>Check out:</p><ul><li><a class="externalLink" href="http://maven.apache.org/community.html">T
he Maven Community</a></li><li><a class="externalLink" href="http://maven.apache.org/users/getting-help.html">Getting Help with Maven</a></li></ul></div></div><div class="section"><h3>How to Contribute<a name="How_to_Contribute"></a></h3><p>As with any open source project, there are several ways you can help:</p><ul><li><b>Join a mailing list</b><br />Join a <a href="./mail-lists.html">mailing list</a> and answer other user's questions. You can also meet up with developers and users on <tt>#archiva</tt> on <tt>irc.codehaus.org</tt></li><li><b>Fix bugs</b><br />Report bugs, feature requests and other issues in the <a href="./issue-tracking.html">Jira</a> issue tracking system. Also, read up on <a href="./developers/how-we-do-things.html">how we do things</a> in Archiva.</li><li><b>Build it</b><br />Check out the <a href="./source-repository.html">source code</a> and <a href="./developers/building.html">build Archiva</a> for yourself. Fix bugs and submit patches for reported i
ssues (both those you find, or that others have filed).</li><li><b>Write documentation</b><br />Help with the documentation by pointing out areas that are lacking or unclear, and if you are so inclined, submitting patches to correct it. You can quickly contribute rough thoughts to the <a class="externalLink" href="http://cwiki.apache.org/confluence/display/ARCHIVA"> wiki</a>, or you can volunteer to help collate and organise information that is already there.</li></ul><p>Your participation in the community is much appreciated!</p><div class="section"><h4>More Information<a name="More_Information"></a></h4><p>If you are new to Archiva (or Maven), there are a number of helpful resources on the Maven website regarding contribution back to the community.</p><p>Check out:</p><ul><li><a class="externalLink" href="http://maven.apache.org/community.html">The Maven Community</a> </li><li><a class="externalLink" href="http://maven.apache.org/guides/development/guide-helping.html">Guid
e to helping with Maven</a></li></ul></div></div></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Getting Involved in the Archiva Project<a name="Getting_Involved_in_the_Archiva_Project"></a></h2>
+<p>Archiva is an open source project and relies heavily on an active community. If you need help, you should look to the community. Equally, please look for ways that you may contribute back.</p>
+<p>This page provides some pointers for receiving help and contributing to the Archiva community.</p>
+<div class="section">
+<h3>Getting Help<a name="Getting_Help"></a></h3>
+<p>There are a number of ways to find help if you have an issue. </p>
+<ul>
+<li><b>Read the documentation</b><br />Read the <a class="externalLink" href="http://archiva.apache.org/docs/1.4.0-SNAPSHOT/userguide">user</a> and <a class="externalLink" href="http://archiva.apache.org/docs/1.4.0-SNAPSHOT/adminguide">administration</a> documentation. </li>
+<li><b>Search the Wiki</b><br />Search the <a class="externalLink" href="http://cwiki.apache.org/confluence/display/ARCHIVA">Archiva Wiki</a>. Lots of useful information has been contributed by users here.</li>
+<li><b>Submit an issue</b><br />Search the <a href="./issue-tracking.html">Jira</a> issue tracking system. The problem you are experiencing may be a known issue and others may have suggested work-arounds. If the issue is new, you should consider submitting a report.</li>
+<li><b>Search the mailing lists</b><br />Search the mailing lists. Look <a href="./mail-lists.html">here</a> for a list of Archiva mailing lists. If you cannot find everything you need, ask a question on the appropriate list.</li></ul>
+<div class="section">
+<h4>More Information<a name="More_Information"></a></h4>
+<p>If you are new to Archiva (or Maven), there are a number of helpful resources on the Maven website which provide step-by-step guides to getting help, useful information regarding etiquette, and lots of other resources.</p>
+<p>Check out:</p>
+<ul>
+<li><a class="externalLink" href="http://maven.apache.org/community.html">The Maven Community</a></li>
+<li><a class="externalLink" href="http://maven.apache.org/users/getting-help.html">Getting Help with Maven</a></li></ul></div></div>
+<div class="section">
+<h3>How to Contribute<a name="How_to_Contribute"></a></h3>
+<p>As with any open source project, there are several ways you can help:</p>
+<ul>
+<li><b>Join a mailing list</b><br />Join a <a href="./mail-lists.html">mailing list</a> and answer other user's questions. You can also meet up with developers and users on <tt>#archiva</tt> on <tt>irc.codehaus.org</tt></li>
+<li><b>Fix bugs</b><br />Report bugs, feature requests and other issues in the <a href="./issue-tracking.html">Jira</a> issue tracking system. Also, read up on <a href="./developers/how-we-do-things.html">how we do things</a> in Archiva.</li>
+<li><b>Build it</b><br />Check out the <a href="./source-repository.html">source code</a> and <a href="./developers/building.html">build Archiva</a> for yourself. Fix bugs and submit patches for reported issues (both those you find, or that others have filed).</li>
+<li><b>Write documentation</b><br />Help with the documentation by pointing out areas that are lacking or unclear, and if you are so inclined, submitting patches to correct it. You can quickly contribute rough thoughts to the <a class="externalLink" href="http://cwiki.apache.org/confluence/display/ARCHIVA"> wiki</a>, or you can volunteer to help collate and organise information that is already there.</li></ul>
+<p>Your participation in the community is much appreciated!</p>
+<div class="section">
+<h4>More Information<a name="More_Information"></a></h4>
+<p>If you are new to Archiva (or Maven), there are a number of helpful resources on the Maven website regarding contribution back to the community.</p>
+<p>Check out:</p>
+<ul>
+<li><a class="externalLink" href="http://maven.apache.org/community.html">The Maven Community</a> </li>
+<li><a class="externalLink" href="http://maven.apache.org/guides/development/guide-helping.html">Guide to helping with Maven</a></li></ul></div></div></div>
</div>
</div>
Modified: archiva/site-content/license.html
URL: http://svn.apache.org/viewvc/archiva/site-content/license.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/license.html (original)
+++ archiva/site-content/license.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Project License</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -212,7 +212,15 @@
<div id="bodyColumn" >
- <div class="section"><h2>Overview<a name="Overview"></a></h2><a name="Overview"></a><p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p></div><div class="section"><h2>Project License<a name="Project_License"></a></h2><a name="Project_License"></a><div class="section"><h3>The Apache Software License, Version 2.0<a name="The_Apache_Software_License_Version_2.0"></a></h3><a name="The_Apache_Software_License_Version_2.0"></a><div class="source"><pre>
+ <div class="section">
+<h2>Overview<a name="Overview"></a></h2><a name="Overview"></a>
+<p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p></div>
+<div class="section">
+<h2>Project License<a name="Project_License"></a></h2><a name="Project_License"></a>
+<div class="section">
+<h3>The Apache Software License, Version 2.0<a name="The_Apache_Software_License_Version_2.0"></a></h3><a name="The_Apache_Software_License_Version_2.0"></a>
+<div class="source">
+<pre>
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Modified: archiva/site-content/mail-lists.html
URL: http://svn.apache.org/viewvc/archiva/site-content/mail-lists.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/mail-lists.html (original)
+++ archiva/site-content/mail-lists.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,101 @@
<div id="bodyColumn" >
- <div class="section"><h2>Project Mailing Lists<a name="Project_Mailing_Lists"></a></h2><a name="Project_Mailing_Lists"></a><p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p><table border="0" class="table table-striped"><tr class="a"><th>Name</th><th>Subscribe</th><th>Unsubscribe</th><th>Post</th><th>Archive</th><th>Other Archives</th></tr><tr class="b"><td>Archiva User List</td><td><a class="externalLink" href="mailto:users-subscribe@archiva.apache.org">Subscribe</a></td><td><a class="externalLink" href="mailto:users-unsubscribe@archiva.apache.org">Unsubscribe</a></td><td><a class="externalLink" href="mailto:users@archiva.apache.org">Post</a></td><td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-users/">mail-archives.apache.org</a></td><td><a class="externalLink" href="http://www.mail-archive.com/users@archiva.apache.org">www.mail-a
rchive.com</a></td></tr><tr class="a"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://old.nabble.com/archiva-users-f16426.html">old.nabble.com</a></td></tr><tr class="b"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.users">markmail.org</a></td></tr><tr class="a"><td>Archiva Developer List</td><td><a class="externalLink" href="mailto:dev-subscribe@archiva.apache.org">Subscribe</a></td><td><a class="externalLink" href="mailto:dev-unsubscribe@archiva.apache.org">Unsubscribe</a></td><td><a class="externalLink" href="mailto:dev@archiva.apache.org">Post</a></td><td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-dev">mail-archives.apache.org</a></td><td><a class="externalLink" href="http://www.mail-archive.com/dev@archiva.apache.org">www.mail-archive.com</a></td></tr><tr class="b"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</
td><td><a class="externalLink" href="http://old.nabble.com/archiva-dev-f16427.html">old.nabble.com</a></td></tr><tr class="a"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.dev">markmail.org</a></td></tr><tr class="b"><td>Archiva Commits List</td><td><a class="externalLink" href="mailto:commits-subscribe@archiva.apache.org">Subscribe</a></td><td><a class="externalLink" href="mailto:commits-unsubscribe@archiva.apache.org">Unsubscribe</a></td><td>-</td><td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-commits">mail-archives.apache.org</a></td><td><a class="externalLink" href="http://www.mail-archive.com/commits@archiva.apache.org">www.mail-archive.com</a></td></tr><tr class="a"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.commits">markmail.org</a></td></tr><tr class="b"><td>Archiva I
ssues List</td><td><a class="externalLink" href="mailto:issues-subscribe@archiva.apache.org">Subscribe</a></td><td><a class="externalLink" href="mailto:issues-unsubscribe@archiva.apache.org">Unsubscribe</a></td><td>-</td><td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-issues">mail-archives.apache.org</a></td><td><a class="externalLink" href="http://www.mail-archive.com/issues@archiva.apache.org">www.mail-archive.com</a></td></tr><tr class="a"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://old.nabble.com/Archiva---Issues-f29617.html">old.nabble.com</a></td></tr><tr class="b"><td>Archiva Notifications List</td><td><a class="externalLink" href="mailto:notifications-subscribe@archiva.apache.org">Subscribe</a></td><td><a class="externalLink" href="mailto:notifications-unsubscribe@archiva.apache.org">Unsubscribe</a></td><td>-</td><td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox
/archiva-notifications/">mail-archives.apache.org</a></td><td><a class="externalLink" href="http://www.mail-archive.com/notifications@archiva.apache.org">www.mail-archive.com</a></td></tr><tr class="a"><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td><a class="externalLink" href="http://archiva.notifications.markmail.org/">archiva.notifications.markmail.org</a></td></tr></table></div>
+ <div class="section">
+<h2>Project Mailing Lists<a name="Project_Mailing_Lists"></a></h2><a name="Project_Mailing_Lists"></a>
+<p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
+<table border="0" class="table table-striped">
+<tr class="a">
+<th>Name</th>
+<th>Subscribe</th>
+<th>Unsubscribe</th>
+<th>Post</th>
+<th>Archive</th>
+<th>Other Archives</th></tr>
+<tr class="b">
+<td>Archiva User List</td>
+<td><a class="externalLink" href="mailto:users-subscribe@archiva.apache.org">Subscribe</a></td>
+<td><a class="externalLink" href="mailto:users-unsubscribe@archiva.apache.org">Unsubscribe</a></td>
+<td><a class="externalLink" href="mailto:users@archiva.apache.org">Post</a></td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-users/">mail-archives.apache.org</a></td>
+<td><a class="externalLink" href="http://www.mail-archive.com/users@archiva.apache.org">www.mail-archive.com</a></td></tr>
+<tr class="a">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://old.nabble.com/archiva-users-f16426.html">old.nabble.com</a></td></tr>
+<tr class="b">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.users">markmail.org</a></td></tr>
+<tr class="a">
+<td>Archiva Developer List</td>
+<td><a class="externalLink" href="mailto:dev-subscribe@archiva.apache.org">Subscribe</a></td>
+<td><a class="externalLink" href="mailto:dev-unsubscribe@archiva.apache.org">Unsubscribe</a></td>
+<td><a class="externalLink" href="mailto:dev@archiva.apache.org">Post</a></td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-dev">mail-archives.apache.org</a></td>
+<td><a class="externalLink" href="http://www.mail-archive.com/dev@archiva.apache.org">www.mail-archive.com</a></td></tr>
+<tr class="b">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://old.nabble.com/archiva-dev-f16427.html">old.nabble.com</a></td></tr>
+<tr class="a">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.dev">markmail.org</a></td></tr>
+<tr class="b">
+<td>Archiva Commits List</td>
+<td><a class="externalLink" href="mailto:commits-subscribe@archiva.apache.org">Subscribe</a></td>
+<td><a class="externalLink" href="mailto:commits-unsubscribe@archiva.apache.org">Unsubscribe</a></td>
+<td>-</td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-commits">mail-archives.apache.org</a></td>
+<td><a class="externalLink" href="http://www.mail-archive.com/commits@archiva.apache.org">www.mail-archive.com</a></td></tr>
+<tr class="a">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://markmail.org/list/org.apache.archiva.commits">markmail.org</a></td></tr>
+<tr class="b">
+<td>Archiva Issues List</td>
+<td><a class="externalLink" href="mailto:issues-subscribe@archiva.apache.org">Subscribe</a></td>
+<td><a class="externalLink" href="mailto:issues-unsubscribe@archiva.apache.org">Unsubscribe</a></td>
+<td>-</td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-issues">mail-archives.apache.org</a></td>
+<td><a class="externalLink" href="http://www.mail-archive.com/issues@archiva.apache.org">www.mail-archive.com</a></td></tr>
+<tr class="a">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://old.nabble.com/Archiva---Issues-f29617.html">old.nabble.com</a></td></tr>
+<tr class="b">
+<td>Archiva Notifications List</td>
+<td><a class="externalLink" href="mailto:notifications-subscribe@archiva.apache.org">Subscribe</a></td>
+<td><a class="externalLink" href="mailto:notifications-unsubscribe@archiva.apache.org">Unsubscribe</a></td>
+<td>-</td>
+<td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/archiva-notifications/">mail-archives.apache.org</a></td>
+<td><a class="externalLink" href="http://www.mail-archive.com/notifications@archiva.apache.org">www.mail-archive.com</a></td></tr>
+<tr class="a">
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td><a class="externalLink" href="http://archiva.notifications.markmail.org/">archiva.notifications.markmail.org</a></td></tr></table></div>
</div>
</div>
Modified: archiva/site-content/privacy-policy.html
URL: http://svn.apache.org/viewvc/archiva/site-content/privacy-policy.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/privacy-policy.html (original)
+++ archiva/site-content/privacy-policy.html Sat Jun 8 14:05:28 2013
@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Vincent Siveton" />
<meta name="Date-Creation-yyyymmdd" content="20081203" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Privacy Policy</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -206,7 +206,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -215,7 +215,18 @@
<div id="bodyColumn" >
- <!-- 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. --><div class="section"><h2>Privacy Policy<a name="Privacy_Policy"></a></h2><p>Information about yo
ur use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p><ol style="list-style-type: decimal"><li>The IP address from which you access the website;</li><li>The type of browser and operating system you use to access our site;</li><li>The date and time you access our site;</li><li>The pages you visit; and</li><li>The addresses of pages from where you followed a link to our site.</li></ol><p>Part of this information is gathered using a tracking cookie set by the <a class="externalLink" href="http://www.google.com/analytics/">Google Analytics</a> service and handled by Google as described in their <a class="externalLink" href="http://www.google.com/privacy.html">privacy policy</a>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p><p>We use the gathered information to help us make our site more useful to visitors and t
o better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p><p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p></div>
+ <!-- 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. --><div class="section">
+<h2>Privacy Policy<a name="Privacy_Policy"></a></h2>
+<p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
+<ol style="list-style-type: decimal">
+<li>The IP address from which you access the website;</li>
+<li>The type of browser and operating system you use to access our site;</li>
+<li>The date and time you access our site;</li>
+<li>The pages you visit; and</li>
+<li>The addresses of pages from where you followed a link to our site.</li></ol>
+<p>Part of this information is gathered using a tracking cookie set by the <a class="externalLink" href="http://www.google.com/analytics/">Google Analytics</a> service and handled by Google as described in their <a class="externalLink" href="http://www.google.com/privacy.html">privacy policy</a>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p>
+<p>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p>
+<p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p></div>
</div>
</div>
Modified: archiva/site-content/project-info.html
URL: http://svn.apache.org/viewvc/archiva/site-content/project-info.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/project-info.html (original)
+++ archiva/site-content/project-info.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,33 @@
<div id="bodyColumn" >
- <div class="section"><h2>Project Information<a name="Project_Information"></a></h2><p>This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by <a class="externalLink" href="http://maven.apache.org">Maven</a> on behalf of the project.</p><div class="section"><h3>Overview<a name="Overview"></a></h3><table border="0" class="table table-striped"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="integration.html">Continuous Integration</a></td><td>This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.</td></tr><tr class="a"><td><a href="mail-lists.html">Mailing Lists</a></td><td>This document provides subscription and archive information for this project's mailing lists.</td></tr><tr class="b"><td><a href="issue-tracking.html">Issue Tracking</a></
td><td>This is a link to the issue management system for this project. Issues (bugs, features, change requests) can be created and queried using this link.</td></tr><tr class="a"><td><a href="license.html">Project License</a></td><td>This is a link to the definitions of project licenses.</td></tr><tr class="b"><td><a href="team-list.html">Project Team</a></td><td>This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.</td></tr><tr class="a"><td><a href="source-repository.html">Source Repository</a></td><td>This is a link to the online source repository that can be viewed via a web browser.</td></tr></table></div></div>
+ <div class="section">
+<h2>Project Information<a name="Project_Information"></a></h2>
+<p>This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by <a class="externalLink" href="http://maven.apache.org">Maven</a> on behalf of the project.</p>
+<div class="section">
+<h3>Overview<a name="Overview"></a></h3>
+<table border="0" class="table table-striped">
+<tr class="a">
+<th>Document</th>
+<th>Description</th></tr>
+<tr class="b">
+<td><a href="integration.html">Continuous Integration</a></td>
+<td>This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.</td></tr>
+<tr class="a">
+<td><a href="mail-lists.html">Mailing Lists</a></td>
+<td>This document provides subscription and archive information for this project's mailing lists.</td></tr>
+<tr class="b">
+<td><a href="issue-tracking.html">Issue Tracking</a></td>
+<td>This is a link to the issue management system for this project. Issues (bugs, features, change requests) can be created and queried using this link.</td></tr>
+<tr class="a">
+<td><a href="license.html">Project License</a></td>
+<td>This is a link to the definitions of project licenses.</td></tr>
+<tr class="b">
+<td><a href="team-list.html">Project Team</a></td>
+<td>This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.</td></tr>
+<tr class="a">
+<td><a href="source-repository.html">Source Repository</a></td>
+<td>This is a link to the online source repository that can be viewed via a web browser.</td></tr></table></div></div>
</div>
</div>
Modified: archiva/site-content/security.html
URL: http://svn.apache.org/viewvc/archiva/site-content/security.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/security.html (original)
+++ archiva/site-content/security.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Security Vulnerabilities</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,50 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Security Vulnerabilities<a name="Security_Vulnerabilities"></a></h2><p>Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache Archiva version where that vulnerability has been fixed.</p><p>For more information about reporting vulnerabilities, see the <a class="externalLink" href="http://www.apache.org/security/"> Apache Security Team</a> page.</p><div class="section"><h3>CVE-2010-1870: Struts2 remote commands execution<a name="CVE-2010-1870:_Struts2_remote_commands_execution"></a></h3><p>Apache Archiva is affected by a vulnerability in the version of the Struts library being used, which allows a malicious user to run code on the server remotely. More details about the vulnerability can be found at <a class="externalLink" href="http://struts.apache.org/2.2.1/docs/s2-005.html">http://struts.apache.org/2.2.1/docs/
s2-005.html</a>.</p><p>Versions Affected:</p><ul><li>Archiva 1.3 to Archiva 1.3.5</li></ul><ul><li>The unsupported versions Archiva 1.2 to 1.2.2 are also affected.</li></ul><p>All users are recommended to upgrade to <a href="./download.cgi"> Archiva 1.3.6</a>, which configures Struts in such a way that it is not affected by this issue.</p><p>Archiva 1.4-M3 and later is not affected by this issue.</p></div><div class="section"><h3>CVE-2011-1077: Multiple XSS issues<a name="CVE-2011-1077:_Multiple_XSS_issues"></a></h3><p>Apache Archiva is vulnerable to multiple XSS issues, both stored (persistent) and reflected (non-persistent). Javascript which might contain malicious code can be appended in a request parameter or stored as a value in a submitted form, and get executed.</p><p>Versions Affected:</p><ul><li>Archiva 1.3 to 1.3.4</li><li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></div><div class="section"><h3>CVE-2011-1026: Multiple CSRF issues<a n
ame="CVE-2011-1026:_Multiple_CSRF_issues"></a></h3><p>An attacker can build a simple html page containing a hidden Image tag (eg: <tt><img src=vulnurl width=0 height=0 /</tt>>) and entice the administrator to access the page.</p><p>Versions Affected:</p><ul><li>Archiva 1.3 to 1.3.4</li><li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></div><div class="section"><h3>CVE-2011-0533: Apache Archiva cross-site scripting vulnerability<a name="CVE-2011-0533:_Apache_Archiva_cross-site_scripting_vulnerability"></a></h3><p>A request that included a specially crafted request parameter could be used to inject arbitrary HTML or Javascript into the Archiva user management page. This fix is available in version <a href="./download.html"> 1.3.4</a> of Apache Archiva. All users must upgrade to this version (or higher).</p><p>Versions Affected:</p><ul><li>Archiva 1.3 to 1.3.3</li><li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></
div><div class="section"><h3>CVE-2010-3449: Apache Archiva CSRF Vulnerability<a name="CVE-2010-3449:_Apache_Archiva_CSRF_Vulnerability"></a></h3><p>Apache Archiva doesn't check which form sends credentials. An attacker can create a specially crafted page and force archiva administrators to view it and change their credentials. To fix this, a referrer check was added to the security interceptor for all secured actions. A prompt for the administrator's password when changing a user account was also set in place. This fix is available in version <a href="./download.html"> 1.3.2</a> of Apache Archiva. All users must upgrade to this version (or higher).</p><p>Versions Affected:</p><ul><li>Archiva 1.3 to 1.3.1</li><li>Archiva 1.2 to 1.2.2 (end of life)</li><li>Archiva 1.1 to 1.1.4 (end of life)</li><li>Archiva 1.0 to 1.0.3 (end of life)</li></ul></div></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Security Vulnerabilities<a name="Security_Vulnerabilities"></a></h2>
+<p>Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache Archiva version where that vulnerability has been fixed.</p>
+<p>For more information about reporting vulnerabilities, see the <a class="externalLink" href="http://www.apache.org/security/"> Apache Security Team</a> page.</p>
+<div class="section">
+<h3>CVE-2010-1870: Struts2 remote commands execution<a name="CVE-2010-1870:_Struts2_remote_commands_execution"></a></h3>
+<p>Apache Archiva is affected by a vulnerability in the version of the Struts library being used, which allows a malicious user to run code on the server remotely. More details about the vulnerability can be found at <a class="externalLink" href="http://struts.apache.org/2.2.1/docs/s2-005.html">http://struts.apache.org/2.2.1/docs/s2-005.html</a>.</p>
+<p>Versions Affected:</p>
+<ul>
+<li>Archiva 1.3 to Archiva 1.3.5</li></ul>
+<ul>
+<li>The unsupported versions Archiva 1.2 to 1.2.2 are also affected.</li></ul>
+<p>All users are recommended to upgrade to <a href="./download.cgi"> Archiva 1.3.6</a>, which configures Struts in such a way that it is not affected by this issue.</p>
+<p>Archiva 1.4-M3 and later is not affected by this issue.</p></div>
+<div class="section">
+<h3>CVE-2011-1077: Multiple XSS issues<a name="CVE-2011-1077:_Multiple_XSS_issues"></a></h3>
+<p>Apache Archiva is vulnerable to multiple XSS issues, both stored (persistent) and reflected (non-persistent). Javascript which might contain malicious code can be appended in a request parameter or stored as a value in a submitted form, and get executed.</p>
+<p>Versions Affected:</p>
+<ul>
+<li>Archiva 1.3 to 1.3.4</li>
+<li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></div>
+<div class="section">
+<h3>CVE-2011-1026: Multiple CSRF issues<a name="CVE-2011-1026:_Multiple_CSRF_issues"></a></h3>
+<p>An attacker can build a simple html page containing a hidden Image tag (eg: <tt><img src=vulnurl width=0 height=0 /</tt>>) and entice the administrator to access the page.</p>
+<p>Versions Affected:</p>
+<ul>
+<li>Archiva 1.3 to 1.3.4</li>
+<li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></div>
+<div class="section">
+<h3>CVE-2011-0533: Apache Archiva cross-site scripting vulnerability<a name="CVE-2011-0533:_Apache_Archiva_cross-site_scripting_vulnerability"></a></h3>
+<p>A request that included a specially crafted request parameter could be used to inject arbitrary HTML or Javascript into the Archiva user management page. This fix is available in version <a href="./download.html"> 1.3.4</a> of Apache Archiva. All users must upgrade to this version (or higher).</p>
+<p>Versions Affected:</p>
+<ul>
+<li>Archiva 1.3 to 1.3.3</li>
+<li>The unsupported versions Archiva 1.0 to 1.2.2 are also affected.</li></ul></div>
+<div class="section">
+<h3>CVE-2010-3449: Apache Archiva CSRF Vulnerability<a name="CVE-2010-3449:_Apache_Archiva_CSRF_Vulnerability"></a></h3>
+<p>Apache Archiva doesn't check which form sends credentials. An attacker can create a specially crafted page and force archiva administrators to view it and change their credentials. To fix this, a referrer check was added to the security interceptor for all secured actions. A prompt for the administrator's password when changing a user account was also set in place. This fix is available in version <a href="./download.html"> 1.3.2</a> of Apache Archiva. All users must upgrade to this version (or higher).</p>
+<p>Versions Affected:</p>
+<ul>
+<li>Archiva 1.3 to 1.3.1</li>
+<li>Archiva 1.2 to 1.2.2 (end of life)</li>
+<li>Archiva 1.1 to 1.1.4 (end of life)</li>
+<li>Archiva 1.0 to 1.0.3 (end of life)</li></ul></div></div>
</div>
</div>
Modified: archiva/site-content/source-repository.html
URL: http://svn.apache.org/viewvc/archiva/site-content/source-repository.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/source-repository.html (original)
+++ archiva/site-content/source-repository.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Source Repository</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,39 @@
<div id="bodyColumn" >
- <div class="section"><h2>Overview<a name="Overview"></a></h2><a name="Overview"></a><p>This project uses <a class="externalLink" href="http://subversion.apache.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a class="externalLink" href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p></div><div class="section"><h2>Web Access<a name="Web_Access"></a></h2><a name="Web_Access"></a><p>The following is a link to the online source repository.</p><div class="source"><pre class="prettyprint"><a class="externalLink" href="http://svn.apache.org/viewvc/archiva/">http://svn.apache.org/viewvc/archiva/</a></pre></div></div><div class="section"><h2>Anonymous access<a name="Anonymous_access"></a></h2><a name="Anonymous_access"></a><p>The source can be checked out anonymously from SVN with this command:</p><div class="source"><pre class="prettyprint">$ svn checkout http://svn.apache.org/repos/asf/archiva/all archi
va-all</pre></div></div><div class="section"><h2>Developer access<a name="Developer_access"></a></h2><a name="Developer_access"></a><p>Everyone can access the Subversion repository via HTTP, but Committers must checkout the Subversion repository via HTTPS.</p><div class="source"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div><p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p><div class="source"><pre class="prettyprint">$ svn commit --username your-username -m "A message"</pre></div></div><div class="section"><h2>Access from behind a firewall<a name="Access_from_behind_a_firewall"></a></h2><a name="Access_from_behind_a_firewall"></a><p>For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:</p><div class="so
urce"><pre class="prettyprint">$ svn checkout https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div><div class="section"><h2>Access through a proxy<a name="Access_through_a_proxy"></a></h2><a name="Access_through_a_proxy"></a><p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p><p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p><p>Example: Edit the 'servers' file and add something like:</p><div class="source"><pre class="prettyp
rint">[global]
+ <div class="section">
+<h2>Overview<a name="Overview"></a></h2><a name="Overview"></a>
+<p>This project uses <a class="externalLink" href="http://subversion.apache.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a class="externalLink" href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p></div>
+<div class="section">
+<h2>Web Access<a name="Web_Access"></a></h2><a name="Web_Access"></a>
+<p>The following is a link to the online source repository.</p>
+<div class="source">
+<pre><a class="externalLink" href="http://svn.apache.org/viewvc/archiva/">http://svn.apache.org/viewvc/archiva/</a></pre></div></div>
+<div class="section">
+<h2>Anonymous access<a name="Anonymous_access"></a></h2><a name="Anonymous_access"></a>
+<p>The source can be checked out anonymously from SVN with this command:</p>
+<div class="source">
+<pre>$ svn checkout http://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div>
+<div class="section">
+<h2>Developer access<a name="Developer_access"></a></h2><a name="Developer_access"></a>
+<p>Everyone can access the Subversion repository via HTTP, but Committers must checkout the Subversion repository via HTTPS.</p>
+<div class="source">
+<pre>$ svn checkout https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div>
+<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
+<div class="source">
+<pre>$ svn commit --username your-username -m "A message"</pre></div></div>
+<div class="section">
+<h2>Access from behind a firewall<a name="Access_from_behind_a_firewall"></a></h2><a name="Access_from_behind_a_firewall"></a>
+<p>For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:</p>
+<div class="source">
+<pre>$ svn checkout https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div>
+<div class="section">
+<h2>Access through a proxy<a name="Access_through_a_proxy"></a></h2><a name="Access_through_a_proxy"></a>
+<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
+<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
+<p>Example: Edit the 'servers' file and add something like:</p>
+<div class="source">
+<pre>[global]
http-proxy-host = your.proxy.name
http-proxy-port = 3128
</pre></div></div>
Modified: archiva/site-content/team-list.html
URL: http://svn.apache.org/viewvc/archiva/site-content/team-list.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/team-list.html (original)
+++ archiva/site-content/team-list.html Sat Jun 8 14:05:28 2013
@@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Team list</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -204,7 +204,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -213,7 +213,361 @@
<div id="bodyColumn" >
- <div class="section"><h2>The Team<a name="The_Team"></a></h2><a name="The_Team"></a><p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p><p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p><div class="section"><h3>Members<a name="Members"></a></h3><a name="Members"></a><p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p><table border="0" class="table table-striped"><tr class="a"><th>Image</th><th>Id</th><th>Name</th><th>Email</th><th>O
rganization</th><th>Roles</th><th>Time Zone</th><th>Actual Time (GMT)</th></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/a49e2c09c4c36374c40e6cb819157eda?d=mm&s=60" alt="" /></td><td><a name="oching"></a>oching</td><td>Maria Odea B. Ching</td><td><a class="externalLink" href="mailto:oching@apache.org">oching@apache.org</a></td><td>-</td><td>PMC Chair</td><td>+8</td><td><span id="developer-0">+8</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/1db61ec29963d4a77ef2275140144fd4?d=mm&s=60" alt="" /></td><td><a name="brett"></a>brett</td><td>Brett Porter</td><td><a class="externalLink" href="mailto:brett@apache.org">brett@apache.org</a></td><td>ASF</td><td>PMC Member</td><td>+10</td><td><span id="developer-1">+10</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/6559d4b2de15cb1433fc13c34599e4c7?d=mm&s=60" alt="" /></td><td><a name="carlos"></a>carlos</td><td>Carlos Sanchez</td><td><a class="externalLi
nk" href="mailto:carlos@apache.org">carlos@apache.org</a></td><td>ASF</td><td>PMC Member</td><td>+1</td><td><span id="developer-2">+1</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/89d1772a8f19085482a13decc709cda2?d=mm&s=60" alt="" /></td><td><a name="epunzalan"></a>epunzalan</td><td>Edwin Punzalan</td><td><a class="externalLink" href="mailto:epunzalan@apache.org">epunzalan@apache.org</a></td><td>-</td><td>PMC Member</td><td>-8</td><td><span id="developer-3">-8</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/3fe23ff82e7920b5941e18515adf9bba?d=mm&s=60" alt="" /></td><td><a name="nicolas"></a>nicolas</td><td>Nicolas De Loof</td><td><a class="externalLink" href="mailto:nicolas@apache.org">nicolas@apache.org</a></td><td>-</td><td>PMC Member</td><td>+1</td><td><span id="developer-4">+1</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/bab29f762bea8e578505424443d8cd41?d=mm&s=60" alt="" /></
td><td><a name="olamy"></a>olamy</td><td>Olivier Lamy</td><td><a class="externalLink" href="mailto:olamy@apache.org">olamy@apache.org</a></td><td>Talend</td><td>PMC Member</td><td>Australia/Melbourne</td><td><span id="developer-5">Australia/Melbourne</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/c8686cad245196c9e392201ad7bb364f?d=mm&s=60" alt="" /></td><td><a name="dennisl"></a>dennisl</td><td>Dennis Lundberg</td><td><a class="externalLink" href="mailto:dennisl@apache.org">dennisl@apache.org</a></td><td>ASF</td><td>Committer</td><td>+1</td><td><span id="developer-6">+1</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/76f1823568e5f31931bd32415a4cffa7?d=mm&s=60" alt="" /></td><td><a name="martinc"></a>martinc</td><td>Martin Cooper</td><td><a class="externalLink" href="mailto:martinc@apache.org">martinc@apache.org</a></td><td>ASF</td><td>Committer</td><td>-</td><td><span id="developer-7">-</span></td></tr><tr class=
"b"><td><img src="http://www.gravatar.com/avatar/07a0055c4259569aff19ee558ee3999d?d=mm&s=60" alt="" /></td><td><a name="mbaclay"></a>mbaclay</td><td>Marecor M. Baclay</td><td><a class="externalLink" href="mailto:mbaclay@apache.org">mbaclay@apache.org</a></td><td>-</td><td>Committer</td><td>+8</td><td><span id="developer-8">+8</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/026acc6fb60c44ed137de35517837065?d=mm&s=60" alt="" /></td><td><a name="jzurbano"></a>jzurbano</td><td>Jevica Arianne B. Zurbano</td><td><a class="externalLink" href="mailto:jzurbano@apache.org">jzurbano@apache.org</a></td><td>-</td><td>Committer</td><td>+8</td><td><span id="developer-9">+8</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/27790393b874159fe05609ca7ed812f9?d=mm&s=60" alt="" /></td><td><a name="jbonofre"></a>jbonofre</td><td>Jean-Baptiste Onofré</td><td><a class="externalLink" href="mailto:jbonofre@apache.org">jbonofre@apach
e.org</a></td><td>Talend</td><td>Committer</td><td>+1</td><td><span id="developer-10">+1</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/030e414fc478d45703ba0cbf6fa431f9?d=mm&s=60" alt="" /></td><td><a name="skygo"></a>skygo</td><td>Eric Barboni</td><td><a class="externalLink" href="mailto:skygo@apache.org">skygo@apache.org</a></td><td>ASF</td><td>Committer</td><td>+1</td><td><span id="developer-11">+1</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/aeb4e8e65a6c91233e1a9128d8989093?d=mm&s=60" alt="" /></td><td><a name="alecharp"></a>alecharp</td><td>Adrien Lecharpentier</td><td><a class="externalLink" href="mailto:alecharp@apache.org">alecharp@apache.org</a></td><td>Zenika</td><td>Committer</td><td>+1</td><td><span id="developer-12">+1</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/38f7796e51a469f8efc08de2d88fa335?d=mm&s=60" alt="" /></td><td><a name="joakime"></a>joakime</td><td>Jo
akim Erdfelt</td><td><a class="externalLink" href="mailto:joakime@apache.org">joakime@apache.org</a></td><td>ASF</td><td>Emeritus</td><td>-5</td><td><span id="developer-13">-5</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="jvanzyl"></a>jvanzyl</td><td>Jason van Zyl</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-14">-</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="bayard"></a>bayard</td><td>Henri Yandell</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-15">-</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="kenney"></a>kenney</td><td>Kenney Westerhof</td><td>-</td><td>-</td><td>Emeritus</td
><td>-</td><td><span id="developer-16">-</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="aheritier"></a>aheritier</td><td>Arnaud Heritier</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-17">-</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="bellingard"></a>bellingard</td><td>Fabrice Bellingard</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-18">-</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="jdumay"></a>jdumay</td><td>James William Dumay</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-19">-</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avat
ar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="jmcconnell"></a>jmcconnell</td><td>Jesse McConnell</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-20">-</span></td></tr><tr class="a"><td><img src="http://www.gravatar.com/avatar/efe7252f3b18253bf4318062ece95a3b?d=mm&s=60" alt="" /></td><td><a name="evenisse"></a>evenisse</td><td>Emmanuel Venisse</td><td><a class="externalLink" href="mailto:evenisse@apache.org">evenisse@apache.org</a></td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-21">-</span></td></tr><tr class="b"><td><img src="http://www.gravatar.com/avatar/b38a3be83226b10b399985496c058e4c?d=mm&s=60" alt="" /></td><td><a name="jtolentino"></a>jtolentino</td><td>Ernesto Tolentino Jr.</td><td><a class="externalLink" href="mailto:jtolentino@apache.org">jtolentino@apache.org</a></td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-22">-</span></td></tr><tr class="a"><td><im
g src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td><td><a name="wsmoak"></a>wsmoak</td><td>Wendy Smoak</td><td>-</td><td>-</td><td>Emeritus</td><td>-</td><td><span id="developer-23">-</span></td></tr></table></div><div class="section"><h3>Contributors<a name="Contributors"></a></h3><a name="Contributors"></a><p>The following additional people have contributed to this project through the way of suggestions, patches or documentation.</p><table border="0" class="table table-striped"><tr class="a"><th>Name</th></tr><tr class="b"><td>Steffen Grunwald</td></tr><tr class="a"><td>Stefan Prange</td></tr><tr class="b"><td>John Michael Luy</td></tr><tr class="a"><td>Martin Höller</td></tr><tr class="b"><td>Stephen Gargan</td></tr><tr class="a"><td>Dario Oliveros</td></tr><tr class="b"><td>james ahlborn</td></tr><tr class="a"><td>Jim Jackson</td></tr><tr class="b"><td>Daniel Harvey</td></tr><tr class="a"><td>Aleksandr Taru
tin</td></tr><tr class="b"><td>Teodoro Cue Jr.</td></tr><tr class="a"><td>Jan Ancajas</td></tr><tr class="b"><td>Jens Mühlenhoff</td></tr><tr class="a"><td>Dawn Angelito</td></tr><tr class="b"><td>Henry Isidro</td></tr><tr class="a"><td>Antoine Veret</td></tr><tr class="b"><td>Christian Gruber</td></tr><tr class="a"><td>Allan Ramirez</td></tr><tr class="b"><td>Pete Marvin King</td></tr><tr class="a"><td>Joel Sudiacal</td></tr><tr class="b"><td>Milos Kleint</td></tr><tr class="a"><td>Nick Gonzalez</td></tr><tr class="b"><td>Maria Catherine Tan</td></tr><tr class="a"><td>Dan Tran</td></tr><tr class="b"><td>Gwen Harold Autencio</td></tr><tr class="a"><td>Mark Jeffery</td></tr><tr class="b"><td>Fabrice Daugan</td></tr><tr class="a"><td>Doron Solomon</td></tr><tr class="b"><td>Michal Stochmialek</td></tr><tr class="a"><td>Julien Henry</td></tr><tr class="b"><td>Andreas Baumann</td></tr><tr class="a"><td>Adelita L. Padilla</td></tr><tr class="b"><td>Daniel Triphaus</td></tr><
tr class="a"><td>Patti Arachchige Eshan Sudharaka</td></tr><tr class="b"><td>Shinsuke Sugaya</td></tr><tr class="a"><td>Marcus Dimand</td></tr><tr class="b"><td>Catalino Pineda Jr.</td></tr><tr class="a"><td>Warner Pinero</td></tr><tr class="b"><td>Dave Brosius</td></tr><tr class="a"><td>Jim Sellers</td></tr><tr class="b"><td>Igor Galic</td></tr><tr class="a"><td>Mark Struberg</td></tr><tr class="b"><td>Marc Jansen Tan Chua</td></tr><tr class="a"><td>Lucien Weller</td></tr><tr class="b"><td>Greg Michael Meneses</td></tr><tr class="a"><td>Chris Graham</td></tr><tr class="b"><td>Fredrik Jonson</td></tr><tr class="a"><td>Lester Ecarma</td></tr><tr class="b"><td>Eirik Bjørsnøs</td></tr><tr class="a"><td>Jan Ancajas</td></tr><tr class="b"><td>Damien Blugeon</td></tr><tr class="a"><td>John Michael Luy</td></tr><tr class="b"><td>Wolfgang Strunk</td></tr><tr class="a"><td>Jevica Arianne B. Zurbano</td></tr><tr class="b"><td>Stefan Prange</td></tr><tr class="a"><td>Napoleon
Esmundo C. Ramirez</td></tr><tr class="b"><td>Brent Atkinson</td></tr><tr class="a"><td>Antoine ROUAZE</td></tr></table><script type="text/javascript">
+ <div class="section">
+<h2>The Team<a name="The_Team"></a></h2><a name="The_Team"></a>
+<p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p>
+<p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p>
+<div class="section">
+<h3>Members<a name="Members"></a></h3><a name="Members"></a>
+<p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p>
+<table border="0" class="table table-striped">
+<tr class="a">
+<th>Image</th>
+<th>Id</th>
+<th>Name</th>
+<th>Email</th>
+<th>Organization</th>
+<th>Roles</th>
+<th>Time Zone</th>
+<th>Actual Time (GMT)</th></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/a49e2c09c4c36374c40e6cb819157eda?d=mm&s=60" alt="" /></td>
+<td><a name="oching"></a>oching</td>
+<td>Maria Odea B. Ching</td>
+<td><a class="externalLink" href="mailto:oching@apache.org">oching@apache.org</a></td>
+<td>-</td>
+<td>PMC Chair</td>
+<td>+8</td>
+<td><span id="developer-0">+8</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/1db61ec29963d4a77ef2275140144fd4?d=mm&s=60" alt="" /></td>
+<td><a name="brett"></a>brett</td>
+<td>Brett Porter</td>
+<td><a class="externalLink" href="mailto:brett@apache.org">brett@apache.org</a></td>
+<td>ASF</td>
+<td>PMC Member</td>
+<td>+10</td>
+<td><span id="developer-1">+10</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/6559d4b2de15cb1433fc13c34599e4c7?d=mm&s=60" alt="" /></td>
+<td><a name="carlos"></a>carlos</td>
+<td>Carlos Sanchez</td>
+<td><a class="externalLink" href="mailto:carlos@apache.org">carlos@apache.org</a></td>
+<td>ASF</td>
+<td>PMC Member</td>
+<td>+1</td>
+<td><span id="developer-2">+1</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/89d1772a8f19085482a13decc709cda2?d=mm&s=60" alt="" /></td>
+<td><a name="epunzalan"></a>epunzalan</td>
+<td>Edwin Punzalan</td>
+<td><a class="externalLink" href="mailto:epunzalan@apache.org">epunzalan@apache.org</a></td>
+<td>-</td>
+<td>PMC Member</td>
+<td>-8</td>
+<td><span id="developer-3">-8</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/3fe23ff82e7920b5941e18515adf9bba?d=mm&s=60" alt="" /></td>
+<td><a name="nicolas"></a>nicolas</td>
+<td>Nicolas De Loof</td>
+<td><a class="externalLink" href="mailto:nicolas@apache.org">nicolas@apache.org</a></td>
+<td>-</td>
+<td>PMC Member</td>
+<td>+1</td>
+<td><span id="developer-4">+1</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/bab29f762bea8e578505424443d8cd41?d=mm&s=60" alt="" /></td>
+<td><a name="olamy"></a>olamy</td>
+<td>Olivier Lamy</td>
+<td><a class="externalLink" href="mailto:olamy@apache.org">olamy@apache.org</a></td>
+<td>Ecetera.com.au</td>
+<td>PMC Member</td>
+<td>Australia/Melbourne</td>
+<td><span id="developer-5">Australia/Melbourne</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/c8686cad245196c9e392201ad7bb364f?d=mm&s=60" alt="" /></td>
+<td><a name="dennisl"></a>dennisl</td>
+<td>Dennis Lundberg</td>
+<td><a class="externalLink" href="mailto:dennisl@apache.org">dennisl@apache.org</a></td>
+<td>ASF</td>
+<td>Committer</td>
+<td>+1</td>
+<td><span id="developer-6">+1</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/76f1823568e5f31931bd32415a4cffa7?d=mm&s=60" alt="" /></td>
+<td><a name="martinc"></a>martinc</td>
+<td>Martin Cooper</td>
+<td><a class="externalLink" href="mailto:martinc@apache.org">martinc@apache.org</a></td>
+<td>ASF</td>
+<td>Committer</td>
+<td>-</td>
+<td><span id="developer-7">-</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/07a0055c4259569aff19ee558ee3999d?d=mm&s=60" alt="" /></td>
+<td><a name="mbaclay"></a>mbaclay</td>
+<td>Marecor M. Baclay</td>
+<td><a class="externalLink" href="mailto:mbaclay@apache.org">mbaclay@apache.org</a></td>
+<td>-</td>
+<td>Committer</td>
+<td>+8</td>
+<td><span id="developer-8">+8</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/026acc6fb60c44ed137de35517837065?d=mm&s=60" alt="" /></td>
+<td><a name="jzurbano"></a>jzurbano</td>
+<td>Jevica Arianne B. Zurbano</td>
+<td><a class="externalLink" href="mailto:jzurbano@apache.org">jzurbano@apache.org</a></td>
+<td>-</td>
+<td>Committer</td>
+<td>+8</td>
+<td><span id="developer-9">+8</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/27790393b874159fe05609ca7ed812f9?d=mm&s=60" alt="" /></td>
+<td><a name="jbonofre"></a>jbonofre</td>
+<td>Jean-Baptiste Onofré</td>
+<td><a class="externalLink" href="mailto:jbonofre@apache.org">jbonofre@apache.org</a></td>
+<td>Talend</td>
+<td>Committer</td>
+<td>+1</td>
+<td><span id="developer-10">+1</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/030e414fc478d45703ba0cbf6fa431f9?d=mm&s=60" alt="" /></td>
+<td><a name="skygo"></a>skygo</td>
+<td>Eric Barboni</td>
+<td><a class="externalLink" href="mailto:skygo@apache.org">skygo@apache.org</a></td>
+<td>ASF</td>
+<td>Committer</td>
+<td>+1</td>
+<td><span id="developer-11">+1</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/aeb4e8e65a6c91233e1a9128d8989093?d=mm&s=60" alt="" /></td>
+<td><a name="alecharp"></a>alecharp</td>
+<td>Adrien Lecharpentier</td>
+<td><a class="externalLink" href="mailto:alecharp@apache.org">alecharp@apache.org</a></td>
+<td>Zenika</td>
+<td>Committer</td>
+<td>+1</td>
+<td><span id="developer-12">+1</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/38f7796e51a469f8efc08de2d88fa335?d=mm&s=60" alt="" /></td>
+<td><a name="joakime"></a>joakime</td>
+<td>Joakim Erdfelt</td>
+<td><a class="externalLink" href="mailto:joakime@apache.org">joakime@apache.org</a></td>
+<td>ASF</td>
+<td>Emeritus</td>
+<td>-5</td>
+<td><span id="developer-13">-5</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="jvanzyl"></a>jvanzyl</td>
+<td>Jason van Zyl</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-14">-</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="bayard"></a>bayard</td>
+<td>Henri Yandell</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-15">-</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="kenney"></a>kenney</td>
+<td>Kenney Westerhof</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-16">-</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="aheritier"></a>aheritier</td>
+<td>Arnaud Heritier</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-17">-</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="bellingard"></a>bellingard</td>
+<td>Fabrice Bellingard</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-18">-</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="jdumay"></a>jdumay</td>
+<td>James William Dumay</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-19">-</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="jmcconnell"></a>jmcconnell</td>
+<td>Jesse McConnell</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-20">-</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/efe7252f3b18253bf4318062ece95a3b?d=mm&s=60" alt="" /></td>
+<td><a name="evenisse"></a>evenisse</td>
+<td>Emmanuel Venisse</td>
+<td><a class="externalLink" href="mailto:evenisse@apache.org">evenisse@apache.org</a></td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-21">-</span></td></tr>
+<tr class="b">
+<td><img src="http://www.gravatar.com/avatar/b38a3be83226b10b399985496c058e4c?d=mm&s=60" alt="" /></td>
+<td><a name="jtolentino"></a>jtolentino</td>
+<td>Ernesto Tolentino Jr.</td>
+<td><a class="externalLink" href="mailto:jtolentino@apache.org">jtolentino@apache.org</a></td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-22">-</span></td></tr>
+<tr class="a">
+<td><img src="http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&s=60" alt="" /></td>
+<td><a name="wsmoak"></a>wsmoak</td>
+<td>Wendy Smoak</td>
+<td>-</td>
+<td>-</td>
+<td>Emeritus</td>
+<td>-</td>
+<td><span id="developer-23">-</span></td></tr></table></div>
+<div class="section">
+<h3>Contributors<a name="Contributors"></a></h3><a name="Contributors"></a>
+<p>The following additional people have contributed to this project through the way of suggestions, patches or documentation.</p>
+<table border="0" class="table table-striped">
+<tr class="a">
+<th>Name</th></tr>
+<tr class="b">
+<td>Steffen Grunwald</td></tr>
+<tr class="a">
+<td>Stefan Prange</td></tr>
+<tr class="b">
+<td>John Michael Luy</td></tr>
+<tr class="a">
+<td>Martin Höller</td></tr>
+<tr class="b">
+<td>Stephen Gargan</td></tr>
+<tr class="a">
+<td>Dario Oliveros</td></tr>
+<tr class="b">
+<td>james ahlborn</td></tr>
+<tr class="a">
+<td>Jim Jackson</td></tr>
+<tr class="b">
+<td>Daniel Harvey</td></tr>
+<tr class="a">
+<td>Aleksandr Tarutin</td></tr>
+<tr class="b">
+<td>Teodoro Cue Jr.</td></tr>
+<tr class="a">
+<td>Jan Ancajas</td></tr>
+<tr class="b">
+<td>Jens Mühlenhoff</td></tr>
+<tr class="a">
+<td>Dawn Angelito</td></tr>
+<tr class="b">
+<td>Henry Isidro</td></tr>
+<tr class="a">
+<td>Antoine Veret</td></tr>
+<tr class="b">
+<td>Christian Gruber</td></tr>
+<tr class="a">
+<td>Allan Ramirez</td></tr>
+<tr class="b">
+<td>Pete Marvin King</td></tr>
+<tr class="a">
+<td>Joel Sudiacal</td></tr>
+<tr class="b">
+<td>Milos Kleint</td></tr>
+<tr class="a">
+<td>Nick Gonzalez</td></tr>
+<tr class="b">
+<td>Maria Catherine Tan</td></tr>
+<tr class="a">
+<td>Dan Tran</td></tr>
+<tr class="b">
+<td>Gwen Harold Autencio</td></tr>
+<tr class="a">
+<td>Mark Jeffery</td></tr>
+<tr class="b">
+<td>Fabrice Daugan</td></tr>
+<tr class="a">
+<td>Doron Solomon</td></tr>
+<tr class="b">
+<td>Michal Stochmialek</td></tr>
+<tr class="a">
+<td>Julien Henry</td></tr>
+<tr class="b">
+<td>Andreas Baumann</td></tr>
+<tr class="a">
+<td>Adelita L. Padilla</td></tr>
+<tr class="b">
+<td>Daniel Triphaus</td></tr>
+<tr class="a">
+<td>Patti Arachchige Eshan Sudharaka</td></tr>
+<tr class="b">
+<td>Shinsuke Sugaya</td></tr>
+<tr class="a">
+<td>Marcus Dimand</td></tr>
+<tr class="b">
+<td>Catalino Pineda Jr.</td></tr>
+<tr class="a">
+<td>Warner Pinero</td></tr>
+<tr class="b">
+<td>Dave Brosius</td></tr>
+<tr class="a">
+<td>Jim Sellers</td></tr>
+<tr class="b">
+<td>Igor Galic</td></tr>
+<tr class="a">
+<td>Mark Struberg</td></tr>
+<tr class="b">
+<td>Marc Jansen Tan Chua</td></tr>
+<tr class="a">
+<td>Lucien Weller</td></tr>
+<tr class="b">
+<td>Greg Michael Meneses</td></tr>
+<tr class="a">
+<td>Chris Graham</td></tr>
+<tr class="b">
+<td>Fredrik Jonson</td></tr>
+<tr class="a">
+<td>Lester Ecarma</td></tr>
+<tr class="b">
+<td>Eirik Bjørsnøs</td></tr>
+<tr class="a">
+<td>Jan Ancajas</td></tr>
+<tr class="b">
+<td>Damien Blugeon</td></tr>
+<tr class="a">
+<td>John Michael Luy</td></tr>
+<tr class="b">
+<td>Wolfgang Strunk</td></tr>
+<tr class="a">
+<td>Jevica Arianne B. Zurbano</td></tr>
+<tr class="b">
+<td>Stefan Prange</td></tr>
+<tr class="a">
+<td>Napoleon Esmundo C. Ramirez</td></tr>
+<tr class="b">
+<td>Brent Atkinson</td></tr>
+<tr class="a">
+<td>Antoine ROUAZE</td></tr></table><script type="text/javascript">
function offsetDate(id, offset) {
var now = new Date();
var nowTime = now.getTime();
Modified: archiva/site-content/versions.html
URL: http://svn.apache.org/viewvc/archiva/site-content/versions.html?rev=1490981&r1=1490980&r2=1490981&view=diff
==============================================================================
--- archiva/site-content/versions.html (original)
+++ archiva/site-content/versions.html Sat Jun 8 14:05:28 2013
@@ -9,7 +9,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Brett Porter" />
- <meta name="Date-Revision-yyyymmdd" content="20130603" />
+ <meta name="Date-Revision-yyyymmdd" content="20130609" />
<meta http-equiv="Content-Language" content="en" />
<title>Archiva - Documentation - All Versions</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1-SNAPSHOT.min.css" />
@@ -205,7 +205,7 @@
- <li id="publishDate" class="pull-right">Last Published: 03 Jun 2013</li>
+ <li id="publishDate" class="pull-right">Last Published: 09 Jun 2013</li>
</ul>
</div>
@@ -214,7 +214,25 @@
<div id="bodyColumn" >
- <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section"><h2>Archiva Documentation<a name="Archiva_Documentation"></a></h2><div class="section"><h3>Current Release: Archiva 1.3.6<a name="Current_Release:_Archiva_1.3.6"></a></h3><p>The current stable release of Archiva is <i>1.3.6</i>.</p><ul><li><a href="./docs/1.3.6/release-notes.html"> Release Notes</a></li><li><a href="./docs/1.3.6/index.html"> Documentation</a></li><li><a href="./ref/1.3.6/index.html"> Developer Reference</a></li></ul><!-- TODO: have more specific links than Documentation, and find a better link for developer reference --></div><div class="section"><h3>Preview Release: Archiva 1.4-M4<a name="Preview_Release:_Archiva_1.4-M4"></a></h3><p>The current stable release of Archiva is <i>1.4-M4</i>.</p><ul><li><a href="./docs/1.4-M4/release-notes.html"> Release Notes</a></li><li><a href="./docs/1.4-M4/index.html"> Documentation</a></li><li><a href="./ref/1.4-M4/index.html"> Developer Reference</a></li></ul><!-- TODO: hav
e more specific links than Documentation, and find a better link for developer reference --></div><div class="section"><h3>Unsupported Releases<a name="Unsupported_Releases"></a></h3><!-- rough list of unsupported version because materials (RNotes,Docs,Refs are not yet available) --><p>1.3.5,1.3.4,1.3.3,1.3.2,1.3.1,1.3,1.2.2,1.2.1,1.2,1.1.3,1.1.2,1.1.1,1.1,1.0.2,1.0.1,1.0</p></div></div>
+ <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mi
ni/guide-apt-format.html --><div class="section">
+<h2>Archiva Documentation<a name="Archiva_Documentation"></a></h2>
+<div class="section">
+<h3>Current Release: Archiva 1.3.6<a name="Current_Release:_Archiva_1.3.6"></a></h3>
+<p>The current stable release of Archiva is <i>1.3.6</i>.</p>
+<ul>
+<li><a href="./docs/1.3.6/release-notes.html"> Release Notes</a></li>
+<li><a href="./docs/1.3.6/index.html"> Documentation</a></li>
+<li><a href="./ref/1.3.6/index.html"> Developer Reference</a></li></ul><!-- TODO: have more specific links than Documentation, and find a better link for developer reference --></div>
+<div class="section">
+<h3>Preview Release: Archiva 1.4-M4<a name="Preview_Release:_Archiva_1.4-M4"></a></h3>
+<p>The current stable release of Archiva is <i>1.4-M4</i>.</p>
+<ul>
+<li><a href="./docs/1.4-M4/release-notes.html"> Release Notes</a></li>
+<li><a href="./docs/1.4-M4/index.html"> Documentation</a></li>
+<li><a href="./ref/1.4-M4/index.html"> Developer Reference</a></li></ul><!-- TODO: have more specific links than Documentation, and find a better link for developer reference --></div>
+<div class="section">
+<h3>Unsupported Releases<a name="Unsupported_Releases"></a></h3><!-- rough list of unsupported version because materials (RNotes,Docs,Refs are not yet available) -->
+<p>1.3.5,1.3.4,1.3.3,1.3.2,1.3.1,1.3,1.2.2,1.2.1,1.2,1.1.3,1.1.2,1.1.1,1.1,1.0.2,1.0.1,1.0</p></div></div>
</div>
</div>