6 files changed, 239 insertions, 199 deletions

diff --git a/www/rubygem-actionwebservice/Makefile b/www/rubygem-actionwebservice/Makefile
index e99a24de805d..684e2f6135c1 100644
--- a/www/rubygem-actionwebservice/Makefile
+++ b/www/rubygem-actionwebservice/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionwebservice
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	aws
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR=	aws
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Simple support for publishing Web Service APIs for Rails applications
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
-		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord
+BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.1.gemspec:${PORTSDIR}/databases/rubygem-activerecord
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 # This target is only meant to be used by the port maintainer.
diff --git a/www/rubygem-actionwebservice/distinfo b/www/rubygem-actionwebservice/distinfo
index e52e5b208e98..dfeb7ff480c7 100644
--- a/www/rubygem-actionwebservice/distinfo
+++ b/www/rubygem-actionwebservice/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionwebservice-1.1.6.gem) = 007eed546c522692fbe88d47bb0d7934
-SHA256 (rubygem/actionwebservice-1.1.6.gem) = e093589cc3bde3375c4feef4b82cdbde3ea6a2fbeb4103cbaded2dde5ec1f8a1
-SIZE (rubygem/actionwebservice-1.1.6.gem) = 67072
+MD5 (rubygem/actionwebservice-1.2.1.gem) = a451876559c0a3c5eab7b1d10de8a70e
+SHA256 (rubygem/actionwebservice-1.2.1.gem) = 26e6b4fc79977d8ff2a49ca7ec3fd6851698109f548973b418891f7002fd5200
+SIZE (rubygem/actionwebservice-1.2.1.gem) = 67584
diff --git a/www/rubygem-actionwebservice/pkg-plist b/www/rubygem-actionwebservice/pkg-plist
index 0ad758ce014a..718c8f77300b 100644
--- a/www/rubygem-actionwebservice/pkg-plist
+++ b/www/rubygem-actionwebservice/pkg-plist
@@ -1,105 +1,11 @@
 %%GEM_CACHE%%
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000031.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000032.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000033.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000034.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000035.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000036.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000037.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000038.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Base.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000025.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000026.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000027.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000028.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000029.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000030.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController/ClassMethods.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController/ClassMethods.src/M000001.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.src/M000003.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.src/M000004.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.src/M000002.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000040.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000041.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000043.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000044.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.src/M000005.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.src/M000006.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.src/M000007.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.src/M000008.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src/M000023.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src/M000024.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000009.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000010.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000011.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000012.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000014.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000015.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000016.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000017.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000018.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000020.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.src/M000021.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.src/M000022.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding/ClassMethods.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding/ClassMethods.src/M000039.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/SignatureTypes.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000046.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000047.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000048.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000049.html
-%%GEM_DOC_DIR%%/rdoc/created.rid
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/api_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/base_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/casting_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/base_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/soap_client_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/xmlrpc_client_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/action_controller_container_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/delegated_container_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/direct_container_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher/abstract_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher/action_controller_dispatcher_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/invocation_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/abstract_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/discovery_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol/marshaler_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/xmlrpc_protocol_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/scaffolding_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/struct_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support/class_inheritable_options_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support/signature_types_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/test_invoke_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/version_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service_rb.html
-%%GEM_DOC_DIR%%/rdoc/fr_class_index.html
-%%GEM_DOC_DIR%%/rdoc/fr_file_index.html
-%%GEM_DOC_DIR%%/rdoc/fr_method_index.html
-%%GEM_DOC_DIR%%/rdoc/index.html
-%%GEM_DOC_DIR%%/rdoc/rdoc-style.css
-%%GEM_LIB_DIR%%/CHANGELOG
-%%GEM_LIB_DIR%%/MIT-LICENSE
-%%GEM_LIB_DIR%%/README
+%%GEM_SPEC%%
 %%GEM_LIB_DIR%%/Rakefile
+%%GEM_LIB_DIR%%/setup.rb
+%%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/TODO
+%%GEM_LIB_DIR%%/CHANGELOG
+%%GEM_LIB_DIR%%/MIT-LICENSE
 %%GEM_LIB_DIR%%/examples/googlesearch/README
 %%GEM_LIB_DIR%%/examples/googlesearch/autoloading/google_search_api.rb
 %%GEM_LIB_DIR%%/examples/googlesearch/autoloading/google_search_controller.rb
