geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1362990 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.runtime.v11/ org.apache.geronimo.runtime.v20/ org.apache.geronimo.runtime.v21/ org.apache.geronimo.runtime.v22/ org.apache.geronimo.runtime.v30/
Date Wed, 18 Jul 2012 15:53:17 GMT
Author: gawor
Date: Wed Jul 18 15:53:16 2012
New Revision: 1362990

URL: http://svn.apache.org/viewvc?rev=1362990&view=rev
Log:
merge license & notice changes (and fix slf4j name)

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
Wed Jul 18 15:53:16 2012
@@ -239,3 +239,32 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE A
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For org.apache.geronimo.runtime.* jar:
+
+=========================================================================
+==  SLF4J License                                                      ==
+==  slf4j-api slf4j-simple                                             ==
+=========================================================================
+
+Copyright (c) 2004-2011 QOS.ch 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
Wed Jul 18 15:53:16 2012
@@ -20,3 +20,14 @@ package) which was developed by the Boun
 (http://www.bouncycastle.org/) 
 
      Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
+slf4j-simple jar in org.apache.geronimo.runtime.*
+
+=========================================================================
+==  SLF4J Notice -- http://www.slf4j.org/license.html                  ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
Wed Jul 18 15:53:16 2012
@@ -239,3 +239,32 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE A
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For org.apache.geronimo.runtime.* jar:
+
+=========================================================================
+==  SLF4J License                                                      ==
+==  slf4j-api slf4j-simple                                             ==
+=========================================================================
+
+Copyright (c) 2004-2011 QOS.ch 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
Wed Jul 18 15:53:16 2012
@@ -20,3 +20,14 @@ package) which was developed by the Boun
 (http://www.bouncycastle.org/) 
 
      Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
+slf4j-simple jar in org.apache.geronimo.runtime.*
+
+=========================================================================
+==  SLF4J Notice -- http://www.slf4j.org/license.html                  ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
Wed Jul 18 15:53:16 2012
@@ -478,3 +478,31 @@ Agreement will bring a legal action unde
 after the cause of action arose. Each party waives its rights to a jury 
 trial in any resulting litigation. 
 
+For org.apache.geronimo.runtime.* jar:
+
+=========================================================================
+==  SLF4J License                                                      ==
+==  slf4j-api slf4j-simple                                             ==
+=========================================================================
+
+Copyright (c) 2004-2011 QOS.ch 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
Wed Jul 18 15:53:16 2012
@@ -34,3 +34,13 @@ The source code for the Plexus project c
 
 http://plexus.codehaus.org/source-repository.html
 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
+slf4j-simple jar in org.apache.geronimo.runtime.*
+
+=========================================================================
+==  SLF4J Notice -- http://www.slf4j.org/license.html                  ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
Wed Jul 18 15:53:16 2012
@@ -478,3 +478,31 @@ Agreement will bring a legal action unde
 after the cause of action arose. Each party waives its rights to a jury 
 trial in any resulting litigation. 
 
+For org.apache.geronimo.runtime.* jar:
+
+=========================================================================
+==  SLF4J License                                                      ==
+==  slf4j-api slf4j-simple                                             ==
+=========================================================================
+
+Copyright (c) 2004-2011 QOS.ch 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
Wed Jul 18 15:53:16 2012
@@ -34,3 +34,13 @@ The source code for the Plexus project c
 
 http://plexus.codehaus.org/source-repository.html
 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
+slf4j-simple jar in org.apache.geronimo.runtime.*
+
+=========================================================================
+==  SLF4J Notice -- http://www.slf4j.org/license.html                  ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
Wed Jul 18 15:53:16 2012
@@ -478,3 +478,31 @@ Agreement will bring a legal action unde
 after the cause of action arose. Each party waives its rights to a jury 
 trial in any resulting litigation. 
 
+For org.apache.geronimo.runtime.* jar:
+
+=========================================================================
+==  SLF4J License                                                      ==
+==  slf4j-api slf4j-simple                                             ==
+=========================================================================
+
+Copyright (c) 2004-2011 QOS.ch 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt?rev=1362990&r1=1362989&r2=1362990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt
Wed Jul 18 15:53:16 2012
@@ -34,3 +34,14 @@ The source code for the Plexus project c
 
 http://plexus.codehaus.org/source-repository.html
 
+
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
+slf4j-simple jar in org.apache.geronimo.runtime.*
+
+=========================================================================
+==  SLF4J Notice -- http://www.slf4j.org/license.html                  ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+



Mime
View raw message