geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecr...@apache.org
Subject svn commit: r610651 - in /geronimo/server/trunk: ./ applications/monitoring/mconsole-jetty/ applications/monitoring/mconsole-tomcat/ assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ plugins/ plugins/debugviews/debugviews-jetty/ ...
Date Thu, 10 Jan 2008 02:39:11 GMT
Author: ecraig
Date: Wed Jan  9 18:38:31 2008
New Revision: 610651

URL: http://svn.apache.org/viewvc?rev=610651&view=rev
Log:
GERONIMO-3300
Upgrade Dojo to 1.0

-Moved dojo 0.4.3 to dojolegacy artifact to prevent issues/conflicts with 1.0.2, as well as allow both to co-exist
-created dojo-legacy plugin for 0.4.3
-changed dependencies for 0.4.3 to use dojo-legacy plugin
-changed dojo plugin to use 1.0.2
-added dojo 1.0.2 to repository
-set dojo 1.0.2 to default context root of /dojo/1.0
-Dojo 0.4.3 still has default context root of /dojo
-added dojo plugin to default jee5 assemblies


Added:
    geronimo/server/trunk/plugins/dojo-legacy/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/LICENSE.txt
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/NOTICE.txt
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/LICENSE.txt
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/NOTICE.txt
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/LICENSE.txt
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/NOTICE.txt
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/apt/
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/site.xml
    geronimo/server/trunk/plugins/dojo-legacy/pom.xml
    geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/
    geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz   (with props)
    geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz.md5
    geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/
    geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/
    geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz   (with props)
    geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz.md5
Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/repository/pom.xml

