Author: lcorneliussen
Date: Tue Jan 10 09:30:02 2012
New Revision: 1229493
URL: http://svn.apache.org/viewvc?rev=1229493&view=rev
Log:
[NPANDAY-527] Remove the NAR packaging and maven-webapp-plugin
Removed:
incubator/npanday/trunk/plugins/maven-webapp-plugin/
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/groovy/npanday/plugin/compile/CompileLifecycleMap.groovy
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=1229493&r1=1229492&r2=1229493&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
Tue Jan 10 09:30:02 2012
@@ -135,9 +135,7 @@ public enum ArtifactType
@Deprecated
EXECONFIG( "exe.config", "null", "exe.config" ),
- NAR( "nar", null, "nar" ),
-
- /**
+ /**
* Use DOTNET_MAVEN_PLUGIN instead
*/
@Deprecated
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/groovy/npanday/plugin/compile/CompileLifecycleMap.groovy
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/groovy/npanday/plugin/compile/CompileLifecycleMap.groovy?rev=1229493&r1=1229492&r2=1229493&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/groovy/npanday/plugin/compile/CompileLifecycleMap.groovy
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/groovy/npanday/plugin/compile/CompileLifecycleMap.groovy
Tue Jan 10 09:30:02 2012
@@ -54,7 +54,16 @@ class CompileLifecycleMap extends Lifecy
def default_process_sources = [np_compile_process_sources,
np_compile_process_test_sources]
def default_install =
["org.apache.npanday.plugins:maven-install-plugin:$npandayVersion:install",
mv_install]
- forTypes( [ArtifactType.DOTNET_LIBRARY, ArtifactType.LIBRARY] )
{
+ forTypes([
+
+ /* --> DLL */
+ ArtifactType.DOTNET_LIBRARY, ArtifactType.LIBRARY,
+ /* see https://issues.apache.org/jira/browse/NPANDAY-526 */
+ ArtifactType.SHARP_DEVELOP_ADDIN,
ArtifactType.VISUAL_STUDIO_ADDIN,
+
+ /* --> EXE */
+ ArtifactType.DOTNET_EXECUTABLE, ArtifactType.EXE,
ArtifactType.WINEXE
+ ]) {
LifecycleMappingBuilder b->
b.validate (default_validate)
b.generate_sources (default_generate_sources)
@@ -66,18 +75,6 @@ class CompileLifecycleMap extends Lifecy
b.install (default_install)
b.deploy (mv_deploy)
}
- forType( ArtifactType.NAR ) {
- LifecycleMappingBuilder b->
- b.validate (default_validate)
- b.generate_sources (default_generate_sources)
- b.process_sources (default_process_sources)
- b.process_resources (default_process_resources)
- b.compile (np_compile)
- b.test_compile (np_test_compile)
- b.test (np_test)
- b._package
("org.apache.npanday.plugins:maven-webapp-plugin:$npandayVersion:package")
- b.deploy
("org.apache.npanday.plugins:maven-webapp-plugin:$npandayVersion:deploy")
- }
forTypes( [ArtifactType.DOTNET_MODULE, ArtifactType.MODULE] ) {
LifecycleMappingBuilder b->
b.validate (default_validate)
@@ -103,18 +100,6 @@ class CompileLifecycleMap extends Lifecy
b.install (default_install)
b.deploy (mv_deploy)
}
- forTypes( [ArtifactType.DOTNET_EXECUTABLE, ArtifactType.EXE,
ArtifactType.WINEXE] ) {
- LifecycleMappingBuilder b->
- b.validate (default_validate)
- b.generate_sources (default_generate_sources)
- b.process_sources (default_process_sources)
- b.process_resources (default_process_resources)
- b.compile (np_compile)
- b.test_compile (np_test_compile)
- b.test (np_test)
- b.install (default_install)
- b.deploy (mv_deploy)
- }
forTypes( [ArtifactType.DOTNET_MAVEN_PLUGIN,
ArtifactType.NETPLUGIN] ) {
LifecycleMappingBuilder b->
b.validate (default_validate)
@@ -128,31 +113,8 @@ class CompileLifecycleMap extends Lifecy
b._package
("org.apache.npanday.plugins:maven-mojo-generator-plugin:$npandayVersion:generate-bindings")
b.deploy (mv_deploy)
}
- forType( ArtifactType.VISUAL_STUDIO_ADDIN ) {
- LifecycleMappingBuilder b->
- b.validate (default_validate)
- b.generate_sources (default_generate_sources)
- b.process_sources (default_process_sources)
- b.process_resources (default_process_resources)
- b.compile (np_compile)
- b.test_compile (np_test_compile)
- b.test (np_test)
- b.install (default_install)
- b.deploy (mv_deploy)
- }
- forType( ArtifactType.SHARP_DEVELOP_ADDIN ) {
- LifecycleMappingBuilder b->
- b.validate (default_validate)
- b.generate_sources (default_generate_sources)
- b.process_sources (default_process_sources)
- b.process_resources (default_process_resources)
- b.compile (np_compile)
- b.test_compile (np_test_compile)
- b.test (np_test)
- b.install (default_install)
- b.deploy (mv_deploy)
- }
+ // TODO: Should use the custom lifecycle mapping! Just delete it?
forTypes( [ArtifactType.DOTNET_EXECUTABLE_CONFIG,
ArtifactType.EXECONFIG] ) {
LifecycleMappingBuilder b->
b.install (default_install)
