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/10 18:42:36 UTC
svn commit: r764001 - in /incubator/olio: ./
webapp/rails/trunk/vendor/plugins/rorclassify/
webapp/rails/trunk/vendor/plugins/rorclassify/lib/
webapp/rails/trunk/vendor/plugins/rorclassify/templates/
Author: shanti
Date: Fri Apr 10 18:42:35 2009
New Revision: 764001
URL: http://svn.apache.org/viewvc?rev=764001&view=rev
Log:
More fixes for OLIO-13.
Modified:
incubator/olio/LICENSE_rails.txt
incubator/olio/NOTICE_rails.txt
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/apache.rb
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/mongrel.rb
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/my_sql.rb
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/svn.rb
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/rorclassify.rb
incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/templates/app.conf
Modified: incubator/olio/LICENSE_rails.txt
URL: http://svn.apache.org/viewvc/incubator/olio/LICENSE_rails.txt?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/LICENSE_rails.txt (original)
+++ incubator/olio/LICENSE_rails.txt Fri Apr 10 18:42:35 2009
@@ -202,8 +202,9 @@
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
+The third-party plugins acts_as_network, acts_as_taggable, attachment_fu,
+calendar_helper, country_select, fixture_replacement2,
+rspec, rspec-rails, rails_rcov, white_list and the Javascript
libraries script.aculo.us and prototype are distributed under a MIT license :
The MIT License
Modified: incubator/olio/NOTICE_rails.txt
URL: http://svn.apache.org/viewvc/incubator/olio/NOTICE_rails.txt?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/NOTICE_rails.txt (original)
+++ incubator/olio/NOTICE_rails.txt Fri Apr 10 18:42:35 2009
@@ -27,6 +27,12 @@
Plugin 'acts_as_network' :
Copyright (c) 2007 Zetetic LLC
+Plugin 'acts_as_taggable' :
+Copyright (c) 2006 Jonathan Viney
+
+Plugin 'attachment_fu' :
+Copyright (c) 2005 Rick Olson
+
Plugin 'calendar-helper':
Copyright (c) 2006 Jeremy Voorhis and Geoffrey Grosenbach
@@ -42,18 +48,19 @@
Plugin 'rspec' :
Copyright (c) 2005-2008 The RSpec Development Team
+Plugin 'white-list':
+Copyright (c) 2005 Rick Olson
+
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:
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/apache.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/apache.rb?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/apache.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/apache.rb Fri Apr 10 18:42:35 2009
@@ -1,4 +1,20 @@
-
+#
+# 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.
+#
namespace :apache do
task :setup, :role => :web do
machine = get_machine
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/mongrel.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/mongrel.rb?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/mongrel.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/mongrel.rb Fri Apr 10 18:42:35 2009
@@ -1,4 +1,20 @@
-
+#
+# 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.
+#
namespace :mongrel do
set :mongrel_clean, false
set :mongrel_rails, 'mongrel_rails'
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/my_sql.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/my_sql.rb?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/my_sql.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/my_sql.rb Fri Apr 10 18:42:35 2009
@@ -1,4 +1,20 @@
-
+#
+# 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.
+#
namespace :mysql do
task :setup do
# Get database names from database.yml
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/svn.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/svn.rb?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/svn.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/lib/svn.rb Fri Apr 10 18:42:35 2009
@@ -1,4 +1,20 @@
-
+#
+# 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.
+#
namespace :svn do
desc "Setup repo"
task :setup do
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/rorclassify.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/rorclassify.rb?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/rorclassify.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/rorclassify.rb Fri Apr 10 18:42:35 2009
@@ -1,4 +1,20 @@
-
+#
+# 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.
+#
require 'erb'
require 'rubygems'
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/templates/app.conf
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/templates/app.conf?rev=764001&r1=764000&r2=764001&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/templates/app.conf (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rorclassify/templates/app.conf Fri Apr 10 18:42:35 2009
@@ -1,3 +1,20 @@
+#
+# 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.
+#
<VirtualHost <%= apache_ssl_enabled ? apache_ssl_ip : "*" %>:80>
ServerName <%= apache_server_name %>
<% apache_server_aliases_array.each do |a| %>