Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Addapt to latest changes in sisu-rdf, Nexus 2.x and capabilities plug…
Browse files Browse the repository at this point in the history 
…in 2.x

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
  • Loading branch information
@adreghiciu
adreghiciu committed May 1, 2012
1 parent c51c4b9 commit 839d0d5
Show file tree
Hide file tree
Showing 27 changed files with 232 additions and 1,391 deletions.
160 changes: 24 additions & 136 deletions pom.xml
View file
Expand Up @@ -19,8 +19,8 @@
<description>Nexus RDF Plugin</description>

<properties>
<nexus.version>1.9.1-SNAPSHOT</nexus.version>
<sisu.assembler.tags>nexus,nexus-plugins</sisu.assembler.tags>
<nexus.version>2.0.4</nexus.version>
<nexus.plugin.type>nexus-plugin</nexus.plugin.type>
</properties>

<scm>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-bean</artifactId>
<version>2.3.0-SNAPSHOT</version>
<version>2.3.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -67,69 +67,27 @@
<version>${nexus.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-capabilities-plugin</artifactId>
<type>nexus-plugin</type>
<version>${nexus.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-rdf</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-rdf-query</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-rdf-sesame-jena</artifactId>
<version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-maven-bridge</artifactId>
<artifactId>sisu-sparql-endpoint</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-resource-scanner</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>1.0-beta-7</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<artifactId>xercesMinimal</artifactId>
<groupId>nekohtml</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-sparql-endpoint</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu.inject</groupId>
<artifactId>guice-servlet</artifactId>
Expand All @@ -148,90 +106,48 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>1.5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>3.0.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>1.10.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.openrdf.alibaba</groupId>
<artifactId>alibaba-repository-sparql</artifactId>
<version>2.0-beta4</version>
</dependency>

<!-- force versions -->
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<version>1.10.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>1.10.1</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
<version>1.10.1</version>
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-capabilities-plugin</artifactId>
<type>${nexus.plugin.type}</type>
<version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>1.10.1</version>
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-maven-bridge-plugin</artifactId>
<version>2.0</version>
<type>${nexus.plugin.type}</type>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>app-lifecycle-maven-plugin</artifactId>
<version>1.2</version>
<version>1.6</version>
<extensions>true</extensions>
<dependencies>
<dependency>
<groupId>org.sonatype.plugins</groupId>
<artifactId>app-lifecycle-nexus</artifactId>
<version>1.2</version>
<version>1.6</version>
</dependency>
</dependencies>
<configuration>
<pluginSiteUrl>http://links.sonatype.com/products/nexus/pro/home</pluginSiteUrl>
<componentDependencies>
<componentDependency>org.sonatype.sisu:sisu-rdf</componentDependency>
<componentDependency>org.sonatype.sisu:sisu-rdf-query</componentDependency>
<componentDependency>org.sonatype.sisu:sisu-maven-bridge</componentDependency>
<componentDependency>org.sonatype.sisu:sisu-sparql-endpoint</componentDependency>
</componentDependencies>
</configuration>
Expand All @@ -240,40 +156,12 @@
</build>

<profiles>
<!-- HACK: Workaround for issue with IDEA loading nexus-plugin artifacts -->
<profile>
<id>assembly</id>
<activation>
<property>
<name>!skipAssembly</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.maven.plugins</groupId>
<artifactId>maven-sisu-assembler-plugin</artifactId>
<version>1.0.7</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<alternativeArtifact>
<classifier>bundle</classifier>
<type>zip</type>
</alternativeArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<resolveUpdateSiteArtifacts>true</resolveUpdateSiteArtifacts>
<includeScopes>
<includeScope>provided</includeScope>
</includeScopes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<id>idea</id>
<properties>
<nexus.plugin.type>jar</nexus.plugin.type>
</properties>
</profile>
</profiles>

Expand Down
16 changes: 0 additions & 16 deletions src/main/advices/advices.xml
View file

This file was deleted.

60 changes: 8 additions & 52 deletions src/main/java/org/sonatype/nexus/plugin/rdf/NexusItemPath.java
View file
Expand Up @@ -9,43 +9,36 @@

import java.io.File;

import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.artifact.GavCalculator;
import org.sonatype.nexus.plugin.rdf.internal.Utils;
import org.sonatype.nexus.proxy.maven.MavenRepository;
import org.sonatype.sisu.rdf.ItemPath;

/**
* Path to an item in a maven repository.
*
*
* @author Alin Dreghiciu
*/
public class NexusItemPath
extends ItemPath
{

/**
* Name of directory storing metadata.
*/
public static final String METADATA_DIR = "/.meta";

/**
* Maven repository containing the item.
*/
private final MavenRepository repository;

/**
* Constructor.
*
* @param repository maven repository containing the item
*
* @param repository maven repository containing the item
* @param repositoryRoot repository root file
* @param path path to item in repository.
* @param path path to item in repository.
*/
public NexusItemPath( final MavenRepository repository,
final File repositoryRoot,
final String path )
{
super( repositoryRoot, path, repository.getGavCalculator() );
super( repositoryRoot, path );

assert repository != null : "Item repository must be specified (cannot be null)";

Expand All @@ -54,17 +47,7 @@ public NexusItemPath( final MavenRepository repository,

/**
* Getter.
*
* @return true if the path is a path to a custom metadata file.
*/
public boolean isPathOfCustomMetadata()
{
return path().startsWith( METADATA_DIR );
}

/**
* Getter.
*
*
* @return item repository
*/
public MavenRepository repository()
Expand All @@ -74,8 +57,8 @@ public MavenRepository repository()

/**
* Create a new item path relative to passed item path root.
*
* @param path path to item in repository.
*
* @param file path to item in repository.
*/
public NexusItemPath relative( final File file )
{
Expand All @@ -84,33 +67,6 @@ public NexusItemPath relative( final File file )
return new NexusItemPath( repository(), repositoryRoot(), Utils.getRelativePath( repositoryRoot(), file ) );
}

/**
* Calculate the GAV for specified path.
*
* @return calculated GAV or null if GAV cannot be calculated
*/
@Override
protected Gav calculateGav( String path, GavCalculator gavCalculator )
{
Gav gav = null;
try
{
if ( path.startsWith( METADATA_DIR ) )
{
gav = repository.getGavCalculator().pathToGav( path.replace( METADATA_DIR, "" ) );
}
else
{
gav = super.calculateGav( path, gavCalculator );
}
}
catch ( Exception ignore )
{
// ignore
}
return gav;
}

/**
* {@inheritDoc}
*/
Expand Down
2 changes: 1 addition & 1 deletion .../plugin/rdf/internal/SPARQLEndpoints.java → ...ype/nexus/plugin/rdf/SPARQLEndpoints.java
View file
@@ -1,4 +1,4 @@
package org.sonatype.nexus.plugin.rdf.internal;
package org.sonatype.nexus.plugin.rdf;

import java.util.HashMap;
import java.util.Map;
Expand Down

0 comments on commit 839d0d5

Please sign in to comment.