From 3823131239568ab079779f77206b7e9e6554fe9e Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Fri, 6 Mar 2009 07:44:10 +0000 Subject: [PATCH] [MNG-1073] remove class from the model that was never used and required a model change. Typically, you'd just leave it out of the current version but we get some clean up by removing it altogether without any side effects. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@750795 13f79535-47bb-0310-9956-ffa450edef68 --- .../jpox/ArchivaArtifactJavaDetailsKey.java | 46 ------ .../model/platform/JavaArtifactHelper.java | 43 ------ .../src/main/mdo/archiva-base.xml | 137 ------------------ 3 files changed, 226 deletions(-) delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactJavaDetailsKey.java delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/platform/JavaArtifactHelper.java diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactJavaDetailsKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactJavaDetailsKey.java deleted file mode 100644 index 9fb78e6bf..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactJavaDetailsKey.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.apache.maven.archiva.model.jpox; - -/* - * 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.maven.archiva.model.AbstractArtifactKey; - -import java.io.Serializable; - -/** - * ArchivaArtifactJavaDetailsKey - unique classid-key for JPOX. - * - * @version $Id$ - */ -public class ArchivaArtifactJavaDetailsKey - extends AbstractArtifactKey - implements Serializable -{ - private static final long serialVersionUID = -2565748477203220905L; - - public ArchivaArtifactJavaDetailsKey() - { - } - - public ArchivaArtifactJavaDetailsKey( String key ) - { - super( key ); - } - -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/platform/JavaArtifactHelper.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/platform/JavaArtifactHelper.java deleted file mode 100644 index a05852631..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/platform/JavaArtifactHelper.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.apache.maven.archiva.model.platform; - -/* - * 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.maven.archiva.model.ArchivaArtifact; -import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails; - -/** - * Utility methods for working with java platform specific ArchivaArtifacts. - * - * @version $Id$ - */ -public class JavaArtifactHelper -{ - public static ArchivaArtifactJavaDetails getJavaDetails( ArchivaArtifact artifact ) - { - ArchivaArtifactJavaDetails javaDetails = (ArchivaArtifactJavaDetails) artifact.getPlatformDetails(); - if ( javaDetails == null ) - { - javaDetails = new ArchivaArtifactJavaDetails(); - artifact.setPlatformDetails( javaDetails ); - } - - return javaDetails; - } -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml index 2ef7fc625..3c2887d38 100644 --- a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml +++ b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml @@ -228,8 +228,6 @@ NOTE TO ARCHIVA DEVELOPERS.... The ArchivaArtifact object should contain no platform specifics!! - Put Java specifics in the ArchivaArtifactJavaDetails object. - Put .Net specifics in the ArchivaArtifactDotNetDetails object. --> - - ArchivaArtifactJavaDetails - - org.apache.maven.archiva.model.ArchivaArtifactPlatformDetails - - 1.0.0+ - - - groupId - true - 1.0.0+ - String - true - - The Group ID of the repository content. - - - - artifactId - true - 1.0.0+ - String - true - - The Artifact ID of the repository content. - - - - version - true - 1.0.0+ - String - true - - The version of the repository content. - - - - classifier - true - 1.0.0+ - String - true - - The classifier for this artifact. - - - - type - true - 1.0.0+ - String - true - - The type of artifact. - - - - repositoryId - true - 1.0.0+ - true - String - - The repository associated with this content. - - - - checksumBytecode - false - 1.0.0+ - String - false - - The SHA1 checksum for the bytecode in the artifact file. (Can be empty if - the artifact contains no bytecode) - - - - jdk - false - 1.0.0+ - String - false - - The JDK revision of the bytecode. (Can be empty if the artifact contains no bytecode) - - - - - - 1.0.0+ - - - - 1.0.0+ - - - -