diff --git a/cordova/README.md b/cordova/README.md index 2b1ecf3ab..b72b2f712 100644 --- a/cordova/README.md +++ b/cordova/README.md @@ -7,7 +7,7 @@ This is the Hybrid Mobile project for TicketMonster. Prerequisites ------------- -* JBoss Developer Studio (JBDS) 7.1 and JBDS 8.0.0 Beta 2 +* JBoss Developer Studio (JBDS) 8.0.0 GA * The JBoss Hybrid Mobile Tools + CordovaSim feature is installed in JBDS. For running on an Android emulator: @@ -18,7 +18,7 @@ For running on an Android emulator: For running on an iOS simulator: * Mac OS X 10.7 (Lion) or higher. -* XCode 4.5 or higher, with iOS 6 SDK or higher. +* XCode 6.0 or higher, with iOS 6 SDK or higher. * An iOS 5.x or higher simulator for the iPhone or iPad. If you need more detailed instruction to setup a iOS Development Environment with Apache Cordova, you can take a look at [Setting up your development environment to use Apache Cordova](http://aerogear.org/docs/guides/CordovaSetup/) @@ -28,15 +28,11 @@ Import the ticket-monster Code First we need to import the existing Hybrid Mobile project code to JBDS. -1. In JBDS, click File then import. -2. Select *Existing Projects into Workspace* and click *Next*. +1. In JBDS, click File then Import. +2. Select *Import Cordova Project* and click *Next*. 3. On Root Directory, click on *Browse...* button and navigate to the `$TICKET-MONSTER_HOME/cordova/` directory on your filesystem. 4. After selecting the TicketMonster-Cordova project, you can click on *Finish* button to start the project import. -5. Make sure that `$TICKET-MONSTER_HOME/cordova/www` is a symbolic link to `../demo/src/main/webapp` - -#### Troubleshooting Windows Operating Systems - -As Windows doesn't support symbolic links you must copy `$TICKET-MONSTER_HOME/demo/src/main/webapp` folder to `$TICKET-MONSTER_HOME/cordova/www` +5. Make sure that `$TICKET-MONSTER_HOME/cordova/www` is a linked folder that resolves to `../demo/src/main/webapp`. Deploy the application on an Android Emulator diff --git a/demo/README.md b/demo/README.md index 4d2c65d28..3e7409d34 100644 --- a/demo/README.md +++ b/demo/README.md @@ -29,7 +29,7 @@ Before building and running TicketMonster, you must generate the administration The git patches need to be applied manually. Both the patches are located in the patches sub-directory. To apply the manual changes, first apply the patch located in file _admin_layer_functional.patch_. Then perform the same for the file _admin_layer_graphics.patch_ if you want to apply the style changes for the generated administration site. You can do so in JBoss Developer Studio, by opening the context-menu on the project (Right-click on the project) and then apply a git patch via _Team_ -> _Apply Patch..._. Locate the patch file in the Workspace, select it and click the 'Next' button. In the next dialog, select to apply the patch on the 'ticket-monster' project in the workspace. Click Finish in the final page of the wizard after satisfying that the patch applies cleanly. -4. Deployment to JBoss EAP 6.2 is optional. The project can be built and deployed to a running instance of JBoss EAP through the following command in JBoss Forge: +4. Deployment to JBoss EAP 6.3 is optional. The project can be built and deployed to a running instance of JBoss EAP through the following command in JBoss Forge: $ build clean package jboss-as:deploy @@ -65,11 +65,11 @@ If you intend to deploy into [OpenShift](http://openshift.com), you can use the ## Running TicketMonster -You can run TicketMonster into a local JBoss EAP 6.2 instance or on OpenShift. +You can run TicketMonster into a local JBoss EAP 6.3 instance or on OpenShift. ### Running TicketMonster locally -#### Start JBoss Enterprise Application Platform 6.2 +#### Start JBoss Enterprise Application Platform 6.3 1. Open a command line and navigate to the root of the JBoss server directory. 2. The following shows the command line to start the server with the web profile: