diff options
7 files changed, 0 insertions, 217 deletions
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 @@ <bundle>mvn:org.apache.archiva/metadata-store-jcr/${project.version}</bundle> </feature> - <feature name="archiva-npanday-support" description="Archiva Npanday Support module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-repository-layer</feature> - <bundle>mvn:org.apache.archiva/npanday-support/${project.version}</bundle> - </feature> - <feature name="archiva-webapp-common" description="Archiva WebApp Common" version="${project.version}" resolver="(obr)"> <feature>war</feature> <feature version="[3,4)">spring</feature> 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 @@ -54,10 +54,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>npanday-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>repository-statistics</artifactId> </dependency> <dependency> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>plugins</artifactId> - <groupId>org.apache.archiva</groupId> - <version>2.2.1-SNAPSHOT</version> - </parent> - <artifactId>npanday-support</artifactId> - <packaging>bundle</packaging> - <name>Archiva Core Plugins :: NPanday Support for Archiva</name> - <dependencies> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>maven2-repository</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.plugins.npanday</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.plugins.npanday;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version}, - org.springframework*;version="[3,4)" - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> 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<String, String> extensionToTypeMap; - - private final Map<String, String> 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 @@ -<?xml version="1.0"?> - -<!-- - ~ 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. - --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd" - default-lazy-init="true"> - - <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.plugins.npanday"/> - -</beans>
\ 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 @@ <module>repository-statistics</module> <module>problem-reports</module> <module>audit</module> - <!-- TODO: eventually not a core plugin, needs to be moved to a separate tree, with it's own Selenium tests --> - <module>npanday-support</module> <module>stage-repository-merge</module> <module>generic-metadata-support</module> <module>metadata-store-jcr</module> @@ -277,11 +277,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>npanday-support</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-common</artifactId> <version>${project.version}</version> </dependency> |