Author: brett
Date: Mon Jan 30 19:44:13 2006
New Revision: 373689
URL: http://svn.apache.org/viewcvs?rev=373689&view=rev
Log:
copyright and reformat
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/Checksum.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/DefaultRepositoryFileManager.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
Mon Jan 30 19:44:13 2006
@@ -1,12 +1,28 @@
package org.apache.maven.repository.proxy;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.Artifact;
import org.apache.maven.artifact.manager.ChecksumFailedException;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
-import org.apache.maven.repository.proxy.files.DefaultRepositoryFileManager;
import org.apache.maven.repository.proxy.files.Checksum;
+import org.apache.maven.repository.proxy.files.DefaultRepositoryFileManager;
import org.apache.maven.repository.proxy.repository.ProxyRepository;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
@@ -91,11 +107,11 @@
}
}
}
- catch( TransferFailedException e )
+ catch ( TransferFailedException e )
{
throw new ProxyException( e.getMessage(), e );
}
- catch( ResourceDoesNotExistException e)
+ catch ( ResourceDoesNotExistException e )
{
throw new ProxyException( e.getMessage(), e );
}
@@ -129,7 +145,7 @@
ArtifactRepository cache = config.getRepositoryCache();
File target = new File( cache.getBasedir(), path );
- for( Iterator repositories = config.getRepositories().iterator();
repositories.hasNext(); )
+ for ( Iterator repositories = config.getRepositories().iterator();
repositories.hasNext(); )
{
ProxyRepository repository = (ProxyRepository) repositories.next();
@@ -151,8 +167,8 @@
}
catch ( NoSuchAlgorithmException e )
{
- System.out.println( "Skipping checksum validation for
unsupported algorithm: "
- + repository.getChecksum() );
+ System.out.println(
+ "Skipping checksum validation for unsupported
algorithm: " + repository.getChecksum() );
}
if ( connectToRepository( wagon, repository ) )
@@ -163,7 +179,7 @@
int tries = 0;
boolean success = false;
- while( !success )
+ while ( !success )
{
tries++;
@@ -191,8 +207,7 @@
}
catch ( TransferFailedException e )
{
- System.out.println( "Skipping repository " +
repository.getUrl() +
- ": " + e.getMessage() );
+ System.out.println( "Skipping repository " +
repository.getUrl() + ": " + e.getMessage() );
}
catch ( ResourceDoesNotExistException e )
{
@@ -200,8 +215,7 @@
}
catch ( AuthorizationException e )
{
- System.out.println( "Skipping repository " +
repository.getUrl() +
- ": " + e.getMessage() );
+ System.out.println( "Skipping repository " +
repository.getUrl() + ": " + e.getMessage() );
}
catch ( UnsupportedProtocolException e )
{
@@ -234,7 +248,7 @@
}
private boolean doChecksumCheck( ChecksumObserver listener,
ProxyRepository repository, String path, Wagon wagon )
- //throws ChecksumFailedException
+ //throws ChecksumFailedException
{
boolean success = false;
@@ -297,7 +311,10 @@
if ( expectedChecksum.equals( actualChecksum ) )
{
File checksumFile = new File( destination +
checksumFileExtension );
- if ( checksumFile.exists() ) checksumFile.delete();
+ if ( checksumFile.exists() )
+ {
+ checksumFile.delete();
+ }
FileUtils.copyFile( tempChecksumFile, checksumFile );
}
else
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
Mon Jan 30 19:44:13 2006
@@ -1,5 +1,21 @@
package org.apache.maven.repository.proxy;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
/**
* @author Edwin Punzalan
*/
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
Mon Jan 30 19:44:13 2006
@@ -1,12 +1,28 @@
package org.apache.maven.repository.proxy;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.Artifact;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.File;
/**
* @author Edwin Punzalan
@@ -15,6 +31,7 @@
{
File getArtifactFile( Artifact artifact )
throws TransferFailedException, ResourceDoesNotExistException,
IOException;
+
InputStream getArtifactAsStream( Artifact artifact )
throws TransferFailedException, ResourceDoesNotExistException,
IOException;
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
Mon Jan 30 19:44:13 2006
@@ -1,30 +1,49 @@
package org.apache.maven.repository.proxy.configuration;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.repository.proxy.repository.ProxyRepository;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collections;
+import java.util.List;
/**
- * @plexus.component
role="org.apache.maven.repository.proxy.configuration.ProxyConfiguration"
- *
* @author Edwin Punzalan
+ * @plexus.component
role="org.apache.maven.repository.proxy.configuration.ProxyConfiguration"
*/
public class ProxyConfiguration
{
public static final String ROLE = ProxyConfiguration.class.getName();
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private ArtifactRepositoryFactory artifactRepositoryFactory;
private boolean browsable;
+
private ArtifactRepository repoCache;
+
private ArrayList repositories = new ArrayList();
public void setBrowsable( boolean browsable )
@@ -49,7 +68,7 @@
standardPolicy, standardPolicy );
}
- public ArtifactRepository getRepositoryCache( )
+ public ArtifactRepository getRepositoryCache()
{
return repoCache;
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/Checksum.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/Checksum.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/Checksum.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/Checksum.java
Mon Jan 30 19:44:13 2006
@@ -1,5 +1,21 @@
package org.apache.maven.repository.proxy.files;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
/**
* @author Edwin Punzalan
*/
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/DefaultRepositoryFileManager.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/DefaultRepositoryFileManager.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/DefaultRepositoryFileManager.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/files/DefaultRepositoryFileManager.java
Mon Jan 30 19:44:13 2006
@@ -1,5 +1,21 @@
package org.apache.maven.repository.proxy.files;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -67,7 +83,7 @@
List reversedPath = new ArrayList();
StringTokenizer tokenizer = new StringTokenizer( path, "/" );
- while( tokenizer.hasMoreTokens() )
+ while ( tokenizer.hasMoreTokens() )
{
reversedPath.add( 0, tokenizer.nextToken() );
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java?rev=373689&r1=373688&r2=373689&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
Mon Jan 30 19:44:13 2006
@@ -1,9 +1,25 @@
package org.apache.maven.repository.proxy.repository;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.repository.proxy.files.Checksum;
+import org.apache.maven.wagon.observers.ChecksumObserver;
import java.security.NoSuchAlgorithmException;
