You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/04/23 20:44:41 UTC
svn commit: r650998 - in
/geronimo/server/trunk/framework/modules/geronimo-crypto: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
Author: jdillon
Date: Wed Apr 23 11:44:39 2008
New Revision: 650998
URL: http://svn.apache.org/viewvc?rev=650998&view=rev
Log:
Hook up additional legal bits to m-r-r-p, drop other legal muck
Added:
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm (with props)
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm (with props)
Removed:
geronimo/server/trunk/framework/modules/geronimo-crypto/LICENSE.txt
geronimo/server/trunk/framework/modules/geronimo-crypto/NOTICE.txt
Added: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm?rev=650998&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm Wed Apr 23 11:44:39 2008
@@ -0,0 +1,45 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+## $Rev$ $Date$
+##
+
+=========================================================================
+== Bouncy Castle License ==
+=========================================================================
+
+The Bouncy Castle License
+
+Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+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.
+
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm?rev=650998&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm Wed Apr 23 11:44:39 2008
@@ -0,0 +1,30 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+## $Rev$ $Date$
+##
+
+=========================================================================
+== Bouncy Castle Notice ==
+=========================================================================
+
+This product includes software (the ASN1 codec in the org.apache.geronimo.asn1
+package) developed by the Bouncy Castle project. (http://www.bouncycastle.org/)
+
+ Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:mime-type = text/plain