Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it work on EAP7 #60

Open
wants to merge 3 commits into
base: 2.7.0.Final-with-tutorials
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions demo/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ <h2><a id="generating-the-administration-site" class="anchor" href="#generating-
<span class="nv">$ </span>run admin_layer.fsh
</pre></div>
<p>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 <em>admin_layer_functional.patch</em>. Then perform the same for the file <em>admin_layer_graphics.patch</em> 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 <em>Team</em> -&gt; <em>Apply Patch&hellip;</em>. Locate the patch file in the Workspace, select it and click the &lsquo;Next&rsquo; button. In the next dialog, select to apply the patch on the &lsquo;ticket-monster&rsquo; project in the workspace. Click Finish in the final page of the wizard after satisfying that the patch applies cleanly.</p></li>
<li><p>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:</p>
<div class="highlight"><pre><span class="nv">$ </span>build clean package jboss-as:deploy
<li><p>Deployment to JBoss EAP 7.0 is optional. The project can be built and deployed to a running instance of JBoss EAP through the following command in JBoss Forge:</p>
<div class="highlight"><pre><span class="nv">$ </span>build clean package wildfly:deploy
</pre></div></li>
</ol>

Expand All @@ -43,10 +43,10 @@ <h3><a id="building-ticketmonster-with-tests" class="anchor" href="#building-tic

<p>If you want to run the Arquillian tests as part of the build, you can enable one of the two available Arquillian profiles.</p>

<p>For running the tests in an <em>already running</em> application server instance, use the <code>arq-jbossas-remote</code> profile.</p>
<p>For running the tests in an <em>already running</em> application server instance, use the <code>arq-remote</code> profile.</p>
<div class="highlight"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">package</span> <span class="o">-</span><span class="n">Parq</span><span class="o">-</span><span class="n">jbossas</span><span class="o">-</span><span class="n">remote</span>
</pre></div>
<p>If you want the test runner to <em>start</em> an application server instance, use the <code>arq-jbossas-managed</code> profile. You must set up the <code>JBOSS_HOME</code> property to point to the server location, or update the <code>src/main/test/resources/arquillian.xml</code> file.</p>
<p>If you want the test runner to <em>start</em> an application server instance, use the <code>arq-managed</code> profile. You must set up the <code>JBOSS_HOME</code> property to point to the server location, or update the <code>src/main/test/resources/arquillian.xml</code> file.</p>
<div class="highlight"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">package</span> <span class="o">-</span><span class="n">Parq</span><span class="o">-</span><span class="n">jbossas</span><span class="o">-</span><span class="n">managed</span>
</pre></div>
<h3><a id="building-ticketmonster-with-postgresql-for-openshift" class="anchor" href="#building-ticketmonster-with-postgresql-for-openshift"><span class="anchor-icon"></span></a>Building TicketMonster with Postgresql (for OpenShift)</h3>
Expand All @@ -61,11 +61,11 @@ <h3><a id="building-ticketmonster-with-mysql-for-openshift" class="anchor" href=
</pre></div>
<h2><a id="running-ticketmonster" class="anchor" href="#running-ticketmonster"><span class="anchor-icon"></span></a>Running TicketMonster</h2>

<p>You can run TicketMonster into a local JBoss EAP 6.3 instance or on OpenShift.</p>
<p>You can run TicketMonster into a local JBoss EAP 7.0 instance or on OpenShift.</p>

<h3><a id="running-ticketmonster-locally" class="anchor" href="#running-ticketmonster-locally"><span class="anchor-icon"></span></a>Running TicketMonster locally</h3>

<h4><a id="start-jboss-enterprise-application-platform-63" class="anchor" href="#start-jboss-enterprise-application-platform-63"><span class="anchor-icon"></span></a>Start JBoss Enterprise Application Platform 6.3</h4>
<h4><a id="start-jboss-enterprise-application-platform-63" class="anchor" href="#start-jboss-enterprise-application-platform-63"><span class="anchor-icon"></span></a>Start JBoss Enterprise Application Platform 7.0</h4>

<ol>
<li>Open a command line and navigate to the root of the JBoss server directory.</li>
Expand All @@ -82,7 +82,7 @@ <h4><a id="deploy-ticketmonster" class="anchor" href="#deploy-ticketmonster"><sp
<li><p>Type this command to build and deploy the archive into a running server instance.</p>
<div class="highlight"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">package</span> <span class="n">jboss</span><span class="o">-</span><span class="n">as</span><span class="o">:</span><span class="n">deploy</span>
</pre></div>
<p>(You can use the <code>arq-jbossas-remote</code> profile for running tests as well)</p></li>
<p>(You can use the <code>arq-remote</code> profile for running tests as well)</p></li>
<li><p>This will deploy <code>target/ticket-monster.war</code> to the running instance of the server.</p></li>
<li><p>Now you can see the application running at <code>http://localhost:8080/ticket-monster</code></p></li>
</ol>
Expand Down
20 changes: 10 additions & 10 deletions demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ 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.3 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 7.0 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
$ build clean package wildfly:deploy

## Building TicketMonster

Expand All @@ -43,13 +43,13 @@ TicketMonster can be built from Maven, by runnning the following Maven command:

If you want to run the Arquillian tests as part of the build, you can enable one of the two available Arquillian profiles.

For running the tests in an _already running_ application server instance, use the `arq-jbossas-remote` profile.
For running the tests in an _already running_ application server instance, use the `arq-remote` profile.

mvn clean package -Parq-jbossas-remote
mvn clean package -Parq-remote

If you want the test runner to _start_ an application server instance, use the `arq-jbossas-managed` profile. You must set up the `JBOSS_HOME` property to point to the server location, or update the `src/main/test/resources/arquillian.xml` file.
If you want the test runner to _start_ an application server instance, use the `arq-managed` profile. You must set up the `JBOSS_HOME` property to point to the server location, or update the `src/main/test/resources/arquillian.xml` file.

mvn clean package -Parq-jbossas-managed
mvn clean package -Parq-managed

### Building TicketMonster with Postgresql (for OpenShift)

Expand All @@ -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.3 instance or on OpenShift.
You can run TicketMonster into a local JBoss EAP 7.0 instance or on OpenShift.

### Running TicketMonster locally

#### Start JBoss Enterprise Application Platform 6.3
#### Start JBoss Enterprise Application Platform 7.0

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:
Expand All @@ -82,9 +82,9 @@ You can run TicketMonster into a local JBoss EAP 6.3 instance or on OpenShift.
1. Make sure you have started the JBoss Server as described above.
2. Type this command to build and deploy the archive into a running server instance.

mvn clean package jboss-as:deploy
mvn clean package wildfly:deploy

(You can use the `arq-jbossas-remote` profile for running tests as well)
(You can use the `arq-remote` profile for running tests as well)

3. This will deploy `target/ticket-monster.war` to the running instance of the server.
4. Now you can see the application running at `http://localhost:8080/ticket-monster`
Expand Down
2 changes: 1 addition & 1 deletion demo/admin_layer.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ scaffold-generate --provider AngularJS --webRoot /admin --targets org.jboss.exam
echo "Don't forget to apply the manual changes described in tutorial provided in admin_layer_functional.patch and admin_layer_graphics.patch. Both files are in the patches sub-directory.";

echo "To build and deploy the application to JBoss EAP, run the following command:"
echo " build clean package jboss-as:deploy";
echo " build clean package wildfly:deploy";

echo "Examine the app deployed at http://localhost:8080/ticket-monster/admin/index.html";
Loading