Author: lcorneliussen
Date: Tue Jan 3 10:19:16 2012
New Revision: 1226727
URL: http://svn.apache.org/viewvc?rev=1226727&view=rev
Log:
Reviewed TODO comments
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/UnpackDependencyIterationItem.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=1226727&r1=1226726&r2=1226727&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
Tue Jan 3 10:19:16 2012
@@ -37,6 +37,7 @@ public final class PathUtil
private static final Logger logger = Logger.getAnonymousLogger();
public static File getGACFile4Artifact(Artifact artifact) {
+ // TODO: Should be harmonized with
VendorInfo#getGlobalAssemblyCacheDirectoryFor
File gacFile;
String type = artifact.getType();
@@ -72,6 +73,8 @@ public final class PathUtil
*/
public static File getGlobalAssemblyCacheFileFor( Artifact artifact, File
gacRepository )
{
+ // TODO: Should be harmonized with
VendorInfo#getGlobalAssemblyCacheDirectoryFor
+
if ( artifact == null )
{
logger.warning( "NPANDAY-040-000: Artifact is null - Cannot get
application file." );
@@ -98,7 +101,6 @@ 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 new File( "C:\\WINDOWS\\assembly\\" + artifact.getType() +
File.separator + artifact.getArtifactId() +
File.separator + version + "__" +
artifact.getClassifier() + File.separator +
artifact.getArtifactId() + ".dll" );
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
Tue Jan 3 10:19:16 2012
@@ -142,7 +142,7 @@ public final class DefaultCompiler
commands.add( "/nologo" );
}
- // TODO: this should rather be a custom compiler class for this
combination of vendor and framework!!
+ // TODO: the "built-in" references should be part of the
compiler-config.xml
if ( compilerContext.getVendor().equals( Vendor.MICROSOFT ) &&
compilerContext.getFrameworkVersion().equals( "3.0" ) )
{
@@ -158,7 +158,6 @@ public final class DefaultCompiler
commands.add( wcfRef + "SMDiagnostics.dll" );
}
- // TODO: this should rather be a custom compiler class for this
combination of vendor and framework!!
if ( compilerContext.getVendor().equals( Vendor.MICROSOFT ) &&
compilerContext.getFrameworkVersion().equals( "3.5" ) )
{
@@ -177,7 +176,6 @@ public final class DefaultCompiler
commands.add( wcfRef + "Microsoft.VisualC.STLCLR.dll" );
}
- // TODO: this should rather be a custom compiler class for this
combination of vendor and framework!!
if ( compilerContext.getVendor().equals( Vendor.MICROSOFT ) &&
compilerContext.getFrameworkVersion().equals( "4.0" ) )
{
@@ -210,7 +208,7 @@ public final class DefaultCompiler
commands.add( "/warnaserror-" );
//commands.add( "/nowarn" );
- // TODO: this should rather be a custom compiler class for FULL profile
+ // TODO: should be done through compiler-config.xml !!
if ( compilerContext.getVendor().equals( Vendor.MONO ) &&
"FULL".equals( compilerContext.getTargetProfile() ) )
{
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
Tue Jan 3 10:19:16 2012
@@ -576,7 +576,7 @@ public final class CompilerContextImpl
checkArgument( gacRoot != null, "gacRoot must not be null!" );
checkArgument( artifact != null, "artifact must not be null!" );
- // TODO: Refactor to PathUtil.getGlobalAssemblyCacheFileFor
+ // TODO: Tripplicated code: check
PathUtil.getGlobalAssemblyCacheFileFor and
VendorInfo#getGlobalAssemblyCacheFileFor
String type = artifact.getType();
logger.debug( "NPANDAY-061-001: Gac Root:" + gacRoot );
logger.debug( "NPANDAY-061-003: Artifact Type:" + type );
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
Tue Jan 3 10:19:16 2012
@@ -142,7 +142,6 @@ public final class CompilerPluginsReposi
MutableCompilerCapability platformCapability = new
MutableCompilerCapability();
platformCapability.setVendorInfo( vendorInfo );
- // TODO: Allow probing paths for compilers
platformCapability.setProbingPaths(plugin.getProbingPaths());
Platform platform = (Platform) j.next();
Modified:
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
(original)
+++
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
Tue Jan 3 10:19:16 2012
@@ -201,6 +201,7 @@ public class CreateCloudServicePackageMo
);
}
+ // TODO: enable configuration of different framework pr. role;
default to frameworkVersion
// TODO: save roleprops file somewhere else?
File rolePropertiesFile = new
File(project.getBuild().getDirectory(), artifact.getArtifactId() +
".roleproperties");
try
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
Tue Jan 3 10:19:16 2012
@@ -1124,6 +1124,8 @@ public abstract class AbstractCompilerMo
if ( outputDirectory != null )
{
ArtifactType artifactType =
getCompilerConfig().getArtifactType();
+
+ // TODO: shouldn't this use build.finalName?
compiledArtifact = new File(outputDirectory.getAbsolutePath()
+ File.separator +
project.getArtifactId() + "." +
artifactType.getExtension());
}
Modified:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/UnpackDependencyIterationItem.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/UnpackDependencyIterationItem.java?rev=1226727&r1=1226726&r2=1226727&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/UnpackDependencyIterationItem.java
(original)
+++
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/UnpackDependencyIterationItem.java
Tue Jan 3 10:19:16 2012
@@ -45,9 +45,6 @@ public class UnpackDependencyIterationIt
throw new MojoFailureException( "NPANDAY-124-000: The artifact
should already have been resolved: " + artifact);
}
- // TODO: very, very temporary fix for NPANDAY-509
-
-
packageSource = artifact.getFile();
assert packageSource != null : "package source should not be null
here";
