You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/03/16 05:31:17 UTC
svn commit: r1301342 -
/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
Author: brett
Date: Fri Mar 16 05:31:17 2012
New Revision: 1301342
URL: http://svn.apache.org/viewvc?rev=1301342&view=rev
Log:
[NPANDAY-546] Azure plugin doesn't add the correct entry point to web roles
Modified:
incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
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=1301342&r1=1301341&r2=1301342&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 Fri Mar 16 05:31:17 2012
@@ -176,17 +176,20 @@ public class CreateCloudServicePackageMo
);
}
- File entryPoint = new File( roleRoot, artifact.getArtifactId() + ".dll" );
+ File entryPoint = null;
if ( isWebRole )
{
+ String name = "bin" + File.separator + artifact.getArtifactId() + ".dll";
+ entryPoint = new File( roleRoot, name );
if ( entryPoint.exists() )
{
commands.add(
- "/role:" + artifact.getArtifactId() + ";" + roleRoot.getAbsolutePath() + ";" + entryPoint.getName()
+ "/role:" + artifact.getArtifactId() + ";" + roleRoot.getAbsolutePath() + ";" + name
);
}
else
{
+ getLog().warn( "NPANDAY-123-005: entry point '" + entryPoint + "' could not be found" );
commands.add(
"/role:" + artifact.getArtifactId() + ";" + roleRoot.getAbsolutePath()
);
@@ -199,6 +202,7 @@ public class CreateCloudServicePackageMo
}
else if ( isWorkerRole )
{
+ entryPoint = new File( roleRoot, artifact.getArtifactId() + ".dll" );
if ( !entryPoint.exists() )
{
throw new MojoExecutionException(
@@ -217,7 +221,7 @@ public class CreateCloudServicePackageMo
Properties properties = new Properties();
String v = frameworkVersion != null ? "v" + frameworkVersion : "v4.0";
properties.setProperty( "TargetFrameworkVersion", v );
- if ( entryPoint.exists() )
+ if ( entryPoint != null && entryPoint.exists() )
{
properties.setProperty( "EntryPoint", entryPoint.getName() );
}