From: Olivier Lamy Date: Fri, 9 Sep 2011 14:41:48 +0000 (+0000) Subject: remove no more use beans : see previous commit X-Git-Tag: archiva-1.4-M1~336 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2e2934ff940430f71e0ceea0f341fdef653b6c64;p=archiva.git remove no more use beans : see previous commit git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1167225 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/RepositoryScanning.java b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/RepositoryScanning.java deleted file mode 100644 index 7a91b89e9..000000000 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/RepositoryScanning.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.apache.archiva.admin.repository.admin; -/* - * 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.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Olivier Lamy - */ -public class RepositoryScanning - implements Serializable -{ - /** - * Field fileTypes. - */ - private List fileTypes; - - /** - * Field knownContentConsumers. - */ - private List knownContentConsumers; - - /** - * Field invalidContentConsumers. - */ - private List invalidContentConsumers; - - public RepositoryScanning() - { - // no op - } - - public RepositoryScanning( List fileTypes, List knownContentConsumers, - List invalidContentConsumers ) - { - this.fileTypes = fileTypes; - this.knownContentConsumers = knownContentConsumers; - this.invalidContentConsumers = invalidContentConsumers; - } - - public List getFileTypes() - { - if ( this.fileTypes == null ) - { - this.fileTypes = new ArrayList(); - } - return fileTypes; - } - - public void setFileTypes( List fileTypes ) - { - this.fileTypes = fileTypes; - } - - public List getKnownContentConsumers() - { - if ( this.knownContentConsumers == null ) - { - this.knownContentConsumers = new ArrayList(); - } - return knownContentConsumers; - } - - public void setKnownContentConsumers( List knownContentConsumers ) - { - this.knownContentConsumers = knownContentConsumers; - } - - public List getInvalidContentConsumers() - { - if ( this.invalidContentConsumers == null ) - { - this.invalidContentConsumers = new ArrayList(); - } - return invalidContentConsumers; - } - - public void setInvalidContentConsumers( List invalidContentConsumers ) - { - this.invalidContentConsumers = invalidContentConsumers; - } -} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScanning.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScanning.java deleted file mode 100644 index 870b9c3ed..000000000 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScanning.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.apache.archiva.rest.api.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 javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Olivier Lamy - */ -@XmlRootElement( name = "repositoryScanning" ) -public class RepositoryScanning - implements Serializable -{ - /** - * Field fileTypes. - */ - private List fileTypes; - - /** - * Field knownContentConsumers. - */ - private List knownContentConsumers; - - /** - * Field invalidContentConsumers. - */ - private List invalidContentConsumers; - - public RepositoryScanning() - { - // no op - } - - public RepositoryScanning( List fileTypes, List knownContentConsumers, - List invalidContentConsumers ) - { - this.fileTypes = fileTypes; - this.knownContentConsumers = knownContentConsumers; - this.invalidContentConsumers = invalidContentConsumers; - } - - public List getFileTypes() - { - if ( this.fileTypes == null ) - { - this.fileTypes = new ArrayList(); - } - return fileTypes; - } - - public void setFileTypes( List fileTypes ) - { - this.fileTypes = fileTypes; - } - - public List getKnownContentConsumers() - { - if ( this.knownContentConsumers == null ) - { - this.knownContentConsumers = new ArrayList(); - } - return knownContentConsumers; - } - - public void setKnownContentConsumers( List knownContentConsumers ) - { - this.knownContentConsumers = knownContentConsumers; - } - - public List getInvalidContentConsumers() - { - if ( this.invalidContentConsumers == null ) - { - this.invalidContentConsumers = new ArrayList(); - } - return invalidContentConsumers; - } - - public void setInvalidContentConsumers( List invalidContentConsumers ) - { - this.invalidContentConsumers = invalidContentConsumers; - } - - @Override - public String toString() - { - final StringBuilder sb = new StringBuilder(); - sb.append( "RepositoryScanning" ); - sb.append( "{fileTypes=" ).append( fileTypes ); - sb.append( ", knownContentConsumers=" ).append( knownContentConsumers ); - sb.append( ", invalidContentConsumers=" ).append( invalidContentConsumers ); - sb.append( '}' ); - return sb.toString(); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java index 29f122b04..c61810965 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java @@ -25,7 +25,6 @@ import org.apache.archiva.admin.repository.RepositoryAdminException; import org.apache.archiva.admin.repository.admin.ArchivaAdministration; import org.apache.archiva.admin.repository.admin.FileType; import org.apache.archiva.admin.repository.admin.FiletypeToMapClosure; -import org.apache.archiva.admin.repository.admin.RepositoryScanning; import org.apache.archiva.audit.Auditable; import org.apache.archiva.repository.scanner.RepositoryContentConsumers; import org.apache.archiva.security.common.ArchivaRoleConstants;