geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r512525 - in /geronimo/server/trunk: applications/geronimo-dojo/pom.xml pom.xml repository/pom.xml
Date Wed, 28 Feb 2007 00:42:37 GMT
Author: jdillon
Date: Tue Feb 27 16:42:37 2007
New Revision: 512525

URL: http://svn.apache.org/viewvc?view=rev&rev=512525
Log:
Add dojo to DM, using dojoVersion property because this value is needed by plugin than can't
use DM
Added jstl to repository config and fixed indent

Modified:
    geronimo/server/trunk/applications/geronimo-dojo/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/repository/pom.xml

Modified: geronimo/server/trunk/applications/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-dojo/pom.xml?view=diff&rev=512525&r1=512524&r2=512525
==============================================================================
--- geronimo/server/trunk/applications/geronimo-dojo/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-dojo/pom.xml Tue Feb 27 16:42:37 2007
@@ -48,10 +48,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <dojoVersion>0.4.1</dojoVersion>
-    </properties>
-
     <!-- this build process extracts certain files from dojo.zip
          into a webapp. -->
     <build>
@@ -70,7 +66,6 @@
                                 <artifactItem>
                                     <groupId>org.dojotoolkit</groupId>
                                     <artifactId>dojo</artifactId>
-                                    <version>${dojoVersion}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/</outputDirectory>
                                 </artifactItem>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=512525&r1=512524&r2=512525
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Feb 27 16:42:37 2007
@@ -81,7 +81,12 @@
         HACK: Used by uddi-jetty and uddi-tomcat config plans
         -->
         <tranqlVendorsVersion>1.3-SNAPSHOT</tranqlVendorsVersion>
-
+        
+        <!--
+        HACK: Used by applications/geronimo-dojo
+        -->
+        <dojoVersion>0.4.1</dojoVersion>
+        
         <cxfVersion>2.0-incubator-RC-SNAPSHOT</cxfVersion>
     </properties>
 
@@ -1353,6 +1358,13 @@
 			    <artifactId>woden</artifactId>
 			    <version>1.0-incubating-SNAPSHOT</version>
 		    </dependency>
+            
+            <dependency>
+                <groupId>org.dojotoolkit</groupId>
+                <artifactId>dojo</artifactId>
+                <version>${dojoVersion}</version>
+                <type>zip</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?view=diff&rev=512525&r1=512524&r2=512525
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Tue Feb 27 16:42:37 2007
@@ -19,9 +19,9 @@
 <!-- $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>
@@ -32,42 +32,51 @@
     <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>
+        <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
             <scope>provided</scope>
         </dependency>
 
-      <dependency>
+        <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        
         <dependency>
-          <groupId>org.dojotoolkit</groupId>
-          <artifactId>dojo</artifactId>
-          <version>0.4.1</version>
-          <type>zip</type>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojo</artifactId>
+            <type>zip</type>
         </dependency>
-
     </dependencies>
-    
-   <repositories>
-      <repository>
+
+    <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>
-    
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
 </project>



Mime
View raw message