Return-Path: 
 <scm-return-23815-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 97715 invoked from network); 4 Dec 2007 14:02:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Dec 2007 14:02:01 -0000
Received: (qmail 19265 invoked by uid 500); 4 Dec 2007 14:01:49 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 19202 invoked by uid 500); 4 Dec 2007 14:01:49 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 19191 invoked by uid 99); 4 Dec 2007 14:01:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 06:01:49 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 14:01:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D6ECB1A9832; Tue,  4 Dec 2007 06:01:35 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r600957 - in /geronimo/specs/trunk: ./
 geronimo-activation_1.1_spec/ geronimo-el_1.0_spec/
 geronimo-javamail_1.4_spec/ geronimo-jsp_2.1_spec/
 geronimo-jsp_2.1_spec/src/main/resources/
 geronimo-jsp_2.1_spec/src/main/resources/javax/ geronimo...
Date: Tue, 04 Dec 2007 14:01:34 -0000
To: scm@geronimo.apache.org
From: gnodet@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071204140135.D6ECB1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gnodet
Date: Tue Dec  4 06:01:31 2007
New Revision: 600957

URL: http://svn.apache.org/viewvc?rev=600957&view=rev
Log:
Add missing resources and add remaining specs

Added:
    geronimo/specs/trunk/geronimo-activation_1.1_spec/
      - copied from r600894, geronimo/specs/branches/geronimo-activation_1.1_spec-1.0.1/
    geronimo/specs/trunk/geronimo-el_1.0_spec/   (props changed)
      - copied from r600897, geronimo/specs/tags/geronimo-el_1.0_spec-1.0/
    geronimo/specs/trunk/geronimo-javamail_1.4_spec/
      - copied from r600894, geronimo/specs/branches/geronimo-javamail_1.4_spec-1.2/
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/   (props changed)
      - copied from r600900, geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0/
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/LocalStrings.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/LocalStrings_fr.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings_fr.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/LocalStrings_ja.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings_ja.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/http/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/http/LocalStrings.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/http/LocalStrings_es.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_es.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/http/LocalStrings_fr.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_fr.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/http/LocalStrings_ja.properties
      - copied unchanged from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_ja.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/resources/javax/servlet/resources/
      - copied from r600870, geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/schema/
Removed:
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/schema/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings_fr.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/LocalStrings_ja.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_es.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_fr.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/LocalStrings_ja.properties
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/schema/
Modified:
    geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
    geronimo/specs/trunk/pom.xml

Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml?rev=600957&r1=600894&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Tue Dec  4 06:01:31 2007
@@ -34,11 +34,12 @@
     <artifactId>geronimo-activation_1.1_spec</artifactId>
     <packaging>bundle</packaging>
     <name>Activation 1.1</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <properties>
 	    <geronimo.osgi.export.pkg>javax.activation*</geronimo.osgi.export.pkg>
         <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
+        <geronimo.osgi.resources>src/main/resources/,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
 	</properties>
 
     <scm>

Propchange: geronimo/specs/trunk/geronimo-el_1.0_spec/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec  4 06:01:31 2007
@@ -0,0 +1 @@
+target

Modified: geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml?rev=600957&r1=600897&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml Tue Dec  4 06:01:31 2007
@@ -27,18 +27,25 @@
     <parent>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>specs</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-el_1.0_spec</artifactId>
+    <packaging>bundle</packaging>
     <name>Expression Language 1.0</name>
-    <version>1.0</version>
+    <version>1.0.1-SNAPSHOT</version>
+
+    <properties>
+	    <geronimo.osgi.export.pkg>javax.el*</geronimo.osgi.export.pkg>
+        <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
+        <geronimo.osgi.resources>src/main/resources/,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
+	</properties>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-el_1.0_spec-1.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-el_1.0_spec-1.0</developerConnection>
-        <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-el_1.0_spec-1.0</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</developerConnection>
+        <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</url>
     </scm>
 
     <build>

Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml?rev=600957&r1=600894&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml Tue Dec  4 06:01:31 2007
@@ -34,12 +34,13 @@
     <artifactId>geronimo-javamail_1.4_spec</artifactId>
     <packaging>bundle</packaging>
     <name>JavaMail 1.4</name>
-    <version>1.2</version>
+    <version>1.2-SNAPSHOT</version>
 
     <properties>
         <geronimo.osgi.export.pkg>javax.mail*</geronimo.osgi.export.pkg>
         <geronimo.osgi.private.pkg>org.apache.geronimo.mail*</geronimo.osgi.private.pkg>
         <geronimo.osgi.export.version>1.4</geronimo.osgi.export.version>
+        <geronimo.osgi.resources>src/main/resources/,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
 	</properties>
 
     <scm>
@@ -52,7 +53,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec  4 06:01:31 2007
@@ -0,0 +1 @@
+target

Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml?rev=600957&r1=600900&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Tue Dec  4 06:01:31 2007
@@ -27,31 +27,37 @@
     <parent>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>specs</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jsp_2.1_spec</artifactId>
+    <packaging>bundle</packaging>
     <name>JSP 2.1</name>
     <version>1.0</version>
 
+    <properties>
+	    <geronimo.osgi.export.pkg>javax.servlet.jsp*</geronimo.osgi.export.pkg>
+        <geronimo.osgi.export.version>2.1</geronimo.osgi.export.version>
+	</properties>
+
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0</developerConnection>
-        <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/tags/geronimo-jsp_2.1_spec</developerConnection>
+        <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec</url>
     </scm>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml?rev=600957&r1=600956&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml Tue Dec  4 06:01:31 2007
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>specs</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -41,6 +41,7 @@
     <properties>
 	    <geronimo.osgi.export.pkg>javax.servlet*</geronimo.osgi.export.pkg>
         <geronimo.osgi.export.version>2.5</geronimo.osgi.export.version>
+        <geronimo.osgi.resources>src/main/resources/,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
 	</properties>
 
     <scm>

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=600957&r1=600956&r2=600957&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Tue Dec  4 06:01:31 2007
@@ -70,6 +70,7 @@
 	    <geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
 	    <geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
 	    <geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
+        <geronimo.osgi.resources>META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
     </properties>
 
     <build>
@@ -128,6 +129,7 @@
 		                <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
 		                <Implementation-Title>Apache Geronimo</Implementation-Title>
 		                <Implementation-Version>${project.version}</Implementation-Version>
+                        <Include-Resource>${geronimo.osgi.resources}</Include-Resource>
 		           </instructions>
 		        </configuration>
 	        </plugin>
@@ -136,6 +138,7 @@
     </build>
     
     <modules>
+        <module>geronimo-activation_1.1_spec</module>
         <module>geronimo-commonj_1.1_spec</module>
         <module>geronimo-jaspi_1.0_spec</module>
         <module>geronimo-javamail_1.4_spec</module>
@@ -164,8 +167,10 @@
             <modules>
 		        <module>geronimo-annotation_1.0_spec</module>
 		        <module>geronimo-ejb_3.0_spec</module>
+		        <module>geronimo-el_1.0_spec</module>
 		        <module>geronimo-jacc_1.1_spec</module>
 		        <module>geronimo-jpa_3.0_spec</module>
+		        <module>geronimo-jsp_2.1_spec</module>
 		        <module>geronimo-interceptor_3.0_spec</module>
 		        <module>geronimo-ws-metadata_2.0_spec</module>
             </modules>