Author: sisbell
Date: Sun Jul 29 22:03:55 2007
New Revision: 560862
URL: http://svn.apache.org/viewvc?view=rev&rev=560862
Log:
Bug fix for resolvinging of assemblies in the GAC.
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/maven-dotnet.iml
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
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=560862&r1=560861&r2=560862
==============================================================================
---
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 22:03:55 2007
@@ -562,6 +562,11 @@
repositoryConnection.add( did, version,
valueFactory.createLiteral( projectDependency.getVersion() ) );
repositoryConnection.add( did, artifactType,
valueFactory.createLiteral(
projectDependency.getArtifactType() ) );
+ if ( projectDependency.getPublicKeyTokenId() != null )
+ {
+ repositoryConnection.add( did, classifier,
valueFactory.createLiteral(
+ projectDependency.getPublicKeyTokenId() + ":" ) );
+ }
repositoryConnection.add( id, dependency, did );
}//end for
Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?view=diff&rev=560862&r1=560861&r2=560862
==============================================================================
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Sun Jul 29 22:03:55 2007
@@ -512,15 +512,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/mortbay/jetty/jetty/6.1.3/jetty-6.1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root
url="jar://$localRepository$/org/apache/maven/maven-project/2.1-SNAPSHOT/maven-project-2.1-SNAPSHOT.jar!/"
/>
</CLASSES>
<JAVADOC />
@@ -557,25 +548,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/mortbay/jetty/jetty-util/6.1.3/jetty-util-6.1.3.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$localRepository$/org/mortbay/jetty/servlet-api-2.5/6.1.3/servlet-api-2.5-6.1.3.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$localRepository$/jpox/jpox/1.1.7/jpox-1.1.7.jar!/"
/>
+ <root
url="jar://$localRepository$/info/aduna/aduna-iteration/1.1/aduna-iteration-1.1.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -584,7 +557,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/javax/jdo/jdo2-api/2.0/jdo2-api-2.0.jar!/" />
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-rio-api/2.0-beta5/openrdf-rio-api-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -593,7 +566,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-rio-rdfxml/2.0-beta5/openrdf-rio-rdfxml-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -602,7 +575,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-repository-api/2.0-beta4/openrdf-repository-api-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-model/2.0-beta5/openrdf-model-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -611,7 +584,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-api/2.0-beta4/openrdf-sail-api-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-query/2.0-beta5/openrdf-query-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -620,7 +593,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-model/2.0-beta4/openrdf-model-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryalgebra-evaluation/2.0-beta5/openrdf-queryalgebra-evaluation-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -629,7 +602,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-query/2.0-beta4/openrdf-query-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryalgebra-model/2.0-beta5/openrdf-queryalgebra-model-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -638,7 +611,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-queryalgebra-model/2.0-beta4/openrdf-queryalgebra-model-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryparser-api/2.0-beta5/openrdf-queryparser-api-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -647,7 +620,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-queryresultio-api/2.0-beta4/openrdf-queryresultio-api-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryparser-serql/2.0-beta5/openrdf-queryparser-serql-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -656,7 +629,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-rio-api/2.0-beta4/openrdf-rio-api-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryparser-sparql/2.0-beta5/openrdf-queryparser-sparql-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -665,7 +638,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-memory/2.0-beta4/openrdf-sail-memory-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-queryresultio-api/2.0-beta5/openrdf-queryresultio-api-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -674,7 +647,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-nativerdf/2.0-beta4/openrdf-sail-nativerdf-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-repository-api/2.0-beta5/openrdf-repository-api-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -683,7 +656,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-inferencer/2.0-beta4/openrdf-sail-inferencer-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-repository-sail/2.0-beta5/openrdf-repository-sail-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -692,7 +665,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-repository-sail/2.0-beta4/openrdf-repository-sail-2.0-beta4.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-api/2.0-beta5/openrdf-sail-api-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -701,7 +674,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/info/aduna/aduna-iteration/1.1/aduna-iteration-1.1.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-inferencer/2.0-beta5/openrdf-sail-inferencer-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -710,7 +683,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-rio-api/2.0-beta5/openrdf-rio-api-2.0-beta5.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-memory/2.0-beta5/openrdf-sail-memory-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -719,7 +692,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$localRepository$/org/openrdf/openrdf-rio-rdfxml/2.0-beta5/openrdf-rio-rdfxml-2.0-beta5.jar!/"
/>
+ <root
url="jar://$localRepository$/org/openrdf/openrdf-sail-nativerdf/2.0-beta5/openrdf-sail-nativerdf-2.0-beta5.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=560862&r1=560861&r2=560862
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Sun Jul 29 22:03:55 2007
@@ -55,31 +55,9 @@
private File localRepository;
/**
- * @parameter expression="${project.file}"
- * @required
- * @readonly
- */
- private File pomFile;
-
- /**
* @component
*/
private AssemblyResolver assemblyResolver;
-
- /**
- * @component
- */
- private org.apache.maven.dotnet.executable.CapabilityMatcher
capabilityMatcher;
-
- /**
- * @component
- */
- private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
-
- /**
- * @component
- */
- private org.apache.maven.dotnet.registry.DataAccessObjectRegistry
daoRegistry;
/**
* @component
