geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r577442 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/src/main/assembly/ eclipse/ features/org.apache.geronimo.feature/ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.installabl...
Date Wed, 19 Sep 2007 20:43:02 GMT
Author: mcconne
Date: Wed Sep 19 13:43:00 2007
New Revision: 577442

URL: http://svn.apache.org/viewvc?rev=577442&view=rev
Log:
Synch with Tags 2.0.0

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/NOTICE
Modified:
    geronimo/devtools/eclipse-plugin/trunk/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.properties
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.properties
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.properties
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/LICENSE?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/LICENSE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/LICENSE Wed Sep 19 13:43:00 2007
@@ -269,6 +269,57 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 =========================================================================
+==  xpp3 License                                                       ==
+=========================================================================
+
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 AUTHORS, COPYRIGHT HOLDERS OR ITS 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.
+
+=========================================================================
 ==  XStream License                                                    ==
 =========================================================================
 

Modified: geronimo/devtools/eclipse-plugin/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/NOTICE?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/NOTICE Wed Sep 19 13:43:00 2007
@@ -1,5 +1,10 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
+=========================================================================
+
+Apache Geronimo Eclipse Plugin
+Copyright 2003-2007 The Apache Software Foundation
 
 Portions of the Eclipse Geronimo Server Adapter were orginally developed by
 International Business Machines Corporation and are
@@ -18,6 +23,14 @@
      Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
 =========================================================================
+==  OpenEJB Notice                                                     ==
+=========================================================================
+
+This product includes software created by the OpenEJB project (http://openejb.org/).
+
+     Copyright 2001-2006 (C) The OpenEJB Group. All Rights Reserved.
+
+=========================================================================
 ==  XmlBeans Notice                                                    ==
 =========================================================================
 
@@ -40,3 +53,19 @@
  - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
    Copyright 2002 Yuval Oren under the terms of the Apache Software 
    License 2.0
+
+=========================================================================
+==  XPP3 Notice                                                        ==
+=========================================================================
+
+This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/).
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+=========================================================================
+==  XStream Notice                                                     ==
+=========================================================================
+
+Copyright (c) 2003-2006, Joe Walnes
+All rights reserved.

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Wed Sep 19 13:43:00 2007
@@ -34,26 +34,45 @@
         </fileSet>
     </fileSets>
     <dependencySets>
+
         <!-- Plug-ins -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.*</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
             </includes>
-            <excludes>
-                <exclude>org.apache.geronimo.devtools:*.feature</exclude>
-            </excludes>
         </dependencySet>
+
         <!-- Features -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <unpack>true</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:*.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v10.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
             </includes>
         </dependencySet>
+
     </dependencySets>
 </assembly>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Wed Sep 19 13:43:00 2007
@@ -45,19 +45,19 @@
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
     
-    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0.jar"
-             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.0">
+    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1.jar"
+             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.1">
         <category name="Geronimo Runtime"/>
     </feature>
     
-    <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0.jar"
-             id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.0">
+    <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1.jar"
+             id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.1">
         <category name="Geronimo Runtime"/>
     </feature>
     
-    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0/geronimo-tomcat6-jee5-2.0.zip"
-             url="runtimes/geronimo-tomcat6-jee5-2.0.2.zip"/>
-    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0/geronimo-jetty6-jee5-2.0.zip"
-             url="runtimes/geronimo-jetty6-jee5-2.0.2.zip"/>
+    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip"
+             url="runtimes/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
+    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip"
+             url="runtimes/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
     
 </site>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Wed Sep 19 13:43:00 2007
@@ -24,26 +24,45 @@
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
+
         <!-- Plug-ins -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.*</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
             </includes>
-            <excludes>
-                <exclude>org.apache.geronimo.devtools:*.feature</exclude>
-            </excludes>
         </dependencySet>
+
         <!-- Features -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
