You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by sh...@apache.org on 2009/04/02 05:03:11 UTC

svn commit: r761169 - in /incubator/olio: ./ dist/ dist/releasenotes/ webapp/php/trunk/public_html/ webapp/php/trunk/public_html/js/ webapp/rails/trunk/public/

Author: shanti
Date: Thu Apr  2 05:03:10 2009
New Revision: 761169

URL: http://svn.apache.org/viewvc?rev=761169&view=rev
Log:
Fixed LICENSE, NOTICE files. Updated dist build script to generate RAT
output.

Added:
    incubator/olio/LICENSE_php.txt
    incubator/olio/LICENSE_rails.txt
    incubator/olio/NOTICE_php.txt
    incubator/olio/NOTICE_rails.txt
Removed:
    incubator/olio/webapp/php/trunk/public_html/js/application.js
Modified:
    incubator/olio/dist/README
    incubator/olio/dist/build.properties.template
    incubator/olio/dist/build.xml
    incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt
    incubator/olio/webapp/php/trunk/public_html/apcinfo.php
    incubator/olio/webapp/rails/trunk/public/.htaccess

Added: incubator/olio/LICENSE_php.txt
URL: http://svn.apache.org/viewvc/incubator/olio/LICENSE_php.txt?rev=761169&view=auto
==============================================================================
--- incubator/olio/LICENSE_php.txt (added)
+++ incubator/olio/LICENSE_php.txt Thu Apr  2 05:03:10 2009
@@ -0,0 +1,320 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+The script.aculo.us and prototype Javascript libraries are made available under a MIT license:
+
+The MIT License
+
+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.
+
+============================================
+The JSON library has the following license :
+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 shall be used for Good, not Evil.
+
+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. 
+
+============================================
+The file apc.php in the application's public_html directory is subject to
+version 3.01 of the PHP license included below :
+
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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.
+ 
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``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 THE PHP
+DEVELOPMENT TEAM 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.
+
+-------------------------------------------------------------------- 
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group@php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.
+

Added: incubator/olio/LICENSE_rails.txt
URL: http://svn.apache.org/viewvc/incubator/olio/LICENSE_rails.txt?rev=761169&view=auto
==============================================================================
--- incubator/olio/LICENSE_rails.txt (added)
+++ incubator/olio/LICENSE_rails.txt Thu Apr  2 05:03:10 2009
@@ -0,0 +1,229 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+============================================
+The third-party plugins acts_as_network, calendar_helper, country_select,
+fixture_replacement2, rspec, rspec-rails, rails_rcov and the Javascript 
+libraries script.aculo.us and prototype are distributed under a MIT license :
+
+The MIT License
+
+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.
+
+============================================

