From 46fa8834873fa1aed03fdfc499508203419e033e Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Wed, 25 Nov 2009 03:11:22 +0000 Subject: [MRM-1282] clear up confusing "build" terminology, instead using project version (1.0-SNAPSHOT) and artifact version (1.0-20091112.0123456-1) git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@883965 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/metadata/model/ProjectBuildFacet.java | 25 ---- .../metadata/model/ProjectBuildMetadata.java | 161 --------------------- .../metadata/model/ProjectVersionFacet.java | 25 ++++ .../metadata/model/ProjectVersionMetadata.java | 161 +++++++++++++++++++++ 4 files changed, 186 insertions(+), 186 deletions(-) delete mode 100644 archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildFacet.java delete mode 100644 archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java create mode 100644 archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionFacet.java create mode 100644 archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java (limited to 'archiva-modules/metadata/metadata-model') diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildFacet.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildFacet.java deleted file mode 100644 index 6b02fc8ce..000000000 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildFacet.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apache.archiva.metadata.model; - -/* - * 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. - */ - -public interface ProjectBuildFacet -{ - String getFacetId(); -} diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java deleted file mode 100644 index 712481745..000000000 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.apache.archiva.metadata.model; - -/* - * 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 java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ProjectBuildMetadata -{ - private String id; - - private String url; - - private String name; - - private String description; - - private Organization organization; - - private IssueManagement issueManagement; - - private Scm scm; - - private CiManagement ciManagement; - - private List licenses; - - private Map facets; - - public String getId() - { - return id; - } - - public void setId( String id ) - { - this.id = id; - } - - public void setUrl( String url ) - { - this.url = url; - } - - public void setName( String name ) - { - this.name = name; - } - - public void setDescription( String description ) - { - this.description = description; - } - - public String getDescription() - { - return description; - } - - public String getUrl() - { - return url; - } - - public String getName() - { - return name; - } - - public Organization getOrganization() - { - return organization; - } - - public void setOrganization( Organization organization ) - { - this.organization = organization; - } - - public IssueManagement getIssueManagement() - { - return issueManagement; - } - - public void setIssueManagement( IssueManagement issueManagement ) - { - this.issueManagement = issueManagement; - } - - public Scm getScm() - { - return scm; - } - - public void setScm( Scm scm ) - { - this.scm = scm; - } - - public CiManagement getCiManagement() - { - return ciManagement; - } - - public void setCiManagement( CiManagement ciManagement ) - { - this.ciManagement = ciManagement; - } - - public List getLicenses() - { - return licenses; - } - - public void setLicenses( List licenses ) - { - this.licenses = licenses; - } - - public void addLicense( License license ) - { - if ( this.licenses == null ) - { - this.licenses = new ArrayList(); - } - this.licenses.add( license ); - } - - public void addFacet( ProjectBuildFacet mavenProjectFacet ) - { - if ( this.facets == null ) - { - this.facets = new HashMap(); - } - this.facets.put( mavenProjectFacet.getFacetId(), mavenProjectFacet ); - } - - public ProjectBuildFacet getFacet( String facetId ) - { - return this.facets.get( facetId ); - } -} diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionFacet.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionFacet.java new file mode 100644 index 000000000..8cb109fcb --- /dev/null +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionFacet.java @@ -0,0 +1,25 @@ +package org.apache.archiva.metadata.model; + +/* + * 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. + */ + +public interface ProjectVersionFacet +{ + String getFacetId(); +} diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java new file mode 100644 index 000000000..c2add5b4f --- /dev/null +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java @@ -0,0 +1,161 @@ +package org.apache.archiva.metadata.model; + +/* + * 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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ProjectVersionMetadata +{ + private String id; + + private String url; + + private String name; + + private String description; + + private Organization organization; + + private IssueManagement issueManagement; + + private Scm scm; + + private CiManagement ciManagement; + + private List licenses; + + private Map facets; + + public String getId() + { + return id; + } + + public void setId( String id ) + { + this.id = id; + } + + public void setUrl( String url ) + { + this.url = url; + } + + public void setName( String name ) + { + this.name = name; + } + + public void setDescription( String description ) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + + public String getUrl() + { + return url; + } + + public String getName() + { + return name; + } + + public Organization getOrganization() + { + return organization; + } + + public void setOrganization( Organization organization ) + { + this.organization = organization; + } + + public IssueManagement getIssueManagement() + { + return issueManagement; + } + + public void setIssueManagement( IssueManagement issueManagement ) + { + this.issueManagement = issueManagement; + } + + public Scm getScm() + { + return scm; + } + + public void setScm( Scm scm ) + { + this.scm = scm; + } + + public CiManagement getCiManagement() + { + return ciManagement; + } + + public void setCiManagement( CiManagement ciManagement ) + { + this.ciManagement = ciManagement; + } + + public List getLicenses() + { + return licenses; + } + + public void setLicenses( List licenses ) + { + this.licenses = licenses; + } + + public void addLicense( License license ) + { + if ( this.licenses == null ) + { + this.licenses = new ArrayList(); + } + this.licenses.add( license ); + } + + public void addFacet( ProjectVersionFacet mavenProjectFacet ) + { + if ( this.facets == null ) + { + this.facets = new HashMap(); + } + this.facets.put( mavenProjectFacet.getFacetId(), mavenProjectFacet ); + } + + public ProjectVersionFacet getFacet( String facetId ) + { + return this.facets.get( facetId ); + } +} -- cgit v1.2.3