rhoconnect 3.0.4 → 3.0.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.5 (not released)
+* use redis 2.4 by default
+* #17447481 - auto-renewal of expired C2DM tokens
+* #19723593 - re-creating Client if clientregister call is made with unknown client id
+
 ## 3.0.4 (2011-10-13)
 * #19675957 - fixing broken task :set_admin_password
 

data/Gemfile

@@ -14,6 +14,7 @@ end
 gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
 
 group :development do
+  gem 'aws-s3', '>= 0.6.2', :require => 'aws/s3'
   gem 'fpm', '>= 0.3.8'
   gem 'fog', '>= 1.0.0' 
   gem 'ffaker', '~> 1.8.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.0.4)
+    rhoconnect (3.0.5)
       bundler (~> 1.0)
       json (~> 1.5.0)
       rake (= 0.9.2)
@@ -17,6 +17,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
     builder (3.0.0)
     crack (0.3.1)
     diff-lcs (1.1.3)
@@ -88,11 +92,13 @@ GEM
     webmock (1.6.4)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   ffaker (~> 1.8.0)

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 load 'tasks/redis.rake'
 load 'installer/utils/nix_installation.rake'
+load 'installer/utils/package_upload/repos.rake'
 
 require 'bundler'
 Bundler.setup(:default, :development, :test)

data/doc/blob-sync.txt

@@ -40,7 +40,7 @@ The following example stores the `:filename` argument as another object attribut
 The following example takes the blob and stores it in S3:
 
 	:::ruby
-	def create(create_hash,blob)
+	def create(create_hash)
 	  # this would be a blob attribute, points to a tempfile 
 	  # containing the raw post data
 	  name = create_hash["image_uri"] 
@@ -72,12 +72,19 @@ In your query call, you should store the URL to images in the blob attribute so
 	    @result[entry.key] = new_item
 	  end
 	  @result
-	end
+	end              
 
 Here we save the image URL to an attribute `image_uri-rhoblob`.  This will correspond to the `image_uri` attribute in our Rhom model above.
 
 **NOTE: In order for Rhodes to automatically recognize a blob attribute, the attribute name must end with "-rhoblob".  In the above example, `image_uri` was our Rhom attribute, so our source adapter assigned `image_uri-rhoblob` with the blob URL.**
 
+### Blob file name and extension on client
+File name is generated on client when downloading. File extension is determine by:
+
+* To specify blob file extension add extension parameter to the blob URL. For example: '&extension=jpg'
+* If no extension parameter the blob URL then extension is extracted from blob URL itself(looking for '.' from the end of the URL)
+* If still no file extension found, then '.bin' is used
+
 A complete image source adapter that stores files in S3 might look like:
 
 	:::ruby

data/doc/client-objc.txt

@@ -41,7 +41,7 @@ Do the following steps to add `<rhoconnect-client>/objectivec/RhoConnectClient.x
 
 1. Drag and drop `<rhoconnect-client>/ObjectiveC/RhoConnectClient.xcodeproj` from the Finder into Groups & Files for your Xcode project. RhoConnectClient.xcodeproj should now appear in Groups & Files.
 
-<img src="rhoconnect-objc-client-tutorial/rhoconnectclient-groupfile.png" alt="RhoConnectClient in Groups & Files" /> 
+<img src="http://rhodocs.s3.amazonaws.com/rhoconnect-objc-client-tutorial/rhoconnectclient-groupfile.png" alt="RhoConnectClient in Groups & Files" /> 
 
 2. Under Groups and Files, open the Targets icon.
 3. Right-click on your project-named target.
@@ -49,7 +49,7 @@ Do the following steps to add `<rhoconnect-client>/objectivec/RhoConnectClient.x
 5. In Direct Dependencies, click the + button.
 6. Choose the dependency from RhoConnectClient.xcodeproj.
 
-<img src="rhoconnect-objc-client-tutorial/direct-dependency.png" alt="RhoConnectClient Direct Dependency" />
+<img src="http://rhodocs.s3.amazonaws.com/rhoconnect-objc-client-tutorial/direct-dependency.png" alt="RhoConnectClient Direct Dependency" />
 
 ### Adding Xcode Libraries
 
@@ -59,7 +59,7 @@ Do the following steps to add libraries:
 2. Select Add->Existing Frameworks from the popup menu.
 3. Add the following to your project: `libstdc++6.dylib, libsqlite3.dylib, libz.dylib, CFNetwork.framework`.
 
