Author: jocaba
Date: Wed Nov 17 15:03:46 2010
New Revision: 1036072
URL: http://svn.apache.org/viewvc?rev=1036072&view=rev
Log:
[NPANDAY-186] Partial Refactor. Still need to change other generation of paths
that aren't using PathUtil.
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java?rev=1036072&r1=1036071&r2=1036072&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
Wed Nov 17 15:03:46 2010
@@ -113,7 +113,19 @@ public final class PathUtil
logger.finest( "NPANDAY-040-003: Read global assembly cache folder
for: " + artifact);
//TODO: gac_generic
//String processArchitecture = ( artifact.getType().equals(
"gac_generic" ) );
- return getDotNetArtifact( artifact , gacRepository );
+
+ File defaultGac = new File(
+ "C:\\WINDOWS\\assembly\\" + artifact.getType() + File.separator +
artifact.getArtifactId() + File.separator + version + "__" +
+ artifact.getClassifier() + File.separator +
artifact.getArtifactId() + ".dll" );
+ if(defaultGac.exists())
+ {
+ return defaultGac;
+ }
+ else
+ {
+ return getDotNetArtifact( artifact , gacRepository );
+ }
+
}
/**
Modified:
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java?rev=1036072&r1=1036071&r2=1036072&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
(original)
+++
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
Wed Nov 17 15:03:46 2010
@@ -213,10 +213,7 @@ public final class ProjectFactory
project.getPublicKeyTokenId() );
- File artifactFile = ( ( ArtifactTypeHelper.isDotnetAnyGac(
project.getArtifactType() ) ) ) ? new File(
- "C:\\WINDOWS\\assembly\\" + project.getArtifactType() +
File.separator + project.getArtifactId() + File.separator +
- project.getVersion() + "__" + project.getPublicKeyTokenId() +
File.separator + project.getArtifactId() +
ArtifactType.getArtifactTypeForPackagingName( project.getArtifactType()
).getExtension() )
- : PathUtil.getDotNetArtifact( assembly, localRepository ) ;
+ File artifactFile = ( ( ArtifactTypeHelper.isDotnetAnyGac(
project.getArtifactType() ) ) ) ? PathUtil.getGlobalAssemblyCacheFileFor(
assembly, localRepository) : PathUtil.getDotNetArtifact( assembly,
localRepository ) ;
assembly.setFile( artifactFile );
return assembly;
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1036072&r1=1036071&r2=1036072&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Wed Nov 17 15:03:46 2010
@@ -73,6 +73,14 @@ public abstract class AbstractMojo
implements DotNetMojo, Contextualizable
{
private PlexusContainer container;
+
+ /**
+ * Output directory
+ *
+ * @parameter expression = "${outputDirectory}"
default-value="${project.build.directory}/build-sources"
+ * @required
+ */
+ private String outputDirectory;
public void contextualize(Context context) throws ContextException {
container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
@@ -174,6 +182,7 @@ public abstract class AbstractMojo
private void resolveArtifact(Artifact artifact) throws
ComponentLookupException, MojoExecutionException {
File localRepository = new File(getLocalRepository());
+
if (PathUtil.getPrivateApplicationBaseFileFor(artifact,
localRepository).exists())
{
return;
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs?rev=1036072&r1=1036071&r2=1036072&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
Wed Nov 17 15:03:46 2010
@@ -63,11 +63,6 @@ namespace NPanday.ProjectImporter.Verifi
projectDigest.UnitTest = IsProjectAnIntegrationTest(model);
- if (projectDigest.UnitTest)
- {
- System.Windows.Forms.MessageBox.Show(">>>>>>>>>" +
pomFile.FullName);
- }
-
}
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java?rev=1036072&r1=1036071&r2=1036072&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
Wed Nov 17 15:03:46 2010
@@ -71,7 +71,7 @@ public class RepositoryRdfExporterMojo
RDFHandler rdfxmlWriter;
try
{
- rdfxmlWriter = new RDFXMLWriter( new FileOutputStream(
localRepository ) );
+ rdfxmlWriter = new RDFXMLWriter( new FileOutputStream(
localRepository+"/rdf-repository-export.xml" ) );
}
catch ( IOException e )
{
