archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [2/2] archiva git commit: [MRM-1915] remove npanday plugin
Date Tue, 15 Mar 2016 06:27:34 GMT
[MRM-1915] remove npanday plugin

Signed-off-by: olivier lamy <olamy@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6742949c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6742949c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6742949c

Branch: refs/heads/master
Commit: 6742949ceb5efb9e8c60612fa03d67bed0801b6f
Parents: c03f35d
Author: olivier lamy <olamy@apache.org>
Authored: Tue Mar 15 16:51:25 2016 +1100
Committer: olivier lamy <olamy@apache.org>
Committed: Tue Mar 15 16:51:25 2016 +1100

----------------------------------------------------------------------
 .../src/main/resources/features.xml             |  5 -
 .../archiva-web/archiva-webapp/pom.xml          |  4 -
 archiva-modules/plugins/npanday-support/pom.xml | 72 ---------------
 .../npanday/NPandayArtifactMappingProvider.java | 96 --------------------
 .../main/resources/META-INF/spring-context.xml  | 33 -------
 archiva-modules/plugins/pom.xml                 |  2 -
 pom.xml                                         |  5 -
 7 files changed, 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
----------------------------------------------------------------------
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 23707e9..82d7cef 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/archiva-web/archiva-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 2f3608e..fee485e 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/plugins/npanday-support/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/npanday-support/pom.xml b/archiva-modules/plugins/npanday-support/pom.xml
deleted file mode 100644
index fbefd7c..0000000
--- 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java
----------------------------------------------------------------------
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 5af0b91..0000000
--- 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 );
-    }
-}

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/plugins/npanday-support/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
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 c804011..0000000
--- 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

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/archiva-modules/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/pom.xml b/archiva-modules/plugins/pom.xml
index 44892b4..0485bb4 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/6742949c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b137d88..497b067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>


Mime
View raw message