You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/07/17 01:04:31 UTC
svn commit: r794898 - in /geronimo/server/trunk: plugins/dojo-legacy/
plugins/dojo-legacy/dojo-legacy-jetty/
plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/
plugins/dojo-legacy/dojo-legacy-tomcat/
plugins/dojo-legacy/dojo-legacy-tomcat/src/main...
Author: djencks
Date: Thu Jul 16 23:04:30 2009
New Revision: 794898
URL: http://svn.apache.org/viewvc?rev=794898&view=rev
Log:
GERONIMO-4750 build the legacy dojo war from source in external. Remove jars from svn repo. Mostly patch from Rex Wang, thanks
Removed:
geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/
geronimo/server/trunk/repository/jtidy/
geronimo/server/trunk/repository/org/dojotoolkit/
Modified:
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/dojo-legacy/pom.xml
geronimo/server/trunk/repository/pom.xml
Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml Thu Jul 16 23:04:30 2009
@@ -30,30 +30,29 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>dojo-legacy-jetty</artifactId>
- <name>Geronimo Plugins, Dojo Legacy :: Jetty6</name>
+ <name>Geronimo Plugins, Dojo Legacy :: Jetty</name>
<packaging>car</packaging>
<description>
The Dojo AJAX library for Geronimo. This binds to /dojo so that
applications needing to add dojo support can simply include a
- reference to /dojo/dojo.js to enable Dojo support.
+ reference to /dojo/0.4/dojo.js to enable Dojo support.
</description>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo-legacy</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.geronimo.ext</groupId>
+ <artifactId>geronimo-dojo-0.4.3</artifactId>
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -83,17 +82,13 @@
<deploymentConfig>${jettyDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo-legacy</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.geronimo.ext</groupId>
+ <artifactId>geronimo-dojo-0.4.3</artifactId>
+ <version>1.0-SNAPSHOT</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-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml Thu Jul 16 23:04:30 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-legacy/dojo-legacy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml Thu Jul 16 23:04:30 2009
@@ -36,24 +36,23 @@
<description>
The Dojo AJAX library for Geronimo. This binds to /dojo so that
applications needing to add dojo support can simply include a
- reference to /dojo/dojo.js to enable Dojo support.
+ reference to /dojo/0.4/dojo.js to enable Dojo support.
</description>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo-legacy</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.geronimo.ext</groupId>
+ <artifactId>geronimo-dojo-0.4.3</artifactId>
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -83,17 +82,13 @@
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-dojo-legacy</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.geronimo.ext</groupId>
+ <artifactId>geronimo-dojo-0.4.3</artifactId>
+ <version>1.0-SNAPSHOT</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-legacy/dojo-legacy-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/history/dependencies.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/history/dependencies.xml Thu Jul 16 23:04:30 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-legacy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/pom.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/pom.xml Thu Jul 16 23:04:30 2009
@@ -36,10 +36,21 @@
Dojo legacy plugin
</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext</groupId>
+ <artifactId>geronimo-dojo-0.4.3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>dojo-legacy-jetty</module>
<module>dojo-legacy-tomcat</module>
- <module>geronimo-dojo-legacy</module>
</modules>
</project>
Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=794898&r1=794897&r2=794898&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Thu Jul 16 23:04:30 2009
@@ -48,17 +48,17 @@
<artifactId>jstl</artifactId>
</dependency>
-->
- <dependency>
- <groupId>org.dojotoolkit</groupId>
- <artifactId>dojo-ajax</artifactId>
- <type>zip</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.dojotoolkit</groupId>-->
+ <!--<artifactId>dojo-ajax</artifactId>-->
+ <!--<type>zip</type>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.dojotoolkit</groupId>
- <artifactId>dojo-mini</artifactId>
- <type>zip</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.dojotoolkit</groupId>-->
+ <!--<artifactId>dojo-mini</artifactId>-->
+ <!--<type>zip</type>-->
+ <!--</dependency>-->
<!--
See GERONIMO-3010 These artifacts are here temporarily while we discuss the proposed change in
@@ -104,11 +104,11 @@
<!--<artifactId>pluto-taglib</artifactId>-->
<!--</dependency>-->
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>8.0-20060801</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>jtidy</groupId>-->
+ <!--<artifactId>jtidy</artifactId>-->
+ <!--<version>8.0-20060801</version>-->
+ <!--</dependency>-->
<!-- See GERONIMO-4266 -->
<dependency>