-<img src="rhoconnect-objc-client-tutorial/add-frameworks.png" alt="Add Frameworks" />
+<img src="http://rhodocs.s3.amazonaws.com/rhoconnect-objc-client-tutorial/add-frameworks.png" alt="Add Frameworks" />
 
 ### Adding Schema Files
 
@@ -99,10 +99,10 @@ Call init for RhoConnectClient to initialize your client.
 	:::cplusplus
 	sclient = [[RhoConnectClient alloc] init];
 
-Set up an NSArray containing the models for your client.
+Set up an NSMutableArray containing the models for your client.
 
 	:::cplusplus
-	NSArray* models = [NSArray arrayWithObjects:customer, product, nil];
+	NSMutableArray* models = [NSMutableArray arrayWithObjects:customer, product, nil];
 
 Call the RhoConnectClient method addModels to add those models to your client.
 
@@ -251,37 +251,56 @@ Here is the Store code for the find process, contained in RootViewController.m.
 
 ## RhoConnectClient Class API
 
-The RhoConnectClient class contains properties and methods to build an Objective C RhoConnect client and connect it with a RhoConnect server.
-
-## threaded\_mode (RhoConnectClient property)
+The RhoConnectClient class contains the following properties and methods to build an Objective C RhoConnect client and connect it with a RhoConnect server.
+
+ * <a href="#threaded_mode">threaded_mode property</a>
+ * <a href="#poll_interval">poll_interval property</a>
+ * <a href="#sync_server">sync_server property</a>
+ * <a href="#initDatabase">initDatabase</a>
+ * <a href="#addModels">addModels</a>
+ * <a href="#database_full_reset_and_logout">database\_full\_reset\_and\_logout</a>
+ * <a href="#database_client_reset">database\_client\_reset</a>
+ * <a href="#initDatabase">initDatabase</a>
+ * <a href="#loginWithUser">loginWithUser</a>
+ * <a href="#loginWithUser (with callback)">loginWithUser (with callback)</a>
+ * <a href="#setNotification">setNotification</a>
+ * <a href="#clearNotification">clearNotification</a>
+ * <a href="#is_logged_in">is\_logged\_in</a>
+ * <a href="#syncAll">syncAll</a>
+ * <a href="#search">search</a>
+ * <a href="#setObjectNotification">setObjectNotification</a>
+ * <a href="#clearObjectNotification">clearObjectNotification</a>
+ * <a href="#addObjectNotify">addObjectNotify</a>
+
+### <a id="threaded_mode"></a>threaded\_mode property
 
 BOOL. Set to false to get the result of operations as a return value. (Set to true to get notifications - not supported yet.) Default = false.
 
 	:::cplusplus
 	@property(setter=setThreadedMode) BOOL threaded_mode;
 
-## poll\_interval (RhoConnectClient property)
+### <a id="poll_interval"></a>poll\_interval property
 
 int. Not yet supported. Default = 0.
 
 	:::cplusplus
 	@property(setter=setPollInterval) int poll_interval;
 
-## sync\_server (RhoConnectClient property)
+### <a id="sync_server"></a>sync\_server property
 
 NSString. Sets the RhoConnect server url, for example: "`http://<ip>:<port>/application`"
 
 	:::cplusplus
 	@property(assign, setter=setSyncServer) NSString* sync_server;
 
-## initDatabase (RhoConnectClient method)
+### <a id="initDatabase"></a>initDatabase
 
 Initializes your client database. Call this method before you create and use a client.
 
 	::::cplusplus
 	+ (void) initDatabase;
 
-## addModels (RhoConnectClient method)
+### <a id="addModels"></a>addModels
 
 Adds your model objects to your client database, allowing them to sync with the RhoConnect server.
 
@@ -295,14 +314,21 @@ Adds your model objects to your client database, allowing them to sync with the
 </tr>
 </table>
 
-## database\_full\_reset\_and\_logout (RhoConnectClient method)
+### <a id="database_full_reset_and_logout"></a>database\_full\_reset\_and\_logout
 
 Resets all data for all models in your local database, and then performs logout.
 
 	:::cplusplus
 	- (void) database_full_reset_and_logout;
 
