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 lc...@apache.org on 2011/12/15 17:07:13 UTC
svn commit: r1214869 [1/11] - in /incubator/npanday/trunk: ./
archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/
components/ components/dotnet-artifact/
components/dotnet-artifact/src/main/java/npanday/artifa...
Author: lcorneliussen
Date: Thu Dec 15 17:07:06 2011
New Revision: 1214869
URL: http://svn.apache.org/viewvc?rev=1214869&view=rev
Log:
[NPANDAY-480, NPANDAY-488, NPANDAY-499] Reintegration of branch '1.5.0-azuresupport' throug git mirrors (svn merge didn't work)
Added:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/MutableCompilerCapability.java
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/src/test/
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/src/test/groovy/
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/src/test/groovy/AssemblyPluginXpp3ReaderTest.groovy
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/src/test/resources/
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/src/test/resources/sample-assembly-plugins.xml
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/groovy/npanday/model/compiler/plugins/io/CompilerPluginXpp3ReaderTest.groovy
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/resources/
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/src/test/resources/sample-compiler-plugins.xml
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/groovy/npanday/model/compiler/plugins/io/ExecutablePluginXpp3ReaderTest.groovy
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/
incubator/npanday/trunk/components/dotnet-model/executable-plugins/src/test/resources/sample-executable-plugins.xml
incubator/npanday/trunk/components/dotnet-model/netdependency/src/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/npanday/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/npanday/model/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/groovy/npanday/model/settings/io/NetDependencyXpp3ReaderTest.groovy
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/resources/
incubator/npanday/trunk/components/dotnet-model/netdependency/src/test/resources/sample-netdependencies.xml
incubator/npanday/trunk/components/dotnet-model/settings/src/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/npanday/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/npanday/model/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/groovy/npanday/model/settings/io/NPandaySettingsXpp3ReaderTest.groovy
incubator/npanday/trunk/components/dotnet-model/settings/src/test/resources/
incubator/npanday/trunk/components/dotnet-model/settings/src/test/resources/sample-settings.xml
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ModelInterpolator.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/WindowsRegistryAccessException.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/WindowsRegistryAccessProvider.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/AbstractMultisourceRepository.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/ContextAwareModelInterpolator.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/WindowsRegistryValueSource.java
incubator/npanday/trunk/components/dotnet-registry/src/test/
incubator/npanday/trunk/components/dotnet-registry/src/test/groovy/
incubator/npanday/trunk/components/dotnet-registry/src/test/groovy/WindowsRegistryValueSourceTest.groovy
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsRepository.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorRequirement.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorRequirementState.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorUnknownException.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/FileBasedSettingsRepository.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/SettingsBasedVendorInfo.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/VendorRequirementStateTest.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/MutableVendorInfo.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/VendorInfoRepositoryTest.java
incubator/npanday/trunk/plugins/aspnet-maven-plugin/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/aspnet-maven-plugin.iml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/deep/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/deep/deeper/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/deep/deeper/do-not-copy.sql
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/deep/deeper/please-copy.aspx
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/do-not-copy.sql
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/please-copy.aspx
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/do-not-copy.aspx
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/please-copy.aspx
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/copy-also.txt
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/copy-anyway.aspx
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/PackagePreparationConfigurationSource.java
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/META-INF/plexus/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/aspnet-webapp-defaults.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-contents.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/site/
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/site/site.xml
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/resources/
incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/resources/META-INF/
incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/resources/META-INF/npanday/
incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Modified:
incubator/npanday/trunk/.gitignore
incubator/npanday/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java
incubator/npanday/trunk/components/dotnet-artifact/pom.xml
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java
incubator/npanday/trunk/components/dotnet-assembler/pom.xml
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java
incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/components/dotnet-core/pom.xml
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactType.java
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayContext.java
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/PathUtil.java
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/components/dotnet-dao-project/pom.xml
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
incubator/npanday/trunk/components/dotnet-executable/pom.xml
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/CommandExecutor.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/CommandFilter.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/ExecutableCapability.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/ExecutableConfig.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/ExecutableContext.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/ExecutableRequirement.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutableFactory.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerCapability.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerContext.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerRequirement.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/BaseCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/CSharpCompilerForProfile.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/compiler/impl/DotGNUCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/NemerleCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/PhpCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/RubyCompiler.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CapabilityMatcherImpl.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/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutableContextImpl.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/MatchPolicyFactory.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/RepositoryExecutableContextImpl.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ThreadedNetExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/components/dotnet-executable/src/test/java/npanday/executable/CommandExecutorTest.java
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/assembly-plugins.mdo
incubator/npanday/trunk/components/dotnet-model/assembly-plugins/pom.xml
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo
incubator/npanday/trunk/components/dotnet-model/compiler-plugins/pom.xml
incubator/npanday/trunk/components/dotnet-model/configuration-appenders/configurationAppenders.mdo
incubator/npanday/trunk/components/dotnet-model/configuration-appenders/pom.xml
incubator/npanday/trunk/components/dotnet-model/entries/entries.mdo
incubator/npanday/trunk/components/dotnet-model/entries/pom.xml
incubator/npanday/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo
incubator/npanday/trunk/components/dotnet-model/executable-plugins/pom.xml
incubator/npanday/trunk/components/dotnet-model/netdependency/netdependency.mdo
incubator/npanday/trunk/components/dotnet-model/netdependency/pom.xml
incubator/npanday/trunk/components/dotnet-model/pom.xml
incubator/npanday/trunk/components/dotnet-model/settings/pom.xml
incubator/npanday/trunk/components/dotnet-model/settings/settings.mdo
incubator/npanday/trunk/components/dotnet-plugin/pom.xml
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java
incubator/npanday/trunk/components/dotnet-registry/pom.xml
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/DataAccessObject.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java
incubator/npanday/trunk/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/components/dotnet-vendor/pom.xml
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/StateMachineProcessor.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/Vendor.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorFactory.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorInfo.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorInfoRepository.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/VendorInfoTransitionRule.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/StateMachineProcessorImpl.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/VendorInfoRepositoryImpl.java
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/VendorInfoTransitionRuleFactory.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/VendorTestFactory.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/MatchPolicyFactoryTest.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/RepositoryRegistryTestStub.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/VendorInfoRepositoryTestStub.java
incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/VendorInfoTransitionRuleFactoryTest.java
incubator/npanday/trunk/components/pom.xml
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java
incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopMojo.java
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/FileInstallerMojo.java
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/java/npanday/plugin/link/LinkerMojo.java
incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/main/java/npanday/plugin/generator/MojoGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ResourceGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NPanday.VisualStudio.AddIn
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java
incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
incubator/npanday/trunk/plugins/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/Setup-en-us.wxl
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/.gitignore?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/.gitignore (original)
+++ incubator/npanday/trunk/.gitignore Thu Dec 15 17:07:06 2011
@@ -1 +1,4 @@
-target
+target
+*.iml
+*.ipr
+*.iws
\ No newline at end of file
Modified: incubator/npanday/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java (original)
+++ incubator/npanday/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java Thu Dec 15 17:07:06 2011
@@ -54,6 +54,7 @@ import java.util.ArrayList;
* 3) Add any special commands to the getCommands method.
* 4) Recompile the dotnet-core component.
* 5) Rename this class and install this Mojo component.
+ * 6) Rename
*/
public class NetExecutableMojo
extends AbstractMojo
@@ -95,8 +96,7 @@ public class NetExecutableMojo
{
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
- null ).execute();
+ netExecutableFactory.getNetExecutableFor( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), null ).execute();
}
catch ( ExecutionException e )
{
Modified: incubator/npanday/trunk/components/dotnet-artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/pom.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/pom.xml Thu Dec 15 17:07:06 2011
@@ -56,6 +56,12 @@ under the License.
<directory>src/test/resources/uac</directory>
<targetPath>../test-repo/uac</targetPath>
</testResource>
- </testResources>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java Thu Dec 15 17:07:06 2011
@@ -20,12 +20,9 @@ package npanday.artifact;
import npanday.registry.NPandayRepositoryException;
import npanday.registry.Repository;
-import npanday.registry.RepositoryRegistry;
import org.apache.maven.model.Dependency;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Hashtable;
+import java.net.URL;
import java.util.List;
/**
@@ -37,17 +34,12 @@ public interface NetDependenciesReposito
extends Repository
{
/**
- * @see npanday.registry.Repository#load(java.io.InputStream, java.util.Hashtable)
+ * Loads a list of .NET dependencies from a config file or resource.
*/
- void load( InputStream inputStream, Hashtable properties )
+ void load( URL source )
throws NPandayRepositoryException;
/**
- * @see npanday.registry.Repository#setRepositoryRegistry(npanday.registry.RepositoryRegistry)
- */
- void setRepositoryRegistry( RepositoryRegistry repositoryRegistry );
-
- /**
* Returns a list of .NET dependencies as given within the net dependencies config file. This dependency list
* is external to the pom file dependencies. This separation is necessary since some Java Maven plugins
* - which themselves are necessary for building .NET applications - may have .NET executable dependencies that
Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java Thu Dec 15 17:07:06 2011
@@ -18,50 +18,51 @@
*/
package npanday.artifact.impl;
-import npanday.registry.NPandayRepositoryException;
-import npanday.registry.Repository;
-import npanday.registry.RepositoryRegistry;
+import npanday.artifact.NetDependenciesRepository;
+import npanday.artifact.NetDependencyMatchPolicy;
import npanday.model.netdependency.NetDependency;
import npanday.model.netdependency.NetDependencyModel;
import npanday.model.netdependency.io.xpp3.NetDependencyXpp3Reader;
-import npanday.artifact.NetDependenciesRepository;
-import npanday.artifact.NetDependencyMatchPolicy;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.apache.maven.model.Dependency;
+import npanday.registry.ModelInterpolator;
+import npanday.registry.NPandayRepositoryException;
+import npanday.registry.impl.AbstractMultisourceRepository;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.util.List;
-import java.util.Hashtable;
-import java.util.ArrayList;
-import java.io.InputStream;
import java.io.IOException;
import java.io.Reader;
-import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
/**
* Provides methods for loading and reading the net dependency config file.
*
* @author Shane Isbell
+ * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
+ * @plexus.component role="npanday.artifact.impl.NetDependenciesRepositoryImpl"
*/
public class NetDependenciesRepositoryImpl
+ extends AbstractMultisourceRepository<NetDependencyModel>
implements NetDependenciesRepository
{
/**
- * List of net dependencies. These dependencies are intended to be executed directly from the local Maven repository,
+ * List of net dependencies. These dependencies are intended to be executed directly from the local Maven
+ * repository,
* not to be compiled against.
*/
- private List<NetDependency> netDependencies;
+ private List<NetDependency> netDependencies = new ArrayList<NetDependency>();
/**
* The artifact factory, used for creating artifacts.
*/
private ArtifactFactory artifactFactory;
- private Hashtable properties;
-
/**
* Constructor. This method is intended to be invoked by the <code>RepositoryRegistry<code>, not by the
@@ -71,64 +72,45 @@ public class NetDependenciesRepositoryIm
{
}
- /**
- * @see Repository#load(java.io.InputStream, java.util.Hashtable)
- */
- public void load( InputStream inputStream, Hashtable properties )
- throws NPandayRepositoryException
+ @Override
+ protected NetDependencyModel loadFromReader( Reader reader, Hashtable properties ) throws
+ IOException,
+ XmlPullParserException
{
- this.properties = properties;
NetDependencyXpp3Reader xpp3Reader = new NetDependencyXpp3Reader();
- Reader reader = new InputStreamReader( inputStream );
- NetDependencyModel model;
- try
- {
- model = xpp3Reader.read( reader );
- }
- catch( IOException e )
- {
- throw new NPandayRepositoryException( "NPANDAY-003-000: An error occurred while reading net-dependencies.xml", e );
- }
- catch ( XmlPullParserException e )
- {
- throw new NPandayRepositoryException( "NPANDAY-003-001: Could not read net-dependencies.xml", e );
- }
- netDependencies = model.getNetDependencies();
- String npandayVersion = (String) properties.get( "npanday.version" );
- for ( NetDependency dependency : netDependencies )
+ return xpp3Reader.read( reader );
+ }
+
+ @Override
+ protected void mergeLoadedModel( NetDependencyModel model ) throws NPandayRepositoryException
+ {
+ final List<NetDependency> tmpList = model.getNetDependencies();
+
+ String npandayVersion = getProperty( "npanday.version" );
+ for ( NetDependency dependency : tmpList )
{
- if ( dependency.getVersion() == null && dependency.getGroupId().toLowerCase().startsWith( "org.apache.npanday" ) )
+ if ( dependency.getVersion() == null && dependency.getGroupId().toLowerCase().startsWith(
+ "org.apache.npanday"
+ ) )
{
dependency.setVersion( npandayVersion );
}
}
- }
-
- /**
- * @see Repository#setRepositoryRegistry(npanday.registry.RepositoryRegistry)
- */
- public void setRepositoryRegistry( RepositoryRegistry repositoryRegistry )
- {
- }
-
- /**
- * @see Repository#setSourceUri(String)
- */
- public void setSourceUri( String fileUri )
- {
- // not supported
+ netDependencies.addAll( tmpList );
}
/**
- * @see Repository#reload()
+ * Remove all stored values in preparation for a reload.
*/
- public void reload() throws IOException
+ @Override
+ protected void clear()
{
- // not supported
+ netDependencies.clear();
}
/**
+ * TODO: Remove getDependencies?
* Returns a list of .NET dependencies as given within the net dependencies config file. This dependency list
* is external to the pom file dependencies. This separation is necessary since some Java Maven plugins
* - which themselves are necessary for building .NET applications - may have .NET executable dependencies that
@@ -164,7 +146,7 @@ public class NetDependenciesRepositoryIm
public String getProperty( String key )
{
- return (String) properties.get( key );
+ return (String) getProperties().get( key );
}
/**
@@ -179,11 +161,13 @@ public class NetDependenciesRepositoryIm
/**
- * Return true is the specified net dependency matches ALL of the specified match policies, otherwise returns false.
+ * Return true is the specified net dependency matches ALL of the specified match policies,
+ * otherwise returns false.
*
* @param netDependency the net dependency to match
* @param matchPolicies the match policies to use in matching the net dependency
- * @return true is the specified net dependency matches ALL of the specified match policies, otherwise returns false
+ * @return true is the specified net dependency matches ALL of the specified match policies,
+ * otherwise returns false
*/
private boolean isMatch( NetDependency netDependency, List<NetDependencyMatchPolicy> matchPolicies )
{
@@ -212,9 +196,10 @@ public class NetDependenciesRepositoryIm
List<Artifact> artifacts = new ArrayList<Artifact>();
for ( NetDependency netDependency : netDependencies )
{
- if ( netDependency.getGroupId().equals( groupId ) && netDependency.getArtifactId().equals( artifactId ) &&
- ( version == null || netDependency.getVersion().equals( version ) ) &&
- ( type == null || netDependency.getType().equals( type ) ) )
+ if ( netDependency.getGroupId().equals( groupId ) && netDependency.getArtifactId().equals( artifactId )
+ && ( version == null || netDependency.getVersion().equals( version ) ) && (
+ type == null || netDependency.getType().equals( type )
+ ) )
{
artifacts.add( netDependencyToArtifact( netDependency ) );
}
@@ -272,9 +257,23 @@ public class NetDependenciesRepositoryIm
*/
private Artifact netDependencyToArtifact( NetDependency dependency )
{
- return artifactFactory.createDependencyArtifact( dependency.getGroupId(), dependency.getArtifactId(),
- VersionRange.createFromVersion( dependency.getVersion() ),
- dependency.getType(), dependency.getPublicKeyToken(),
- Artifact.SCOPE_RUNTIME, null );
+ return artifactFactory.createDependencyArtifact(
+ dependency.getGroupId(), dependency.getArtifactId(),
+ VersionRange.createFromVersion( dependency.getVersion() ), dependency.getType(),
+ dependency.getPublicKeyToken(), Artifact.SCOPE_RUNTIME, null
+ );
+ }
+
+ // ### COMPONENTS REQUIRED BY THE BASE CLASS
+
+ /**
+ * @plexus.requirement
+ */
+ private ModelInterpolator interpolator;
+
+ @Override
+ protected ModelInterpolator getInterpolator()
+ {
+ return interpolator;
}
}
Modified: incubator/npanday/trunk/components/dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/pom.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/pom.xml Thu Dec 15 17:07:06 2011
@@ -49,5 +49,13 @@ under the License.
<groupId>org.apache.npanday</groupId>
<artifactId>dotnet-core</artifactId>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblerContextImpl.java Thu Dec 15 17:07:06 2011
@@ -39,6 +39,9 @@ import java.io.*;
* Provides an implementation of the <code>AssemblerContext</code>.
*
* @author Shane Isbell
+ *
+ * @plexus.component
+ * role="npanday.assembler.AssemblerContext"
*/
public final class AssemblerContextImpl
implements AssemblerContext, LogEnabled
@@ -48,6 +51,8 @@ public final class AssemblerContextImpl
/**
* A registry component of repository (config) files
+ *
+ * @plexus.requirement
*/
private RepositoryRegistry repositoryRegistry;
Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java Thu Dec 15 17:07:06 2011
@@ -18,35 +18,42 @@
*/
package npanday.assembler.impl;
+import npanday.assembler.AssemblyInfoException;
+import npanday.model.assembly.plugins.AssemblyPlugin;
+import npanday.model.assembly.plugins.AssemblyPluginsModel;
+import npanday.model.assembly.plugins.io.xpp3.AssemblyPluginXpp3Reader;
+import npanday.registry.ModelInterpolator;
import npanday.registry.NPandayRepositoryException;
import npanday.registry.Repository;
-import npanday.registry.RepositoryRegistry;
+import npanday.registry.impl.AbstractMultisourceRepository;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.InputStream;
import java.io.IOException;
import java.io.Reader;
-import java.io.InputStreamReader;
-import java.util.*;
-
-import npanday.assembler.AssemblyInfoException;
-import npanday.model.assembly.plugins.AssemblyPlugin;
-import npanday.model.assembly.plugins.AssemblyPluginsModel;
-import npanday.model.assembly.plugins.io.xpp3.AssemblyPluginXpp3Reader;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
/**
* Provides a way for loading the assembly-plugins.xml file and accessing its content.
*
* @author Shane Isbell
+ * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
+ * @plexus.component
+ * role="npanday.assembler.impl.AssemblyPluginsRepository"
*/
public final class AssemblyPluginsRepository
+ extends AbstractMultisourceRepository<AssemblyPluginsModel>
implements Repository
{
/**
* List of all assembly plugins within the repository
*/
- private List<AssemblyPlugin> assemblyPlugins;
+ private List<AssemblyPlugin> assemblyPlugins = new ArrayList<AssemblyPlugin>( );
/**
* Constructor. This method is intended to by invoked by the <code>RepositoryRegistry<code>, not by the
@@ -56,62 +63,35 @@ public final class AssemblyPluginsReposi
{
}
- /**
- * Loads the repository.
- *
- * @param inputStream a stream of the repository file (typically from *.xml)
- * @param properties additional user-supplied parameters used to customize the behavior of the repository
- * @throws NPandayRepositoryException if there is a problem loading the repository
- */
- public void load( InputStream inputStream, Hashtable properties )
- throws NPandayRepositoryException
+ @Override
+ protected AssemblyPluginsModel loadFromReader( Reader reader, Hashtable properties )
+ throws IOException, XmlPullParserException
{
AssemblyPluginXpp3Reader xpp3Reader = new AssemblyPluginXpp3Reader();
- Reader reader = new InputStreamReader( inputStream );
- AssemblyPluginsModel plugins = null;
- try
- {
- plugins = xpp3Reader.read( reader );
- }
- catch( IOException e )
- {
- throw new NPandayRepositoryException( "NPANDAY-021-000: An error occurred while reading executable-plugins.xml", e );
- }
- catch ( XmlPullParserException e )
- {
- throw new NPandayRepositoryException( "NPANDAY-021-001: Could not read plugins-compiler.xml", e );
- }
- assemblyPlugins = plugins.getAssemblyPlugins();
+ return xpp3Reader.read( reader );
+ }
+
+ @Override
+ protected void mergeLoadedModel( AssemblyPluginsModel model )
+ throws NPandayRepositoryException
+ {
+ assemblyPlugins.addAll( model.getAssemblyPlugins());
Set languages = getAssemblyPluginLanguages();
if ( languages.size() < assemblyPlugins.size() )
{
throw new NPandayRepositoryException(
- "NPANDAY-021-002: Duplicate language entries in the assembly-plugins.xml: Total Language Count = " +
- languages.size() + ", Total Plugins = " + assemblyPlugins.size() );
+ "NPANDAY-021-002: Duplicate language entries in the assembly-plugins.xml: Total Language Count = "
+ + languages.size() + ", Total Plugins = " + assemblyPlugins.size() );
}
}
/**
- * @see Repository#setRepositoryRegistry(npanday.registry.RepositoryRegistry)
- */
- public void setRepositoryRegistry( RepositoryRegistry repositoryRegistry )
- {
- }
-
- /**
- * @see Repository#setSourceUri(String)
- */
- public void setSourceUri( String fileUri )
- {
- // not supported
- }
-
- /**
- * @see Repository#reload()
+ * Remove all stored values in preparation for a reload.
*/
- public void reload() throws IOException
+ @Override
+ protected void clear()
{
- // not supported
+ assemblyPlugins.clear();
}
/**
@@ -160,4 +140,17 @@ public final class AssemblyPluginsReposi
}
return set;
}
+
+ // ### COMPONENTS REQUIRED BY THE BASE CLASS
+
+ /**
+ * @plexus.requirement
+ */
+ private ModelInterpolator interpolator;
+
+ @Override
+ protected ModelInterpolator getInterpolator()
+ {
+ return interpolator;
+ }
}
Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml Thu Dec 15 17:07:06 2011
@@ -17,15 +17,5 @@ specific language governing permissions
under the License.
-->
<component-set>
- <components>
- <component>
- <role>npanday.assembler.AssemblerContext</role>
- <implementation>npanday.assembler.impl.AssemblerContextImpl</implementation>
- <requirements>
- <requirement>
- <role>npanday.registry.RepositoryRegistry</role>
- </requirement>
- </requirements>
- </component>
- </components>
+ <!-- generated by plexus-maven-plugin -->
</component-set>
Modified: incubator/npanday/trunk/components/dotnet-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/pom.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/pom.xml Thu Dec 15 17:07:06 2011
@@ -69,18 +69,22 @@ under the License.
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
+ <id>groovy-main</id>
<goals>
<goal>generateStubs</goal>
<goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
+ <!-- enable, if you have @plexus.component in your source
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ </plugin>
+ -->
</plugins>
<resources>
<resource>
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=1214869&r1=1214868&r2=1214869&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 Thu Dec 15 17:07:06 2011
@@ -79,7 +79,7 @@ public enum ArtifactType
* A maven plugin authored in .NET.
*/
DOTNET_MAVEN_PLUGIN("dotnet-maven-plugin", "library", "dll"),
-
+
/**
* A compilation of libraries and their complementary
* files as debug symbols, docs or local satellite
@@ -162,7 +162,13 @@ public enum ArtifactType
GAC_64_4 ( "gac_64_4", null, "dll"),
- COM_REFERENCE( "com_reference", null, "dll");
+ COM_REFERENCE( "com_reference", null, "dll"),
+
+ /* Azure support */
+ AZURE_CLOUD_SERVICE ("azure-cloud-service", null, "cspkg"),
+
+ /* MSDeploy support */
+ MSDEPLOY_PACKAGE ("msdeploy-package", null, "msdeploy.zip");
/**
* The extension used for the artifact(netmodule, dll, exe)
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayContext.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayContext.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayContext.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayContext.java Thu Dec 15 17:07:06 2011
@@ -18,7 +18,6 @@
*/
package npanday;
-import npanday.registry.Repository;
import org.codehaus.plexus.logging.Logger;
/**
@@ -35,20 +34,6 @@ public interface NPandayContext
String ROLE = NPandayContext.class.getName();
/**
- * This method is used to obtain an instance of a <code>Repository</code> specified within the registry-config.xml file.
- * This method allows the application developer to create configuration files and have them accessible through the
- * NPanday Context. For more information on how the registry/repository works, go to
- * http://jvending.sourceforge.net/registry-cdc/
- *
- * @param repositoryName the name of the repository. This name should match the /<repository-name> field within the
- * registry-config.xml file.
- * @return repository for the specified repository name
- * @throws RepositoryNotFoundException if repository is not found.
- */
- Repository find( String repositoryName )
- throws RepositoryNotFoundException;
-
- /**
* Returns Maven Plexus logger: <code>Log</code>.
*
* @return the plugin logger
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=1214869&r1=1214868&r2=1214869&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 Thu Dec 15 17:07:06 2011
@@ -253,4 +253,10 @@ public final class PathUtil
// Maven already basedir aligns this
return new File( project.getBuild().getDirectory() );
}
+
+ public static File getPreparedPackageFolder( MavenProject project )
+ {
+ String folderName = project.getArtifactId();
+ return new File(new File(project.getBuild().getDirectory(), "packages"), folderName);
+ }
}
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml Thu Dec 15 17:07:06 2011
@@ -18,98 +18,6 @@ under the License.
-->
<executablePlugins>
<executablePlugin>
- <identifier>nunit-console</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>nunit-console</executable>
- <profile>nunit-console</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>nunit-console-x86</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>nunit-console-x86</executable>
- <profile>nunit-console-x86</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>nunit-console</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>nunit-console</executable>
- <profile>nunit-console</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>nunit-console2</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>nunit-console2</executable>
- <profile>nunit-console2</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
<identifier>ncover</identifier>
<pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
<vendor>MICROSOFT</vendor>
@@ -127,23 +35,6 @@ under the License.
</platforms>
</executablePlugin>
<executablePlugin>
- <identifier>fxcop</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>FxCopCmd</executable>
- <profile>Microsoft:FxCop:FxCopCmd</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
<identifier>BuildAssembler</identifier>
<pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
<vendor>MICROSOFT</vendor>
@@ -194,206 +85,9 @@ under the License.
</platform>
</platforms>
</executablePlugin>
- <executablePlugin>
- <identifier>dotnet-jetty</identifier>
- <pluginClass>npanday.executable.impl.ThreadedNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>java</executable>
- <profile>dotnet-jetty:start</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSP</identifier>
- <pluginClass>npanday.executable.impl.ThreadedNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>startXSP</executable>
- <profile>XSP:START</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSD</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>namespace</include>
- <include>language</include>
- <include>generator</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:SCHEMA</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>fields</include>
- <include>enableDataBinding</include>
- <include>namespace</include>
- <include>language</include>
- <include>out</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- <include>parameters</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:RESGEN</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>resgen</executable>
- <profile>RESGEN</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
+
+ <!-- GACUTIL is used in maven-install-plugin, but it might be moved 'closer' to the core in the future,
+ so we leave it here -->
<executablePlugin>
<identifier>MS:GACUTIL</identifier>
<pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
@@ -442,145 +136,5 @@ under the License.
</platform>
</platforms>
</executablePlugin>
- <executablePlugin>
- <identifier>MONO:RESGEN</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>resgen</executable>
- <profile>RESGEN</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:AL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>al</executable>
- <profile>AL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:AL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>al</executable>
- <profile>AL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:ILMERGE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>ILMerge</executable>
- <profile>ILMERGE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:ILREPACK</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>ILRepack</executable>
- <profile>ILREPACK</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:ILREPACK</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>ILRepack</executable>
- <profile>ILREPACK</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
+
</executablePlugins>
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml Thu Dec 15 17:07:06 2011
@@ -21,7 +21,7 @@ under the License.
<repositories>
<repository>
<repository-name>npanday-settings</repository-name>
- <repository-class>npanday.vendor.impl.SettingsRepository</repository-class>
+ <repository-class>npanday.vendor.SettingsRepository</repository-class>
<!--dummy variable - not needed since it will be populated in the code during generation of npanday-settings.xml-->
<repository-config>*</repository-config>
<init-param>
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/plexus/components.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/plexus/components.xml Thu Dec 15 17:07:06 2011
@@ -18,14 +18,6 @@ under the License.
-->
<component-set>
<components>
- <component>
- <role>npanday.NPandayRepositoryRegistry</role>
- <implementation>npanday.impl.NPandayRepositoryRegistryImpl</implementation>
- <requirements>
- <requirement>
- <role>npanday.registry.RepositoryRegistry</role>
- </requirement>
- </requirements>
- </component>
+ <!-- use annotations instead -->
</components>
</component-set>
Modified: incubator/npanday/trunk/components/dotnet-dao-project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/pom.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/pom.xml Thu Dec 15 17:07:06 2011
@@ -90,6 +90,14 @@ under the License.
<directory>src/test/resources</directory>
<targetPath>../remote-test-repo</targetPath>
</testResource>
- </testResources>
+ </testResources>
+ <plugins>
+ <!-- enable, if you have @plexus.component in your source
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ </plugin>
+ -->
+ </plugins>
</build>
</project>
Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java Thu Dec 15 17:07:06 2011
@@ -824,11 +824,6 @@ public final class ProjectDaoImpl
this.rdfRepository = (org.openrdf.repository.Repository) dataStoreObject;
}
- public void setRepositoryRegistry( RepositoryRegistry repositoryRegistry )
- {
-
- }
-
protected void initForUnitTest( Object dataStoreObject, String id, String className,
ArtifactResolver artifactResolver, ArtifactFactory artifactFactory )
{
Modified: incubator/npanday/trunk/components/dotnet-executable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/pom.xml?rev=1214869&r1=1214868&r2=1214869&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-executable/pom.xml Thu Dec 15 17:07:06 2011
@@ -54,5 +54,13 @@ under the License.
<version>4.8.1</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>