You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2006/09/24 13:14:25 UTC

svn commit: r449394 - in /geronimo/server/branches/1.1: assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/minimal-jetty-server/ assemblies/minimal-tomcat-server/ configs/client/ configs/ldap-realm/

Author: jlaskowski
Date: Sun Sep 24 04:14:24 2006
New Revision: 449394

URL: http://svn.apache.org/viewvc?view=rev&rev=449394
Log:
GERONIMO-2429 - Branches/1.1 - Several project.xml files are referencing jaxr-api-0.5.jar which does not seem to exist anymore

Submitted by: Jay D. McHugh

Modified:
    geronimo/server/branches/1.1/assemblies/j2ee-jetty-server/project.xml
    geronimo/server/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
    geronimo/server/branches/1.1/assemblies/minimal-jetty-server/project.xml
    geronimo/server/branches/1.1/assemblies/minimal-tomcat-server/project.xml
    geronimo/server/branches/1.1/configs/client/project.xml
    geronimo/server/branches/1.1/configs/ldap-realm/project.xml

Modified: geronimo/server/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/assemblies/j2ee-jetty-server/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/server/branches/1.1/assemblies/j2ee-jetty-server/project.xml Sun Sep 24 04:14:24 2006
@@ -859,12 +859,6 @@
 
         <dependency>
             <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>scout</groupId>
             <artifactId>scout</artifactId>
             <version>${scout_version}</version>
         </dependency>

Modified: geronimo/server/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/server/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Sun Sep 24 04:14:24 2006
@@ -855,12 +855,6 @@
 
         <dependency>
             <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>scout</groupId>
             <artifactId>scout</artifactId>
             <version>${scout_version}</version>
         </dependency>

Modified: geronimo/server/branches/1.1/assemblies/minimal-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/assemblies/minimal-jetty-server/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/assemblies/minimal-jetty-server/project.xml (original)
+++ geronimo/server/branches/1.1/assemblies/minimal-jetty-server/project.xml Sun Sep 24 04:14:24 2006
@@ -524,12 +524,6 @@
 
         <dependency>
             <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>scout</groupId>
             <artifactId>scout</artifactId>
             <version>${scout_version}</version>
         </dependency>

Modified: geronimo/server/branches/1.1/assemblies/minimal-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/assemblies/minimal-tomcat-server/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/assemblies/minimal-tomcat-server/project.xml (original)
+++ geronimo/server/branches/1.1/assemblies/minimal-tomcat-server/project.xml Sun Sep 24 04:14:24 2006
@@ -519,12 +519,6 @@
 
         <dependency>
             <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>scout</groupId>
             <artifactId>scout</artifactId>
             <version>${scout_version}</version>
         </dependency>

Modified: geronimo/server/branches/1.1/configs/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/client/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/configs/client/project.xml (original)
+++ geronimo/server/branches/1.1/configs/client/project.xml Sun Sep 24 04:14:24 2006
@@ -48,8 +48,8 @@
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -270,13 +270,11 @@
             <artifactId>org.mortbay.jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
-       <dependency>
-            <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <version>${geronimo_spec_jaxr_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/1.1/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/ldap-realm/project.xml?view=diff&rev=449394&r1=449393&r2=449394
==============================================================================
--- geronimo/server/branches/1.1/configs/ldap-realm/project.xml (original)
+++ geronimo/server/branches/1.1/configs/ldap-realm/project.xml Sun Sep 24 04:14:24 2006
@@ -120,10 +120,10 @@
             <artifactId>activeio</artifactId>
             <version>${activeio_version}</version>
         </dependency>
-       <dependency>
-            <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <version>${geronimo_spec_jaxr_version}</version>
         </dependency>
 
         <dependency>