-## loginWithUser (RhoConnectClient method)
+### <a id="database_client_reset"></a>database\_client\_reset
+
+Resets all data for all models in your local database and delete client ID. Use this method for 'unknown client' error
+
+	:::cplusplus
+	- (void) database_client_reset;
+
+### <a id="loginWithUser">loginWithUser
 
 Returns a RhoConnectNotify object containing login data after logging your client database into the RhoConnect server.
 
@@ -320,7 +346,7 @@ Returns a RhoConnectNotify object containing login data after logging your clien
 </tr>
 </table>
 
-## loginWithUser (RhoConnectClient method)
+### <a id="loginWithUser (with callback)">loginWithUser (with callback)
 
 Logs your client database into the RhoConnect server and calls a selector callback target method when the login process is finished.
 
@@ -342,7 +368,7 @@ Logs your client database into the RhoConnect server and calls a selector callba
 </tr>
 </table>
 
-## setNotification (RhoConnectClient method)
+### <a id="setNotification">setNotification
 
 Set the sync notification callback method.
 
@@ -356,28 +382,28 @@ Set the sync notification callback method.
 </tr>
 </table>
 
-## clearNotification (RhoConnectClient method)
+### <a id="clearNotification">clearNotification
 
 Instance method. Clear the sync notification callback.
 
 	:::cplusplus
 	- (void) clearNotification;
 
-## is\_logged\_in (RhoConnectClient method)
+### <a id="is_logged_in">is\_logged\_in
 
 Instance method. Returns true if your RhoConnect session is logged in (if the login session exists in the database), false otherwise.
 
 	:::cplusplus	
 	- (BOOL) is_logged_in;
 
-## syncAll (RhoConnectClient method)
+### <a id="syncAll">syncAll
 
 Instance method. Returns a RhoConnectNotify object after running a sync on all the models for your RhoConnect client.
 
 	:::cplusplus
 	- (RhoConnectNotify*) syncAll;
 
-## search (RhoConnectClient method)
+### <a id="search">search
 
 Instance method. Returns a RhoConnectNotify object after sending a search request to the RhoConnect server.
 
@@ -408,7 +434,7 @@ Instance method. Returns a RhoConnectNotify object after sending a search reques
 </tr>
 </table>
 
-## setObjectNotification (RhoConnectClient method)
+### <a id="setObjectNotification">setObjectNotification
 
 Instance method. Sets the callback method for object notification. The callback receives a RhoConnectObjectNotify object as a parameter. This RhoConnectObjectNotify object contains three arrays of hashes for the objects and their source ids that have been updated, created, and deleted, allowing you to display which records were changed.
 
@@ -421,13 +447,13 @@ Instance method. Sets the callback method for object notification. The callback
 </tr>
 </table>
 
-## clearObjectNotification (RhoConnectClient method)
+### <a id="clearObjectNotification"></a>clearObjectNotification
 
     - (void) clearObjectNotification;
 
 Instance method. Clears the callback method for object notification.
 
-## addObjectNotify (RhoConnectClient method)
+### <a id="addObjectNotify"></a>addObjectNotify
 
 Instance method. Add an object to track changes: create, update, delete.
 
@@ -454,30 +480,48 @@ Sample call:
     
 ## RhomModel Class API
 
-The RhomModel class contains properties and methods for setting and using RhomModel objects; those objects are RhoConnect models and their attributes.
-
-## name (RhomModel property)
+The RhomModel class contains the following properties and methods for setting and using RhomModel objects; RhomModel objects are RhoConnect models and their attributes.
+
+ * <a href="#name">name property</a>
+ * <a href="#sync_type">sync_type property</a>
+ * <a href="#model_type">model_type property</a>
+ * <a href="#associations">associations property</a>
+ * <a href="#init">init</a>
+ * <a href="#sync">sync</a>
+ * <a href="#sync (with callback)">sync (with callback)</a>
+ * <a href="#setNotification">setNotification</a>
+ * <a href="#clearNotification">clearNotification</a>
+ * <a href="#create">create</a>
+ * <a href="#find">find</a>
+ * <a href="#find_first">find_first</a>
+ * <a href="#find_all">find_all</a>
+ * <a href="#save">save</a>
+ * <a href="#destroy">destroy</a>
+ * <a href="#startBulkUpdate">startBulkUpdate</a>
+ * <a href="#stopBulkUpdate">stopBulkUpdate</a>
+
+### <a id="name"></a>name property
 
 NSString. Sets the model name.
 
 	:::cplusplus
 	@property(assign) NSString* name;
 
