Skip to content

Commit

Permalink
WFLY-4225 - Update BOMs to 8.2.0.Final / WFLY-4224 - Update all text …
Browse files Browse the repository at this point in the history
…references from JBoss to Wildfly on kitchensink quickstarts
  • Loading branch information
rafabene committed Jan 6, 2015
1 parent d8c7794 commit c5c771c
Show file tree
Hide file tree
Showing 52 changed files with 76 additions and 75 deletions.
2 changes: 1 addition & 1 deletion bean-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<version.arquillian.container>8.0.0.Final</version.arquillian.container>

Expand Down
2 changes: 1 addition & 1 deletion carmart-tx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<com.sun.faces.jsf.impl.version>2.0.2</com.sun.faces.jsf.impl.version>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<!-- This is the Management URL of EWS/Tomcat, so tomcat-maven-plugin
Expand Down
2 changes: 1 addition & 1 deletion carmart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<tomcat.management.url>http://localhost:8080/manager/text</tomcat.management.url>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<!-- other plugin versions -->
Expand Down
2 changes: 1 addition & 1 deletion cdi-portable-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion cdi-veto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion cmt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<!-- other plugin versions -->
Expand Down
2 changes: 1 addition & 1 deletion deltaspike-authorization/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion deltaspike-beanbuilder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion deltaspike-projectstage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion ejb-in-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<version.arquillian.container>8.0.0.Final</version.arquillian.container>

Expand Down
2 changes: 1 addition & 1 deletion ejb-throws-exception/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
BOM -->
<!-- Define the version of JBoss' Java EE 7 APIs and Tools we want
to import. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<!-- JBoss dependency versions -->
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
Expand Down
2 changes: 1 addition & 1 deletion helloworld-html5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<maven.compiler.source>1.7</maven.compiler.source>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


</properties>
Expand Down
2 changes: 1 addition & 1 deletion helloworld-jdg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<!-- other plugin versions -->
Expand Down
2 changes: 1 addition & 1 deletion helloworld-singleton/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
Expand Down
2 changes: 1 addition & 1 deletion helloworld-websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<maven.compiler.source>1.7</maven.compiler.source>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion helloworld-ws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>


Expand Down
2 changes: 1 addition & 1 deletion hibernate4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>


<version.wildfly>9.0.0.Alpha1</version.wildfly>
Expand Down
2 changes: 1 addition & 1 deletion jax-rs-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<!-- JBoss dependency versions -->

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<!-- other plugin versions -->
<version.compiler.plugin>3.1</version.compiler.plugin>
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-angularjs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<!-- JBoss dependency versions -->
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<version.arquillian.container>8.0.0.Final</version.arquillian.container>

Expand Down
6 changes: 3 additions & 3 deletions kitchensink-angularjs/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@
<p>Learn more about JBoss WildFly.</p>
<ul>
<li><a
href="https://github.com/wildfly/quickstart/guide/Introduction">Getting
href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting
Started Developing Applications Guide</a></li>
<li><a href="http://jboss.org/jbossas">Community
<li><a href="http://www.wildfly.org/">Community
Project Information</a></li>
</ul>
</div>
<footer id="footer">
<p>
This project was generated from a Maven archetype from
JBoss.<br />
WildFly.<br />
</p>
</footer>
</aside>
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-angularjs/src/main/webapp/partials/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-->
<!-- This is a partial, and is templated by AngularJS -->
<div>
<h1>Welcome to JBoss!</h1>
<h1>Welcome to WildFly!</h1>

<div>
<p>You have successfully deployed a Java EE 7 Enterprise
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-ear/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.wildfly>9.0.0.Alpha1</version.wildfly>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
<p>Learn more about JBoss WildFly.</p>
<ul>
<li><a
href="https://github.com/wildfly/quickstart/guide/Introduction">Getting Started Developing Applications Guide</a></li>
<li><a href="http://jboss.org/jbossas">Community Project Information</a></li>
href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting Started Developing Applications Guide</a></li>
<li><a href="http://www.wildfly.org/">Community Project Information</a></li>
</ul>
</div>
<div id="footer">
<p>
This project was generated from a Maven archetype from
JBoss.<br />
WildFly.<br />
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
xmlns:h="http://java.sun.com/jsf/html"
template="/WEB-INF/templates/default.xhtml">
<ui:define name="content">
<h1>Welcome to JBoss!</h1>
<h1>Welcome to WildFly!</h1>

<div>
<p>You have successfully deployed a Java EE 7 Enterprise Application.</p>
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-html5-mobile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>

<!-- Other dependency versions -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<persistence-unit name="primary">
<!-- If you are running in a production environment, add a managed
data source, the example data source is just for proofs of concept! -->
<jta-data-source>java:jboss/datasources/KitchensinkHTML5MobileQuickstartDSS</jta-data-source>
<jta-data-source>java:jboss/datasources/KitchensinkHTML5MobileQuickstartDS</jta-data-source>
<properties>
<!-- Properties for Hibernate -->
<property name="hibernate.hbm2ddl.auto" value="create-drop" />
Expand Down
6 changes: 3 additions & 3 deletions kitchensink-html5-mobile/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@ <h3>Find out more</h3>
<!-- /Header -->

<div class="ui-content" role="main">
<p>Learn about HTML5/Mobile development on JBoss EAP.</p>
<p>Learn about HTML5/Mobile development on WildFly.</p>
<ul>
<li><a href="http://www.jboss.org/jdf/quickstarts/get-started/" target="_blank">Quickstarts</a></li>
<li><a href="http://www.jboss.org/jdf/quickstarts/jboss-as-quickstart/wfk-quickstarts/kitchensink-html5-mobile/" target="_blank">Get this application</a></li>
<li><a href="https://github.com/wildfly/quickstart" target="_blank">Quickstarts</a></li>
<li><a href="https://github.com/wildfly/quickstart/tree/master/kitchensink-html5-mobile" target="_blank">Get this application</a></li>
</ul>
</div>
</aside>
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-jsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>

