Author: dblevins Date: Sun Oct 2 23:03:17 2011 New Revision: 1178272 URL: http://svn.apache.org/viewvc?rev=1178272&view=rev Log: svn merge -r 1178228:1178229 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1178229 ------------------------------------------------------------------------ r1178229 | kevan | 2011-10-02 12:33:03 -0700 (Sun, 02 Oct 2011) | 1 line Add W3C license to source license, CDDL attribution to source NOTICE, and append cddl/w3c to openejb-jee jar license/notice files ------------------------------------------------------------------------ Added: openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/main/appended-resources/ - copied from r1178229, openejb/trunk/openejb/container/openejb-jee/src/main/appended-resources/ openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/main/appended-resources/META-INF/ - copied from r1178229, openejb/trunk/openejb/container/openejb-jee/src/main/appended-resources/META-INF/ openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/main/appended-resources/META-INF/LICENSE.vm - copied unchanged from r1178229, openejb/trunk/openejb/container/openejb-jee/src/main/appended-resources/META-INF/LICENSE.vm openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/main/appended-resources/META-INF/NOTICE.vm - copied unchanged from r1178229, openejb/trunk/openejb/container/openejb-jee/src/main/appended-resources/META-INF/NOTICE.vm Modified: openejb/branches/openejb-4.0.0-beta-1/ (props changed) openejb/branches/openejb-4.0.0-beta-1/LICENSE openejb/branches/openejb-4.0.0-beta-1/NOTICE openejb/branches/openejb-4.0.0-beta-1/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/test/resources/jsf/ (props changed) openejb/branches/openejb-4.0.0-beta-1/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) openejb/branches/openejb-4.0.0-beta-1/examples/application-composer/ (props changed) openejb/branches/openejb-4.0.0-beta-1/src/ (props changed) Propchange: openejb/branches/openejb-4.0.0-beta-1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -1,3 +1,4 @@ /openejb/branches/openejb-3.1.1:779593 /openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250 /openejb/branches/openejb-jcdi:984659-985270 +/openejb/trunk/openejb:1178229 Modified: openejb/branches/openejb-4.0.0-beta-1/LICENSE URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-1/LICENSE?rev=1178272&r1=1178271&r2=1178272&view=diff ============================================================================== --- openejb/branches/openejb-4.0.0-beta-1/LICENSE (original) +++ openejb/branches/openejb-4.0.0-beta-1/LICENSE Sun Oct 2 23:03:17 2011 @@ -618,3 +618,46 @@ distribute such responsibility on an equ herein is intended or shall be deemed to constitute any admission of liability. +========================================================================= + - W3C Schemas + License: W3C Software Notice and License +------------------------------------------------------------------------- + +W3C® SOFTWARE NOTICE AND LICENSE +http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + +This work (and included software, documentation such as READMEs, 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 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: + + 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, the W3C Software Short Notice should be + included (hypertext is preferred, text is permitted) within the body + of any redistributed or derivative code. + 3. Notice of any changes or modifications to the 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: openejb/branches/openejb-4.0.0-beta-1/NOTICE URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-1/NOTICE?rev=1178272&r1=1178271&r2=1178272&view=diff ============================================================================== --- openejb/branches/openejb-4.0.0-beta-1/NOTICE (original) +++ openejb/branches/openejb-4.0.0-beta-1/NOTICE Sun Oct 2 23:03:17 2011 @@ -5,4 +5,9 @@ Copyright 1999-2011 The Apache Software This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This product includes schema files developed for the Glassfish Java EE +reference implementation (http://java.sun.com/xml/ns/j2ee/). +Apache OpenEJB elects to include this software in this distribution +under the CDDL license. You can obtain a copy of the License at: + https://glassfish.dev.java.net/public/CDDL+GPL.html Propchange: openejb/branches/openejb-4.0.0-beta-1/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -1,3 +1,4 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 /openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250 /openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270 +/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1178229 Propchange: openejb/branches/openejb-4.0.0-beta-1/container/openejb-jee/src/test/resources/jsf/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -2,3 +2,4 @@ /geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792 /geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507 /openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270 +/openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:1178229 Propchange: openejb/branches/openejb-4.0.0-beta-1/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -1,3 +1,4 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 /openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250 /openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270 +/openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1178229 Propchange: openejb/branches/openejb-4.0.0-beta-1/examples/application-composer/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -1,2 +1,3 @@ /openejb/branches/openejb-3.1.1/examples/application-composer:779593 +/openejb/trunk/openejb/examples/application-composer:1178229 /openejb/trunk/openejb3/examples/application-composer:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528 Propchange: openejb/branches/openejb-4.0.0-beta-1/src/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 23:03:17 2011 @@ -1,2 +1,3 @@ /openejb/branches/openejb-3.1.1/src:779593 +/openejb/trunk/openejb/src:1178229 /openejb/trunk/openejb3/src:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