-## sync\_type (RhomModel property)
+### <a id="sync_type"></a>sync\_type property
 
 int. Sets the synchronization type: RST\_INCREMENTAL or RST\_BULK\_ONLY.
 
 	:::cplusplus
 	@property(assign) int sync_type;
 
-## model\_type (RhomModel property)
+### <a id="model_type">model\_type property
 
 int. Sets the model type: RMT\_PROPERTY\_BAG (default) or RMT\_PROPERTY\_FIXEDSCHEMA.
 
 	:::cplusplus
 	@property(assign) int model_type;
 
-## associations (RhomModel property)
+### <a id="associations">associations property
 
 The associations dictionary is a property of the model that controls its synchronization process. When one model (model A) has an association with another model (model B), this forces the other model (model B) synchronized along with the model (model A).
 
@@ -495,21 +539,21 @@ Example of associating two models, customer and product:
 	order.name = @"Order";
     order.associations = [NSDictionary dictionaryWithObjectsAndKeys: @"Customer", @"customer", @"Product", @"product", nil];
 
-## init (RhomModel method)
+### <a id="init">init
 
 Initializes a model object.
 
 	:::cplusplus
 	- (id) init;
 
-## sync (RhomModel method)
+### <a id="sync">sync
 
 Returns a RhoConnectNotify object containing sync information, after running a sync on this model.
 
 	:::cplusplus
 	- (RhoConnectNotify*) sync;
 
-## sync with callback (RhomModel method)
+### <a id="sync (with callback)">sync (with callback)
 
 Runs a sync on this model, and calls a callback, passing the callback the RhoConnectNotify status parameter for the synchronization: "in\_progress", "ok", "error", "complete".
 
@@ -531,7 +575,29 @@ Example:
 		return 1;
 	}
 
-## create (RhomModel method)
+### <a id="setNotification">setNotification
+
+Set the sync notification callback method for the Model.
+
+	:::cplusplus
+	- (void) setNotification: (SEL) callback target:(id)target;
+
+<table border="1">
+<tr>
+	<td><code>callback:(SEL) target:(id)target</code></td>
+	<td>The reference to the callback method that performs actions upon a sync notification.</td>
+</tr>
+</table>
+
+### <a id="clearNotification">clearNotification
+
+Instance method. Clear the sync notification callback for the Model.
+
+	:::cplusplus
+	- (void) clearNotification;
+
+
+### <a id="create">create
 
 Create a model object with attributes and save it to the database, the object id will be generated automatically if not set.
 
@@ -545,7 +611,7 @@ Create a model object with attributes and save it to the database, the object id
 </tr>
 </table>
 
-## find (RhomModel method)
+### <a id="find">find
 
 Returns an NSMutableDictionary object containing a model with the given object id.
 
@@ -559,7 +625,7 @@ Returns an NSMutableDictionary object containing a model with the given object i
 </tr>
 </table>
 
-## find\_first (RhomModel method)
+### <a id="find_first">find\_first
 
 Returns an NSMutableDictionary object containing the first model object found with the given set of model attributes.
 
@@ -584,7 +650,7 @@ Example call:
           // not found
     }
 
-## find\_all (RhomModel method)
+### <a id="find_all">find\_all
 
 Returns a NSMutableArray containing all the model objects that match the given set of attributes.
 
@@ -598,7 +664,7 @@ Returns a NSMutableArray containing all the model objects that match the given s
 </tr>
 </table>
 
-## save (RhomModel method)
+### <a id="save">save
 
 Saves a model object with the given data to the database.
 
@@ -612,7 +678,7 @@ Saves a model object with the given data to the database.
 </tr>
 </table>
 
-## destroy (RhomModel method)
+### <a id="destroy">destroy
 
 Delete model objects from the database that contain the given data.
 
@@ -626,14 +692,14 @@ Delete model objects from the database that contain the given data.
 </tr>
 </table>
 
-## startBulkUpdate (RhomModel method)
+### <a id="startBulkUpdate">startBulkUpdate
 
 Run this method when you start to create or update a bunch of models; it will optimize database access. Equal to start transaction.
 
 	:::cplusplus
 	- (void) startBulkUpdate;
 
