Author: ate
Date: Fri May 22 22:41:04 2009
New Revision: 777733
URL: http://svn.apache.org/viewvc?rev=777733&view=rev
Log:
JS2-1018: Release 2.2.0 preparation
See: http://issues.apache.org/jira/browse/JS2-1018
- adding more licenses and notice descriptions
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOJO-LICENSE
- copied unchanged from r777726,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/BSD-LICENSE
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOM4J-LICENSE
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/JAVOLUTION-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOJO-LICENSE
- copied unchanged from r777726,
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/BSD-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOM4J-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/JAVOLUTION-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOJO-LICENSE
- copied unchanged from r777726,
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/BSD-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOM4J-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/JAVOLUTION-LICENSE
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/BSD-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/BSD-LICENSE
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/BSD-LICENSE
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/NOTICE
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/NOTICE
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/NOTICE
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOM4J-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOM4J-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOM4J-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/DOM4J-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,11 @@
+ 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 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 name "DOM4J" must not be used to endorse or promote products derived
from this Software without prior written permission of MetaStuff, Ltd. For
written permission, please contact [email protected].
+ 4. Products derived from this Software may not be called "DOM4J" nor may
"DOM4J" appear in their names without prior written permission of MetaStuff,
Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+ 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. 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 METASTUFF, LTD. 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.
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/JAVOLUTION-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/JAVOLUTION-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/JAVOLUTION-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/JAVOLUTION-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,25 @@
+* Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+* Copyright (c) 2005 - Javolution (http://javolution.org/)
+* 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.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/NOTICE?rev=777733&r1=777732&r2=777733&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/NOTICE
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/META-INF/NOTICE
Fri May 22 22:41:04 2009
@@ -9,4 +9,5 @@
JSCookMenu v1.4 FROM (c) Copyright 2002-2005 by Heng Yuan
(http://jscook.yuanheng.org/JSCookMenu/copyright.html) licensed under the
JSCookMenu license
Tango Free Desktop Icons (http://creativecommons.org/) licensed under the
Creative Commons Attribution-ShareAlike 2.5 License
SWFObject v2.0 beta5 (http://code.google.com/p/swfobject) Copyright (c) 2007
Geoff Stearns, Michael Williams, and Bobby van der Sluis licensed under the MIT
License
-
\ No newline at end of file
+Dom4J 1.6.1 from the DOM4J Project (http://www.dom4j.org) Copyright 2001-2005
(C) MetaStuff, Ltd licensed under BSD style license
+Javolution 4.0.2 - Java(tm) Solution for Real-Time and Embedded Systems,
Copyright (c) 2005 - Javolution (http://javolution.org/) licensed under the BSD
license
\ No newline at end of file
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOM4J-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOM4J-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOM4J-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/DOM4J-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,11 @@
+ 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 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 name "DOM4J" must not be used to endorse or promote products derived
from this Software without prior written permission of MetaStuff, Ltd. For
written permission, please contact [email protected].
+ 4. Products derived from this Software may not be called "DOM4J" nor may
"DOM4J" appear in their names without prior written permission of MetaStuff,
Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+ 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. 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 METASTUFF, LTD. 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.
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/JAVOLUTION-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/JAVOLUTION-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/JAVOLUTION-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/JAVOLUTION-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,25 @@
+* Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+* Copyright (c) 2005 - Javolution (http://javolution.org/)
+* 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.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/NOTICE?rev=777733&r1=777732&r2=777733&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/NOTICE
(original)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/application/META-INF/NOTICE
Fri May 22 22:41:04 2009
@@ -9,4 +9,5 @@
JSCookMenu v1.4 FROM (c) Copyright 2002-2005 by Heng Yuan
(http://jscook.yuanheng.org/JSCookMenu/copyright.html) licensed under the
JSCookMenu license
Tango Free Desktop Icons (http://creativecommons.org/) licensed under the
Creative Commons Attribution-ShareAlike 2.5 License
SWFObject v2.0 beta5 (http://code.google.com/p/swfobject) Copyright (c) 2007
Geoff Stearns, Michael Williams, and Bobby van der Sluis licensed under the MIT
License
-
\ No newline at end of file
+Dom4J 1.6.1 from the DOM4J Project (http://www.dom4j.org) Copyright 2001-2005
(C) MetaStuff, Ltd licensed under BSD style license
+Javolution - Java(tm) Solution for Real-Time and Embedded Systems, Copyright
(c) 2005 - Javolution (http://javolution.org/) licensed under the BSD license
\ No newline at end of file
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOM4J-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOM4J-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOM4J-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/DOM4J-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,11 @@
+ 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 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 name "DOM4J" must not be used to endorse or promote products derived
from this Software without prior written permission of MetaStuff, Ltd. For
written permission, please contact [email protected].
+ 4. Products derived from this Software may not be called "DOM4J" nor may
"DOM4J" appear in their names without prior written permission of MetaStuff,
Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+ 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. 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 METASTUFF, LTD. 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.
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/JAVOLUTION-LICENSE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/JAVOLUTION-LICENSE?rev=777733&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/JAVOLUTION-LICENSE
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/JAVOLUTION-LICENSE
Fri May 22 22:41:04 2009
@@ -0,0 +1,25 @@
+* Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+* Copyright (c) 2005 - Javolution (http://javolution.org/)
+* 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.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified:
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/NOTICE?rev=777733&r1=777732&r2=777733&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/NOTICE
(original)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/application/META-INF/NOTICE
Fri May 22 22:41:04 2009
@@ -9,4 +9,5 @@
JSCookMenu v1.4 FROM (c) Copyright 2002-2005 by Heng Yuan
(http://jscook.yuanheng.org/JSCookMenu/copyright.html) licensed under the
JSCookMenu license
Tango Free Desktop Icons (http://creativecommons.org/) licensed under the
Creative Commons Attribution-ShareAlike 2.5 License
SWFObject v2.0 beta5 (http://code.google.com/p/swfobject) Copyright (c) 2007
Geoff Stearns, Michael Williams, and Bobby van der Sluis licensed under the MIT
License
-
\ No newline at end of file
+Dom4J 1.6.1 from the DOM4J Project (http://www.dom4j.org) Copyright 2001-2005
(C) MetaStuff, Ltd licensed under BSD style license
+Javolution - Java(tm) Solution for Real-Time and Embedded Systems, Copyright
(c) 2005 - Javolution (http://javolution.org/) licensed under the BSD license
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]