From: olivier lamy Date: Tue, 15 Mar 2016 05:51:25 +0000 (+1100) Subject: [MRM-1915] remove npanday plugin X-Git-Tag: archiva-2.2.1~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6742949ceb5efb9e8c60612fa03d67bed0801b6f;p=archiva.git [MRM-1915] remove npanday plugin Signed-off-by: olivier lamy --- diff --git a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml index 23707e975..82d7cef40 100644 --- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml +++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml @@ -372,11 +372,6 @@ mvn:org.apache.archiva/metadata-store-jcr/${project.version} - - archiva-repository-layer - mvn:org.apache.archiva/npanday-support/${project.version} - - war spring diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 2f3608e6f..fee485e1f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -52,10 +52,6 @@ org.apache.archiva generic-metadata-support - - org.apache.archiva - npanday-support - org.apache.archiva repository-statistics diff --git a/archiva-modules/plugins/npanday-support/pom.xml b/archiva-modules/plugins/npanday-support/pom.xml deleted file mode 100644 index fbefd7c85..000000000 --- a/archiva-modules/plugins/npanday-support/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - plugins - org.apache.archiva - 2.2.1-SNAPSHOT - - npanday-support - bundle - Archiva Core Plugins :: NPanday Support for Archiva - - - org.apache.archiva - maven2-repository - - - log4j - log4j - - - commons-logging - commons-logging-api - - - - - org.springframework - spring-context - - - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.plugins.npanday - ${project.version} - - org.apache.archiva.plugins.npanday;version=${project.version};-split-package:=merge-first - - - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version}, - org.springframework*;version="[3,4)" - - - - - - - diff --git a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java deleted file mode 100644 index 5af0b9159..000000000 --- a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.apache.archiva.plugins.npanday; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -/** - */ -@Service( "artifactMappingProvider#npanday" ) -public class NPandayArtifactMappingProvider - implements ArtifactMappingProvider -{ - private final Map extensionToTypeMap; - - private final Map typeToExtensionMap; - - public NPandayArtifactMappingProvider() - { - extensionToTypeMap = new HashMap<>(); - - // TODO: this could be one of many - we need to look up the artifact metadata from the POM instead - // should do this anyway so that plugins don't compete for providing an extension - extensionToTypeMap.put( "dll", "dotnet-library" ); - - extensionToTypeMap.put( "netmodule", "dotnet-module" ); - extensionToTypeMap.put( "exe", "dotnet-executable" ); - - typeToExtensionMap = new HashMap<>(); - typeToExtensionMap.put( "dotnet-library", "dll" ); - typeToExtensionMap.put( "dotnet-library-config", "dll.config" ); - typeToExtensionMap.put( "dotnet-executable", "exe" ); - typeToExtensionMap.put( "dotnet-executable-config", "exe.config" ); - typeToExtensionMap.put( "dotnet-module", "netmodule" ); - typeToExtensionMap.put( "dotnet-maven-plugin", "dll" ); - typeToExtensionMap.put( "asp", "dll" ); - typeToExtensionMap.put( "visual-studio-addin", "dll" ); - typeToExtensionMap.put( "sharp-develop-addin", "dll" ); - typeToExtensionMap.put( "nar", "nar" ); - typeToExtensionMap.put( "dotnet-symbols", "pdb" ); - typeToExtensionMap.put( "ole-type-library", "tlb" ); - typeToExtensionMap.put( "dotnet-vsdocs", "xml" ); - typeToExtensionMap.put( "dotnet-archive", "zip" ); - typeToExtensionMap.put( "dotnet-gac", "dll" ); - typeToExtensionMap.put( "gac", "dll" ); - typeToExtensionMap.put( "gac_msil", "dll" ); - typeToExtensionMap.put( "gac_msil4", "dll" ); - typeToExtensionMap.put( "gac_32", "dll" ); - typeToExtensionMap.put( "gac_32_4", "dll" ); - typeToExtensionMap.put( "gac_64", "dll" ); - typeToExtensionMap.put( "gac_64_4", "dll" ); - typeToExtensionMap.put( "com_reference", "dll" ); - - // Legacy types - typeToExtensionMap.put( "library", "dll" ); - typeToExtensionMap.put( "gac_generic", "dll" ); - typeToExtensionMap.put( "netplugin", "dll" ); - typeToExtensionMap.put( "module", "netmodule" ); - typeToExtensionMap.put( "exe.config", "exe.config" ); - typeToExtensionMap.put( "winexe", "exe" ); - typeToExtensionMap.put( "exe", "exe" ); - } - - @Override - public String mapClassifierAndExtensionToType( String classifier, String ext ) - { - // we don't need classifier - return extensionToTypeMap.get( ext ); - } - - @Override - public String mapTypeToExtension( String type ) - { - return typeToExtensionMap.get( type ); - } -} diff --git a/archiva-modules/plugins/npanday-support/src/main/resources/META-INF/spring-context.xml b/archiva-modules/plugins/npanday-support/src/main/resources/META-INF/spring-context.xml deleted file mode 100644 index c804011ac..000000000 --- a/archiva-modules/plugins/npanday-support/src/main/resources/META-INF/spring-context.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/archiva-modules/plugins/pom.xml b/archiva-modules/plugins/pom.xml index 44892b4f8..0485bb4ec 100644 --- a/archiva-modules/plugins/pom.xml +++ b/archiva-modules/plugins/pom.xml @@ -33,8 +33,6 @@ repository-statistics problem-reports audit - - npanday-support stage-repository-merge generic-metadata-support metadata-store-jcr diff --git a/pom.xml b/pom.xml index b137d88a2..497b06795 100644 --- a/pom.xml +++ b/pom.xml @@ -275,11 +275,6 @@ archiva-checksum ${project.version} - - org.apache.archiva - npanday-support - ${project.version} - org.apache.archiva archiva-common