-## stopBulkUpdate (RhomModel method)
+### <a id="stopBulkUpdate">stopBulkUpdate
 
 Run this method when you start to create or update a bunch of models; it will optimize database access. Equal to commit transaction.
 
@@ -731,6 +797,6 @@ This will produce a zipfile in the folder called `rhoconnect-client-<someversion
 ## Release procedure
 1. Unzip package to some folder
 
-2. Open project `rhoconnect-client\ObjectiveC\Tests\RhoConnectClientTest` in xcode and run. See log - SUCCESS should be at the end of log
+2. Open project `rhoconnect-client\ObjectiveC\Tests\RhoConnectClientTest` in xcode and run. See log - SUCCESS should be at the end of log.
 
-3. Open project `rhoconnect-client\Samples\ObjectiveC\store` in xcode and run. Press Login, you should see several items, click on item, you should see details
+3. Open project `rhoconnect-client\Samples\ObjectiveC\store` in xcode and run. Press Login, you should see several items, click on item, you should see details.

data/doc/deploying.txt

@@ -72,120 +72,86 @@ The [RhoHub](/rhohub/introduction) service offers several [production RhoConnect
 ## Deploying On-Premise
 The [sinatra book](http://sinatra-book.gittr.com/) has some great [deployment documentation](http://sinatra-book.gittr.com/#deployment) that you should review before running your RhoConnect application in production.
 
-## Deploying into J2EE environment
-In JRuby environment, there is an option to create the WAR container for the Rhoconnect app
-and deploy it into the J2EE App Server.
-(see the corresponding 'rake' task for creating the WAR containers).
-Deploying the WAR container varies per J2EE App Server, for JBoss it is necessary
-to place the WAR file into the server's deploy directory.
-
 We recommend using the [phusion passenger](http://modrails.com/index.html) stack for deploying an on-premise RhoConnect application.  Please refer to the [section on rack applications](http://modrails.com/documentation/Users%20guide%20Apache.html#_deploying_a_rack_based_ruby_application) for information on deploying a RhoConnect sinatra application.
 
 ## Deploying packaged RhoConnect software on Linux servers
 
 You can create RhoConnect production environment on Linux servers by installing software packages
-for Ubuntu and Cent OS respectively. At this moment supported formats are Debian (deb) and Red Hat (rpm) packages.
+for Ubuntu and CentOS respectively. At this moment supported formats are Debian (deb) and Red Hat (rpm) packages.
 
 Every package provides the following components:
 
 * Ruby 1.8.7, Ruby Enterprise Edition 2011.03
  
-* Nginx HTTP server (v. 1.0.6)
+* Nginx HTTP server
 
-* Passenger (v. 3.0.9)
+* Phusion Passenger
 
-* Redis data store (v. 2.2.14)
+* Redis data store
 
-* Rhoconnect gem with all required dependencies 
+* RhoConnect gem with all required dependencies 
  
 In addition, RPM package provides latest Sqlite3 headers and binaries, because standard Cent OS (5.x) libraries for Sqlite3 outdated.
 
-To create Debian package you need to have development version of RhoConnect software on Ubuntu (server, desktop. virtual machine) and execute the following rake task:
-<pre>
-rake build:deb  
-</pre>
-
-To create RPM package you need to have development version of RhoConnect software on Cent OS and execute the following rake task:
-<pre>
-rake build:rpm  
-</pre>
-
-After task is compete, either rhoconnect-x.y.z_all.deb or rhoconnect-x.y.z.noarch.rpm package will be created in the pkg/ directory. In the future, pre-built packages for latest RhoConnect software will be available for direct download.
-
-To install Deb package on Ununtu server (Ubuntu 11.4 server, Amazon EC2 Ubuntu server), you should run the following command:
-<pre>
-dpkg -i rhoconnect-x.y.z_all.deb
-</pre>
-
-To install RPM package on Cent OS server (tested for 5.x, 6.x, and basic 64-bit Amazon Linux AMI 2011.09):
-<pre>
-rpm -i rhoconnect-x.y.z.noarch.rpm
-</pre>
-
-In process of installation many of above components will be downloaded, configured and compiled on target platform.
-For practical usage, you should be familiar with and understand some of the provided settings.
-
-### Ruby Enterprise Edition
-By defaut all ruby binaries, libraries, and gems are installed into <b>/opt/rhoconnect</b> directory. 
-You may wish to have access to these items by adding to bash configuration files this command:
-<pre>
-export PATH=/opt/rhoconnect/bin:$PATH
-</pre>
-
-### Redis
-Rhoconnect installer configured redis server with the following settings:
-
-* Redis configuration file <b>/opt/rhoconnect/etc/redis.conf</b> has the following properties:
-  <pre>
-daemonize yes
-pidfile /var/run/redis.pid
-logfile /var/log/redis.log
-  </pre>
-
-* Redis logrotate settings for <b>/var/log/redis.log</b> files defined in <b>/etc/logrotate.d/redis</b> as: 
-  <pre>
-/var/log/redis.log {
-rotate 3
-missingok
-notifempty
-size 250k
-create 0644 root root
-compress
-}
-  </pre>
-
-* Redis start-up script <b>/etc/init.d/redis</b>. You can start/stop redis server by running the following commands:
-  <pre>
-/etc/init.d/redis {start|stop}
-  </pre>
-
-### Nginx
-Installer compiled Nginx web server (to <b>/opt/nginx</b> directory) with the following configuration files:
-
-* Nginx start-up script (<b>/etc/init.d/nginx</b>)
-
-* Nginx logrotate settings (<b>/etc/logrotate.d/nginx</b>)
-
-* Nginx configuration file (<b>/opt/nginx/conf/nginx.conf</b>) 
-
-* Passenger configuration file and virtual host template for RhoConnect application 
-  (<b>/opt/nginx/conf/conf.d/passenger.conf</b> and <b>/opt/nginx/conf/conf.d/rhoconnect.conf</b>)
-
-* user <b>nginx</b> added to system users list
- 
-  
-### As a bonus  :-)
+### Getting the Packages
+
+To download the RhoConnect debian package, you first must add our repo to your list of sources.
+
+#### Steps for Debian-Based Linux Users
+Add the following line to the end of your <b>/etc/apt/sources.list</b>:
+
+	:::text
+	deb http://rhoconnect.s3.amazonaws.com/packages/deb rhoconnect main
+
+Once the repo is added apt-get needs to be updated:
+
+	:::term
+	$ sudo apt-get update
+
+Once that is done, it is time to install RhoConnect:
+
+	:::term
+	$ sudo apt-get install rhoconnect
+
+#### Steps for RedHat-Based Linux Users
+Create a file named <b>rhoconnect.repo</b> in the <b>/etc/yum.repos.d/</b> directory:
+
+	:::term
+	$ sudo vim /etc/yum.repos.d/rhoconnect.repo
+
+Copy and paste these contents into the file.
+
+	:::text
+	[rhoconnect]
+	name=Rhoconnect
+	baseurl=http://rhoconnect.s3.amazonaws.com/packages/rpm
+	enabled=1
+	gpgcheck=0
+
+
+Once that is done, it is time to install RhoConnect:
+
+	:::term
+	$ sudo yum install rhoconnect
+
+### Final Steps (After the installer is finished)
 Installer also created and configured RhoConnect <b>rhoapp</b> application in <b>/opt/nginx/html</b> directory.
 To test it you need to as a root user start redis and nginx servers:
-<pre>
-/etc/init.d/redis start
-/etc/init.d/nginx start
-</pre>
+
+	:::term
+	$ sudo /etc/init.d/redis start
+	$ sudo /etc/init.d/nginx start
 
 And verify that it's up and running by visiting application web console in your browser:
-<pre>
-http://server_ip_address/console/
-</pre>
+
+	http://server_ip_address/console/
+
+## Deploying into J2EE environment
+In JRuby environment, there is an option to create the WAR container for the RhoConnect app
+and deploy it into the J2EE App Server.
+(see the corresponding 'rake' task for creating the WAR containers).
+Deploying the WAR container varies per J2EE App Server, for JBoss it is necessary
+to place the WAR file into the server's deploy directory.
  
 
 

data/doc/install.txt

@@ -17,7 +17,7 @@ You can now skip to the [generating a new application instructions](/rhoconnect/
 
 3. Ruby Web Server - We test with [thin](http://code.macournoyer.com/thin/), and [passenger](http://www.modrails.com/).  WEBrick, the web server that ships with ruby, is known to cause issues with HTTP headers/cookies and is ***not*** recommended.
 
-4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](/rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
+4. [Redis 2.4.1+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](/rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
 
 ### Installing RhoConnect Gem