diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-09-13 12:12:39 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-09-13 12:12:39 +0000 |
| commit | 919a5ac3eb725dc676e81fcbf868f3cc165598a4 (patch) | |
| tree | 9aecd4829e214ecbb256dbd0ec5f13f428016ab3 /archiva-modules/archiva-web/archiva-rest | |
| parent | 5c067f2a4deaa775213a3b5c2ca44ce62f4ba914 (diff) | |
| download | archiva-919a5ac3eb725dc676e81fcbf868f3cc165598a4.tar.gz archiva-919a5ac3eb725dc676e81fcbf868f3cc165598a4.zip | |
[MRM-1504] Add a new module for repository administration management
split the repo admin in two modules : api and default implementation (to be able to more easily change the impl).
Use the repo admin api consumers and indexing modules.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170135 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest')
110 files changed, 1476 insertions, 85 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java index a98585291..e24666d92 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java @@ -36,7 +36,36 @@ public class Artifact private String type; - //private Date whenGathered; + private String url; + + /** + * contains osgi metadata Bundle-Version if available + * + * @since 1.4 + */ + private String bundleVersion; + + /** + * contains osgi metadata Bundle-SymbolicName if available + * + * @since 1.4 + */ + private String bundleSymbolicName; + + /** + * contains osgi metadata Export-Package if available + * + * @since 1.4 + */ + private String bundleExportPackage; + + /** + * contains osgi metadata Export-Service if available + * + * @since 1.4 + */ + private String bundleExportService; + public Artifact() { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java index 57a9917cc..85d903a28 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java @@ -45,10 +45,13 @@ public class ManagedRepository private boolean stageRepoNeeded; - private String cronExpression; + // default value + private String cronExpression = "0 0 * * * ?"; private boolean resetStats; + private boolean scanned =false; + public ManagedRepository() { // no op @@ -173,6 +176,16 @@ public class ManagedRepository this.resetStats = resetStats; } + public boolean isScanned() + { + return scanned; + } + + public void setScanned( boolean scanned ) + { + this.scanned = scanned; + } + public int hashCode() { int result = 17; @@ -205,14 +218,15 @@ public class ManagedRepository sb.append( "ManagedRepository" ); sb.append( "{id='" ).append( id ).append( '\'' ); sb.append( ", name='" ).append( name ).append( '\'' ); - sb.append( ", location='" ).append( location ).append( '\'' ); sb.append( ", layout='" ).append( layout ).append( '\'' ); + sb.append( ", location='" ).append( location ).append( '\'' ); sb.append( ", snapshots=" ).append( snapshots ); sb.append( ", releases=" ).append( releases ); sb.append( ", blockRedeployments=" ).append( blockRedeployments ); sb.append( ", stageRepoNeeded=" ).append( stageRepoNeeded ); sb.append( ", cronExpression='" ).append( cronExpression ).append( '\'' ); sb.append( ", resetStats=" ).append( resetStats ); + sb.append( ", scanned=" ).append( scanned ); sb.append( '}' ); return sb.toString(); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 0f19a4681..0055e3f77 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -55,6 +55,10 @@ <artifactId>archiva-scheduler-repository</artifactId> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-indexer</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.redback</groupId> <artifactId>redback-authorization-api</artifactId> <exclusions> @@ -212,6 +216,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> @@ -234,6 +244,7 @@ <systemPropertyVariables> <plexus.home>${project.build.outputDirectory}</plexus.home> <appserver.base>${basedir}/target/appserver-base</appserver.base> + <targetDir>${basedir}/target/</targetDir> </systemPropertyVariables> </configuration> </plugin> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index 469f1e0c5..dc968434a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -18,7 +18,7 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.AuditInformation; +import org.apache.archiva.admin.model.AuditInformation; import org.apache.archiva.audit.AuditListener; import org.codehaus.plexus.redback.users.User; import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java index 522779395..c95ccbd7f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java @@ -19,8 +19,8 @@ package org.apache.archiva.rest.services; */ import net.sf.beanlib.provider.replicator.BeanReplicator; -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.admin.ArchivaAdministration; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.admin.ArchivaAdministration; import org.apache.archiva.rest.api.model.FileType; import org.apache.archiva.rest.api.model.LegacyArtifactPath; import org.apache.archiva.rest.api.model.OrganisationInformation; @@ -51,7 +51,7 @@ public class DefaultArchivaAdministrationService try { List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>(); - for ( org.apache.archiva.admin.repository.admin.LegacyArtifactPath legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() ) + for ( org.apache.archiva.admin.model.admin.LegacyArtifactPath legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() ) { legacyArtifactPaths.add( new BeanReplicator().replicateBean( legacyArtifactPath, LegacyArtifactPath.class ) ); @@ -70,7 +70,7 @@ public class DefaultArchivaAdministrationService try { archivaAdministration.addLegacyArtifactPath( new BeanReplicator().replicateBean( legacyArtifactPath, - org.apache.archiva.admin.repository.admin.LegacyArtifactPath.class ), + org.apache.archiva.admin.model.admin.LegacyArtifactPath.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) @@ -127,8 +127,7 @@ public class DefaultArchivaAdministrationService { try { - org.apache.archiva.admin.repository.admin.FileType fileType = - archivaAdministration.getFileType( fileTypeId ); + org.apache.archiva.admin.model.admin.FileType fileType = archivaAdministration.getFileType( fileTypeId ); if ( fileType == null ) { return null; @@ -146,9 +145,9 @@ public class DefaultArchivaAdministrationService { try { - archivaAdministration.addFileType( new BeanReplicator().replicateBean( fileType, - org.apache.archiva.admin.repository.admin.FileType.class ), - getAuditInformation() ); + archivaAdministration.addFileType( + new BeanReplicator().replicateBean( fileType, org.apache.archiva.admin.model.admin.FileType.class ), + getAuditInformation() ); } catch ( RepositoryAdminException e ) { @@ -257,14 +256,13 @@ public class DefaultArchivaAdministrationService { try { - List<org.apache.archiva.admin.repository.admin.FileType> modelfileTypes = - archivaAdministration.getFileTypes(); + List<org.apache.archiva.admin.model.admin.FileType> modelfileTypes = archivaAdministration.getFileTypes(); if ( modelfileTypes == null || modelfileTypes.isEmpty() ) { return Collections.emptyList(); } List<FileType> fileTypes = new ArrayList<FileType>( modelfileTypes.size() ); - for ( org.apache.archiva.admin.repository.admin.FileType fileType : modelfileTypes ) + for ( org.apache.archiva.admin.model.admin.FileType fileType : modelfileTypes ) { fileTypes.add( new BeanReplicator().replicateBean( fileType, FileType.class ) ); } @@ -307,7 +305,7 @@ public class DefaultArchivaAdministrationService { try { - org.apache.archiva.admin.repository.admin.OrganisationInformation organisationInformation = + org.apache.archiva.admin.model.admin.OrganisationInformation organisationInformation = archivaAdministration.getOrganisationInformation(); return organisationInformation == null @@ -333,7 +331,7 @@ public class DefaultArchivaAdministrationService { archivaAdministration.setOrganisationInformation( new BeanReplicator().replicateBean( organisationInformation, - org.apache.archiva.admin.repository.admin.OrganisationInformation.class ) ); + org.apache.archiva.admin.model.admin.OrganisationInformation.class ) ); } } catch ( RepositoryAdminException e ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index f473abc58..f2fa197d4 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -18,8 +18,8 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.rest.api.model.ManagedRepository; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.ManagedRepositoriesService; @@ -48,12 +48,12 @@ public class DefaultManagedRepositoriesService { try { - List<org.apache.archiva.admin.repository.managed.ManagedRepository> repos = + List<org.apache.archiva.admin.model.managed.ManagedRepository> repos = managedRepositoryAdmin.getManagedRepositories(); List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>( repos.size() ); - for ( org.apache.archiva.admin.repository.managed.ManagedRepository repoConfig : repos ) + for ( org.apache.archiva.admin.model.managed.ManagedRepository repoConfig : repos ) { // TODO staging repo too ManagedRepository repo = @@ -96,8 +96,8 @@ public class DefaultManagedRepositoriesService public Boolean addManagedRepository( ManagedRepository managedRepository ) throws Exception { - org.apache.archiva.admin.repository.managed.ManagedRepository repo = - new org.apache.archiva.admin.repository.managed.ManagedRepository(); + org.apache.archiva.admin.model.managed.ManagedRepository repo = + new org.apache.archiva.admin.model.managed.ManagedRepository(); repo.setLocation( managedRepository.getLocation() ); repo.setBlockRedeployments( managedRepository.isBlockRedeployments() ); repo.setCronExpression( managedRepository.getCronExpression() ); @@ -114,8 +114,8 @@ public class DefaultManagedRepositoriesService public Boolean updateManagedRepository( ManagedRepository managedRepository ) throws Exception { - org.apache.archiva.admin.repository.managed.ManagedRepository repo = - new org.apache.archiva.admin.repository.managed.ManagedRepository(); + org.apache.archiva.admin.model.managed.ManagedRepository repo = + new org.apache.archiva.admin.model.managed.ManagedRepository(); repo.setLocation( managedRepository.getLocation() ); repo.setBlockRedeployments( managedRepository.isBlockRedeployments() ); repo.setCronExpression( managedRepository.getCronExpression() ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java index 5e23c9ff0..011dda6dc 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java @@ -19,8 +19,8 @@ package org.apache.archiva.rest.services; */ import net.sf.beanlib.provider.replicator.BeanReplicator; -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.networkproxy.NetworkProxyAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; import org.apache.archiva.rest.api.model.NetworkProxy; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.NetworkProxyService; @@ -47,7 +47,7 @@ public class DefaultNetworkProxyService try { List<NetworkProxy> networkProxies = new ArrayList<NetworkProxy>(); - for ( org.apache.archiva.admin.repository.networkproxy.NetworkProxy networkProxy : networkProxyAdmin.getNetworkProxies() ) + for ( org.apache.archiva.admin.model.networkproxy.NetworkProxy networkProxy : networkProxyAdmin.getNetworkProxies() ) { networkProxies.add( new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class ) ); } @@ -64,7 +64,7 @@ public class DefaultNetworkProxyService { try { - org.apache.archiva.admin.repository.networkproxy.NetworkProxy networkProxy = + org.apache.archiva.admin.model.networkproxy.NetworkProxy networkProxy = networkProxyAdmin.getNetworkProxy( networkProxyId ); return networkProxy == null ? null : new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class ); } @@ -84,7 +84,7 @@ public class DefaultNetworkProxyService return; } getNetworkProxyAdmin().addNetworkProxy( new BeanReplicator().replicateBean( networkProxy, - org.apache.archiva.admin.repository.networkproxy.NetworkProxy.class ), + org.apache.archiva.admin.model.networkproxy.NetworkProxy.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) @@ -103,7 +103,7 @@ public class DefaultNetworkProxyService try { getNetworkProxyAdmin().updateNetworkProxy( new BeanReplicator().replicateBean( networkProxy, - org.apache.archiva.admin.repository.networkproxy.NetworkProxy.class ), + org.apache.archiva.admin.model.networkproxy.NetworkProxy.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java index 24087aa06..30e2ab8ae 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java @@ -19,8 +19,8 @@ package org.apache.archiva.rest.services; */ import net.sf.beanlib.provider.replicator.BeanReplicator; -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.proxyconnector.ProxyConnectorAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.rest.api.model.ProxyConnector; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.ProxyConnectorService; @@ -47,7 +47,7 @@ public class DefaultProxyConnectorService try { List<ProxyConnector> proxyConnectors = new ArrayList<ProxyConnector>(); - for ( org.apache.archiva.admin.repository.proxyconnector.ProxyConnector proxyConnector : proxyConnectorAdmin.getProxyConnectors() ) + for ( org.apache.archiva.admin.model.proxyconnector.ProxyConnector proxyConnector : proxyConnectorAdmin.getProxyConnectors() ) { proxyConnectors.add( new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class ) ); } @@ -64,7 +64,7 @@ public class DefaultProxyConnectorService { try { - org.apache.archiva.admin.repository.proxyconnector.ProxyConnector proxyConnector = + org.apache.archiva.admin.model.proxyconnector.ProxyConnector proxyConnector = proxyConnectorAdmin.getProxyConnector( sourceRepoId, targetRepoId ); return proxyConnector == null ? null @@ -86,7 +86,7 @@ public class DefaultProxyConnectorService try { return proxyConnectorAdmin.addProxyConnector( new BeanReplicator().replicateBean( proxyConnector, - org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + org.apache.archiva.admin.model.proxyconnector.ProxyConnector.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) @@ -105,7 +105,7 @@ public class DefaultProxyConnectorService try { return proxyConnectorAdmin.deleteProxyConnector( new BeanReplicator().replicateBean( proxyConnector, - org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + org.apache.archiva.admin.model.proxyconnector.ProxyConnector.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) @@ -124,7 +124,7 @@ public class DefaultProxyConnectorService try { return proxyConnectorAdmin.updateProxyConnector( new BeanReplicator().replicateBean( proxyConnector, - org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + org.apache.archiva.admin.model.proxyconnector.ProxyConnector.class ), getAuditInformation() ); } catch ( RepositoryAdminException e ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java index 9f3eeeb8d..9dbd068eb 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java @@ -18,8 +18,8 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.remote.RemoteRepositoryAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.rest.api.model.RemoteRepository; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.RemoteRepositoriesService; @@ -49,7 +49,7 @@ public class DefaultRemoteRepositoriesService try { List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>(); - for ( org.apache.archiva.admin.repository.remote.RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() ) + for ( org.apache.archiva.admin.model.remote.RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() ) { RemoteRepository repo = new RemoteRepository( remoteRepository.getId(), remoteRepository.getName(), remoteRepository.getUrl(), remoteRepository.getLayout(), @@ -100,15 +100,15 @@ public class DefaultRemoteRepositoriesService getAuditInformation() ); } - private org.apache.archiva.admin.repository.remote.RemoteRepository getModelRemoteRepository( + private org.apache.archiva.admin.model.remote.RemoteRepository getModelRemoteRepository( RemoteRepository remoteRepository ) { - return new org.apache.archiva.admin.repository.remote.RemoteRepository( remoteRepository.getId(), - remoteRepository.getName(), - remoteRepository.getUrl(), - remoteRepository.getLayout(), - remoteRepository.getUserName(), - remoteRepository.getPassword(), - remoteRepository.getTimeOut() ); + return new org.apache.archiva.admin.model.remote.RemoteRepository( remoteRepository.getId(), + remoteRepository.getName(), + remoteRepository.getUrl(), + remoteRepository.getLayout(), + remoteRepository.getUserName(), + remoteRepository.getPassword(), + remoteRepository.getTimeOut() ); } } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 26048fcff..2475ff809 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -19,14 +19,10 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin; -import org.apache.archiva.metadata.repository.RepositorySessionFactory; -import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager; import org.apache.archiva.rest.api.services.RepositoriesService; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryTask; import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.taskqueue.TaskQueueException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java index e68bdd1a8..c52a20bc6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java @@ -18,8 +18,8 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.group.RepositoryGroupAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.group.RepositoryGroupAdmin; import org.apache.archiva.rest.api.model.RepositoryGroup; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.RepositoryGroupService; @@ -48,7 +48,7 @@ public class DefaultRepositoryGroupService try { List<RepositoryGroup> repositoriesGroups = new ArrayList<RepositoryGroup>(); - for ( org.apache.archiva.admin.repository.group.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() ) + for ( org.apache.archiva.admin.model.group.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() ) { repositoriesGroups.add( new RepositoryGroup( repoGroup.getId(), new ArrayList<String>( repoGroup.getRepositories() ) ) ); @@ -80,7 +80,7 @@ public class DefaultRepositoryGroupService try { return repositoryGroupAdmin.addRepositoryGroup( - new org.apache.archiva.admin.repository.group.RepositoryGroup( repoGroup.getId(), new ArrayList<String>( + new org.apache.archiva.admin.model.group.RepositoryGroup( repoGroup.getId(), new ArrayList<String>( repoGroup.getRepositories() ) ), getAuditInformation() ); } catch ( RepositoryAdminException e ) @@ -95,7 +95,7 @@ public class DefaultRepositoryGroupService try { return repositoryGroupAdmin.updateRepositoryGroup( - new org.apache.archiva.admin.repository.group.RepositoryGroup( repoGroup.getId(), new ArrayList<String>( + new org.apache.archiva.admin.model.group.RepositoryGroup( repoGroup.getId(), new ArrayList<String>( repoGroup.getRepositories() ) ), getAuditInformation() ); } catch ( RepositoryAdminException e ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java new file mode 100644 index 000000000..a4d8cbfc8 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java @@ -0,0 +1,164 @@ +package org.apache.archiva.rest.services; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import net.sf.beanlib.provider.replicator.BeanReplicator; +import org.apache.archiva.indexer.search.RepositorySearch; +import org.apache.archiva.indexer.search.RepositorySearchException; +import org.apache.archiva.indexer.search.SearchResultHit; +import org.apache.archiva.indexer.search.SearchResultLimits; +import org.apache.archiva.indexer.search.SearchResults; +import org.apache.archiva.rest.api.model.Artifact; +import org.apache.archiva.rest.api.model.Dependency; +import org.apache.archiva.rest.api.services.ArchivaRestServiceException; +import org.apache.archiva.rest.api.services.SearchService; +import org.apache.archiva.security.AccessDeniedException; +import org.apache.archiva.security.ArchivaSecurityException; +import org.apache.archiva.security.PrincipalNotFoundException; +import org.apache.archiva.security.UserRepositories; +import org.apache.commons.lang.StringUtils; +import org.codehaus.plexus.redback.users.UserManager; +import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal; +import org.codehaus.redback.rest.services.RedbackRequestInformation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @author Olivier Lamy + */ +@Service( "searchService#rest" ) +public class DefaultSearchService + implements SearchService +{ + + private Logger log = LoggerFactory.getLogger( getClass() ); + + @Inject + private RepositorySearch repositorySearch; + + @Inject + private UserRepositories userRepositories; + + public List<Artifact> quickSearch( String queryString ) + throws ArchivaRestServiceException + { + if ( StringUtils.isBlank( queryString ) ) + { + return Collections.emptyList(); + } + + SearchResultLimits limits = new SearchResultLimits( 0 ); + List<String> observableRepoIds = getObservableRepos(); + try + { + SearchResults searchResults = + repositorySearch.search( getPrincipal(), getObservableRepos(), queryString, limits, + Collections.<String>emptyList() ); + return getArtifacts( searchResults ); + } + catch ( RepositorySearchException e ) + { + log.error( e.getMessage(), e ); + throw new ArchivaRestServiceException( e.getMessage() ); + } + } + + public List<Artifact> getArtifactByChecksum( String checksum ) + throws ArchivaRestServiceException + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public List<Artifact> getArtifactVersions( String groupId, String artifactId ) + throws ArchivaRestServiceException + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public List<Dependency> getDependencies( String groupId, String artifactId, String version ) + throws ArchivaRestServiceException + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + + protected List<String> getObservableRepos() + { + try + { + List<String> ids = userRepositories.getObservableRepositoryIds( getPrincipal() ); + return ids == null ? Collections.<String>emptyList() : ids; + } + catch ( PrincipalNotFoundException e ) + { + log.warn( e.getMessage(), e ); + } + catch ( AccessDeniedException e ) + { + log.warn( e.getMessage(), e ); + } + catch ( ArchivaSecurityException e ) + { + log.warn( e.getMessage(), e ); + } + return Collections.emptyList(); + } + + protected String getPrincipal() + { + RedbackRequestInformation redbackRequestInformation = RedbackAuthenticationThreadLocal.get(); + + return redbackRequestInformation == null + ? UserManager.GUEST_USERNAME + : ( redbackRequestInformation.getUser() == null + ? UserManager.GUEST_USERNAME + : redbackRequestInformation.getUser().getUsername() ); + } + + protected List<Artifact> getArtifacts( SearchResults searchResults ) + { + if ( searchResults == null || searchResults.isEmpty() ) + { + return Collections.emptyList(); + } + List<Artifact> artifacts = new ArrayList<Artifact>( searchResults.getReturnedHitsCount() ); + for ( SearchResultHit searchResultHit : searchResults.getHits() ) + { + Artifact artifact = new BeanReplicator().replicateBean( searchResultHit, Artifact.class ); + artifacts.add( artifact ); + // duplicate Artifact one per available version + if ( searchResultHit.getVersions().size() > 1 ) + { + for ( String version : searchResultHit.getVersions() ) + { + Artifact versionned = new BeanReplicator().replicateBean( searchResultHit, Artifact.class ); + versionned.setVersion( version ); + artifacts.add( versionned ); + } + } + } + return artifacts; + } +} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml index 9dbc8e677..af17b5ae3 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml @@ -35,9 +35,9 @@ --> <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/> - <context:annotation-config /> + <context:annotation-config/> <context:component-scan - base-package="org.apache.archiva.rest.services"/> + base-package="org.apache.archiva.rest.services"/> <jaxrs:server id="archivaServices" address="/archivaServices"> @@ -56,12 +56,13 @@ <ref bean="proxyConnectorService#rest"/> <ref bean="networkProxyService#rest"/> <ref bean="archivaAdministrationService#default"/> + <ref bean="searchService#rest"/> </jaxrs:serviceBeans> <jaxrs:outInterceptors> <ref bean="threadLocalUserCleaner#rest"/> </jaxrs:outInterceptors> - </jaxrs:server> + </jaxrs:server> </beans>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java index 79a3e8223..39fa6ae76 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java @@ -28,6 +28,7 @@ import org.apache.archiva.rest.api.services.ProxyConnectorService; import org.apache.archiva.rest.api.services.RemoteRepositoriesService; import org.apache.archiva.rest.api.services.RepositoriesService; import org.apache.archiva.rest.api.services.RepositoryGroupService; +import org.apache.archiva.rest.api.services.SearchService; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.maven.archiva.common.utils.FileUtil; @@ -52,15 +53,36 @@ public abstract class AbstractArchivaRestTest protected RepositoriesService getRepositoriesService() { - return JAXRSClientFactory.create( "http://localhost:" + port + "/services/archivaServices/", - RepositoriesService.class ); + return getRepositoriesService( null ); + } + + protected RepositoriesService getRepositoriesService( String authzHeader ) + { + RepositoriesService service = + JAXRSClientFactory.create( "http://localhost:" + port + "/services/archivaServices/", + RepositoriesService.class ); + + if ( authzHeader != null ) + { + WebClient.client( service ).header( "Authorization", authzHeader ); + } + WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 100000000 ); + return service; } - protected ManagedRepositoriesService getManagedRepositoriesService() + protected ManagedRepositoriesService getManagedRepositoriesService( String authzHeader ) { - return JAXRSClientFactory.create( "http://localhost:" + port + "/services/archivaServices/", - ManagedRepositoriesService.class ); + ManagedRepositoriesService service = + JAXRSClientFactory.create( "http://localhost:" + port + "/services/archivaServices/", + ManagedRepositoriesService.class ); + + if ( authzHeader != null ) + { + WebClient.client( service ).header( "Authorization", authzHeader ); + } + WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 100000000 ); + return service; } @@ -117,6 +139,20 @@ public abstract class AbstractArchivaRestTest return service; } + protected SearchService getSearchService( String authzHeader ) + { + SearchService service = + JAXRSClientFactory.create( "http://localhost:" + port + "/services/archivaServices/", SearchService.class ); + + if ( authzHeader != null ) + { + WebClient.client( service ).header( "Authorization", authzHeader ); + } + WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 100000000 ); + return service; + + } + protected ManagedRepository getTestManagedRepository() { String location = new File( FileUtil.getBasedir(), "target/test-repo" ).getAbsolutePath(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java index c88570687..c7acbc736 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java @@ -21,12 +21,8 @@ package org.apache.archiva.rest.services; import org.apache.archiva.rest.api.model.ManagedRepository; import org.apache.archiva.rest.api.services.ManagedRepositoriesService; -import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.maven.archiva.common.utils.FileUtil; import org.junit.Test; -import java.io.File; - /** * @author Olivier Lamy */ @@ -39,9 +35,8 @@ public class ManagedRepositoriesServiceTest public void addManagedRepo() throws Exception { - ManagedRepositoriesService service = getManagedRepositoriesService(); - WebClient.client( service ).header( "Authorization", authorizationHeader ); - WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 300000 ); + ManagedRepositoriesService service = getManagedRepositoriesService( authorizationHeader ); + ManagedRepository repo = getTestManagedRepository(); if ( service.getManagedRepository( repo.getId() ) != null ) { @@ -59,9 +54,8 @@ public class ManagedRepositoriesServiceTest public void updateManagedRepo() throws Exception { - ManagedRepositoriesService service = getManagedRepositoriesService(); - WebClient.client( service ).header( "Authorization", authorizationHeader ); - WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 300000 ); + ManagedRepositoriesService service = getManagedRepositoriesService( authorizationHeader ); + ManagedRepository repo = getTestManagedRepository(); if ( service.getManagedRepository( repo.getId() ) != null ) { @@ -81,13 +75,10 @@ public class ManagedRepositoriesServiceTest assertNotNull( repo ); assertEquals( "toto", repo.getName() ); - service.deleteManagedRepository( repo.getId(), true ); assertNull( service.getManagedRepository( repo.getId() ) ); } - - } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java index a9b14cd89..faa417cc7 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java @@ -60,8 +60,8 @@ public class RepositoriesServiceTest WebClient.client( service ).header( "Authorization", authorizationHeader ); WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 300000 ); - ManagedRepositoriesService managedRepositoriesService = getManagedRepositoriesService(); - WebClient.client( managedRepositoriesService ).header( "Authorization", authorizationHeader ); + ManagedRepositoriesService managedRepositoriesService = getManagedRepositoriesService( authorizationHeader ); + WebClient.getConfig( managedRepositoriesService ).getHttpConduit().getClient().setReceiveTimeout( 300000 ); String repoId = managedRepositoriesService.getManagedRepositories().get( 0 ).getId(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java index f048da826..96a02654c 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java @@ -43,8 +43,8 @@ public class RepositoryGroupServiceTest assertTrue( service.getRepositoriesGroups().isEmpty() ); - ManagedRepositoriesService managedRepositoriesService = getManagedRepositoriesService(); - WebClient.client( managedRepositoriesService ).header( "Authorization", authorizationHeader ); + ManagedRepositoriesService managedRepositoriesService = getManagedRepositoriesService( authorizationHeader ); + WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 300000 ); ManagedRepository managedRepository = getTestManagedRepository(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java new file mode 100644 index 000000000..857abf5e3 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java @@ -0,0 +1,105 @@ +package org.apache.archiva.rest.services; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.rest.api.model.Artifact; +import org.apache.archiva.rest.api.model.ManagedRepository; +import org.apache.archiva.rest.api.services.ManagedRepositoriesService; +import org.apache.archiva.rest.api.services.SearchService; +import org.apache.commons.io.FileUtils; +import org.junit.Test; + +import java.io.File; +import java.util.List; + +/** + * @author Olivier Lamy + */ +public class SearchServiceTest + extends AbstractArchivaRestTest +{ + @Test + public void quickSearchOnArtifactId() + throws Exception + { + + // olamy temporary disabled due to huge refactoring + if (true) + { + return; + } + + String testRepoId = "test-repo"; + // force guest user creation if not exists + if ( getUserService( authorizationHeader ).getGuestUser() == null ) + { + assertNotNull( getUserService( authorizationHeader ).createGuestUser() ); + } + + File targetRepo = new File( System.getProperty( "targetDir", "./target" ), "test-repo" ); + + if ( targetRepo.exists() ) + { + FileUtils.deleteDirectory( targetRepo ); + } + + File sourceRepo = new File( "src/test/repo-with-osgi" ); + + FileUtils.copyDirectory( sourceRepo, targetRepo ); + + ManagedRepository managedRepository = new ManagedRepository(); + managedRepository.setId( testRepoId ); + managedRepository.setName( "test repo" ); + managedRepository.setCronExpression( "* * * * * ?" ); + + managedRepository.setLocation( targetRepo.getPath() ); + + ManagedRepositoriesService service = getManagedRepositoriesService( authorizationHeader ); + service.addManagedRepository( managedRepository ); + + getRepositoriesService( authorizationHeader ).scanRepository( testRepoId, true ); + + while ( getRepositoriesService( authorizationHeader ).alreadyScanning( testRepoId ) ) + { + Thread.sleep( 1000 ); + } + + SearchService searchService = getSearchService( authorizationHeader ); + + List<Artifact> artifacts = searchService.quickSearch( "commons-logging" ); + + assertNotNull( artifacts ); + assertTrue( " empty results for commons-logging search", artifacts.size() > 0 ); + log.info( "artifacts for commons-logginf search {}", artifacts ); + + deleteTestRepo( testRepoId ); + } + + private void deleteTestRepo( String id ) + throws Exception + { + if ( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( id ) != null ) + { + getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( id, true ); + } + } + +} + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar Binary files differnew file mode 100644 index 000000000..8f67432bb --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar.sha1 new file mode 100644 index 000000000..eebab12aa --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0-sources.jar.sha1 @@ -0,0 +1 @@ +fc9b2f6fb941aadf5ea34f68c983b0e6bfbf2ca7
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar Binary files differnew file mode 100644 index 000000000..22a004e14 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 new file mode 100644 index 000000000..c22c98b0e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 @@ -0,0 +1 @@ +6dac9733315224fc562f6268df58e92d65fd0137
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom new file mode 100644 index 000000000..cfc5a04d7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom @@ -0,0 +1,76 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <name>CLI</name> + <version>1.0</version> + <description>Commons CLI provides a simple API for working with the command line arguments and options.</description> + <inceptionYear>2002</inceptionYear> + <developers> + <developer> + <id>jstrachan</id> + <name>James Strachan</name> + <email>jstrachan@apache.org</email> + <organization>SpiritSoft, Inc.</organization> + </developer> + <developer> + <id>bob</id> + <name>bob mcwhirter</name> + <email>bob@werken.com</email> + <organization>Werken</organization> + </developer> + <developer> + <id>jkeyes</id> + <name>John Keyes</name> + <email>jbjk@mac.com</email> + <organization>integral Source</organization> + </developer> + </developers> + <contributors> + <contributor> + <name>Berin Loritsch</name> + <email>bloritsch@apache.org</email> + <roles> + <role>helped in the Avalon CLI merge</role> + </roles> + </contributor> + <contributor> + <name>Peter Maddocks</name> + <email>peter_maddocks@hp.com</email> + <organization>Hewlett-Packard</organization> + <roles> + <role>supplied patch</role> + </roles> + </contributor> + </contributors> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Test*.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 new file mode 100644 index 000000000..1d926c9ab --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 @@ -0,0 +1 @@ +bc51fd74ed7c8ccf75b3abc84b3613d6ba60eb89 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar Binary files differnew file mode 100644 index 000000000..77ca3a939 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.md5 new file mode 100644 index 000000000..7cda458de --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.md5 @@ -0,0 +1 @@ +c40f1b459fdf90848bfeef8b5856eba6
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.sha1 new file mode 100644 index 000000000..a92bb1c7d --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.sha1 @@ -0,0 +1 @@ +098d85a82cd48a746e1304825ba70b8df25f4131
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar Binary files differnew file mode 100644 index 000000000..c64e88c4d --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.md5 new file mode 100644 index 000000000..62bd72730 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.md5 @@ -0,0 +1 @@ +e1b1720a761ca36eaa47e1c7d802e676
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.sha1 new file mode 100644 index 000000000..3724daf39 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.jar.sha1 @@ -0,0 +1 @@ +2e8405d4a28a0b359fbfb8855bde0fdeb0099858
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom new file mode 100644 index 000000000..956fcd33b --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom @@ -0,0 +1,30 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <name>Logging</name> + <version>1.0.1</version> + <description>Commons Logging</description> + <inceptionYear>2002</inceptionYear> + <build /> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.1.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.md5 new file mode 100644 index 000000000..cdd2818d1 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.md5 @@ -0,0 +1 @@ +17548178996d55e5f1561a6fd675616f /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.sha1 new file mode 100644 index 000000000..355c5ecd8 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom.sha1 @@ -0,0 +1 @@ +665b8439aad27af8b87fd3fefa11d901d851c9d5 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml new file mode 100644 index 000000000..dbb6f0ad9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.1</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.md5 new file mode 100644 index 000000000..91dc5e9b8 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.md5 @@ -0,0 +1 @@ +629e92df42c9735e1794689ea6e2f1e5 ./commons-logging/commons-logging/1.0.1/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.sha1 new file mode 100644 index 000000000..ff58c9ba1 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.1/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +e8e65fd3a18876a01e3f771015c3ad052ca01af5 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.1/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar Binary files differnew file mode 100644 index 000000000..994637f8f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.md5 new file mode 100644 index 000000000..06e29d85e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.md5 @@ -0,0 +1 @@ +23bc0c53b59b1689d3cbd97de42e0a74
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.sha1 new file mode 100644 index 000000000..a21af97ed --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2-javadoc.jar.sha1 @@ -0,0 +1 @@ +635c2d062a007ffc71a956d45a149f0896ffed8d
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar Binary files differnew file mode 100644 index 000000000..aca1e4132 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.md5 new file mode 100644 index 000000000..03af6e34c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.md5 @@ -0,0 +1 @@ +bdb6d37e652f164451ebd0cb10b7f645
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.sha1 new file mode 100644 index 000000000..6d343de40 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar.sha1 @@ -0,0 +1 @@ +37c659e57293656ebef1a247fc6ceb738ebdfc74
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom new file mode 100644 index 000000000..6a2cebba7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom @@ -0,0 +1,30 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <name>Logging</name> + <version>1.0.2</version> + <description>Commons Logging</description> + <inceptionYear>2002</inceptionYear> + <build /> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.1.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.md5 new file mode 100644 index 000000000..93a58b66d --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.md5 @@ -0,0 +1 @@ +b7e001b135a56678ac81f21ac2469957 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.sha1 new file mode 100644 index 000000000..906aa58a4 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom.sha1 @@ -0,0 +1 @@ +994768b3b18380239296871de3d732935d390c24 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml new file mode 100644 index 000000000..3f42d4319 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.2</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.md5 new file mode 100644 index 000000000..9db476082 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.md5 @@ -0,0 +1 @@ +32d0d002721d3669f8d01970fb7d556c ./commons-logging/commons-logging/1.0.2/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.sha1 new file mode 100644 index 000000000..a6ddbca08 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.2/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +db4cb003a7eacd19b5eb9747a484f23209ea20fd /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.2/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar Binary files differnew file mode 100644 index 000000000..ce4d7ec40 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.md5 new file mode 100644 index 000000000..ba413f3c9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.md5 @@ -0,0 +1 @@ +852ef679e9998498e7d4ac6121c45316
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.sha1 new file mode 100644 index 000000000..b4a76d40a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar.sha1 @@ -0,0 +1 @@ +d0773fcb73e98a977b54c70c289fe06e60d57643
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar Binary files differnew file mode 100644 index 000000000..b99c9375a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.md5 new file mode 100644 index 000000000..4b9f4d161 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.md5 @@ -0,0 +1 @@ +5bc8bdd15b18018e84fd862993aaca42
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 new file mode 100644 index 000000000..9e50b2572 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 @@ -0,0 +1 @@ +760c711c71588bc273d3e56d196d720a7678cd93
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom new file mode 100644 index 000000000..c46b27ffb --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom @@ -0,0 +1,31 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <name>Logging</name> + <version>1.0.3</version> + <description>Commons Logging</description> + <url>http://jakarta.apache.org/commons/logging/</url> + <inceptionYear>2001</inceptionYear> + <build /> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.6</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.md5 new file mode 100644 index 000000000..02d6c5f91 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.md5 @@ -0,0 +1 @@ +881dca51df49b39efb7b81b05b31278d /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 new file mode 100644 index 000000000..c03effc78 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 @@ -0,0 +1 @@ +b7de43bb310eb1dbfd00a34cec30500fa13cb577 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml new file mode 100644 index 000000000..d733c03bb --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.3</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.md5 new file mode 100644 index 000000000..425ad3e93 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.md5 @@ -0,0 +1 @@ +15cae318f3bfbde23028f26c8ba153aa ./commons-logging/commons-logging/1.0.3/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.sha1 new file mode 100644 index 000000000..0557855d5 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.3/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +7f4047267ed6d4679ee568460c2abea4fe8146b6 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.3/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar Binary files differnew file mode 100644 index 000000000..efacb52ba --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.md5 new file mode 100644 index 000000000..1308a1a52 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.md5 @@ -0,0 +1 @@ +f0626403d6ba70cd8758d74a4d557a86
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.sha1 new file mode 100644 index 000000000..c9243b396 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar.sha1 @@ -0,0 +1 @@ +e6ab582bb54e0eba076f314d98272457261501ee
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar Binary files differnew file mode 100644 index 000000000..fc4bc9fcb --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.md5 new file mode 100644 index 000000000..75ba5707c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.md5 @@ -0,0 +1 @@ +0a95b57dbd6ac8fc8da869de59709477 commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.sha1 new file mode 100644 index 000000000..95635464e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar.sha1 @@ -0,0 +1 @@ +08d3424a318e818f88568dfb3b55c58583364ba9 commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar Binary files differnew file mode 100644 index 000000000..b73a80fab --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.md5 new file mode 100644 index 000000000..1156a2e99 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.md5 @@ -0,0 +1 @@ +8a507817b28077e0478add944c64586a
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 new file mode 100644 index 000000000..7e0a60e4f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 @@ -0,0 +1 @@ +f029a2aefe2b3e1517573c580f948caac31b1056
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom new file mode 100644 index 000000000..7c1017dc2 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom @@ -0,0 +1,165 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <name>Logging</name> + <version>1.0.4</version> + <description>Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems.</description> + <url>http://jakarta.apache.org/commons/logging/</url> + <issueManagement> + <url>http://issues.apache.org/bugzilla/</url> + </issueManagement> + <ciManagement> + <notifiers> + <notifier> + <configuration> + <address>commons-dev@jakarta.apache.org</address> + </configuration> + </notifier> + </notifiers> + </ciManagement> + <inceptionYear>2001</inceptionYear> + <mailingLists> + <mailingList> + <name>Commons Dev List</name> + <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe> + <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe> + <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive> + </mailingList> + <mailingList> + <name>Commons User List</name> + <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe> + <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe> + <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <id>morgand</id> + <name>Morgan Delagrange</name> + <email>morgand at apache dot org</email> + <organization>Apache</organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + <developer> + <id>rwaldhoff</id> + <name>Rodney Waldhoff</name> + <email>rwaldhoff at apache org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>craigmcc</id> + <name>Craig McClanahan</name> + <email>craigmcc at apache org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>sanders</id> + <name>Scott Sanders</name> + <email>sanders at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>rdonkin</id> + <name>Robert Burrell Donkin</name> + <email>rdonkin at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>donaldp</id> + <name>Peter Donald</name> + <email>donaldp at apache dot org</email> + <organization></organization> + </developer> + <developer> + <id>costin</id> + <name>Costin Manolache</name> + <email>costin at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>rsitze</id> + <name>Richard Sitze</name> + <email>rsitze at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>baliuka</id> + <name>Juozas Baliuka</name> + <email>baliuka@apache.org</email> + <organization></organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>/LICENSE.txt</url> + </license> + </licenses> + <scm> + <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/logging</connection> + <url>http://cvs.apache.org/viewcvs/jakarta-commons/logging/</url> + </scm> + <organization> + <name>The Apache Software Foundation</name> + <url>http://jakarta.apache.org</url> + </organization> + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/AvalonLoggerTest.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.6</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + <version>4.1.3</version> + <optional>true</optional> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>default</id> + <name>Default Repository</name> + <url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url> + </repository> + <site> + <id>default</id> + <name>Default Site</name> + <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/logging/</url> + </site> + </distributionManagement> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.md5 new file mode 100644 index 000000000..65216d827 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.md5 @@ -0,0 +1 @@ +2794b156c9725ac6382c22663ae42124 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 new file mode 100644 index 000000000..676ff7b23 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 @@ -0,0 +1 @@ +7d32e7520b801cabc3dc704d2afe59d020d00c45 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml new file mode 100644 index 000000000..536a7be8a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.md5 new file mode 100644 index 000000000..b0beda653 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.md5 @@ -0,0 +1 @@ +182e4358962671c46ee4242d9dad4013 ./commons-logging/commons-logging/1.0.4/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.sha1 new file mode 100644 index 000000000..722baf944 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0.4/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +5bb716617b7904d05e5563801f72ebcce96a161a /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0.4/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar Binary files differnew file mode 100644 index 000000000..42b59d140 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.md5 new file mode 100644 index 000000000..ea8ffa075 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.md5 @@ -0,0 +1 @@ +cd31f6e132e9076168247b5b62e7d4f2
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.sha1 new file mode 100644 index 000000000..461afce1a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0-javadoc.jar.sha1 @@ -0,0 +1 @@ +e3f9527e9e04311a8d411b93bc06930574070839
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar Binary files differnew file mode 100644 index 000000000..33232cd09 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.md5 new file mode 100644 index 000000000..7c997d231 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.md5 @@ -0,0 +1 @@ +240b26992977c9ad119efb91cb21f8f8
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.sha1 new file mode 100644 index 000000000..58918b630 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.sha1 @@ -0,0 +1 @@ +f10838aa1add95b8cd26b8c9c07b2278c21e64b4
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom new file mode 100644 index 000000000..402a9df37 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom @@ -0,0 +1,6 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0</version> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.md5 new file mode 100644 index 000000000..acb67109d --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.md5 @@ -0,0 +1 @@ +aa412f75c470cd28468a20bd4c811e7d /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 new file mode 100644 index 000000000..3c6069df1 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 @@ -0,0 +1 @@ +4f58df6cca7ad7b863e8186e5dc25a8ef502e374 /home/projects/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml new file mode 100644 index 000000000..db699f58f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.md5 new file mode 100644 index 000000000..f43d7b901 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.md5 @@ -0,0 +1 @@ +d507f2c419364009f089592dfd9acea2 ./commons-logging/commons-logging/1.0/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.sha1 new file mode 100644 index 000000000..a0ac3ddd9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.0/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +5fe9e6d013ddf2a2f9e2b21582024d4f8e2f7ca5 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.0/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar Binary files differnew file mode 100644 index 000000000..1e036f176 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.md5 new file mode 100644 index 000000000..b896085c0 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.md5 @@ -0,0 +1 @@ +6c6e00b54fdb9e3489554b49dface8ec /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.sha1 new file mode 100644 index 000000000..492569722 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar.sha1 @@ -0,0 +1 @@ +5c2bd34c9a05067c72dcf08cd248630561a9c852 /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar Binary files differnew file mode 100644 index 000000000..2ff9bbd90 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.md5 new file mode 100644 index 000000000..42c7efb2f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.md5 @@ -0,0 +1 @@ +6b62417e77b000a87de66ee3935edbf5 /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.sha1 new file mode 100644 index 000000000..5a6ea7b12 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar.sha1 @@ -0,0 +1 @@ +ba24d5de831911b684c92cd289ed5ff826271824 /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom new file mode 100644 index 000000000..b1ea16fe1 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <name>Logging</name> + <version>1.1</version> + <description>Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems.</description> + <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url> + <issueManagement> + <url>http://issues.apache.org/bugzilla/</url> + </issueManagement> + <ciManagement> + <notifiers> + <notifier> + <configuration> + <address>commons-dev@jakarta.apache.org</address> + </configuration> + </notifier> + </notifiers> + </ciManagement> + <inceptionYear>2001</inceptionYear> + <mailingLists> + <mailingList> + <name>Commons Dev List</name> + <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe> + <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive> + </mailingList> + <mailingList> + <name>Commons User List</name> + <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe> + <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <id>morgand</id> + <name>Morgan Delagrange</name> + <email>morgand at apache dot org</email> + <organization>Apache</organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + <developer> + <id>rwaldhoff</id> + <name>Rodney Waldhoff</name> + <email>rwaldhoff at apache org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>craigmcc</id> + <name>Craig McClanahan</name> + <email>craigmcc at apache org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>sanders</id> + <name>Scott Sanders</name> + <email>sanders at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>rdonkin</id> + <name>Robert Burrell Donkin</name> + <email>rdonkin at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>donaldp</id> + <name>Peter Donald</name> + <email>donaldp at apache dot org</email> + <organization></organization> + </developer> + <developer> + <id>costin</id> + <name>Costin Manolache</name> + <email>costin at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>rsitze</id> + <name>Richard Sitze</name> + <email>rsitze at apache dot org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>baliuka</id> + <name>Juozas Baliuka</name> + <email>baliuka@apache.org</email> + <organization></organization> + <roles> + <role>Java Developer</role> + </roles> + </developer> + <developer> + <id>skitching</id> + <name>Simon Kitching</name> + <email>skitching@apache.org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>dennisl</id> + <name>Dennis Lundberg</name> + <email>dennisl@apache.org</email> + <organization>Apache Software Foundation</organization> + </developer> + <developer> + <id>bstansberry</id> + <name>Brian Stansberry</name> + </developer> + </developers> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>/LICENSE.txt</url> + </license> + </licenses> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection> + <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url> + </scm> + <organization> + <name>The Apache Software Foundation</name> + <url>http://jakarta.apache.org</url> + </organization> + <build> + <sourceDirectory>src/java</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/AvalonLoggerTest.java</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-xdoc-plugin</artifactId> + <version>1.9.2</version> + <configuration> + <comment><strong>Site Only</strong> - v1.9.2 (minimum)</comment> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.12</version> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + <version>4.1.3</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.3</version> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>default</id> + <name>Default Repository</name> + <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url> + </repository> + <site> + <id>default</id> + <name>Default Site</name> + <url>scp://cvs.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url> + </site> + <status>converted</status> + </distributionManagement> +</project>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.md5 new file mode 100644 index 000000000..fc51c08b7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.md5 @@ -0,0 +1 @@ +219b31dbb491c609210577941a27a390 /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 new file mode 100644 index 000000000..0b450ccc7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 @@ -0,0 +1 @@ +d80c5278c4f112aba0a6e987d7321676ce074a22 /home/csanchez/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml new file mode 100644 index 000000000..3a46a4fce --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml @@ -0,0 +1,5 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> +</metadata>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.md5 new file mode 100644 index 000000000..ecf3cf561 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.md5 @@ -0,0 +1 @@ +3da6bff52079500a1deb0b50b592f6cc ./commons-logging/commons-logging/1.1/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.sha1 new file mode 100644 index 000000000..a16925ebb --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/commons-logging/1.1/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +0672ee0df7fb5db281603d0fd9328086b8b1a912 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/1.1/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml new file mode 100644 index 000000000..6f725eace --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml @@ -0,0 +1,15 @@ +<metadata> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0</version> + <versioning> + <versions> + <version>1.0</version> + <version>1.0.1</version> + <version>1.0.2</version> + <version>1.0.3</version> + <version>1.0.4</version> + <version>1.1</version> + </versions> + </versioning> +</metadata> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.md5 new file mode 100644 index 000000000..303079faa --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.md5 @@ -0,0 +1 @@ +57ae0a2f19db170eb6a012e255dfe329 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.sha1 new file mode 100644 index 000000000..0a2ec8208 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/commons-logging/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +fa606c3906d034dd7b98ebbf0a0655479a9dc956 /home/maven/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging/maven-metadata.xml
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar Binary files differnew file mode 100644 index 000000000..218330e3f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom new file mode 100644 index 000000000..19831eefa --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom @@ -0,0 +1,138 @@ +<!-- + 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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.apache.felix</groupId> + <artifactId>felix-parent</artifactId> + <version>2.1</version> + <relativePath>../pom/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>bundle</packaging> + <name>Apache Felix Bundle Repository</name> + <description>Bundle repository service.</description> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.6.6</version> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.bundlerepository-1.6.6</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.bundlerepository-1.6.6</developerConnection> + <url>http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.bundlerepository-1.6.6</url> + </scm> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <version>1.1.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>org.osgi.service.obr</artifactId> + <version>1.0.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>org.apache.felix.shell</artifactId> + <version>1.4.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>net.sf.kxml</groupId> + <artifactId>kxml2</artifactId> + <version>2.3.0</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>xmlpull</groupId> + <artifactId>xmlpull</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.0.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>4.0.7</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.4</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package>org.apache.felix.bundlerepository;version="2.0"</Export-Package> + <Private-Package> + org.kxml2.io, + org.xmlpull.v1, + org.apache.felix.bundlerepository.impl.*, + org.apache.felix.utils.* + </Private-Package> + <Import-Package>!javax.xml.parsers,!org.xml.sax,org.osgi.service.log;resolution:=optional,org.osgi.service.obr;resolution:=optional,javax.xml.stream;resolution:=optional,*</Import-Package> + <DynamicImport-Package>org.apache.felix.shell</DynamicImport-Package> + <Bundle-Activator>${project.artifactId}.impl.Activator</Bundle-Activator> + <Bundle-DocURL>http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html</Bundle-DocURL> + <Bundle-Url>http://felix.apache.org/site/downloads.cgi</Bundle-Url> + <Bundle-Source>http://felix.apache.org/site/downloads.cgi</Bundle-Source> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> + <Export-Service>org.apache.felix.bundlerepository.RepositoryAdmin,org.osgi.service.obr.RepositoryAdmin</Export-Service> + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> + <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/LICENSE.kxml2=LICENSE.kxml2,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludeSubProjects>false</excludeSubProjects> + <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes> + <useMavenDefaultExcludes>true</useMavenDefaultExcludes> + <excludes> + <param>doc/*</param> + <param>maven-eclipse.xml</param> + <param>.checkstyle</param> + <param>.externalToolBuilders/*</param> + </excludes> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.jar Binary files differnew file mode 100644 index 000000000..e211324f3 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.pom new file mode 100644 index 000000000..67e206f63 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.pom @@ -0,0 +1,5 @@ +#Generated by org.apache.felix.bundleplugin +#Thu Jun 30 15:25:37 NDT 2011 +version=2.2.2 +groupId=org.apache.karaf.features +artifactId=org.apache.karaf.features.command diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.jar Binary files differnew file mode 100644 index 000000000..a6c5b3556 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.pom new file mode 100644 index 000000000..6cd219e47 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.1/org.apache.karaf.features.core-2.2.1.pom @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <!-- + + 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. + --> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.karaf.features</groupId> + <artifactId>features</artifactId> + <version>2.2.1</version> + </parent> + + <artifactId>org.apache.karaf.features.core</artifactId> + <packaging>bundle</packaging> + <name>Apache Karaf :: Features :: Core</name> + <description>This bundle is the core implementation of the Karaf features support.</description> + + <properties> + <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory> + </properties> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.console</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.obr</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-osgi-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.info</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package>org.apache.karaf.features;version=${project.version}</Export-Package> + <Import-Package> + !org.apache.karaf.features, + javax.management, + javax.management.loading, + org.apache.felix.service.command, + org.apache.felix.gogo.commands, + org.apache.karaf.shell.console, + org.osgi.service.event*;resolution:=optional, + * + </Import-Package> + <Private-Package> + org.apache.karaf.features.internal, + org.apache.felix.utils.version, + org.apache.felix.utils.manifest + </Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.jar Binary files differnew file mode 100644 index 000000000..0e6bb50db --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.jar diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.pom new file mode 100644 index 000000000..e5782e9ec --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.pom @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <!-- + + 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. + --> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.karaf.features</groupId> + <artifactId>features</artifactId> + <version>2.2.2</version> + </parent> + + <artifactId>org.apache.karaf.features.core</artifactId> + <packaging>bundle</packaging> + <name>Apache Karaf :: Features :: Core</name> + <description>This bundle is the core implementation of the Karaf features support.</description> + + <properties> + <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory> + </properties> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.console</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.obr</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-osgi-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.info</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package>org.apache.karaf.features;version=${project.version}</Export-Package> + <Import-Package> + !org.apache.karaf.features, + javax.management, + javax.management.loading, + org.apache.felix.service.command, + org.apache.felix.gogo.commands, + org.apache.karaf.shell.console, + org.osgi.service.event*;resolution:=optional, + * + </Import-Package> + <Private-Package> + org.apache.karaf.features.internal, + org.apache.felix.utils.version, + org.apache.felix.utils.manifest + </Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> |