Added: incubator/olio/NOTICE_php.txt
URL: http://svn.apache.org/viewvc/incubator/olio/NOTICE_php.txt?rev=761169&view=auto
==============================================================================
--- incubator/olio/NOTICE_php.txt (added)
+++ incubator/olio/NOTICE_php.txt Thu Apr  2 05:03:10 2009
@@ -0,0 +1,40 @@
+Apache Olio
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at Sun Microsystems Inc. whose 
+copyright notice is included below:
+
+Copyright 2008 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+California 95054, U.S.A. All rights reserved.
+
+U.S. Government Rights - Commercial software. Government users are subject
+to the Sun Microsystems, Inc. standard license agreement and applicable
+provisions of the FAR and its supplements.
+
+Use is subject to license terms.
+
+This distribution may include materials developed by third parties.
+
+Sun, Sun Microsystems, the Sun logo, Java and MySQL are trademarks or
+registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
+
+This software includes the script.aculo.us javascript library :
+  Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.acu
+lo.us)
+             (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+             (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
+   Contributors:
+    Richard Livsey
+    Rahul Bhargava
+    Rob Wills
+   
+This software includes the Prototype JavaScript framework :
+  (c) 2005-2007 Sam Stephenson
+ 
+This software bundles the JSON library :
+Copyright (c) 2002 JSON.org
+
+This product includes PHP software, freely available from <http://www.php.net/software/>

Added: incubator/olio/NOTICE_rails.txt
URL: http://svn.apache.org/viewvc/incubator/olio/NOTICE_rails.txt?rev=761169&view=auto
==============================================================================
--- incubator/olio/NOTICE_rails.txt (added)
+++ incubator/olio/NOTICE_rails.txt Thu Apr  2 05:03:10 2009
@@ -0,0 +1,67 @@
+Apache Olio
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at Sun Microsystems Inc. whose 
+copyright notice is included below:
+
+Copyright 2008 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+California 95054, U.S.A. All rights reserved.
+
+U.S. Government Rights - Commercial software. Government users are subject
+to the Sun Microsystems, Inc. standard license agreement and applicable
+provisions of the FAR and its supplements.
+
+Use is subject to license terms.
+
+This distribution may include materials developed by third parties.
+
+Sun, Sun Microsystems, the Sun logo, Java and MySQL are trademarks or
+registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
+
+This software contains third-party code whose copyright
+notices are included below.
+
+Plugin 'acts_as_network' :
+Copyright (c) 2007 Zetetic LLC
+
+Plugin 'calendar-helper':
+Copyright (c) 2006 Jeremy Voorhis and Geoffrey Grosenbach
+
+Plugin 'country-select':
+Copyright (c) 2008 Michael Koziarski
+
+Plugin 'fixture_replacement':
+Copyright (c) 2007 Scott Taylor <sc...@railsnewbie.com>
+
+Plugin 'rails-rcov' :
+Copyright (c) 2006 Coda Hale
+
+Plugin 'rspec' :
+Copyright (c) 2005-2008 The RSpec Development Team
+
+Plugin 'rspec-rails':
+== RSpec
+Copyright (c) 2005-2007 The RSpec Development Team
+====================================================================
+== ARTS
+Copyright (c) 2006 Kevin Clark, Jake Howerton
+====================================================================
+== ZenTest
+Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
+====================================================================
+== AssertSelect
+Copyright (c) 2006 Assaf Arkin
+====================================================================
+
+Javascript library script.aculo.us:
+Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+           (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
+   Contributors:
+    Richard Livsey
+    Rahul Bhargava
+    Rob Wills
+====================================================================

Modified: incubator/olio/dist/README
URL: http://svn.apache.org/viewvc/incubator/olio/dist/README?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/dist/README (original)
+++ incubator/olio/dist/README Thu Apr  2 05:03:10 2009
@@ -8,6 +8,14 @@
 The releases will be built in the 'nightly' directory.
 DO NOT check in the 'nightly' directory into the repository.
 However, it is appropriate to check-in new release notes added.
-The build release should be uploaded to the apache distribution directory
-after signing it.
 
+To run RAT on a release, do the following:
+. Ensure you have the rat-<version>.jar and commons-lang-<version>.jar
+  in ~/.ant/lib.
+. Type:  ant php-rat >nightly/php-rat.out
+. Type:  ant rails-rat >nightly/rails-rat.out
+
+NOTES:
+. The running of RAT is not made part of the release generation as it 
+  takes a long time.
+. TODO: Automate creation of md5 and asc files.

Modified: incubator/olio/dist/build.properties.template
URL: http://svn.apache.org/viewvc/incubator/olio/dist/build.properties.template?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/dist/build.properties.template (original)
+++ incubator/olio/dist/build.properties.template Thu Apr  2 05:03:10 2009
@@ -1 +1,18 @@
+#
+#  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.
+#
 olio.version=0.1

Modified: incubator/olio/dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/olio/dist/build.xml?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/dist/build.xml (original)
+++ incubator/olio/dist/build.xml Thu Apr  2 05:03:10 2009
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright © 2008 Sun Microsystems, Inc. All rights reserved
+ * 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
  *
- *  Use is subject to license terms.
+ *     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.
+ * 
 -->
 <project name="Olio" default="package-all">
 
@@ -12,6 +25,7 @@
     <property name="geocoder.dir" value="${base.dir}/geocoder"/>
     <property name="docs.dir" value="${base.dir}/docs"/>
     <property name="kit.dir" value="nightly"/>
+    <property name="stage.dir" value="stage"/>
 
     <tstamp>
         <format property="build.date" pattern="MMddyy"/>
@@ -59,11 +73,13 @@
     </target>
 
     <target name="package-php" depends="package-php-driver, geocoder, release-file">
+		<copy file="${base.dir}/LICENSE_php.txt"
+			  tofile="stage/LICENSE" overwrite="true" verbose="true"/>
+		<copy file="${base.dir}/NOTICE_php.txt"
+			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${php.pkg.name}.tar.gz"
             longfile="gnu" compression="gzip">
-            <tarfileset dir="stage" prefix="${php.pkg.name}" includes="release"/>
-            <tarfileset dir="${base.dir}" prefix="${php.pkg.name}"
-                        includes="LICENSE, NOTICE"/>
+            <tarfileset dir="stage" prefix="${php.pkg.name}" includes="release,LICENSE,NOTICE"/>
             <tarfileset dir="${relnotes.dir}" prefix="${php.pkg.name}"
                         includes="${php.relnotes}"/>
             <tarfileset dir="${docs.dir}" prefix="${php.pkg.name}"
@@ -75,15 +91,31 @@
             <tarfileset dir="${php.app.dir}" prefix="${php.pkg.name}/oliophp"
                         excludes="build.xml, build.properties"/>
         </tar>
+        <zip destfile="${kit.dir}/${php.pkg.name}.zip">
+            <zipfileset dir="stage" prefix="${php.pkg.name}" includes="release,LICENSE,NOTICE"/>
+            <zipfileset dir="${relnotes.dir}" prefix="${php.pkg.name}"
+                        includes="${php.relnotes}"/>
+            <zipfileset dir="${docs.dir}" prefix="${php.pkg.name}"
+                        includes="php_setup_kit.html"/>
+            <zipfileset dir="${php.workload.dir}/build" prefix="${php.pkg.name}"
+                        includes="OlioDriver.jar"/>
+            <zipfileset dir="${geocoder.dir}/dist" prefix="${php.pkg.name}"
+                        includes="geocoder.war"/>
+            <zipfileset dir="${php.app.dir}" prefix="${php.pkg.name}/oliophp"
+                        excludes="build.xml, build.properties"/>
+        </zip>
     </target>
 
+
     <target name="package-rails" depends="package-rails-driver, geocoder,
                     release-file">
+		<copy file="${base.dir}/LICENSE_rails.txt"
+			  tofile="stage/LICENSE" overwrite="true" verbose="true"/>
+		<copy file="${base.dir}/NOTICE_rails.txt"
+			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${rails.pkg.name}.tar.gz"
             longfile="gnu" compression="gzip">
-            <tarfileset dir="stage" prefix="${rails.pkg.name}" includes="release"/>
-            <tarfileset dir="${base.dir}" prefix="${rails.pkg.name}"
-                        includes="LICENSE, NOTICE"/>
+            <tarfileset dir="stage" prefix="${rails.pkg.name}" includes="release,LICENSE,NOTICE"/>
             <tarfileset dir="${relnotes.dir}" prefix="${rails.pkg.name}"
                         includes="${rails.relnotes}"/>
             <tarfileset dir="${docs.dir}" prefix="${rails.pkg.name}"
@@ -95,9 +127,26 @@
             <tarfileset dir="${rails.app.dir}" prefix="${rails.pkg.name}/oliorails"
                         excludes="build.xml"/>
         </tar>
+        <zip destfile="${kit.dir}/${rails.pkg.name}.zip">
+            <zipfileset dir="stage" prefix="${rails.pkg.name}" includes="release,LICENSE,NOTICE"/>
+            <zipfileset dir="${relnotes.dir}" prefix="${rails.pkg.name}"
+                        includes="${rails.relnotes}"/>
+            <zipfileset dir="${docs.dir}" prefix="${rails.pkg.name}"
+                        includes="rails_setup_kit.html"/>
+            <zipfileset dir="${rails.workload.dir}/build" prefix="${rails.pkg.name}"
+                        includes="OlioDriver.jar"/>
+            <zipfileset dir="${geocoder.dir}/dist" prefix="${rails.pkg.name}"
+                        includes="geocoder.war"/>
+            <zipfileset dir="${rails.app.dir}" prefix="${rails.pkg.name}/oliorails"
+                        excludes="build.xml"/>
+        </zip>
     </target>
 
     <target name="package-php-src">
+		<copy file="${base.dir}/LICENSE_php.txt"
+			  tofile="stage/LICENSE" overwrite="true" verbose="true"/>
+		<copy file="${base.dir}/NOTICE_php.txt"
+			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${php.src.name}.tar.gz"
             longfile="gnu" compression="gzip">
             <tarfileset dir="${base.dir}" prefix="${php.src.name}">
@@ -106,8 +155,8 @@
 				<include name="dist/releasenotes/${php.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
+                <include name="stage/LICENSE"/>
+                <include name="stage/NOTICE"/>
                 <include name="webapp/php/trunk/**"/>
                 <include name="workload/php/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -118,9 +167,32 @@
                 <exclude name="**/build.properties"/>
             </tarfileset>
         </tar>
+        <zip destfile="${kit.dir}/${php.src.name}.zip">
+            <zipfileset dir="${base.dir}" prefix="${php.src.name}">
+                <include name="dist/*"/>
+                <include name="dist/*"/>
+				<include name="dist/releasenotes/${php.relnotes}"/>
+                <include name="docs/**"/>
+                <include name="geocoder/**"/>
+                <include name="stage/LICENSE"/>
+                <include name="stage/NOTICE"/>
+                <include name="webapp/php/trunk/**"/>
+                <include name="workload/php/trunk/**"/>
+                <exclude name="dist/nightly/**"/>
+                <exclude name="dist/release/**"/>
+                <exclude name="dist/stage/**"/>
+                <exclude name="**/build/**"/>
+                <exclude name="geocoder/dist/**"/>
+                <exclude name="**/build.properties"/>
+            </zipfileset>
+        </zip>
     </target>
 
     <target name="package-rails-src">
+		<copy file="${base.dir}/LICENSE_rails.txt"
+			  tofile="stage/LICENSE" overwrite="true" verbose="true"/>
+		<copy file="${base.dir}/NOTICE_rails.txt"
+			  tofile="stage/NOTICE" overwrite="true" verbose="true"/>
         <tar destfile="${kit.dir}/${rails.src.name}.tar.gz"
             longfile="gnu" compression="gzip">
             <tarfileset dir="${base.dir}" prefix="${rails.src.name}">
@@ -128,8 +200,8 @@
 				<include name="dist/releasenotes/${rails.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
+                <include name="stage/LICENSE"/>
+                <include name="stage/NOTICE"/>
                 <include name="webapp/rails/trunk/**"/>
                 <include name="workload/rails/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
@@ -140,50 +212,61 @@
                 <exclude name="**/build.properties"/>
             </tarfileset>
         </tar>
-    </target>
-
-    <target name="package-driver">
-        <ant dir="${workload.dir}"/>
-    </target>
-
-
-    <target name="package-dist" depends="package-php-driver, geocoder, release-file">
-        <tar destfile="${kit.dir}/${php.pkg.name}.tar.gz"
-            longfile="gnu" compression="gzip">
-            <tarfileset dir="stage" prefix="${php.pkg.name}" includes="release"/>
-            <tarfileset dir="${base.dir}" prefix="${php.pkg.name}"
-                        includes="LICENSE, NOTICE"/>
-            <tarfileset dir="${docs.dir}" prefix="${php.pkg.name}"
-                        includes="php_setup_kit.html"/>
-            <tarfileset dir="${php.workload.dir}/build" prefix="${php.pkg.name}"
-                        includes="OlioDriver.jar"/>
-            <tarfileset dir="${geocoder.dir}/dist" prefix="${php.pkg.name}"
-                        includes="geocoder.war"/>
-            <tarfileset dir="${php.app.dir}" prefix="${php.pkg.name}/oliophp"
-                        excludes="build.xml, build.properties"/>
-        </tar>
-    </target>
-
-    <target name="package-src">
-        <tar destfile="${kit.dir}/${php.src.name}.tar.gz"
-            longfile="gnu" compression="gzip">
-            <tarfileset dir="${base.dir}" prefix="${php.src.name}">
-                <include name="dist/**"/>
+        <zip destfile="${kit.dir}/${rails.src.name}.zip">
+            <zipfileset dir="${base.dir}" prefix="${rails.src.name}">
+                <include name="dist/*"/>
+				<include name="dist/releasenotes/${rails.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="webapp/php/trunk/**"/>
-                <include name="workload/php/trunk/**"/>
+                <include name="stage/LICENSE"/>
+                <include name="stage/NOTICE"/>
+                <include name="webapp/rails/trunk/**"/>
+                <include name="workload/rails/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
                 <exclude name="dist/release/**"/>
                 <exclude name="dist/stage/**"/>
                 <exclude name="**/build/**"/>
                 <exclude name="geocoder/dist/**"/>
                 <exclude name="**/build.properties"/>
-            </tarfileset>
-        </tar>
+            </zipfileset>
+        </zip>
     </target>
 
     <target name="package-all" depends="package-php, package-rails, package-php-src, package-rails-src"/>
+
+    <target name="-taskdef">
+       <typedef resource="rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
+	      <!-- The rat-0.5.1.jar and commons-lang-2.4.jar should be located in ~/.ant/lib
+         <classpath>
+           <fileset dir="/home/shanti/web2.0/rat/trunk">
+              <include name="**/apache-rat*.jar"/>
+              <include name="**/commons-*.jar"/>
+           </fileset>
+         </classpath>
+	     -->
+       </typedef>
+     </target>
+
+    <target name="php-rat" depends="-taskdef"
+       description="runs the rat task over the php src tarball">
+       <rat:report xmlns:rat="antlib:rat.anttasks">
+         <tarfileset>
+           <gzipresource>
+             <file file="${kit.dir}/${php.src.name}.tar.gz"/>
+           </gzipresource>
+         </tarfileset>
+       </rat:report>
+     </target>
+
+    <target name="rails-rat" depends="-taskdef"
+       description="runs the rat task over the rails src tarball">
+       <rat:report xmlns:rat="antlib:rat.anttasks">
+         <tarfileset>
+           <gzipresource>
+             <file file="${kit.dir}/${rails.src.name}.tar.gz"/>
+           </gzipresource>
+         </tarfileset>
+       </rat:report>
+     </target>
+
 </project> 

Modified: incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt
URL: http://svn.apache.org/viewvc/incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt (original)
+++ incubator/olio/dist/releasenotes/RELEASE-NOTES-rails-0.1.txt Thu Apr  2 05:03:10 2009
@@ -14,6 +14,9 @@
 The instructions for setting up Olio from the source kit are contained in
 rails_setup.html which is located in the 'docs' directory.
 
+This release is known to work on ruby 1.8.6, ruby 1.8.7 and a
+combination of rake 0.8.1/rails 2.1.2 or rake 0.8.4/rails 2.3.2.
+
 Known Issues
 =============
 . Due to the way logging works in apache common HttpClient, you will see a

Modified: incubator/olio/webapp/php/trunk/public_html/apcinfo.php
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/php/trunk/public_html/apcinfo.php?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/webapp/php/trunk/public_html/apcinfo.php (original)
+++ incubator/olio/webapp/php/trunk/public_html/apcinfo.php Thu Apr  2 05:03:10 2009
@@ -1,4 +1,23 @@
 <?php
+/*
+ * 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.
+ * 
+ */
+
 sapi_get_stat();
 ?>
 

Modified: incubator/olio/webapp/rails/trunk/public/.htaccess
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/public/.htaccess?rev=761169&r1=761168&r2=761169&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/public/.htaccess (original)
+++ incubator/olio/webapp/rails/trunk/public/.htaccess Thu Apr  2 05:03:10 2009
@@ -1,3 +1,21 @@
+#
+# 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.
+# 
+
 # General Apache options
 AddHandler fastcgi-script .fcgi
 AddHandler cgi-script .cgi
@@ -37,4 +55,4 @@
 # Example:
 #   ErrorDocument 500 /500.html
 
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
\ No newline at end of file
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"