<!-- Other dependency versions -->
Expand Down
6 changes: 3 additions & 3 deletions kitchensink-jsp/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<p>Learn more about JBoss WildFly.</p>
<ul>
<li><a
href="https://github.com/wildfly/quickstart/guide/Introduction/">Getting
href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting
Started Developing Applications Guide</a></li>
<li><a href="http://jboss.org/jbossas">Community
<li><a href="http://www.wildfly.org/">Community
Project Information</a></li>
</ul>

Expand All @@ -58,7 +58,7 @@
<img src="resources/gfx/logo.png" alt="Weld logo" />
<p>
This project was generated from a Maven archetype from
JBoss.<br />
WildFly.<br />
</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions kitchensink-jsp/src/main/webapp/registrationForm.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<title>registrationPage.jsp</title>
</head>
<body>
<h1>Welcome to JBoss!</h1>
<h1>Welcome to WildFly!</h1>

<div>
<p>You have successfully deployed a Java EE 6 web
<p>You have successfully deployed a Java EE 7 web
application.</p>
<h3>Your application can run on:</h3>
<img src="resources/gfx/dualbrand_as7eap.png" />
Expand Down
2 changes: 1 addition & 1 deletion kitchensink-ml-ear/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom>8.0.0.Final</version.jboss.bom>
<version.jboss.bom>8.2.0.Final</version.jboss.bom>

<version.wildfly>9.0.0.Alpha1</version.wildfly>
<version.arquillian.container>8.0.0.Final</version.arquillian.container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
*/
package org.jboss.as.quickstarts.kitchensink_ear.util;

import org.jboss.logging.Message;
import org.jboss.logging.MessageBundle;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;


/**
* @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
###############################
# Resources for index.xhtml
###############################
memberWelcomeHeader=Welcome to JBoss!
memberWelcomeMessage=You have successfully deployed a localized Java EE 6 web application.
memberWelcomeHeader=Welcome to WildFly!
memberWelcomeMessage=You have successfully deployed a localized Java EE 7 web application.
memberAppMessage=Your application can run on:
memberRegistrationHeader=Member Registration
memberFormDescription=Enforces annotation-based constraints defined on the model class.
Expand Down Expand Up @@ -56,6 +56,6 @@ documentation=Documentation
productInformation=Product Information
getStartedGuide=Get Started Developing Applications Guide
communityProjectInfo=Community Project Information
projectGenerated=This project was generated from a Maven archetype from JBoss.
projectGenerated=This project was generated from a Maven archetype from WildFly.
defaultErrorMsg=Registration failed. See server log for more information.

Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
###############################
# Resources for index.xhtml
###############################
memberWelcomeHeader=Bienvenido a JBoss!
memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 6 de aplicaciones web.
memberWelcomeHeader=Bienvenido a WildFly!
memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 7 de aplicaciones web.
memberAppMessage=La aplicaci\u00F3n puede ejecutarse en:
memberRegistrationHeader=Registro de Usuarios
memberFormDescription=Aplica las anotaciones basadas en restricciones definidas en la clase del modelo.
Expand Down Expand Up @@ -56,6 +56,6 @@ documentation=Documentaci\u00F3n
productInformation=Informaci\u00F3n Sobre el Producto
getStartedGuide=Empezar a desarrollar la Gu\u00EDa de aplicaciones
communityProjectInfo=Informaci\u00F3n del proyecto comunitario
projectGenerated=Este proyecto fue generado a partir de un arquetipo de Maven de JBoss.
projectGenerated=Este proyecto fue generado a partir de un arquetipo de Maven de WildFly.
defaultErrorMsg=Error de registro. Vea el registro del servidor para obtener m\u00E1s informaci\u00F3n.

Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
###############################
# Resources for index.xhtml
###############################
memberWelcomeHeader=Bienvenue sur JBoss!
memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 6.
memberWelcomeHeader=Bienvenue sur WildFly!
memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 7.
memberAppMessage=Votre application peut fonctionner sur:
memberRegistrationHeader=Inscription des Membres
memberFormDescription=Applique annotation bas\u00E9e contraintes d\u00E8finies sur la classe mod\u00E9le.
Expand Down Expand Up @@ -56,6 +56,6 @@ documentation=Documentation
productInformation=Informations sur le Produit
getStartedGuide=Commencer D\u00E9veloppement d'Applications
communityProjectInfo=Renseignements sur le Projet Communautaire
projectGenerated=Ce projet a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 \u00E0 partir d'un arch\u00E9type Maven \u00E0 partir de JBoss.
projectGenerated=Ce projet a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 \u00E0 partir d'un arch\u00E9type Maven \u00E0 partir de WildFly.
defaultErrorMsg=Echec de l'enregistrement. Voir journal du serveur pour plus d'informations.

Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<p>#{bundle.learnAboutJBossAS7}</p>
<ul>
<li><a
href="https://github.com/wildfly/quickstart/guide/Introduction">#{bundle.getStartedGuide}</a></li>
<li><a href="http://jboss.org/jbossas">#{bundle.communityProjectInfo}</a></li>
href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">#{bundle.getStartedGuide}</a></li>
<li><a href="http://www.wildfly.org/">#{bundle.communityProjectInfo}</a></li>
</ul>
</div>
<div id="footer">
Expand Down
Loading

0 comments on commit c5c771c

Please sign in to comment.