-                <include>org.apache.geronimo.devtools:*.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v10.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
             </includes>
         </dependencySet>
+
     </dependencySets>
     <files>
         <file>

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Wed Sep 19 13:43:00 2007
@@ -1,141 +1,145 @@
-<?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.
-  -->
-
-<!-- ================================================================================= -->
-<!-- Download Europa Eclipse artifacts and unzip them into the user's local maven repo -->
-<!-- ================================================================================= -->
-<project name="EuropaArtifacts">
-
-    <target name="init">
-        <property name="europa.download.url"    value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/20070702/"/>
-        <property name="dtp.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.5/"/>
-        <property name="emf.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
-        <property name="gef.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/R-3.3-200706281000/"/>
-        <property name="wtp.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
-        <property name="europa.jee.win32"       value="eclipse-jee-europa-win32.zip"/>
-        <property name="europa.jee.linux"       value="eclipse-jee-europa-linux-gtk.tar"/>
-        <property name="europa.jee.linux.gz"    value="eclipse-jee-europa-linux-gtk.tar.gz"/>
-        <property name="europa.jee.macos"       value="eclipse-jee-europa-macosx-carbon.tar"/>
-        <property name="europa.jee.macos.gz"    value="eclipse-jee-europa-macosx-carbon.tar.gz"/>
-        <property name="dtp-sdk" value="dtp-sdk_1.5_20070704.zip"/>
-        <property name="emf-sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
-        <property name="gef-sdk" value="GEF-SDK-3.3.zip"/>
-        <property name="wtp-sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
-    </target>
-
-    <target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
-        <echo>Downloading ${europa.download.url}${europa.jee.win32}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${europa.download.url}${europa.jee.win32}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.win32}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${europa.jee.win32} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.win32}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
-        <echo>Downloading ${europa.download.url}${europa.jee.linux.gz}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${europa.download.url}${europa.jee.linux.gz}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux.gz}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${europa.jee.linux.gz} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux.gz}"/>
-        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
-        <echo>Downloading ${europa.download.url}${europa.jee.macos.gz}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${europa.download.url}${europa.jee.macos.gz}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos.gz}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${europa.jee.macos.gz} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos.gz}"/>
-        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="common" description="Download artifacts common to all OS'es">
-        <antcall target="dtp"/>
-        <antcall target="emf"/>
-        <antcall target="gef"/>
-        <antcall target="wtp"/>
-    </target>
-
-    <target name="dtp" description="Download Data Tools Platform (DTP) artifact">
-        <echo>Downloading ${dtp.download.url}${dtp-sdk}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${dtp.download.url}${dtp-sdk}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp-sdk}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${dtp-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp-sdk}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="emf" description="Download Eclipse Modeling Framework (EMF) artifact">
-        <echo>Downloading ${emf.download.url}${emf-sdo}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${emf.download.url}${emf-sdo}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf-sdo}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${emf-sdo} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf-sdo}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="gef" description="Download Graphical Editing Framework (GEF) artifact">
-        <echo>Downloading ${gef.download.url}${gef-sdk}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${gef.download.url}${gef-sdk}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef-sdk}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${gef-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef-sdk}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-    <target name="wtp" description="Download Web Tools Platform (WTP) artifact">
-        <echo>Downloading ${wtp.download.url}${wtp-sdk}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
-        <get src="${wtp.download.url}${wtp-sdk}&amp;r=1&amp;protocol=http" 
-             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp-sdk}" 
-             verbose="true"
-             usetimestamp="true"/>
-        <echo>Unzipping ${wtp-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
-        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
-        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp-sdk}" 
-               dest="${LOCAL_M2_REPO}/eclipse"/>
-    </target>
-
-</project>
+<?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.
+  -->
+
+<!-- ================================================================================= -->
+<!-- Download Europa Eclipse artifacts and unzip them into the user's local maven repo -->
+<!-- ================================================================================= -->
+<project name="EuropaArtifacts">
+
+    <target name="init">
+        <property name="base_url"               value="http://www.eclipse.org/downloads/download.php?file="/>
+        <property name="europa_win32_url"       value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
+        <property name="europa_linux_url"       value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
+        <property name="europa_macos_url"       value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
+        <property name="dtp_download_url"       value="${base_url}/datatools/downloads/1.5/"/>
+        <property name="emf_download_url"       value="${base_url}/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
+        <property name="gef_download_url"       value="${base_url}/tools/gef/downloads/drops/R-3.3-200706281000/"/>
+        <property name="wtp_download_url"       value="${base_url}/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
+        <property name="europa_jee_win32"       value="eclipse-SDK-3.3-win32.zip"/>
+        <property name="europa_jee_linux"       value="eclipse-SDK-3.3-linux-gtk.tar"/>
+        <property name="europa_jee_macos"       value="eclipse-SDK-3.3-macosx-carbon.tar"/>
+        <property name="europa_jee_linux_gz"    value="${europa_jee_linux}.gz"/>
+        <property name="europa_jee_macos_gz"    value="${europa_jee_macos}.gz"/>
+        <property name="dtp_sdk" value="dtp-sdk_1.5.zip"/>
+        <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
+        <property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
+        <property name="wtp_sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
+        <property name="protocol" value="&amp;r=1&amp;protocol=http"/>
+    </target>
+
+    <target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
+        <echo>Downloading ${europa_download_url}${europa_jee_win32}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa_win32_url}${europa_jee_win32}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_win32}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${europa_jee_win32} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_win32}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
+        <echo>Downloading ${europa_download_url}${europa_jee_linux_gz}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa_linux_url}${europa_jee_linux_gz}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_linux_gz}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${europa_jee_linux_gz} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_linux_gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_linux}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
+        <echo>Downloading ${europa_download_url}${europa_jee_macos_gz}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa_macos_url}${europa_jee_macos_gz}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_macos_gz}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${europa_jee_macos_gz} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_macos_gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa_jee_macos}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="common" depends="init" description="Download artifacts common to all OS'es">
+        <antcall target="dtp"/>
+        <antcall target="emf"/> 
+        <antcall target="gef"/> 
+        <antcall target="wtp"/> 
+    </target>
+
+    <target name="dtp" depends="init" description="Download Data Tools Platform (DTP) artifact">
+        <echo>Downloading ${dtp_download_url}${dtp_sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${dtp_download_url}${dtp_sdk}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp_sdk}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${dtp_sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp_sdk}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="emf" depends="init" description="Download Eclipse Modeling Framework (EMF) artifact">
+        <echo>Downloading ${emf_download_url}${emf_sdo}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${emf_download_url}${emf_sdo}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf_sdo}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${emf_sdo} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf_sdo}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="gef" depends="init" description="Download Graphical Editing Framework (GEF) artifact">
+        <echo>Downloading ${gef_download_url}${gef_sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${gef_download_url}${gef_sdk}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef_sdk}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${gef_sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef_sdk}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="wtp" depends="init" description="Download Web Tools Platform (WTP) artifact">
+        <echo>Downloading ${wtp_download_url}${wtp_sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${wtp_download_url}${wtp_sdk}${protocol}"
+             dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp_sdk}" 
+             verbose="true"
+             usetimestamp="true"/>
+        <echo>Unzipping ${wtp_sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp_sdk}" 
+               dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+</project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties Wed Sep 19 13:43:00 2007
@@ -194,4 +194,92 @@
       incurred by, or claims asserted against, such Contributor by reason\n\
       of your accepting any such warranty or additional liability.\n\
 \n\
