Author: hboutemy Date: Sun Feb 15 11:18:34 2009 New Revision: 744656 URL: http://svn.apache.org/viewvc?rev=744656&view=rev Log: o coding style fixes o added missing license headers
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; @@ -13,7 +32,7 @@ public class AbstractAntTask extends Task { - private static final Language LANG = new DefaultLanguage( ResolveTask.class ); + private static final Language LANG = new DefaultLanguage( AbstractAntTask.class ); protected boolean _failOnError = true; Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.tools.ant.ProjectComponent; /** Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import java.io.IOException; Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.Collection; import java.util.List; Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import java.util.ArrayList; import java.util.Iterator; @@ -84,7 +103,7 @@ // MavenEmbedder embedder = new MavenEmbedder( configuration ); // // PlexusContainer container = embedder.getPlexusContainer(); - // + // // return embedder; // } private List<ArtifactBasicMetadata> getDependencies( VirtualRepositoryReader vr ) @@ -118,7 +137,9 @@ File pomFile = new File( d._pom ); if ( !pomFile.exists() ) + { throw new RepositoryException( "pom file " + d._pom + " does not exist" ); + } try { @@ -174,11 +195,11 @@ // throws Exception // { // ArtifactRepositoryLayout repoLayout = new DefaultRepositoryLayout(); - // + // // ArtifactRepository r = new DefaultArtifactRepository( "local", // "file://" + path, // repoLayout ); - // + // // return r; // } @@ -292,12 +313,16 @@ private List<ArtifactMetadata> toArtifactMetadataList( List<ArtifactBasicMetadata> depList ) { if ( Util.isEmpty( depList ) ) + { return null; + } List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( depList.size() ); for ( ArtifactBasicMetadata bmd : depList ) + { res.add( new ArtifactMetadata( bmd ) ); + } return res; } @@ -319,7 +344,9 @@ super.setId( id ); if ( _sourceDependency != null ) + { _sourceDependency.setId( id ); + } } public void setSource( String pom ) @@ -327,7 +354,9 @@ _sourceDependency = createDependency(); if ( getId() != null ) + { _sourceDependency.setId( getId() ); + } _sourceDependency.setPom( pom ); } Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.mercury.artifact.ArtifactBasicMetadata; import org.codehaus.plexus.lang.DefaultLanguage; import org.codehaus.plexus.lang.Language; @@ -54,7 +73,9 @@ this._pom = pom.substring( pos + 1 ); } else + { this._pom = pom; + } } public void setGroupId( String groupId ) Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import java.net.MalformedURLException; import java.net.URL; @@ -30,7 +49,7 @@ /** * repository data type - * + * * @author Oleg Gusakov * @version $Id$ */ @@ -150,9 +169,13 @@ public void setLocation( String path ) { if ( FileUtil.isLocalResource( path ) ) + { setDir( path ); + } else + { setUrl( path ); + } } public void setType( String type ) @@ -179,7 +202,9 @@ public void setLayout( String layout ) { if ( layout == null ) + { throw new IllegalArgumentException( LANG.getMessage( "repo.null.layout" ) ); + } boolean notSupported = true; @@ -195,7 +220,9 @@ } if ( notSupported ) + { throw new IllegalArgumentException( LANG.getMessage( "repo.layout.not.supported", layout ) ); + } processDefaults(); } Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import java.util.ArrayList; import java.util.Collection; @@ -21,11 +40,11 @@ public class ResolveTask extends AbstractAntTask { - private static final Language _lang = new DefaultLanguage( ResolveTask.class ); + private static final Language LANG = new DefaultLanguage( ResolveTask.class ); - public static final String TASK_NAME = _lang.getMessage( "resolve.task.name" ); + public static final String TASK_NAME = LANG.getMessage( "resolve.task.name" ); - public static final String TASK_DESC = _lang.getMessage( "resolve.task.desc" ); + public static final String TASK_DESC = LANG.getMessage( "resolve.task.desc" ); private String _pathId; @@ -70,7 +89,7 @@ if ( ( _depId == null ) && Util.isEmpty( _dependencies ) ) { - throwIfEnabled( _lang.getMessage( "no.dep.id" ) ); + throwIfEnabled( LANG.getMessage( "no.dep.id" ) ); return; } @@ -80,13 +99,13 @@ if ( d == null ) { - throwIfEnabled( _lang.getMessage( "no.dep", _depId ) ); + throwIfEnabled( LANG.getMessage( "no.dep", _depId ) ); return; } if ( !Dep.class.isAssignableFrom( d.getClass() ) ) { - throwIfEnabled( _lang.getMessage( "bad.dep", _depId, d.getClass().getName(), Dep.class.getName() ) ); + throwIfEnabled( LANG.getMessage( "bad.dep", _depId, d.getClass().getName(), Dep.class.getName() ) ); return; } @@ -107,7 +126,7 @@ { if ( getProject().getReference( _pathId ) != null ) { - throwIfEnabled( _lang.getMessage( "path.exists", _pathId ) ); + throwIfEnabled( LANG.getMessage( "path.exists", _pathId ) ); return; } } @@ -117,7 +136,7 @@ if ( p == null ) { - throwIfEnabled( _lang.getMessage( "no.path.ref", _refPathId ) ); + throwIfEnabled( LANG.getMessage( "no.path.ref", _refPathId ) ); return; } @@ -266,7 +285,9 @@ this._id = id; if ( _sourceDependency != null ) + { _sourceDependency.setId( id ); + } } public void setSource( String pom ) @@ -274,7 +295,9 @@ _sourceDependency = createDependency(); if ( _id != null ) + { _sourceDependency.setId( _id ); + } _sourceDependency.setPom( pom ); } Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java Sun Feb 15 11:18:34 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import java.util.ArrayList; import java.util.Collection; Modified: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java Sun Feb 15 11:18:34 2009 @@ -1,13 +1,29 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import org.apache.maven.mercury.spi.http.server.AuthenticatingTestServer; import org.apache.maven.mercury.util.FileUtil; import org.apache.tools.ant.BuildFileTest; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Target; -import org.apache.tools.ant.types.Path; /** * @author Oleg Gusakov Modified: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java?rev=744656&r1=744655&r2=744656&view=diff ============================================================================== --- maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java Sun Feb 15 11:18:34 2009 @@ -1,13 +1,29 @@ package org.apache.maven.mercury.ant.tasks; +/* + * 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.File; import org.apache.maven.mercury.spi.http.server.AuthenticatingTestServer; import org.apache.maven.mercury.util.FileUtil; import org.apache.tools.ant.BuildFileTest; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Target; -import org.apache.tools.ant.types.Path; /** * @author Oleg Gusakov