geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r424887 - in /geronimo/sandbox/svkmerge/geronimo-repository: geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repo...
Date Mon, 24 Jul 2006 02:59:18 GMT
Author: jdillon
Date: Sun Jul 23 19:59:17 2006
New Revision: 424887

URL: http://svn.apache.org/viewvc?rev=424887&view=rev
Log:
Normalize headers and interfaces
Added come javadocs

Modified:
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Artifact.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactManager.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactTypeHandler.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Dependency.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Environment.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ListableRepository.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MissingDependencyException.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MultipleMatchesException.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Repository.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Version.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WritableListableRepository.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WriteableRepository.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
    geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Artifact.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Artifact.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Artifact.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Artifact.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2006 The Apache Software Foundation
+ *  Copyright 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.

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactManager.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactManager.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactManager.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.Set;
@@ -23,7 +23,10 @@
  * @version $Rev$ $Date$
  */
 public interface ArtifactManager {
+
     void loadArtifacts(Artifact artifact, Set artifacts);
+
     void unloadAllArtifacts(Artifact artifact);
+
     SortedSet getLoadedArtifacts(Artifact query);
 }

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.Collection;

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactTypeHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactTypeHandler.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactTypeHandler.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ArtifactTypeHandler.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.io.InputStream;
@@ -24,5 +24,6 @@
  * @version $Rev$ $Date$
  */
 public interface ArtifactTypeHandler {
+    
     void install(InputStream source, int size, Artifact artifactId, FileWriteMonitor monitor,
File target) throws IOException;
 }

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.ArrayList;
@@ -33,7 +33,9 @@
  * @version $Rev$ $Date$
  */
 public class DefaultArtifactManager implements ArtifactManager {
+
     private final Map artifactsByLoader = new HashMap();
+
     private final Map artifactsByArtifact = new HashMap();
 
     public void loadArtifacts(Artifact loader, Set artifacts) {

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.Collection;
@@ -32,8 +32,11 @@
  * @version $Rev$ $Date$
  */
 public class DefaultArtifactResolver implements ArtifactResolver {
+
     private final ArtifactManager artifactManager;
+
     private final Collection repositories;
+
     private final Map explicitResolution;
 
     public DefaultArtifactResolver(ArtifactManager artifactManager, ListableRepository repository)
{
@@ -47,7 +50,6 @@
         this.repositories = repositories;
         this.explicitResolution = explicitResolution == null? Collections.EMPTY_MAP: explicitResolution;
     }
-
 
     public Artifact generateArtifact(Artifact source, String defaultType) {
         if(source.isResolved()) {

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Dependency.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Dependency.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Dependency.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.io.Serializable;
@@ -26,8 +26,11 @@
  * @version $Rev$ $Date$
  */
 public class Dependency implements Serializable {
+
     private static final long serialVersionUID = -1940822102064150145L;
+
     private final Artifact artifact;
+
     private final ImportType importType;
 
     public Dependency(Artifact artifact, ImportType importType) {

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Environment.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Environment.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Environment.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Environment.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2006 The Apache Software Foundation
+ *  Copyright 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.

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2003-2004 The Apache Software Foundation
+ *  Copyright 2003-2004 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 /**
@@ -22,6 +22,7 @@
  * @version $Rev$ $Date$
  */
 public interface FileWriteMonitor {
+
     /**
      * @param fileSize If it's known ahead of time, this is the total size of
      *                 the file to be written.  This would typically be the
@@ -29,16 +30,16 @@
      *                 necessarily for a download.  If the file size is not
      *                 known, this will be set to a negative number.
      */
-    public void writeStarted(String fileDescription, int fileSize);
+    void writeStarted(String fileDescription, int fileSize);
 
     /**
      * The running count of bytes written.
      */
-    public void writeProgress(int bytes);
+    void writeProgress(int bytes);
 
     /**
      * Indicates that the write completed with the specified number
      * of total bytes.
      */
-    public void writeComplete(int bytes);
+    void writeComplete(int bytes);
 }

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.io.Serializable;

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ListableRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ListableRepository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ListableRepository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/ListableRepository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2003-2004 The Apache Software Foundation
+ *  Copyright 2003-2004 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.SortedSet;
@@ -26,11 +26,12 @@
  * @version $Rev$ $Date$
  */
 public interface ListableRepository extends Repository {
+
     /**
      * Gets a set (with entries of type Artifact) of all the items available
      * in the repository.
      */
-    public SortedSet list();
+    SortedSet list();
 
     /**
      * Gets a set (with entries of type Artifact) of all the available items
@@ -38,5 +39,5 @@
      * (so the results all match whatever fields are specified on the argument
      * Artifact).
      */
-    public SortedSet list(Artifact query);
+    SortedSet list(Artifact query);
 }

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MissingDependencyException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MissingDependencyException.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MissingDependencyException.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MissingDependencyException.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2003-2004 The Apache Software Foundation
+ *  Copyright 2003-2004 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.
@@ -21,6 +20,7 @@
  * @version $Rev$ $Date$
  */
 public class MissingDependencyException extends Exception {
+
     public MissingDependencyException() {
     }
 

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MultipleMatchesException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MultipleMatchesException.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MultipleMatchesException.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/MultipleMatchesException.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 /**

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Repository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Repository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Repository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Repository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2003-2004 The Apache Software Foundation
+ *  Copyright 2003-2004 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.
@@ -17,9 +16,6 @@
 
 package org.apache.geronimo.kernel.repository;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
 import java.io.File;
 import java.util.LinkedHashSet;
 

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Version.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Version.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Version.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/Version.java
Sun Jul 23 19:59:17 2006
@@ -1,30 +1,32 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
+/**
+ *  Copyright 2001-2005 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
+ *  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
+ *     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.
+ *  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.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 import java.util.StringTokenizer;
 import java.io.Serializable;
 
+// This code was lifted from Apache Maven
+
 /**
  * Default implementation of artifact versioning.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
-// This code was lifted from Apache Maven
 public class Version implements Comparable, Serializable {
     // Geronimo adds Serial UID because we serialize versions into config.ser
     private static final long serialVersionUID = 7941704456058067109L;

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WritableListableRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WritableListableRepository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WritableListableRepository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WritableListableRepository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
 /**

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WriteableRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WriteableRepository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WriteableRepository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-api/src/main/java/org/apache/geronimo/kernel/repository/WriteableRepository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2003-2004 The Apache Software Foundation
+ *  Copyright 2003-2004 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.
@@ -14,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.kernel.repository;
 
-import java.net.URI;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,7 +39,7 @@
      *                     where it should save the data to
      * @param monitor      Tracks the progress of the installation
      */
-    public void copyToRepository(File source, Artifact destination, FileWriteMonitor monitor)
throws IOException;
+    void copyToRepository(File source, Artifact destination, FileWriteMonitor monitor) throws
IOException;
 
     /**
      * Copies the contents of an arbitrary stream into the repository.
@@ -55,5 +54,5 @@
      *                     where it should save the data to
      * @param monitor      Tracks the progress of the installation
      */
-    public void copyToRepository(InputStream source, int size, Artifact destination, FileWriteMonitor
monitor) throws IOException;
+    void copyToRepository(InputStream source, int size, Artifact destination, FileWriteMonitor
monitor) throws IOException;
 }

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.system.repository;
 
 import java.io.File;
@@ -35,6 +35,8 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
 /**
+ * Geronimo repository that implements the Maven1 repository format.
+ *
  * @version $Rev$ $Date$
  */
 public class Maven1Repository extends AbstractRepository implements WritableListableRepository
{

Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java?rev=424887&r1=424886&r2=424887&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
(original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
Sun Jul 23 19:59:17 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 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.
@@ -14,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.system.repository;
 
 import java.io.File;
@@ -31,6 +31,8 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 
 /**
+ * Geronimo repository that implements the Maven2 repository format.
+ * 
  * @version $Rev$ $Date$
  */
 public class Maven2Repository extends AbstractRepository implements WritableListableRepository
{



Mime
View raw message