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/01/02 15:49:49 UTC
svn commit: r1226446 - in
/incubator/npanday/trunk/components/dotnet-core/src/main:
groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy
java/npanday/ArtifactType.java
Author: brett
Date: Mon Jan 2 15:49:48 2012
New Revision: 1226446
URL: http://svn.apache.org/viewvc?rev=1226446&view=rev
Log:
[NPANDAY-488] add "includeDependencies" to the artifact type for MSDeploy packages, so that Azure projects don't have a problem trying to resolve the dependencies
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy?rev=1226446&r1=1226445&r2=1226446&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy Mon Jan 2 15:49:48 2012
@@ -59,6 +59,10 @@ class LifecycleConfigurationGenerator {
configuration{
extension typeDef.extension
type typeDef.packagingType
+ if (typeDef.includesDependencies)
+ {
+ includesDependencies typeDef.includesDependencies
+ }
}
}
}
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java?rev=1226446&r1=1226445&r2=1226446&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java Mon Jan 2 15:49:48 2012
@@ -176,7 +176,7 @@ public enum ArtifactType
AZURE_CLOUD_SERVICE_CONFIGURATION ("azure-cloud-service-configuration", null, "cscfg"),
/* MSDeploy support */
- MSDEPLOY_PACKAGE ("msdeploy-package", null, "msdeploy.zip");
+ MSDEPLOY_PACKAGE ("msdeploy-package", null, "msdeploy.zip", true);
/**
* The extension used for the artifact(netmodule, dll, exe)
@@ -194,6 +194,12 @@ public enum ArtifactType
private String targetCompileType;
/**
+ * Whether to flag the artifact type as including its dependencies (do not pass them on transitively), or not (pass
+ * them on transitively)
+ */
+ private boolean includesDependencies = false;
+
+ /**
* Constructor
*/
ArtifactType( String packagingType, String targetCompileType, String extension )
@@ -204,6 +210,17 @@ public enum ArtifactType
}
/**
+ * Constructor
+ */
+ ArtifactType( String packagingType, String targetCompileType, String extension, boolean includesDependencies )
+ {
+ this.packagingType = packagingType;
+ this.targetCompileType = targetCompileType;
+ this.extension = extension;
+ this.includesDependencies = includesDependencies;
+ }
+
+ /**
* Returns extension used for the artifact(netmodule, dll, exe).
*
* @return Extension used for the artifact(netmodule, dll, exe).
@@ -233,6 +250,11 @@ public enum ArtifactType
return targetCompileType;
}
+ public boolean isIncludesDependencies()
+ {
+ return includesDependencies;
+ }
+
/**
* Returns artifact type for the specified packaging name
*
Re: svn commit: r1226446 - in /incubator/npanday/trunk/components/dotnet-core/src/main: groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy java/npanday/ArtifactType.java
Posted by Brett Porter <br...@apache.org>.
On 03/01/2012, at 4:19 AM, Lars Corneliussen wrote:
> Same should be done for dotnet-application
Thanks - done. There are probably others (the other zip types, and azure's cspkg itself), but I didn't have test cases for those yet.
Cheers,
Brett
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
http://twitter.com/brettporter
Re: svn commit: r1226446 - in /incubator/npanday/trunk/components/dotnet-core/src/main: groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy java/npanday/ArtifactType.java
Posted by Lars Corneliussen <me...@lcorneliussen.de>.
Same should be done for dotnet-application
_
Mobil versendet.
Am 02.01.2012 um 16:49 schrieb brett@apache.org:
> Author: brett
> Date: Mon Jan 2 15:49:48 2012
> New Revision: 1226446
>
> URL: http://svn.apache.org/viewvc?rev=1226446&view=rev
> Log:
> [NPANDAY-488] add "includeDependencies" to the artifact type for MSDeploy packages, so that Azure projects don't have a problem trying to resolve the dependencies
>
> Modified:
> incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy
> incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
>
> Modified: incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy?rev=1226446&r1=1226445&r2=1226446&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy (original)
> +++ incubator/npanday/trunk/components/dotnet-core/src/main/groovy/npanday/lifecycle/LifecycleConfigurationGenerator.groovy Mon Jan 2 15:49:48 2012
> @@ -59,6 +59,10 @@ class LifecycleConfigurationGenerator {
> configuration{
> extension typeDef.extension
> type typeDef.packagingType
> + if (typeDef.includesDependencies)
> + {
> + includesDependencies typeDef.includesDependencies
> + }
> }
> }
> }
>
> Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java?rev=1226446&r1=1226445&r2=1226446&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java (original)
> +++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java Mon Jan 2 15:49:48 2012
> @@ -176,7 +176,7 @@ public enum ArtifactType
> AZURE_CLOUD_SERVICE_CONFIGURATION ("azure-cloud-service-configuration", null, "cscfg"),
>
> /* MSDeploy support */
> - MSDEPLOY_PACKAGE ("msdeploy-package", null, "msdeploy.zip");
> + MSDEPLOY_PACKAGE ("msdeploy-package", null, "msdeploy.zip", true);
>
> /**
> * The extension used for the artifact(netmodule, dll, exe)
> @@ -194,6 +194,12 @@ public enum ArtifactType
> private String targetCompileType;
>
> /**
> + * Whether to flag the artifact type as including its dependencies (do not pass them on transitively), or not (pass
> + * them on transitively)
> + */
> + private boolean includesDependencies = false;
> +
> + /**
> * Constructor
> */
> ArtifactType( String packagingType, String targetCompileType, String extension )
> @@ -204,6 +210,17 @@ public enum ArtifactType
> }
>
> /**
> + * Constructor
> + */
> + ArtifactType( String packagingType, String targetCompileType, String extension, boolean includesDependencies )
> + {
> + this.packagingType = packagingType;
> + this.targetCompileType = targetCompileType;
> + this.extension = extension;
> + this.includesDependencies = includesDependencies;
> + }
> +
> + /**
> * Returns extension used for the artifact(netmodule, dll, exe).
> *
> * @return Extension used for the artifact(netmodule, dll, exe).
> @@ -233,6 +250,11 @@ public enum ArtifactType
> return targetCompileType;
> }
>
> + public boolean isIncludesDependencies()
> + {
> + return includesDependencies;
> + }
> +
> /**
> * Returns artifact type for the specified packaging name
> *
>
>