From: Brett Porter Date: Sat, 14 Jun 2008 06:12:16 +0000 (+0000) Subject: set line ending X-Git-Tag: archiva-r676265~54 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6a1a4915fab010e64d0bc77933f739efca7eb5a;p=archiva.git set line ending git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@667750 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java index 71d6c3bc8..fa7f22616 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java @@ -1,184 +1,184 @@ -package org.apache.maven.archiva.web.action.admin.legacy; - -/* - * 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.configuration.ArchivaConfiguration; -import org.apache.maven.archiva.configuration.Configuration; -import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; -import org.apache.maven.archiva.configuration.LegacyArtifactPath; -import org.apache.maven.archiva.model.ArtifactReference; -import org.apache.maven.archiva.repository.ManagedRepositoryContent; -import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - -import com.opensymphony.webwork.components.ActionError; -import com.opensymphony.xwork.Preparable; - -/** - * Add a LegacyArtifactPath to archiva configuration - * - * @since 1.1 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addLegacyArtifactPathAction" - */ -public class AddLegacyArtifactPathAction - extends PlexusActionSupport - implements Preparable -{ - /** - * @plexus.requirement - */ - private ArchivaConfiguration archivaConfiguration; - - /** - * @plexus.requirement role-hint="legacy" - */ - private ManagedRepositoryContent repositoryContent; - - - private LegacyArtifactPath legacyArtifactPath; - - private String groupId; - - private String artifactId; - - private String version; - - private String classifier; - - private String type; - - - public void prepare() - { - this.legacyArtifactPath = new LegacyArtifactPath(); - } - - public String input() - { - return INPUT; - } - - public String commit() - { - this.legacyArtifactPath.setArtifact( - this.groupId + ":" + this.artifactId + ":" + this.classifier + ":" + this.version + ":" + this.type ); - - // Check the proposed Artifact macthes the path - ArtifactReference artifact = new ArtifactReference(); - - artifact.setGroupId( this.groupId ); - artifact.setArtifactId( this.artifactId ); - artifact.setClassifier( this.classifier ); - artifact.setVersion( this.version ); - artifact.setType( this.type ); - - String path = repositoryContent.toPath( artifact ); - if ( ! path.equals( this.legacyArtifactPath.getPath() ) ) - { - addActionError( "artifact reference does not match the initial path : " + path ); - return ERROR; - } - - Configuration configuration = archivaConfiguration.getConfiguration(); - configuration.addLegacyArtifactPath( legacyArtifactPath ); - return saveConfiguration( configuration ); - } - - public LegacyArtifactPath getLegacyArtifactPath() - { - return legacyArtifactPath; - } - - public void setLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath ) - { - this.legacyArtifactPath = legacyArtifactPath; - } - - protected String saveConfiguration( Configuration configuration ) - { - try - { - archivaConfiguration.save( configuration ); - addActionMessage( "Successfully saved configuration" ); - } - catch ( IndeterminateConfigurationException e ) - { - addActionError( e.getMessage() ); - return INPUT; - } - catch ( RegistryException e ) - { - addActionError( "Configuration Registry Exception: " + e.getMessage() ); - return INPUT; - } - - return SUCCESS; - } - - public String getGroupId() - { - return groupId; - } - - public void setGroupId( String groupId ) - { - this.groupId = groupId; - } - - public String getArtifactId() - { - return artifactId; - } - - public void setArtifactId( String artifactId ) - { - this.artifactId = artifactId; - } - - public String getVersion() - { - return version; - } - - public void setVersion( String version ) - { - this.version = version; - } - - public String getClassifier() - { - return classifier; - } - - public void setClassifier( String classifier ) - { - this.classifier = classifier; - } - - public String getType() - { - return type; - } - - public void setType( String type ) - { - this.type = type; - } -} +package org.apache.maven.archiva.web.action.admin.legacy; + +/* + * 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.configuration.ArchivaConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; +import org.apache.maven.archiva.configuration.LegacyArtifactPath; +import org.apache.maven.archiva.model.ArtifactReference; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.codehaus.plexus.registry.RegistryException; +import org.codehaus.plexus.xwork.action.PlexusActionSupport; + +import com.opensymphony.webwork.components.ActionError; +import com.opensymphony.xwork.Preparable; + +/** + * Add a LegacyArtifactPath to archiva configuration + * + * @since 1.1 + * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addLegacyArtifactPathAction" + */ +public class AddLegacyArtifactPathAction + extends PlexusActionSupport + implements Preparable +{ + /** + * @plexus.requirement + */ + private ArchivaConfiguration archivaConfiguration; + + /** + * @plexus.requirement role-hint="legacy" + */ + private ManagedRepositoryContent repositoryContent; + + + private LegacyArtifactPath legacyArtifactPath; + + private String groupId; + + private String artifactId; + + private String version; + + private String classifier; + + private String type; + + + public void prepare() + { + this.legacyArtifactPath = new LegacyArtifactPath(); + } + + public String input() + { + return INPUT; + } + + public String commit() + { + this.legacyArtifactPath.setArtifact( + this.groupId + ":" + this.artifactId + ":" + this.classifier + ":" + this.version + ":" + this.type ); + + // Check the proposed Artifact macthes the path + ArtifactReference artifact = new ArtifactReference(); + + artifact.setGroupId( this.groupId ); + artifact.setArtifactId( this.artifactId ); + artifact.setClassifier( this.classifier ); + artifact.setVersion( this.version ); + artifact.setType( this.type ); + + String path = repositoryContent.toPath( artifact ); + if ( ! path.equals( this.legacyArtifactPath.getPath() ) ) + { + addActionError( "artifact reference does not match the initial path : " + path ); + return ERROR; + } + + Configuration configuration = archivaConfiguration.getConfiguration(); + configuration.addLegacyArtifactPath( legacyArtifactPath ); + return saveConfiguration( configuration ); + } + + public LegacyArtifactPath getLegacyArtifactPath() + { + return legacyArtifactPath; + } + + public void setLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath ) + { + this.legacyArtifactPath = legacyArtifactPath; + } + + protected String saveConfiguration( Configuration configuration ) + { + try + { + archivaConfiguration.save( configuration ); + addActionMessage( "Successfully saved configuration" ); + } + catch ( IndeterminateConfigurationException e ) + { + addActionError( e.getMessage() ); + return INPUT; + } + catch ( RegistryException e ) + { + addActionError( "Configuration Registry Exception: " + e.getMessage() ); + return INPUT; + } + + return SUCCESS; + } + + public String getGroupId() + { + return groupId; + } + + public void setGroupId( String groupId ) + { + this.groupId = groupId; + } + + public String getArtifactId() + { + return artifactId; + } + + public void setArtifactId( String artifactId ) + { + this.artifactId = artifactId; + } + + public String getVersion() + { + return version; + } + + public void setVersion( String version ) + { + this.version = version; + } + + public String getClassifier() + { + return classifier; + } + + public void setClassifier( String classifier ) + { + this.classifier = classifier; + } + + public String getType() + { + return type; + } + + public void setType( String type ) + { + this.type = type; + } +}