You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/24 04:38:53 UTC
svn commit: r424883 - in
/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers:
./ geronimo-repository-common/ geronimo-repository-common/src/
geronimo-repository-common/src/main/
geronimo-repository-common/src/main/java/ geronim...
Author: jdillon
Date: Sun Jul 23 19:38:52 2006
New Revision: 424883
URL: http://svn.apache.org/viewvc?rev=424883&view=rev
Log:
Copy over the remaining repo bits
Added:
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml (with props)
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/repository/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/system/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/system/repository/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java
- copied unchanged from r424798, geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/system/repository/CopyArtifactTypeHandler.java
- copied unchanged from r424798, geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/repository/CopyArtifactTypeHandler.java
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/src/main/java/org/apache/geronimo/system/repository/UnpackArtifactTypeHandler.java
- copied unchanged from r424798, geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/repository/UnpackArtifactTypeHandler.java
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
- copied unchanged from r424798, geronimo/sandbox/svkmerge/m2migration/modules/system/src/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/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
- copied unchanged from r424798, geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/repository/Maven2Repository.java
Modified:
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/pom.xml
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/src/main/java/org/apache/geronimo/repository/jdbm/JdbmRepository.java
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/pom.xml
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/pom.xml
geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/pom.xml
Added: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml?rev=424883&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml (added)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml Sun Jul 23 19:38:52 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-repository-providers</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-repository-common</artifactId>
+ <name>Geronimo Repository Providers :: Common</name>
+ <packaging>jar</packaging>
+
+</project>
Propchange: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-common/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/pom.xml?rev=424883&r1=424882&r2=424883&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/pom.xml (original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/pom.xml Sun Jul 23 19:38:52 2006
@@ -31,8 +31,14 @@
<artifactId>geronimo-repository-jdbm</artifactId>
<name>Geronimo Repository Providers :: JDBM</name>
<packaging>jar</packaging>
-
+
<dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>geronimo-repository-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>jdbm</groupId>
<artifactId>jdbm</artifactId>
Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/src/main/java/org/apache/geronimo/repository/jdbm/JdbmRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/src/main/java/org/apache/geronimo/repository/jdbm/JdbmRepository.java?rev=424883&r1=424882&r2=424883&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/src/main/java/org/apache/geronimo/repository/jdbm/JdbmRepository.java (original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-jdbm/src/main/java/org/apache/geronimo/repository/jdbm/JdbmRepository.java Sun Jul 23 19:38:52 2006
@@ -157,7 +157,7 @@
public void copyToRepository(final InputStream source, final int size, final Artifact destination, final FileWriteMonitor monitor) throws IOException {
assert source != null;
assert destination != null;
- assert monitor != null;
+ // monitor may be null
// size may be == 0
ensureFullyResolved(destination);
Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/pom.xml?rev=424883&r1=424882&r2=424883&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/pom.xml (original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven1/pom.xml Sun Jul 23 19:38:52 2006
@@ -31,5 +31,13 @@
<artifactId>geronimo-repository-maven1</artifactId>
<name>Geronimo Repository Providers :: Maven 1</name>
<packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>geronimo-repository-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/pom.xml?rev=424883&r1=424882&r2=424883&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/pom.xml (original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/geronimo-repository-maven2/pom.xml Sun Jul 23 19:38:52 2006
@@ -31,5 +31,13 @@
<artifactId>geronimo-repository-maven2</artifactId>
<name>Geronimo Repository Providers :: Maven 2</name>
<packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>geronimo-repository-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/pom.xml?rev=424883&r1=424882&r2=424883&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/pom.xml (original)
+++ geronimo/sandbox/svkmerge/geronimo-repository/geronimo-repository-providers/pom.xml Sun Jul 23 19:38:52 2006
@@ -33,6 +33,7 @@
<packaging>pom</packaging>
<modules>
+ <module>geronimo-repository-common</module>
<module>geronimo-repository-maven1</module>
<module>geronimo-repository-maven2</module>
<module>geronimo-repository-jdbm</module>