@@ -118,40 +24,37 @@
 %%GEM_LIB_DIR%%/lib/action_web_service/base.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/casting.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/client.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/container.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/dispatcher.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/invocation.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/protocol.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/scaffolding.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/struct.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/test_invoke.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/version.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/client/base.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/client/soap_client.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/client/xmlrpc_client.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/container.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/container/action_controller_container.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/container/delegated_container.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/container/direct_container.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/dispatcher.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/dispatcher/abstract.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/invocation.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/protocol.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/protocol/abstract.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/protocol/discovery.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/protocol/soap_protocol.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/protocol/soap_protocol/marshaler.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/protocol/xmlrpc_protocol.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/scaffolding.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/struct.rb
+%%GEM_LIB_DIR%%/lib/action_web_service/protocol/soap_protocol/marshaler.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/support/class_inheritable_options.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/support/signature_types.rb
 %%GEM_LIB_DIR%%/lib/action_web_service/templates/scaffolds/layout.rhtml
 %%GEM_LIB_DIR%%/lib/action_web_service/templates/scaffolds/methods.rhtml
 %%GEM_LIB_DIR%%/lib/action_web_service/templates/scaffolds/parameters.rhtml
 %%GEM_LIB_DIR%%/lib/action_web_service/templates/scaffolds/result.rhtml
-%%GEM_LIB_DIR%%/lib/action_web_service/test_invoke.rb
-%%GEM_LIB_DIR%%/lib/action_web_service/version.rb
-%%GEM_LIB_DIR%%/setup.rb
 %%GEM_LIB_DIR%%/test/abstract_client.rb
 %%GEM_LIB_DIR%%/test/abstract_dispatcher.rb
 %%GEM_LIB_DIR%%/test/abstract_unit.rb
 %%GEM_LIB_DIR%%/test/api_test.rb
-%%GEM_LIB_DIR%%/test/apis/auto_load_api.rb
-%%GEM_LIB_DIR%%/test/apis/broken_auto_load_api.rb
 %%GEM_LIB_DIR%%/test/base_test.rb
 %%GEM_LIB_DIR%%/test/casting_test.rb
 %%GEM_LIB_DIR%%/test/client_soap_test.rb
@@ -159,15 +62,112 @@
 %%GEM_LIB_DIR%%/test/container_test.rb
 %%GEM_LIB_DIR%%/test/dispatcher_action_controller_soap_test.rb
 %%GEM_LIB_DIR%%/test/dispatcher_action_controller_xmlrpc_test.rb
-%%GEM_LIB_DIR%%/test/fixtures/db_definitions/mysql.sql
-%%GEM_LIB_DIR%%/test/fixtures/users.yml
 %%GEM_LIB_DIR%%/test/gencov
 %%GEM_LIB_DIR%%/test/invocation_test.rb
 %%GEM_LIB_DIR%%/test/run
 %%GEM_LIB_DIR%%/test/scaffolded_controller_test.rb
 %%GEM_LIB_DIR%%/test/struct_test.rb
+%%GEM_LIB_DIR%%/test/apis/auto_load_api.rb
+%%GEM_LIB_DIR%%/test/apis/broken_auto_load_api.rb
 %%GEM_LIB_DIR%%/test/test_invoke_test.rb
-%%GEM_SPEC%%
+%%GEM_LIB_DIR%%/test/fixtures/users.yml
+%%GEM_LIB_DIR%%/test/fixtures/db_definitions/mysql.sql
+%%GEM_DOC_DIR%%/rdoc/created.rid
+%%GEM_DOC_DIR%%/rdoc/rdoc-style.css
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/api_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/base_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/casting_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/invocation_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/scaffolding_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/struct_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/test_invoke_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/version_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/base_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/soap_client_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client/xmlrpc_client_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/action_controller_container_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/delegated_container_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container/direct_container_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher/abstract_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher/action_controller_dispatcher_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/abstract_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/discovery_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/xmlrpc_protocol_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol/marshaler_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support/class_inheritable_options_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support/signature_types_rb.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController/ClassMethods.src/M000001.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController/ClassMethods.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.src/M000002.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.src/M000003.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.src/M000004.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.src/M000005.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.src/M000006.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.src/M000007.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.src/M000008.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000009.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000010.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000011.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000012.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src/M000014.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000015.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000016.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000017.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000018.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src/M000020.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.src/M000021.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.src/M000022.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src/M000023.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src/M000024.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000025.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000026.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src/M000027.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000028.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000029.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src/M000030.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000031.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000032.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000033.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000034.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000035.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000036.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000037.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000038.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding/ClassMethods.src/M000039.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding/ClassMethods.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000040.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000041.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000043.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src/M000044.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000046.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000047.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000048.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src/M000049.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/SignatureTypes.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Base.html
+%%GEM_DOC_DIR%%/rdoc/fr_file_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_class_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_method_index.html
+%%GEM_DOC_DIR%%/rdoc/index.html
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/db_definitions
 @dirrm %%GEM_LIB_DIR%%/test/fixtures
 @dirrm %%GEM_LIB_DIR%%/test/apis
