Author: sisbell
Date: Sun Jul 29 12:52:22 2007
New Revision: 560797
URL: http://svn.apache.org/viewvc?view=rev&rev=560797
Log:
Support for attahed artifacts (exe.config).
Removed:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetModuleMatchPolicy.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
Sun Jul 29 12:52:22 2007
@@ -225,4 +225,25 @@
}
return true;
}
+
+ /*
+ * Matches .NET module artifacts.
+ *
+ * @author Shane Isbell
+ */
+ private static class NetModuleMatchPolicy
+ implements ArtifactMatchPolicy
+ {
+
+ /**
+ * Matches artifacts of type module
+ *
+ * @param artifact the artifact to match
+ * @return true if artifact is of type module, otherwise returns false.
+ */
+ public boolean match( Artifact artifact )
+ {
+ return artifact.getType().equals( "module" );
+ }
+ }
}
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Sun Jul 29 12:52:22 2007
@@ -325,38 +325,48 @@
( ( artifact.getFile() != null ) ?
artifact.getFile().getAbsolutePath() : "" ), e );
}
- MavenXpp3Reader reader = new MavenXpp3Reader();
- Model model;
- try
+ if ( !artifact.getType().equals( "exe.config" ) )//TODO: Generalize
for any attached artifact
{
- model = reader.read( new FileReader( pomFile ) );
- }
- catch ( XmlPullParserException e )
- {
- throw new ArtifactInstallationException( "NMAVEN-002-013: Unable
to read pom file" );
- }
- catch ( IOException e )
- {
- throw new ArtifactInstallationException( "NMAVEN-002-013: Unable
to read pom file" );
- }
- //TODO: Add this back in: since this is already done in the resolve
phase, don't redo it for perf reasons.
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model;
+ try
+ {
+ model = reader.read( new FileReader( pomFile ) );
+ if ( configExeFile.exists() )
+ {
+ Dependency dependency = new Dependency();
+ dependency.setGroupId( artifact.getGroupId() );
+ dependency.setArtifactId( artifact.getArtifactId() );
+ dependency.setVersion( artifact.getVersion() );
+ dependency.setType(
ArtifactType.EXECONFIG.getPackagingType() );
+ model.addDependency( dependency );
+ }
+ }
+ catch ( XmlPullParserException e )
+ {
+ throw new ArtifactInstallationException( "NMAVEN-002-013:
Unable to read pom file" );
+ }
+ catch ( IOException e )
+ {
+ throw new ArtifactInstallationException( "NMAVEN-002-013:
Unable to read pom file" );
+ }
- ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
- dao.openConnection();
- try
- {
- dao.storeModelAndResolveDependencies( model,
pomFile.getParentFile(), null,
- new
ArrayList<ArtifactRepository>() );
+ ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
+ dao.openConnection();
+ try
+ {
+ dao.storeModelAndResolveDependencies( model,
pomFile.getParentFile(), localRepository,
+ new
ArrayList<ArtifactRepository>() );
+ }
+ catch ( java.io.IOException e )
+ {
+ throw new ArtifactInstallationException( e.getMessage() );
+ }
+ finally
+ {
+ dao.closeConnection();
+ }
}
- catch ( java.io.IOException e )
- {
- throw new ArtifactInstallationException( e.getMessage() );
- }
- finally
- {
- dao.closeConnection();
- }
-
}
/**
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
Sun Jul 29 12:52:22 2007
@@ -160,7 +160,6 @@
//Check that the list of dependencies matches the first level RDF Repo
//If not, resolve missing dependencies and add to repo or delete
additional dependencies from repo
-
Project project = new Project();
project.setGroupId( mavenProject.getGroupId() );
project.setArtifactId( mavenProject.getArtifactId() );
@@ -205,12 +204,6 @@
{
dao.closeConnection();
}
-
- //Resolve content
-
- //Resolve and store pom
-
- //Add rdf info to mavenProject
if ( addResolvedDependenciesToProject )
{
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
Sun Jul 29 12:52:22 2007
@@ -8,9 +8,9 @@
public class PathUtil
{
- private static Logger logger = Logger.getAnonymousLogger();
+ private static final Logger logger = Logger.getAnonymousLogger();
- public static synchronized File getGlobalAssemblyCacheFileFor( Artifact
artifact, File gacRepository )
+ public static File getGlobalAssemblyCacheFileFor( Artifact artifact, File
gacRepository )
{
if ( artifact == null )
{
@@ -32,12 +32,13 @@
{
version = version + ".0";
}
- return new File( gacRepository, "\\gac_msil\\" +
artifact.getArtifactId() + "\\" + version + "__" +
- artifact.getClassifier() + "\\" + artifact.getArtifactId() + "." +
- ArtifactType.getArtifactTypeForPackagingName( artifact.getType()
).getExtension() );
+ //TODO: gac_generic
+ //String processArchitecture = ( artifact.getType().equals(
"gac_generic" ) );
+ return new File( gacRepository, "\\" + artifact.getType() + "\\" +
artifact.getArtifactId() + "\\" + version +
+ "__" + artifact.getClassifier() + "\\" + artifact.getArtifactId()
+ ".dll" );
}
- public static synchronized File getPrivateApplicationBaseFileFor( Artifact
artifact, File localRepository )
+ public static File getPrivateApplicationBaseFileFor( Artifact artifact,
File localRepository )
{
if ( artifact == null )
{
@@ -54,7 +55,7 @@
ArtifactType.getArtifactTypeForPackagingName( artifact.getType()
).getExtension() );
}
- public static synchronized File getUserAssemblyCacheFileFor( Artifact
artifact, File localRepository )
+ public static File getUserAssemblyCacheFileFor( Artifact artifact, File
localRepository )
{
if ( artifact == null )
{
@@ -70,6 +71,4 @@
artifact.getVersion() + "__" + artifact.getGroupId() + "\\" +
artifact.getArtifactId() + "." +
ArtifactType.getArtifactTypeForPackagingName( artifact.getType()
).getExtension() );
}
-
-
}
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
Sun Jul 29 12:52:22 2007
@@ -12,7 +12,7 @@
CLASSIFIER( "http://maven.apache.org/artifact/classifier";, "classifier",
true ),
- IS_RESOLVED( "http://maven.apache.org/artifact/dependency/isResolved";,
"isResolved", false ),
+ IS_RESOLVED( "http://maven.apache.org/artifact/dependency/isResolved";,
"isResolved", true ),
ARTIFACT( "http://maven.apache.org/Artifact";, "artifact", false ),
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
Sun Jul 29 12:52:22 2007
@@ -21,7 +21,6 @@
import org.openrdf.model.ValueFactory;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
-import org.openrdf.model.BNode;
import org.openrdf.model.vocabulary.RDF;
import org.openrdf.repository.RepositoryConnection;
@@ -115,7 +114,6 @@
try
{
TupleQuery tupleQuery = repositoryConnection.prepareTupleQuery(
QueryLanguage.SERQL, projectQuery );
- //tupleQuery.setBinding( RDF.TYPE.toString(),
valueFactory.createURI( ProjectUri.ARTIFACT.getPredicate() ));
result = tupleQuery.evaluate();
while ( result.hasNext() )
{
@@ -230,11 +228,9 @@
tupleQuery.setBinding( ProjectUri.ARTIFACT_ID.getObjectBinding(),
valueFactory.createLiteral( artifactId ) );
tupleQuery.setBinding( ProjectUri.VERSION.getObjectBinding(),
valueFactory.createLiteral( version ) );
- if ( artifactType != null )
- {
- tupleQuery.setBinding(
ProjectUri.ARTIFACT_TYPE.getObjectBinding(),
- valueFactory.createLiteral(
artifactType ) );
- }
+ tupleQuery.setBinding( ProjectUri.ARTIFACT_TYPE.getObjectBinding(),
+ valueFactory.createLiteral( artifactType )
);
+
if ( publicKeyTokenId != null )
{
tupleQuery.setBinding(
ProjectUri.CLASSIFIER.getObjectBinding(),
@@ -274,8 +270,9 @@
System.out.println( b.getName() + ":" + b.getValue() );
}
*/
- if ( set.getBinding( ProjectUri.IS_RESOLVED.getObjectBinding()
).getValue().toString().equalsIgnoreCase(
- "true" ) )
+ if ( set.hasBinding( ProjectUri.IS_RESOLVED.getObjectBinding()
) &&
+ set.getBinding( ProjectUri.IS_RESOLVED.getObjectBinding()
).getValue().toString().equalsIgnoreCase(
+ "true" ) )
{
project.setResolved( true );
}
@@ -372,8 +369,8 @@
Set<Artifact> artifactDependencies = new HashSet<Artifact>();
ValueFactory valueFactory = rdfRepository.getValueFactory();
- URI id =
- valueFactory.createURI( project.getGroupId() + ":" +
project.getArtifactId() + ":" + project.getVersion() );
+ URI id = valueFactory.createURI( project.getGroupId() + ":" +
project.getArtifactId() + ":" +
+ project.getVersion() + ":" + project.getArtifactType() );
URI groupId = valueFactory.createURI(
ProjectUri.GROUP_ID.getPredicate() );
URI artifactId = valueFactory.createURI(
ProjectUri.ARTIFACT_ID.getPredicate() );
URI version = valueFactory.createURI(
ProjectUri.VERSION.getPredicate() );
@@ -412,7 +409,7 @@
{
Project parentProject = project.getParentProject();
URI pid = valueFactory.createURI( parentProject.getGroupId() +
":" + parentProject.getArtifactId() +
- ":" + parentProject.getVersion() );
+ ":" + parentProject.getVersion() + ":" +
project.getArtifactType() );
repositoryConnection.add( id, parent, pid );
artifactDependencies.addAll(
storeProjectAndResolveDependencies( parentProject, null,
artifactRepositories ) );
@@ -461,96 +458,101 @@
if ( !projectDependency.isResolved() )
{
-
Artifact assembly = ProjectFactory.createArtifactFrom(
projectDependency, artifactFactory );
- Artifact pomArtifact =
artifactFactory.createProjectArtifact( projectDependency.getGroupId(),
-
projectDependency.getArtifactId(),
-
projectDependency.getVersion() );
- //File tmpFile = File.createTempFile( "pomFile", "pom.xml"
);
- // tmpFile.deleteOnExit();
- File tmpFile = new File( localRepository, "pom-." +
System.currentTimeMillis() + ".xml" );
- tmpFile.deleteOnExit();
- pomArtifact.setFile( tmpFile );
-
- try
- {
- logger.info( "NMAVEN-000-000: Retrieving artifact:
Artifact ID = " +
- projectDependency.getArtifactId() );
- wagonManager.getArtifact( pomArtifact,
artifactRepositories );
- }
- catch ( TransferFailedException e )
- {
- throw new IOException(
- "NMAVEN-000-000: Problem in resolving artifact:
Assembly Artifact Id = " +
- assembly.getArtifactId() + ", Message = " +
e.getMessage() );
- }
- catch ( ResourceDoesNotExistException e )
+ if ( !assembly.getType().equals( "exe.config" ) )//TODO:
Generalize to any attached artifact
{
- throw new IOException(
- "NMAVEN-000-000: Problem in resolving artifact:
Assembly Artifact Id = " +
- assembly.getArtifactId() + ", Message = " +
e.getMessage() );
- }
+ Artifact pomArtifact =
artifactFactory.createProjectArtifact( projectDependency.getGroupId(),
+
projectDependency.getArtifactId(),
+
projectDependency.getVersion() );
+
+ File tmpFile = new File( System.getProperty(
"java.io.tmpdir" ),
+ "pom-." +
System.currentTimeMillis() + ".xml" );
+ tmpFile.deleteOnExit();
+ pomArtifact.setFile( tmpFile );
- assembly.setFile( PathUtil.getUserAssemblyCacheFileFor(
assembly, localRepository ) );
- if ( !assembly.getFile().exists() )
- {
try
{
logger.info( "NMAVEN-000-000: Retrieving artifact:
Artifact ID = " +
projectDependency.getArtifactId() );
- wagonManager.getArtifact( assembly,
artifactRepositories );
+ wagonManager.getArtifact( pomArtifact,
artifactRepositories );
}
catch ( TransferFailedException e )
{
throw new IOException(
- "NMAVEN-000-000: Problem in resolving
artifact: Assembly Artifact Id = " +
- assembly.getArtifactId() + ", Message = "
+ e.getMessage() );
+ "NMAVEN-000-000a: Problem in resolving
artifact: Assembly Artifact Id = " +
+ assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+ e.getMessage() );
}
catch ( ResourceDoesNotExistException e )
{
throw new IOException(
- "NMAVEN-000-000: Problem in resolving
artifact: Assembly Artifact Id = " +
- assembly.getArtifactId() + ", Message = "
+ e.getMessage() );
+ "NMAVEN-000-000b: Problem in resolving
artifact: Assembly Artifact Id = " +
+ assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+ e.getMessage() );
}
- }
+ FileReader fileReader = new FileReader(
pomArtifact.getFile() );
- FileReader fileReader = new FileReader(
pomArtifact.getFile() );
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model;
+ try
+ {
+ model = reader.read( fileReader );
+ }
+ catch ( XmlPullParserException e )
+ {
+ throw new IOException( "NMAVEN-000-000: Unable to
read model: Message = " + e.getMessage() +
+ ", Path = " +
pomArtifact.getFile().getAbsolutePath() );
- MavenXpp3Reader reader = new MavenXpp3Reader();
- Model model;
- try
- {
- model = reader.read( fileReader );
- }
- catch ( XmlPullParserException e )
- {
- throw new IOException( "NMAVEN-000-000: Unable to read
model: Message = " + e.getMessage() +
- ", Path = " +
pomArtifact.getFile().getAbsolutePath() );
+ }
+ catch ( EOFException e )
+ {
+ throw new IOException( "NMAVEN-000-000: Unable to
read model: Message = " + e.getMessage() +
+ ", Path = " +
pomArtifact.getFile().getAbsolutePath() );
+ }
- }
- catch ( EOFException e )
- {
- throw new IOException( "NMAVEN-000-000: Unable to read
model: Message = " + e.getMessage() +
- ", Path = " +
pomArtifact.getFile().getAbsolutePath() );
+ if ( !( model.getGroupId().equals(
projectDependency.getGroupId() ) &&
+ model.getArtifactId().equals(
projectDependency.getArtifactId() ) &&
+ model.getVersion().equals(
projectDependency.getVersion() ) ) )
+ {
+ throw new IOException(
+ "Model parameters do not match project
dependencies parameters: Model: " +
+ model.getGroupId() + ":" +
model.getArtifactId() + ":" + model.getVersion() +
+ ", Project: " +
projectDependency.getGroupId() + ":" +
+ projectDependency.getArtifactId() + ":" +
projectDependency.getVersion() );
+ }
+ modelDependencies.add( model );
}
- if ( !( model.getGroupId().equals(
projectDependency.getGroupId() ) &&
- model.getArtifactId().equals(
projectDependency.getArtifactId() ) &&
- model.getVersion().equals(
projectDependency.getVersion() ) ) )
+ assembly.setFile( PathUtil.getUserAssemblyCacheFileFor(
assembly, localRepository ) );
+ if ( !assembly.getFile().exists() )
{
- throw new IOException(
- "Model parameters do not match project
dependencies parameters: Model: " +
- model.getGroupId() + ":" +
model.getArtifactId() + ":" + model.getVersion() +
- ", Project: " + projectDependency.getGroupId()
+ ":" +
- projectDependency.getArtifactId() + ":" +
projectDependency.getVersion() );
+ try
+ {
+ logger.info( "NMAVEN-000-000: Retrieving artifact:
Artifact ID = " +
+ projectDependency.getArtifactId() );
+ wagonManager.getArtifact( assembly,
artifactRepositories );
+ }
+ catch ( TransferFailedException e )
+ {
+ throw new IOException(
+ "NMAVEN-000-000c: Problem in resolving
artifact: Assembly Artifact Id = " +
+ assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+ e.getMessage() );
+ }
+ catch ( ResourceDoesNotExistException e )
+ {
+ throw new IOException(
+ "NMAVEN-000-000d: Problem in resolving
artifact: Assembly Artifact Id = " +
+ assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+ e.getMessage() );
+ }
}
- modelDependencies.add( model );
artifactDependencies.add( assembly );
}//end if dependency not resolved
- // BNode did = valueFactory.createBNode();
URI did = valueFactory.createURI(
projectDependency.getGroupId() + ":" +
- projectDependency.getArtifactId() + ":" +
projectDependency.getVersion() );
+ projectDependency.getArtifactId() + ":" +
projectDependency.getVersion() + ":" +
+ projectDependency.getArtifactType() );
repositoryConnection.add( did, RDF.TYPE, artifact );
repositoryConnection.add( did, groupId,
valueFactory.createLiteral( projectDependency.getGroupId() ) );
repositoryConnection.add( did, artifactId,
@@ -672,10 +674,8 @@
Value dependencyUri )
throws RepositoryException, MalformedQueryException,
QueryEvaluationException
{
- //Set<ProjectDependency> projectDependencies = new
HashSet<ProjectDependency>();
TupleQuery tq = repositoryConnection.prepareTupleQuery(
QueryLanguage.SERQL, dependencyQuery );
tq.setBinding( "x", dependencyUri );
-
TupleQueryResult dependencyResult = tq.evaluate();
try
{
@@ -691,6 +691,7 @@
bs.getBinding( ProjectUri.VERSION.getObjectBinding()
).getValue().toString() );
projectDependency.setArtifactType(
bs.getBinding( ProjectUri.ARTIFACT_TYPE.getObjectBinding()
).getValue().toString() );
+
Binding classifierBinding = bs.getBinding(
ProjectUri.CLASSIFIER.getObjectBinding() );
if ( classifierBinding != null )
{
@@ -718,8 +719,6 @@
StringBuffer buffer = new StringBuffer();
buffer.append( subject );
- //buffer.append( "<" ).append( RDF.TYPE.toString() ).append( ">"
).append( " " ).append(
- // ProjectUri.ARTIFACT.getPredicate() ).append( ";" );
for ( Iterator<ProjectUri> i = projectUris.iterator(); i.hasNext(); )
{
ProjectUri projectUri = i.next();
@@ -752,11 +751,5 @@
}
}
return null;
- }
-
-
- private void mergeProjects( Project parent, Project child )
- {
-
}
}
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
Sun Jul 29 12:52:22 2007
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.FileOutputStream;
import java.util.Set;
import java.util.HashSet;
import java.util.ArrayList;
@@ -11,8 +12,12 @@
import org.openrdf.repository.sail.SailRepository;
import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.RepositoryConnection;
import org.openrdf.sail.memory.MemoryStore;
import org.openrdf.sail.memory.MemoryStoreRDFSInferencer;
+import org.openrdf.rio.RDFHandler;
+import org.openrdf.rio.RDFHandlerException;
+import org.openrdf.rio.rdfxml.RDFXMLWriter;
import org.apache.maven.dotnet.dao.Project;
import org.apache.maven.dotnet.dao.ProjectDependency;
import org.apache.maven.dotnet.dao.Requirement;
@@ -29,6 +34,10 @@
private static File localRepository = new File( System.getProperty(
"basedir" ), "/target/local-test-repo" );
+ private org.openrdf.repository.Repository rdfRepository;
+
+ private File dataDir;
+
public void testGetAllProjects()
{
ProjectDao dao = this.createProjectDao();
@@ -37,7 +46,7 @@
project.setGroupId( "NMaven" );
project.setArtifactId( "NMaven.Test5" );
project.setVersion( "1.0.0" );
-
+ project.setArtifactType( "library" );
//ProjectDependency test2 = createProjectDependency( "NMaven",
"NMaven.Test5", "1.0.0" );
//project.addProjectDependency( test2 );
@@ -83,7 +92,8 @@
project.setGroupId( "NMaven.Model" );
project.setArtifactId( "NMaven.Model.Pom" );
project.setVersion( "0.14.0.0" );
- project.setPublicKeyTokenId( "b03f5f7f11d50a3a");
+ project.setPublicKeyTokenId( "b03f5f7f11d50a3a" );
+ project.setArtifactType( "library" );
Set<Requirement> requirements = new HashSet<Requirement>();
try
{
@@ -113,7 +123,7 @@
Project proj = null;
try
{
- proj = dao.getProjectFor( "NMaven.Model", "NMaven.Model.Pom",
"0.14.0.0", null, null );
+ proj = dao.getProjectFor( "NMaven.Model", "NMaven.Model.Pom",
"0.14.0.0", "library", null );
}
catch ( java.io.IOException e )
{
@@ -166,7 +176,7 @@
project1.setGroupId( "NMaven" );
project1.setArtifactId( "NMaven.Plugin" );
project1.setVersion( "0.14.0.0" );
-
+ project1.setArtifactType( "library" );
project1.addProjectDependency( this.createProjectDependency( "NMaven",
"NMaven.Test4", "1.0.0" ) );
Set<Artifact> artifacts = null;
@@ -191,7 +201,7 @@
Project testProject = null;
try
{
- testProject = dao.getProjectFor( "NMaven", "NMaven.Plugin",
"0.14.0.0", null, null );
+ testProject = dao.getProjectFor( "NMaven", "NMaven.Plugin",
"0.14.0.0", "library", null );
}
catch ( IOException e )
{
@@ -199,6 +209,8 @@
fail( "Could not retrieve the project: " + e.getMessage() );
}
+ this.exportRepositoryToRdf( "testDependency-rdf.xml" );
+
Set<ProjectDependency> projectDependencies =
testProject.getProjectDependencies();
assertEquals( "Incorrect number of dependencies", 1,
projectDependencies.size() );
ProjectDependency projectDependency = (ProjectDependency)
projectDependencies.toArray()[0];
@@ -216,7 +228,7 @@
project.setGroupId( "NMaven" );
project.setArtifactId( "NMaven.Test" );
project.setVersion( "1.0.0" );
-
+ project.setArtifactType( "library" );
ProjectDependency test2 = createProjectDependency( "NMaven",
"NMaven.Test2", "1.0.0" );
project.addProjectDependency( test2 );
Set<Artifact> artifacts = null;
@@ -233,10 +245,12 @@
}
assertEquals( "Incorrect number of returned artifacts", 3,
artifacts.size() );
+ this.exportRepositoryToRdf( "testStoreTransitiveDependency-rdf.xml" );
+
Project testProject = null;
try
{
- testProject = dao.getProjectFor( "NMaven", "NMaven.Test", "1.0.0",
null, null );
+ testProject = dao.getProjectFor( "NMaven", "NMaven.Test", "1.0.0",
"library", null );
}
catch ( IOException e )
{
@@ -263,6 +277,7 @@
project.setGroupId( "NMaven.Model" );
project.setArtifactId( "NMaven.Model.Pom" );
project.setVersion( "0.14.0.0" );
+ project.setArtifactType( "library" );
Set<Artifact> artifacts = null;
try
{
@@ -278,7 +293,7 @@
Project proj = null;
try
{
- proj = dao.getProjectFor( "NMaven.Model", "NMaven.Model.Pom",
"0.14.0.0", null, null );
+ proj = dao.getProjectFor( "NMaven.Model", "NMaven.Model.Pom",
"0.14.0.0", "library", null );
}
catch ( java.io.IOException e )
{
@@ -302,6 +317,8 @@
project.setGroupId( "NMaven.Model" );
project.setArtifactId( "NMaven.Model.Pom" );
project.setVersion( "0.14.0.0" );
+ project.setArtifactType( "library" );
+
try
{
dao.storeProjectAndResolveDependencies( project, localRepository,
new ArrayList<ArtifactRepository>() );
@@ -315,7 +332,7 @@
try
{
- Project proj = dao.getProjectFor( "NMaven.Model",
"NMaven.Model.Pom", "0.15.0.0", null, null );
+ dao.getProjectFor( "NMaven.Model", "NMaven.Model.Pom", "0.15.0.0",
"library", null );
}
catch ( java.io.IOException e )
{
@@ -332,14 +349,14 @@
projectDependency.setGroupId( groupId );
projectDependency.setArtifactId( artifactId );
projectDependency.setVersion( version );
+ projectDependency.setArtifactType( "library" );
return projectDependency;
}
private ProjectDao createProjectDao()
{
- File dataDir = new File( basedir, ( "/target/rdf-repos/rdf-repo-" +
System.currentTimeMillis() ) );
- org.openrdf.repository.Repository rdfRepository =
- new SailRepository( new MemoryStoreRDFSInferencer( new
MemoryStore( dataDir ) ) );
+ dataDir = new File( basedir, ( "/target/rdf-repos/rdf-repo-" +
System.currentTimeMillis() ) );
+ rdfRepository = new SailRepository( new MemoryStoreRDFSInferencer( new
MemoryStore( dataDir ) ) );
try
{
rdfRepository.initialize();
@@ -354,5 +371,34 @@
dao.initForUnitTest( rdfRepository, "", "", stub, new
ArtifactFactoryTestStub() );
dao.openConnection();
return dao;
+ }
+
+ private void exportRepositoryToRdf( String fileName )
+ {
+ RDFHandler rdfxmlWriter;
+ try
+ {
+ File exportFile = new File( localRepository.getParentFile(),
fileName );
+ rdfxmlWriter = new RDFXMLWriter( new FileOutputStream( exportFile
) );
+ }
+ catch ( IOException e )
+ {
+ //fail( e.getMessage() );
+ return;
+ }
+
+ try
+ {
+ RepositoryConnection repositoryConnection =
rdfRepository.getConnection();
+ repositoryConnection.export( rdfxmlWriter );
+ }
+ catch ( RepositoryException e )
+ {
+ e.printStackTrace();
+ }
+ catch ( RDFHandlerException e )
+ {
+ e.printStackTrace();
+ }
}
}
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -22,6 +22,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Test</artifactId>
<version>1.0.0</version>
+ <packaging>library</packaging>
<name>NMaven.Test</name>
<dependencies>
<dependency>
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -22,6 +22,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Test2</artifactId>
<version>1.0.0</version>
+ <packaging>library</packaging>
<name>NMaven.Test</name>
<description>
</description>
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -22,6 +22,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Test3</artifactId>
<version>1.0.0</version>
+ <packaging>library</packaging>
<name>NMaven.Test</name>
<description>
</description>
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -22,6 +22,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Test4</artifactId>
<version>1.0.0</version>
+ <packaging>library</packaging>
<name>NMaven.Test</name>
<description>
</description>
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -4,6 +4,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Test5</artifactId>
<version>1.0.0</version>
+ <packaging>library</packaging>
<name>NMaven.Test5</name>
<description>
</description>
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom
Sun Jul 29 12:52:22 2007
@@ -5,6 +5,7 @@
<artifactId>NMaven.Test6</artifactId>
<version>1.0.0</version>
<name>NMaven.Test6</name>
+ <packaging>library</packaging>
<description>
</description>
</project>
Modified:
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
Sun Jul 29 12:52:22 2007
@@ -29,15 +29,16 @@
testRepo.mkdir();
Repository repository = this.createRepository();
- ProjectDao dao = this.createProjectDao(repository);
+ ProjectDao dao = this.createProjectDao( repository );
Project project = new Project();
project.setGroupId( "NMaven.Model" );
project.setArtifactId( "NMaven.Model.Pom" );
project.setVersion( "1.0" );
+ project.setArtifactType( "library" );
ProjectDependency test2 = createProjectDependency( "NMaven",
"NMaven.Test", "1.0" );
- test2.setArtifactType( "library");
+ test2.setArtifactType( "library" );
project.addProjectDependency( test2 );
try
@@ -62,10 +63,10 @@
fail( "Could not convert the repository: " + e.getMessage() );
}
- assertTrue(new File(testRepo,
"/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0.dll").exists());
- assertTrue(new File(testRepo,
"/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0.pom").exists());
- assertTrue(new File(testRepo,
"/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.dll").exists());
- assertTrue(new File(testRepo,
"/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.pom").exists());
+ assertTrue( new File( testRepo,
"/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0.dll" ).exists() );
+ assertTrue( new File( testRepo,
"/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0.pom" ).exists() );
+ assertTrue( new File( testRepo,
"/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.dll" ).exists() );
+ assertTrue( new File( testRepo,
"/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.pom" ).exists() );
}
private ProjectDependency createProjectDependency( String groupId, String
artifactId, String version )
@@ -93,7 +94,7 @@
return rdfRepository;
}
- private ProjectDao createProjectDao(Repository rdfRepository)
+ private ProjectDao createProjectDao( Repository rdfRepository )
{
ProjectDaoImpl dao = new ProjectDaoImpl();
WagonManagerTestStub stub = new WagonManagerTestStub();
Modified:
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
Sun Jul 29 12:52:22 2007
@@ -65,18 +65,12 @@
/**
* @parameter expression="${project.file}"
- * @readonly
*/
private File pomFile;
/**
* @component
*/
- private ArtifactInstaller artifactInstaller;
-
- /**
- * @component
- */
private ArtifactContext artifactContext;
/**
@@ -183,8 +177,6 @@
}
}
- //Use Private Application Base
-
// To allow executables to be runnable from the repo
Artifact artifact = project.getArtifact();
@@ -193,12 +185,12 @@
artifact.getType().equals(
ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) ||
artifact.getType().equals(
ArtifactType.SHARP_DEVELOP_ADDIN.getPackagingType() ) )
{
- File pab = PathUtil.getPrivateApplicationBaseFileFor( artifact,
localRepository );
List<Dependency> dependencies = project.getDependencies();
if ( artifact.getType().equals(
ArtifactType.EXE.getPackagingType() ) )
{
ApplicationConfig applicationConfig =
artifactContext.getApplicationConfigFor( artifact );
- File configExeFile = new File(
applicationConfig.getConfigDestinationPath() );
+ // File configExeFile = new File(
applicationConfig.getConfigDestinationPath() );
+ /*
if ( configExeFile.exists() )
{
Dependency dependency = new Dependency();
@@ -208,6 +200,7 @@
dependency.setType(
ArtifactType.EXECONFIG.getPackagingType() );
dependencies.add( dependency );
}
+ */
}
try
{
Modified:
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Sun Jul 29 12:52:22 2007
@@ -85,13 +85,7 @@
/**
* @component
*/
- private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
-
- /**
- * @component
- */
private ArtifactContext artifactContext;
-
/**
* @component
Modified:
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java?view=diff&rev=560797&r1=560796&r2=560797
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java
Sun Jul 29 12:52:22 2007
@@ -13,7 +13,6 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
/**