-   END OF TERMS AND CONDITIONS\n\
\ No newline at end of file
+   END OF TERMS AND CONDITIONS\n\
+\n\
+\n\
+\n\
+====================\n\
+==  xpp3 License  ==\n\
+====================\n\
+\n\
+Indiana University Extreme! Lab Software License\n\
+\n\
+Version 1.1.1\n\
+\n\
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.\n\
+\n\
+Redistribution and use in source and binary forms, with or without\n\
+modification, are permitted provided that the following conditions\n\
+are met:\n\
+\n\
+1. Redistributions of source code must retain the above copyright notice,\n\
+   this list of conditions and the following disclaimer.\n\
+\n\
+2. Redistributions in binary form must reproduce the above copyright \n\
+   notice, this list of conditions and the following disclaimer in \n\
+   the documentation and/or other materials provided with the distribution.\n\
+\n\
+3. The end-user documentation included with the redistribution, if any, \n\
+   must include the following acknowledgment:\n\
+\n\
+  "This product includes software developed by the Indiana University \n\
+  Extreme! Lab (http://www.extreme.indiana.edu/)."\n\
+\n\
+Alternately, this acknowledgment may appear in the software itself, \n\
+if and wherever such third-party acknowledgments normally appear.\n\
+\n\
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" \n\
+must not be used to endorse or promote products derived from this \n\
+software without prior written permission. For written permission, \n\
+please contact http://www.extreme.indiana.edu/.\n\
+\n\
+5. Products derived from this software may not use "Indiana Univeristy" \n\
+name nor may "Indiana Univeristy" appear in their name, without prior \n\
+written permission of the Indiana University.\n\
+\n\
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\n\
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n\
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n\
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS\n\
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n\
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n\
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n\
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n\
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR\n\
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n\
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\
+\n\
+\n\
+\n\
+=======================\n\
+==  XStream License  ==\n\
+=======================\n\
+\n\
+Copyright (c) 2003-2006, Joe Walnes\n\
+All rights reserved.\n\
+\n\
+Redistribution and use in source and binary forms, with or without\n\
+modification, are permitted provided that the following conditions are \n\
+met:\n\
+\n\
+Redistributions of source code must retain the above copyright notice, \n\
+this list of conditions and the following disclaimer. Redistributions in \n\
+binary form must reproduce the above copyright notice, this list of \n\
+conditions and the following disclaimer in the documentation and/or other \n\
+materials provided with the distribution.\n\
+\n\
+Neither the name of XStream nor the names of its contributors may be used \n\
+to endorse or promote products derived from this software without \n\
+specific prior written permission.\n\
+\n\
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \n\
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT \n\
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A \n\
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER \n\
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \n\
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, \n\
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \n\
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF \n\
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \n\
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS \n\
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.feature"
       label="Geronimo Core Feature"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-jetty6-jee5-2.0.zip"