@@ -191,41 +191,41 @@
 @dirrm %%GEM_LIB_DIR%%/examples/googlesearch
 @dirrm %%GEM_LIB_DIR%%/examples
 @dirrm %%GEM_LIB_DIR%%
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service
-@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib
-@dirrm %%GEM_DOC_DIR%%/rdoc/files
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Struct.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding/ClassMethods.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Scaffolding
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapTypedArrayFactory.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapMarshaler.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBinding.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapBase64Factory.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/SoapActiveRecordStructFactory.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap/Registry.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol/Soap
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Protocol
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation/ClassMethods.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Invocation
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated/ClassMethods.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Delegated
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct/ClassMethods.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/Direct
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController/ClassMethods.src
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container/ActionController
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Container
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/XmlRpc.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client/Soap.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/Client
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/dispatcher
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/container
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/client
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib
+@dirrm %%GEM_DOC_DIR%%/rdoc/files
 @dirrm %%GEM_DOC_DIR%%/rdoc
 @dirrm %%GEM_DOC_DIR%%
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index 94dcd2aff497..def32787e0b7 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,11 +14,11 @@ MAINTAINER=	jw@innerewut.de
 COMMENT=	MVC web application framework
 
 BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		${LOCALBASE}/${SPEC_DIR}/activesupport-1.3.1.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
