geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r512568 - in /geronimo/server/branches/1.2: ./ applications/console/geronimo-console-standard/ applications/console/geronimo-console-standard/repository/dwr/ applications/geronimo-dojo/ applications/geronimo-dojo/repository/org/ application...
Date Wed, 28 Feb 2007 02:27:31 GMT
Author: prasad
Date: Tue Feb 27 18:27:30 2007
New Revision: 512568

URL: http://svn.apache.org/viewvc?view=rev&rev=512568
Log:
* created a local repository at the top level.
* moved module repos to the top level local repo.

Added:
    geronimo/server/branches/1.2/repository/
    geronimo/server/branches/1.2/repository/dwr/
      - copied from r512499, geronimo/server/branches/1.2/applications/console/geronimo-console-standard/repository/dwr/
    geronimo/server/branches/1.2/repository/juddi/
      - copied from r512499, geronimo/server/branches/1.2/applications/geronimo-uddi-server/repository/juddi/
    geronimo/server/branches/1.2/repository/org/
      - copied from r512499, geronimo/server/branches/1.2/applications/geronimo-dojo/repository/org/
    geronimo/server/branches/1.2/repository/pom.xml   (with props)
Removed:
    geronimo/server/branches/1.2/applications/console/geronimo-console-standard/repository/dwr/
    geronimo/server/branches/1.2/applications/geronimo-dojo/repository/org/
    geronimo/server/branches/1.2/applications/geronimo-uddi-server/repository/juddi/
Modified:
    geronimo/server/branches/1.2/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/branches/1.2/applications/geronimo-dojo/pom.xml
    geronimo/server/branches/1.2/applications/geronimo-uddi-server/pom.xml
    geronimo/server/branches/1.2/pom.xml

Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=512568&r1=512567&r2=512568
==============================================================================
--- geronimo/server/branches/1.2/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/branches/1.2/applications/console/geronimo-console-standard/pom.xml Tue
Feb 27 18:27:30 2007
@@ -165,23 +165,4 @@
         </plugins>
     </build>
     
-    <!--
-    HACK: dwr:dwr:jar:1.1.1 is not available on a m2 repo, so include them here
-          to avoid needing to setup an m1 repo which causes problems resolving
-          dependencies.
-    -->
-    <repositories>
-        <repository>
-            <id>module-local</id>
-            <url>file://${pom.basedir}/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    
 </project>

Modified: geronimo/server/branches/1.2/applications/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/geronimo-dojo/pom.xml?view=diff&rev=512568&r1=512567&r2=512568
==============================================================================
--- geronimo/server/branches/1.2/applications/geronimo-dojo/pom.xml (original)
+++ geronimo/server/branches/1.2/applications/geronimo-dojo/pom.xml Tue Feb 27 18:27:30 2007
@@ -51,20 +51,6 @@
     <!-- the dojo.zip file is not available in a maven repo yet
          so its kept here in a local repo for the time being -->
     
-    <repositories>
-        <repository>
-            <id>module-local</id>
-            <url>file://${pom.basedir}/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <properties>
         <dojoVersion>0.4.1</dojoVersion>
     </properties>

Modified: geronimo/server/branches/1.2/applications/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/geronimo-uddi-server/pom.xml?view=diff&rev=512568&r1=512567&r2=512568
==============================================================================
--- geronimo/server/branches/1.2/applications/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/branches/1.2/applications/geronimo-uddi-server/pom.xml Tue Feb 27 18:27:30
2007
@@ -70,21 +70,4 @@
         </plugins>
     </build>
     
-    <!--
-    HACK: Include local repo to pick up juddi:juddi:jar:0.9rc4
-    -->
-    <repositories>
-        <repository>
-            <id>module-local</id>
-            <url>file://${pom.basedir}/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    
 </project>

Modified: geronimo/server/branches/1.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/pom.xml?view=diff&rev=512568&r1=512567&r2=512568
==============================================================================
--- geronimo/server/branches/1.2/pom.xml (original)
+++ geronimo/server/branches/1.2/pom.xml Tue Feb 27 18:27:30 2007
@@ -19,9 +19,7 @@
 <!-- $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.genesis.config</groupId>
         <artifactId>project-config</artifactId>
@@ -44,7 +42,7 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/trunk</url>
     </scm>
-    
+
     <prerequisites>
         <maven>2.0.5</maven>
     </prerequisites>
@@ -698,7 +696,7 @@
                 <version>${openejbVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>openejb-builder</artifactId>
                 <version>${openejbVersion}</version>
@@ -994,12 +992,14 @@
                     <extensions>true</extensions>
                 </plugin>
                 
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.0-alpha-1</version>
                 </plugin>
                 
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
@@ -1041,6 +1041,7 @@
                     </executions>
                 </plugin>
                 
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>sql-maven-plugin</artifactId>
@@ -1161,6 +1162,7 @@
                                 </options>
                             </optionSet>
                             
+
                             <optionSet>
                                 <id>debug</id>
                                 <options>
@@ -1206,6 +1208,7 @@
                         </configuration>
                     </execution>
                     
+
                     <execution>
                         <id>verify-legal-files</id>
                         <phase>verify</phase>
@@ -1245,7 +1248,7 @@
                     <tagBase>https://svn.apache.org/repos/asf/geronimo/server/tags</tagBase>
                 </configuration>
             </plugin>
-         </plugins>
+        </plugins>
     </build>
 
     <repositories>
@@ -1290,6 +1293,7 @@
             </activation>
 
             <modules>
+                <module>repository</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1356,6 +1360,7 @@
                       includes most modules, so for now just build everything.
                       Fix this when the modules are reorganized.
                 -->
+                <module>repository</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1390,6 +1395,7 @@
             </activation>
 
             <modules>
+                <module>repository</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1415,6 +1421,7 @@
             </activation>
 
             <modules>
+                <module>repository</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>

Added: geronimo/server/branches/1.2/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/repository/pom.xml?view=auto&rev=512568
==============================================================================
--- geronimo/server/branches/1.2/repository/pom.xml (added)
+++ geronimo/server/branches/1.2/repository/pom.xml Tue Feb 27 18:27:30 2007
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $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</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>repository</artifactId>
+    <name>Geronimo Local Repository</name>
+    <packaging>jar</packaging>
+    
+    <description>
+        Container for local artifacts, this is a temporary solution until a more
+        permeant Geronimo specific repository solution can be implemented.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>dwr</groupId>
+            <artifactId>dwr</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>juddi</groupId>
+            <artifactId>juddi</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojo</artifactId>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>module-local</id>
+            <name>Local Repository</name>
+            <url>file://${pom.basedir}/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+</project>

Propchange: geronimo/server/branches/1.2/repository/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/1.2/repository/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/1.2/repository/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message