You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2008/01/31 22:45:17 UTC
svn commit: r617252 - in /geronimo/specs/trunk: ./
geronimo-activation_1.1_spec/ geronimo-annotation_1.0_spec/
geronimo-commonj_1.1_spec/ geronimo-ejb_3.0_spec/ geronimo-el_1.0_spec/
geronimo-interceptor_3.0_spec/ geronimo-j2ee-connector_1.5_spec/ gero...
Author: gnodet
Date: Thu Jan 31 13:45:12 2008
New Revision: 617252
URL: http://svn.apache.org/viewvc?rev=617252&view=rev
Log:
Fix poms, resources, legal files and all...
Modified:
geronimo/specs/trunk/NOTICE.txt
geronimo/specs/trunk/geronimo-activation_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-annotation_1.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-commonj_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-el_1.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jacc_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaspi_1.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxr_1.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jms_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jpa_3.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jsp_2.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.1_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-saaj_1.3_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt
geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/NOTICE.txt
geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
geronimo/specs/trunk/pom.xml
Modified: geronimo/specs/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/NOTICE.txt (original)
+++ geronimo/specs/trunk/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
@@ -10,3 +10,12 @@
Copyright (c) 1999-2000 Object Management Group. Unlimited rights to
duplicate and use this code are hereby granted provided that this
copyright notice is included.
+
+This product includes software developed by
+The W3C Consortium (http://www.w3.org/).
+
+Copyright © 1994-2002 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio
+University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
\ No newline at end of file
Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
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=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Activation 1.1</name>
<version>1.0.2-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-annotation_1.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-commonj_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-commonj_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-commonj_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-commonj_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-commonj_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Commonj 1.1</name>
<version>1.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,12 +32,12 @@
</parent>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>EJB 3.0</name>
<version>1.0.1-SNAPSHOT</version>
<properties>
- <geronimo.osgi.export.pkg>javax.ejb*,javax.xml.rpc.handler*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.pkg>javax.ejb*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
Modified: geronimo/specs/trunk/geronimo-el_1.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_1.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
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=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Expression Language 1.0</name>
<version>1.0.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Interceptor 3.0</name>
<version>1.0.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>J2EE Connector 1.5</name>
<version>2.0-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>J2EE Management 1.1</name>
<version>1.0.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -31,7 +31,7 @@
</parent>
<artifactId>geronimo-jacc_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>J2EE JACC 1.1</name>
<version>1.0.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Java Authentication SPI for Containers</name>
<version>1.0-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jaxr_1.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxr_1.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxr_1.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jaxr_1.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JAXR 1.0</name>
<version>2.0-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JAXRPC 1.1</name>
<version>2.0-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jms_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JMS 1.1</name>
<version>1.1.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jpa_3.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_3.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_3.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jpa_3.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,6 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+
Modified: geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JPA 1.0</name>
<version>1.1.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
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=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JSP 2.1</name>
<version>1.0.1-SNAPSHOT</version>
@@ -56,30 +56,4 @@
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <targetPath>javax/servlet/jsp/resources</targetPath>
- <directory>${basedir}/src/main/schema</directory>
- <includes>
- <include>*.dtd</include>
- <include>*.xsd</include>
- </includes>
- </resource>
- <resource>
- <targetPath>javax/servlet/resources</targetPath>
- <directory>${basedir}/src/main/schema</directory>
- <includes>
- <include>jsp_2_1.xsd</include>
- </includes>
- </resource>
- <resource>
- <targetPath>javax/servlet/resources</targetPath>
- <directory>${basedir}/src/main/schema</directory>
- <includes>
- <include>web-jsptaglibrary_2_1.xsd</include>
- </includes>
- </resource>
- </resources>
- </build>
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JTA 1.1</name>
<version>1.1.1-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-saaj_1.3_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-saaj_1.3_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-saaj_1.3_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>SAAJ 1.3</name>
<version>1.0-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt Thu Jan 31 13:45:12 2008
@@ -201,3 +201,56 @@
See the License for the specific language governing permissions and
limitations under the License.
+#########################################################################
+## ADDITIONAL LICENSES ##
+#########################################################################
+
+The XMLSchema.dtd included in this project was developed by the
+W3C Consortium (http://www.w3c.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+W3C® SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, a short notice of the following form
+ (hypertext is preferred, text is permitted) should be used within
+ the body of any redistributed or derivative code: "Copyright ©
+ [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/"
+ 3. Notice of any changes or modifications to the W3C files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,6 +1,14 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by
+The W3C Consortium (http://www.w3.org/).
+
+Copyright © 1994-2002 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio
+University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
\ No newline at end of file
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=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Servlet 2.5</name>
<version>1.1.2-SNAPSHOT</version>
Modified: geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/NOTICE.txt?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/NOTICE.txt Thu Jan 31 13:45:12 2008
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml Thu Jan 31 13:45:12 2008
@@ -32,7 +32,7 @@
</parent>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Web Services Metadata 2.0</name>
<version>1.1.2-SNAPSHOT</version>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=617252&r1=617251&r2=617252&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Thu Jan 31 13:45:12 2008
@@ -75,20 +75,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-legal-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-legal-files</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -111,6 +97,27 @@
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
</resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="LICENSE.txt" tofile="target/maven-shared-archive-resources/META-INF/LICENSE" overwrite="true" />
+ <copy file="NOTICE.txt" tofile="target/maven-shared-archive-resources/META-INF/NOTICE" overwrite="true" />
+ </tasks>
</configuration>
</execution>
</executions>