Modified: geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml Wed Jan  9 18:38:31 2008
@@ -81,7 +81,7 @@
 	
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
+            <artifactId>dojo-legacy-jetty6</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml Wed Jan  9 18:38:31 2008
@@ -88,7 +88,7 @@
 		
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-tomcat</artifactId>
+            <artifactId>dojo-legacy-tomcat</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Wed Jan  9 18:38:31 2008
@@ -516,6 +516,13 @@
             <type>jar</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-jetty6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <!-- Monitoring plugins -->
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Wed Jan  9 18:38:31 2008
@@ -516,6 +516,13 @@
             <type>jar</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-tomcat</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <!-- Monitoring plugins -->
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-jetty/pom.xml Wed Jan  9 18:38:31 2008
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
+            <artifactId>dojo-legacy-jetty6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml Wed Jan  9 18:38:31 2008
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-tomcat</artifactId>
+            <artifactId>dojo-legacy-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/LICENSE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/LICENSE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/LICENSE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,242 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+#########################################################################
+## APACHE GERONIMO DEPENDENCIES                                        ##
+#########################################################################
+
+A binary distribution of Apache Geronimo includes a number of dependent
+packages with separate copyright notices and license terms. Your use of
+these dependent packages is subject to the terms and conditions of the
+following licenses.
+
+=========================================================================
+==  Dojo License                                                       ==
+=========================================================================
+      
+Copyright (c) 2005, The Dojo Foundation
+All rights reserved.
+      
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+      
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/NOTICE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/NOTICE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/NOTICE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,10 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+This product includes software developed by
+The Dojo Foundation (http://dojotoolkit.org/).

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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: 590482 $ $Date: 2007-10-30 16:51:54 -0500 (Tue, 30 Oct 2007) $ -->
+
+<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.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dojo-legacy-jetty6</artifactId>
+    <name>Geronimo Configs :: Dojo Legacy app - Jetty6</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.
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-dojo-legacy</artifactId>
+            <version>${version}</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>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-dojo-legacy</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+
+                    <category>Web Framework</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>jetty6</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Jetty web container</description>
+                            </prerequisite>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>jasper</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Jasper subsystem</description>
+                            </prerequisite>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/plan.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/src/main/plan/plan.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,19 @@
+<?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: 589946 $ $Date: 2007-10-29 21:53:25 -0500 (Mon, 29 Oct 2007) $-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+  <context-root>/dojo</context-root>
+</web-app>
\ No newline at end of file

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/LICENSE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/LICENSE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/LICENSE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,242 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+#########################################################################
+## APACHE GERONIMO DEPENDENCIES                                        ##
+#########################################################################
+
+A binary distribution of Apache Geronimo includes a number of dependent
+packages with separate copyright notices and license terms. Your use of
+these dependent packages is subject to the terms and conditions of the
+following licenses.
+
+=========================================================================
+==  Dojo License                                                       ==
+=========================================================================
+      
+Copyright (c) 2005, The Dojo Foundation
+All rights reserved.
+      
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+      
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/NOTICE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/NOTICE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/NOTICE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,10 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+This product includes software developed by
+The Dojo Foundation (http://dojotoolkit.org/).

Added: 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=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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: 590482 $ $Date: 2007-10-30 16:51:54 -0500 (Tue, 30 Oct 2007) $ -->
+
+<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.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dojo-legacy-tomcat</artifactId>
+    <name>Geronimo Configs :: Dojo Legacy app - Tomcat</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.
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-dojo-legacy</artifactId>
+            <version>${version}</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>tomcat6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-dojo-legacy</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+
+                    <category>Web Framework</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>tomcat6</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Tomcat web container</description>
+                            </prerequisite>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>jasper</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Jasper subsystem</description>
+                            </prerequisite>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/plan.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/src/main/plan/plan.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,19 @@
+<?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: 589946 $ $Date: 2007-10-29 21:53:25 -0500 (Mon, 29 Oct 2007) $-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+  <context-root>/dojo</context-root>
+</web-app>
\ No newline at end of file

Added: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/LICENSE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/LICENSE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/LICENSE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,242 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+#########################################################################
+## APACHE GERONIMO DEPENDENCIES                                        ##
+#########################################################################
+
+A binary distribution of Apache Geronimo includes a number of dependent
+packages with separate copyright notices and license terms. Your use of
+these dependent packages is subject to the terms and conditions of the
+following licenses.
+
+=========================================================================
+==  Dojo License                                                       ==
+=========================================================================
+      
+Copyright (c) 2005, The Dojo Foundation
+All rights reserved.
+      
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+      
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

Added: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/NOTICE.txt?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/NOTICE.txt (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/NOTICE.txt Wed Jan  9 18:38:31 2008
@@ -0,0 +1,10 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+This product includes software developed by
+The Dojo Foundation (http://dojotoolkit.org/).

Added: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,122 @@
+<?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: 590482 $ $Date: 2007-10-30 16:51:54 -0500 (Tue, 30 Oct 2007) $ -->
+
+<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.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-dojo-legacy</artifactId>
+    <name>Geronimo Applications :: Dojo Legacy</name>
+    <packaging>war</packaging>
+
+    <description>
+        A web application containing the Dojo library files. This web
+        application makes a shared copy of the files available to
+        all web applications in the server.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojolegacy</artifactId>
+            <version>${dojoLegacyVersion}</version>
+            <type>tgz</type>
+        </dependency>
+    </dependencies>
+
+    <!-- this build process extracts certain files from dojo.tgz into a webapp. -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dojotoolkit</groupId>
+                                    <artifactId>dojolegacy</artifactId>
+                                    <version>${dojoLegacyVersion}</version>
+                                    <type>tgz</type>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.directory}/dojo-${dojoLegacyVersion}-ajax/</directory>
+                            <includes>
+                                <include>src/**</include>
+                                <include>*.js</include>
+                                <include>*.html</include>
+                                <include>*.swf</include>
+                                <include>LICENSE</include>
+                            </includes>
+                        </resource>
+                        
+                        <!--
+                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
+                              or in another jar file in the war.
+                        
+                        NOTE: targetPath is broken for webResources (as documented)
+                        -->
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/web.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/main/webapp/WEB-INF/web.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <display-name>Geronimo Dojo application</display-name>
+    <description>
+        Application containing a shared copy of the Dojo AJAX library
+    </description>
+
+</web-app>

Added: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/site.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/site.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/src/site/site.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,35 @@
+<?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: 470729 $ $Date: 2006-11-03 02:57:55 -0600 (Fri, 03 Nov 2006) $ -->
+
+<project name="${project.name}">
+    
+    <body>
+        
+        ${parentProject}
+        
+        ${modules}
+        
+        ${reports}
+        
+    </body>
+
+</project>
+
+

Added: geronimo/server/trunk/plugins/dojo-legacy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/pom.xml?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/pom.xml (added)
+++ geronimo/server/trunk/plugins/dojo-legacy/pom.xml Wed Jan  9 18:38:31 2008
@@ -0,0 +1,46 @@
+<?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: 590482 $ $Date: 2007-10-30 16:51:54 -0500 (Tue, 30 Oct 2007) $ -->
+
+<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.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dojo-legacy</artifactId>
+    <name>Geronimo Plugins :: dojo-legacy</name>
+    <packaging>pom</packaging>
+
+    <description>
+        dojo-legacy plugin
+    </description>
+
+    <modules>
+<module>dojo-legacy-jetty6</module>
+<module>dojo-legacy-tomcat</module>
+<module>geronimo-dojo-legacy</module>
+    </modules>
+
+</project>

Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/main/plan/plan.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/main/plan/plan.xml Wed Jan  9 18:38:31 2008
@@ -15,5 +15,5 @@
   limitations under the License.-->
 <!--$Rev$ $Date$-->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-  <context-root>/dojo</context-root>
-</web-app>
\ No newline at end of file
+  <context-root>/dojo/1.0</context-root>
+</web-app>

Modified: geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/plan/plan.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/main/plan/plan.xml Wed Jan  9 18:38:31 2008
@@ -15,5 +15,5 @@
     limitations under the License.-->
 <!--$Rev$ $Date$-->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-  <context-root>/dojo</context-root>
-</web-app>
\ No newline at end of file
+  <context-root>/dojo/1.0</context-root>
+</web-app>

Modified: geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml Wed Jan  9 18:38:31 2008
@@ -46,6 +46,12 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojo</artifactId>
+            <version>${dojoVersion}</version>
+            <type>tgz</type>
+        </dependency>
     </dependencies>
 
     <!-- this build process extracts certain files from dojo.tgz into a webapp. -->
@@ -65,6 +71,7 @@
                                 <artifactItem>
                                     <groupId>org.dojotoolkit</groupId>
                                     <artifactId>dojo</artifactId>
+                                    <version>${dojoVersion}</version>
                                     <type>tgz</type>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
@@ -81,7 +88,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>${project.build.directory}/dojo-${dojoVersion}-ajax/</directory>
+                            <directory>${project.build.directory}/dojo-release-${dojoVersion}/</directory>
                             <includes>
                                 <include>src/**</include>
                                 <include>*.js</include>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Jan  9 18:38:31 2008
@@ -104,6 +104,7 @@
         <module>corba</module>
         <module>cxf</module>
         <module>dojo</module>
+        <module>dojo-legacy</module>
         <module>debugviews</module>
         <module>hotdeploy</module>
         <module>j2ee</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Jan  9 18:38:31 2008
@@ -86,7 +86,8 @@
         <!--
         HACK: Used by applications/geronimo-dojo
         -->
-        <dojoVersion>0.4.3</dojoVersion>
+        <dojoVersion>1.0.2</dojoVersion>
+        <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
 
         <cxfVersion>2.0.2-incubator</cxfVersion>
 
@@ -1535,6 +1536,13 @@
                 <groupId>org.dojotoolkit</groupId>
                 <artifactId>dojo</artifactId>
                 <version>${dojoVersion}</version>
+                <type>tgz</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dojotoolkit</groupId>
+                <artifactId>dojolegacy</artifactId>
+                <version>${dojoLegacyVersion}</version>
                 <type>tgz</type>
             </dependency>
 

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz?rev=610651&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz.md5?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz.md5 (added)
+++ geronimo/server/trunk/repository/org/dojotoolkit/dojo/1.0.2/dojo-1.0.2.tgz.md5 Wed Jan  9 18:38:31 2008
@@ -0,0 +1 @@
+cb4fcc660380719e309d197d1c742441  dojo-1.0.2.tgz

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz?rev=610651&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz.md5?rev=610651&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz.md5 (added)
+++ geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/0.4.3/dojolegacy-0.4.3.tgz.md5 Wed Jan  9 18:38:31 2008
@@ -0,0 +1 @@
+edd63c92cd70ae4c3f4539fdaca2a7d9  dojolegacy-0.4.3.tgz

Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=610651&r1=610650&r2=610651&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Wed Jan  9 18:38:31 2008
@@ -52,7 +52,15 @@
 
         <dependency>
             <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojolegacy</artifactId>
+            <version>${dojoLegacyVersion}</version>
+            <type>tgz</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
             <artifactId>dojo</artifactId>
+            <version>${dojoVersion}</version>
             <type>tgz</type>
         </dependency>
 



Mime
View raw message