-		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
-		${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
-		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.2.5.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
-		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.1.6.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
+		${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.0.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
+		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.1.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
+		${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.3.1.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
+		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.2.1.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	FCGI "FastCGI support" Off\
diff --git a/www/rubygem-rails/distinfo b/www/rubygem-rails/distinfo
index 67ce1cca7fb0..ce45690f04ba 100644
--- a/www/rubygem-rails/distinfo
+++ b/www/rubygem-rails/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/rails-1.1.6.gem) = dee64ab90efedbbe900944fac754d72d
-SHA256 (rubygem/rails-1.1.6.gem) = f78cc3dfe77ceaa3cdd808735dcb81c8d3bdbd8e4d6b72ecc3a1b7fc19f1bd49
-SIZE (rubygem/rails-1.1.6.gem) = 144896
+MD5 (rubygem/rails-1.2.1.gem) = fc481abad01299791c393ef576746b3f
+SHA256 (rubygem/rails-1.2.1.gem) = 4bd8daec4cdabae8d70a4d00706512d0d1d8f8415b904f3bc8e40be1f693d67e
+SIZE (rubygem/rails-1.2.1.gem) = 168448
diff --git a/www/rubygem-rails/pkg-plist b/www/rubygem-rails/pkg-plist
index 42b10bdb6b1b..547fb87c4ee3 100644
--- a/www/rubygem-rails/pkg-plist
+++ b/www/rubygem-rails/pkg-plist
@@ -1,131 +1,163 @@
 bin/rails
 %%GEM_CACHE%%
+%%GEM_SPEC%%
 %%GEM_LIB_DIR%%/CHANGELOG
+%%GEM_LIB_DIR%%/fresh_rakefile
 %%GEM_LIB_DIR%%/MIT-LICENSE
-%%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/Rakefile
+%%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/bin/about
 %%GEM_LIB_DIR%%/bin/breakpointer
 %%GEM_LIB_DIR%%/bin/console
 %%GEM_LIB_DIR%%/bin/destroy
 %%GEM_LIB_DIR%%/bin/generate
-%%GEM_LIB_DIR%%/bin/performance/benchmarker
-%%GEM_LIB_DIR%%/bin/performance/profiler
 %%GEM_LIB_DIR%%/bin/plugin
-%%GEM_LIB_DIR%%/bin/process/reaper
-%%GEM_LIB_DIR%%/bin/process/spawner
 %%GEM_LIB_DIR%%/bin/rails
 %%GEM_LIB_DIR%%/bin/runner
 %%GEM_LIB_DIR%%/bin/server
+%%GEM_LIB_DIR%%/bin/performance/benchmarker
+%%GEM_LIB_DIR%%/bin/performance/profiler
+%%GEM_LIB_DIR%%/bin/process/inspector
+%%GEM_LIB_DIR%%/bin/process/reaper
+%%GEM_LIB_DIR%%/bin/process/spawner
+%%GEM_LIB_DIR%%/builtin/rails_info/rails_info_controller.rb
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info.rb
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info_controller.rb
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info_helper.rb
-%%GEM_LIB_DIR%%/builtin/rails_info/rails_info_controller.rb
 %%GEM_LIB_DIR%%/configs/apache.conf
+%%GEM_LIB_DIR%%/configs/empty.log
+%%GEM_LIB_DIR%%/configs/lighttpd.conf
+%%GEM_LIB_DIR%%/configs/routes.rb
+%%GEM_LIB_DIR%%/configs/databases/frontbase.yml
 %%GEM_LIB_DIR%%/configs/databases/mysql.yml
 %%GEM_LIB_DIR%%/configs/databases/oracle.yml
 %%GEM_LIB_DIR%%/configs/databases/postgresql.yml
 %%GEM_LIB_DIR%%/configs/databases/sqlite2.yml
 %%GEM_LIB_DIR%%/configs/databases/sqlite3.yml
-%%GEM_LIB_DIR%%/configs/empty.log
-%%GEM_LIB_DIR%%/configs/lighttpd.conf
-%%GEM_LIB_DIR%%/configs/routes.rb
+%%GEM_LIB_DIR%%/doc/README_FOR_APP
 %%GEM_LIB_DIR%%/dispatches/dispatch.fcgi
 %%GEM_LIB_DIR%%/dispatches/dispatch.rb
 %%GEM_LIB_DIR%%/dispatches/gateway.cgi
-%%GEM_LIB_DIR%%/doc/README_FOR_APP
 %%GEM_LIB_DIR%%/environments/boot.rb
 %%GEM_LIB_DIR%%/environments/development.rb
 %%GEM_LIB_DIR%%/environments/environment.rb
 %%GEM_LIB_DIR%%/environments/production.rb
 %%GEM_LIB_DIR%%/environments/test.rb
-%%GEM_LIB_DIR%%/fresh_rakefile
 %%GEM_LIB_DIR%%/helpers/application.rb
 %%GEM_LIB_DIR%%/helpers/application_helper.rb
 %%GEM_LIB_DIR%%/helpers/test_helper.rb
 %%GEM_LIB_DIR%%/html/404.html
 %%GEM_LIB_DIR%%/html/500.html
 %%GEM_LIB_DIR%%/html/favicon.ico
-%%GEM_LIB_DIR%%/html/images/rails.png
 %%GEM_LIB_DIR%%/html/index.html
+%%GEM_LIB_DIR%%/html/robots.txt
+%%GEM_LIB_DIR%%/html/images/rails.png
 %%GEM_LIB_DIR%%/html/javascripts/application.js
 %%GEM_LIB_DIR%%/html/javascripts/controls.js
 %%GEM_LIB_DIR%%/html/javascripts/dragdrop.js
 %%GEM_LIB_DIR%%/html/javascripts/effects.js
 %%GEM_LIB_DIR%%/html/javascripts/prototype.js
-%%GEM_LIB_DIR%%/html/robots.txt
 %%GEM_LIB_DIR%%/lib/binding_of_caller.rb
 %%GEM_LIB_DIR%%/lib/breakpoint.rb
 %%GEM_LIB_DIR%%/lib/breakpoint_client.rb
 %%GEM_LIB_DIR%%/lib/code_statistics.rb
 %%GEM_LIB_DIR%%/lib/commands.rb
+%%GEM_LIB_DIR%%/lib/console_app.rb
+%%GEM_LIB_DIR%%/lib/console_sandbox.rb
+%%GEM_LIB_DIR%%/lib/console_with_helpers.rb
+%%GEM_LIB_DIR%%/lib/dispatcher.rb
+%%GEM_LIB_DIR%%/lib/fcgi_handler.rb
+%%GEM_LIB_DIR%%/lib/initializer.rb
+%%GEM_LIB_DIR%%/lib/rails_generator.rb
+%%GEM_LIB_DIR%%/lib/railties_path.rb
+%%GEM_LIB_DIR%%/lib/ruby_version_check.rb
+%%GEM_LIB_DIR%%/lib/rubyprof_ext.rb
+%%GEM_LIB_DIR%%/lib/test_help.rb
+%%GEM_LIB_DIR%%/lib/webrick_server.rb
 %%GEM_LIB_DIR%%/lib/commands/about.rb
 %%GEM_LIB_DIR%%/lib/commands/breakpointer.rb
 %%GEM_LIB_DIR%%/lib/commands/console.rb
 %%GEM_LIB_DIR%%/lib/commands/destroy.rb
 %%GEM_LIB_DIR%%/lib/commands/generate.rb
+%%GEM_LIB_DIR%%/lib/commands/plugin.rb
+%%GEM_LIB_DIR%%/lib/commands/runner.rb
+%%GEM_LIB_DIR%%/lib/commands/server.rb
+%%GEM_LIB_DIR%%/lib/commands/update.rb
 %%GEM_LIB_DIR%%/lib/commands/ncgi/listener
 %%GEM_LIB_DIR%%/lib/commands/ncgi/tracker
 %%GEM_LIB_DIR%%/lib/commands/performance/benchmarker.rb
 %%GEM_LIB_DIR%%/lib/commands/performance/profiler.rb
-%%GEM_LIB_DIR%%/lib/commands/plugin.rb
+%%GEM_LIB_DIR%%/lib/commands/process/inspector.rb
 %%GEM_LIB_DIR%%/lib/commands/process/reaper.rb
 %%GEM_LIB_DIR%%/lib/commands/process/spawner.rb
 %%GEM_LIB_DIR%%/lib/commands/process/spinner.rb
-%%GEM_LIB_DIR%%/lib/commands/runner.rb
-%%GEM_LIB_DIR%%/lib/commands/server.rb
+%%GEM_LIB_DIR%%/lib/commands/servers/base.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/lighttpd.rb
+%%GEM_LIB_DIR%%/lib/commands/servers/mongrel.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/webrick.rb
-%%GEM_LIB_DIR%%/lib/commands/update.rb
-%%GEM_LIB_DIR%%/lib/console_app.rb
-%%GEM_LIB_DIR%%/lib/console_sandbox.rb
-%%GEM_LIB_DIR%%/lib/console_with_helpers.rb
-%%GEM_LIB_DIR%%/lib/dispatcher.rb
-%%GEM_LIB_DIR%%/lib/fcgi_handler.rb
-%%GEM_LIB_DIR%%/lib/initializer.rb
 %%GEM_LIB_DIR%%/lib/rails/version.rb
-%%GEM_LIB_DIR%%/lib/rails_generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/base.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/commands.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/applications/app/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generated_attribute.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/lookup.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/manifest.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/options.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/scripts.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/simple_logger.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/spec.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/applications/app/app_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/applications/app/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/controller_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/functional_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/helper.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/view.rhtml
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/mailer_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/mailer.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/view.rhtml
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/migration_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/templates/migration.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/model_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/fixtures.yml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/migration.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/model.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/unit_test.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/observer_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/templates/observer.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/templates/unit_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/plugin_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/README
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/Rakefile
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/init.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/install.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/plugin.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/Rakefile
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/README
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/tasks.rake
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/uninstall.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/unit_test.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/resource_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/controller.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/fixtures.yml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/functional_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/helper.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/migration.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/model.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/unit_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/form.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml
@@ -137,26 +169,32 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/fixtures.yml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/functional_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/helper.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/migration.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/model.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/style.css
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/unit_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/templates/migration.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/web_service_generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/api_definition.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/functional_test.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/web_service_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/lookup.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/manifest.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/options.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/scripts.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/destroy.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/generate.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/update.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/simple_logger.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/spec.rb
-%%GEM_LIB_DIR%%/lib/railties_path.rb
-%%GEM_LIB_DIR%%/lib/ruby_version_check.rb
-%%GEM_LIB_DIR%%/lib/rubyprof_ext.rb
 %%GEM_LIB_DIR%%/lib/tasks/databases.rake
 %%GEM_LIB_DIR%%/lib/tasks/documentation.rake
 %%GEM_LIB_DIR%%/lib/tasks/framework.rake
@@ -167,19 +205,22 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/tasks/statistics.rake
 %%GEM_LIB_DIR%%/lib/tasks/testing.rake
 %%GEM_LIB_DIR%%/lib/tasks/tmp.rake
-%%GEM_LIB_DIR%%/lib/test_help.rb
-%%GEM_LIB_DIR%%/lib/webrick_server.rb
-%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/lib/tasks
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/scripts
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/templates
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/templates
+@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/templates
@@ -207,8 +248,8 @@ bin/rails
 @dirrm %%GEM_LIB_DIR%%/html
 @dirrm %%GEM_LIB_DIR%%/helpers
 @dirrm %%GEM_LIB_DIR%%/environments
-@dirrm %%GEM_LIB_DIR%%/doc
 @dirrm %%GEM_LIB_DIR%%/dispatches
+@dirrm %%GEM_LIB_DIR%%/doc
 @dirrm %%GEM_LIB_DIR%%/configs/databases
 @dirrm %%GEM_LIB_DIR%%/configs
 @dirrm %%GEM_LIB_DIR%%/builtin/rails_info/rails