+    id="geronimo-jetty6-jee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-tomcat6-jee5-2.0.zip"
+    id="geronimo-tomcat6-jee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.properties?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.properties Wed Sep 19 13:43:00 2007
@@ -194,4 +194,49 @@
       incurred by, or claims asserted against, such Contributor by reason\n\
       of your accepting any such warranty or additional liability.\n\
 \n\
-   END OF TERMS AND CONDITIONS\n\
\ No newline at end of file
+   END OF TERMS AND CONDITIONS\n\
+\n\
+\n\
+\n\
+=======================\n\
+==  OPENEJB License  ==\n\
+=======================\n\
+\n\
+OpenEJB License  Copyright 2001-2006 (C) The OpenEJB Group. All \n\
+Rights Reserved. This software consists of voluntary contributions made \n\
+by many individuals on behalf of the OpenEJB Project.  For more \n\
+information please see http://openejb.org/.\n\
+\n\
+Redistribution and use of this software and associated documentation \n\
+("Software"), with or without modification, are permitted provided that \n\
+the following conditions are met:\n\
+\n\
+1. Redistributions of source code must retain copyright statements and \n\
+   notices.  Redistributions must also contain a copy of this document.\n\
+\n\
+2. Redistributions in binary form must reproduce this list of conditions\n\
+   and the following disclaimer in the documentation and/or other \n\
+   materials provided with the distribution.\n\
+\n\
+3. The name "OpenEJB" must not be used to endorse or promote products \n\
+   derived from this Software without prior written permission of The \n\
+   OpenEJB Group.  For written permission, please contact \n\
+   openejb-group@openejb.sf.net.\n\
+\n\
+4. Products derived from this Software may not be called "OpenEJB" nor may\n\
+   "OpenEJB" appear in their names without prior written permission of The \n\
+   OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.\n\
+\n\
+5. Due credit should be given to the OpenEJB Project (http://openejb.org/).\n\
+\n\
+THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS'' \n\
+AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \n\
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE \n\
+ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENEJB GROUP OR ITS CONTRIBUTORS BE \n\
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \n\
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \n\
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS \n\
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN \n\
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \n\
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \n\
+POSSIBILITY OF SUCH DAMAGE.\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v10.feature"
       label="Geronimo v1.0 Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.properties?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.properties Wed Sep 19 13:43:00 2007
@@ -194,4 +194,49 @@
       incurred by, or claims asserted against, such Contributor by reason\n\
       of your accepting any such warranty or additional liability.\n\
 \n\
-   END OF TERMS AND CONDITIONS\n\
\ No newline at end of file
+   END OF TERMS AND CONDITIONS\n\
+\n\
+\n\
+\n\
+=======================\n\
+==  OPENEJB License  ==\n\
+=======================\n\
+\n\
+OpenEJB License  Copyright 2001-2006 (C) The OpenEJB Group. All \n\
+Rights Reserved. This software consists of voluntary contributions made \n\
+by many individuals on behalf of the OpenEJB Project.  For more \n\
+information please see http://openejb.org/.\n\
+\n\
+Redistribution and use of this software and associated documentation \n\
+("Software"), with or without modification, are permitted provided that \n\
+the following conditions are met:\n\
+\n\
+1. Redistributions of source code must retain copyright statements and \n\
+   notices.  Redistributions must also contain a copy of this document.\n\
+\n\
+2. Redistributions in binary form must reproduce this list of conditions\n\
+   and the following disclaimer in the documentation and/or other \n\
+   materials provided with the distribution.\n\
+\n\
+3. The name "OpenEJB" must not be used to endorse or promote products \n\
+   derived from this Software without prior written permission of The \n\
+   OpenEJB Group.  For written permission, please contact \n\
+   openejb-group@openejb.sf.net.\n\
+\n\
+4. Products derived from this Software may not be called "OpenEJB" nor may\n\
+   "OpenEJB" appear in their names without prior written permission of The \n\
+   OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.\n\
+\n\
+5. Due credit should be given to the OpenEJB Project (http://openejb.org/).\n\
+\n\
+THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS'' \n\
+AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \n\
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE \n\
+ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENEJB GROUP OR ITS CONTRIBUTORS BE \n\
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \n\
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \n\
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS \n\
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN \n\
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \n\
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \n\
+POSSIBILITY OF SUCH DAMAGE.\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v11.feature"
       label="Geronimo v1.1.x Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.properties?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.properties Wed Sep 19 13:43:00 2007
@@ -194,4 +194,49 @@
       incurred by, or claims asserted against, such Contributor by reason\n\
       of your accepting any such warranty or additional liability.\n\
 \n\
-   END OF TERMS AND CONDITIONS\n\
\ No newline at end of file
+   END OF TERMS AND CONDITIONS\n\
+\n\
+\n\
+\n\
+=======================\n\
+==  OPENEJB License  ==\n\
+=======================\n\
+\n\
+OpenEJB License  Copyright 2001-2006 (C) The OpenEJB Group. All \n\
+Rights Reserved. This software consists of voluntary contributions made \n\
+by many individuals on behalf of the OpenEJB Project.  For more \n\
+information please see http://openejb.org/.\n\
+\n\
+Redistribution and use of this software and associated documentation \n\
+("Software"), with or without modification, are permitted provided that \n\
+the following conditions are met:\n\
+\n\
+1. Redistributions of source code must retain copyright statements and \n\
+   notices.  Redistributions must also contain a copy of this document.\n\
+\n\
+2. Redistributions in binary form must reproduce this list of conditions\n\
+   and the following disclaimer in the documentation and/or other \n\
+   materials provided with the distribution.\n\
+\n\
+3. The name "OpenEJB" must not be used to endorse or promote products \n\
+   derived from this Software without prior written permission of The \n\
+   OpenEJB Group.  For written permission, please contact \n\
+   openejb-group@openejb.sf.net.\n\
+\n\
+4. Products derived from this Software may not be called "OpenEJB" nor may\n\
+   "OpenEJB" appear in their names without prior written permission of The \n\
+   OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.\n\
+\n\
+5. Due credit should be given to the OpenEJB Project (http://openejb.org/).\n\
+\n\
+THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS'' \n\
+AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \n\
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE \n\
+ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENEJB GROUP OR ITS CONTRIBUTORS BE \n\
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \n\
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \n\
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS \n\
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN \n\
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \n\
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \n\
+POSSIBILITY OF SUCH DAMAGE.\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v12.feature"
       label="Geronimo v1.2 Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml Wed Sep 19 13:43:00 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v20.feature"
       label="Geronimo v2.0 Server Adapter"

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/LICENSE?rev=577442&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/LICENSE (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/LICENSE Wed Sep 19 13:43:00 2007
@@ -0,0 +1,246 @@
+
+                                 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.
+
+=========================================================================
+==  OPENEJB License                                                    ==
+=========================================================================
+
+OpenEJB License  Copyright 2001-2006 (C) The OpenEJB Group. All 
+Rights Reserved. This software consists of voluntary contributions made 
+by many individuals on behalf of the OpenEJB Project.  For more 
+information please see http://openejb.org/.
+
+Redistribution and use of this software and associated documentation 
+("Software"), with or without modification, are permitted provided that 
+the following conditions are met:
+
+1. Redistributions of source code must retain copyright statements and 
+   notices.  Redistributions must also contain a copy of this document.
+
+2. Redistributions in binary form must reproduce this list of conditions
+   and the following disclaimer in the documentation and/or other 
+   materials provided with the distribution.
+
+3. The name "OpenEJB" must not be used to endorse or promote products 
+   derived from this Software without prior written permission of The 
+   OpenEJB Group.  For written permission, please contact 
+   openejb-group@openejb.sf.net.
+
+4. Products derived from this Software may not be called "OpenEJB" nor may
+   "OpenEJB" appear in their names without prior written permission of The 
+   OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.
+
+5. Due credit should be given to the OpenEJB Project (http://openejb.org/).
+
+THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS'' 
+AND ANY EXPRESSED 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 OPENEJB GROUP OR ITS 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/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/NOTICE?rev=577442&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/NOTICE (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/NOTICE Wed Sep 19 13:43:00 2007
@@ -0,0 +1,16 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Eclipse Geronimo Server Adapter CLA".
+
+=========================================================================
+==  OpenEJB Notice                                                     ==
+=========================================================================
+
+This product includes software created by the OpenEJB project (http://openejb.org/).
+
+     Copyright 2001-2006 (C) The OpenEJB Group. All Rights Reserved.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=577442&r1=577441&r2=577442&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Wed Sep 19 13:43:00 2007
@@ -44,7 +44,7 @@
             </resource>
             <resource>
                 <targetPath>META-INF</targetPath>
-                <directory>..</directory>
+                <directory>.</directory>
                 <includes>
                     <include>LICENSE</include>
                     <include>NOTICE</include>
@@ -174,4 +174,4 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message