2009/7/14 <[email protected]>
Author: jaydm
Date: Mon Jul 13 19:55:49 2009
New Revision: 793687
URL: http://svn.apache.org/viewvc?rev=793687&view=rev
Log:
GERONIMO-2732: Committed the changes to switch to the published
Dojo artifacts.
Modified:
geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/
dependencies.xml
geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/history/
dependencies.xml
geronimo/server/trunk/plugins/dojo/pom.xml
Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml?rev=793687&r1=793686&r2=793687&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml Mon Jul 13
19:55:49 2009
@@ -41,19 +41,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo</artifactId>
- <version>${version}</version>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo-war</artifactId>
+ <version>1.3.0</version>
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -83,17 +83,13 @@
<deploymentConfig>${jettyDeployer}</
deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.modules</
groupId>
- <artifactId>geronimo-dojo</artifactId>
- <version>${version}</version>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo-war</artifactId>
+ <version>1.3.0</version>
<type>war</type>
</module>
<category>Web Framework</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/
history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml?rev=793687&r1=793686&r2=793687&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/
dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/
dependencies.xml Mon Jul 13 19:55:49 2009
@@ -6,9 +6,4 @@
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml?rev=793687&r1=793686&r2=793687&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml Mon Jul
13 19:55:49 2009
@@ -41,19 +41,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo</artifactId>
- <version>${version}</version>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo-war</artifactId>
+ <version>1.3.0</version>
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -83,17 +83,13 @@
<deploymentConfig>${tomcatDeployer}</
deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.modules</
groupId>
- <artifactId>geronimo-dojo</artifactId>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
<category>Web Framework</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/
history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/history/dependencies.xml?rev=793687&r1=793686&r2=793687&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/history/
dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/history/
dependencies.xml Mon Jul 13 19:55:49 2009
@@ -6,9 +6,4 @@
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/pom.xml?rev=793687&r1=793686&r2=793687&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugins/dojo/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/pom.xml Mon Jul 13 19:55:49
2009
@@ -39,7 +39,7 @@
<modules>
<module>dojo-jetty</module>
<module>dojo-tomcat</module>
- <module>geronimo-dojo</module>
+ <!--<module>geronimo-dojo</module>-->
</modules>
</project>
--
Ivan