From edc386cedfe3881036e320554eea9fd4a8d4caa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Wed, 9 Jul 2014 12:21:54 +0200 Subject: [PATCH] Prepare for 2.6.0.Final release --- cdi-add-interceptor-binding/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- contacts-mobile-basic/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- deltaspike-authorization/pom.xml | 2 +- deltaspike-beanbuilder/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- deltaspike-beanmanagerprovider/pom.xml | 2 +- deltaspike-deactivatable/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- deltaspike-exception-handling/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- deltaspike-helloworld-jms/pom.xml | 2 +- deltaspike-partialbean-advanced/pom.xml | 2 +- deltaspike-partialbean-basic/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- deltaspike-projectstage/pom.xml | 2 +- dist/github-flavored-markdown.rb | 153 ----------- dist/headerdefinition.xml | 48 ---- dist/license.txt | 14 - dist/pom.xml | 65 ----- dist/release-utils.sh | 198 -------------- dist/release.sh | 163 ------------ dist/src/main/assembly/assembly.xml | 51 ---- helloworld-gwt/functional-tests/pom.xml | 2 +- helloworld-gwt/pom.xml | 2 +- helloworld-html5/functional-tests/pom.xml | 2 +- helloworld-html5/pom.xml | 2 +- helloworld-rf/functional-tests/pom.xml | 2 +- helloworld-rf/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- kitchensink-angularjs-bootstrap/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- kitchensink-angularjs/pom.xml | 2 +- kitchensink-backbone/functional-tests/pom.xml | 2 +- kitchensink-backbone/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- kitchensink-deltaspike/pom.xml | 2 +- kitchensink-html5-mobile/pom.xml | 2 +- kitchensink-rf/functional-tests/pom.xml | 2 +- kitchensink-rf/pom.xml | 2 +- pom.xml | 2 +- richfaces-validation/functional-tests/pom.xml | 2 +- richfaces-validation/pom.xml | 2 +- shrinkwrap-resolver/pom.xml | 2 +- spring-greeter/functional-tests/pom.xml | 2 +- spring-greeter/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- spring-kitchensink-basic/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- spring-kitchensink-controlleradvice/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- spring-kitchensink-matrixvariables/pom.xml | 2 +- .../functional-tests/pom.xml | 2 +- spring-kitchensink-springmvctest/pom.xml | 2 +- spring-petclinic/functional-tests/pom.xml | 2 +- spring-petclinic/pom.xml | 2 +- spring-resteasy/pom.xml | 2 +- template/README.md | 251 ------------------ template/pom.xml | 153 ----------- 62 files changed, 53 insertions(+), 1149 deletions(-) delete mode 100755 dist/github-flavored-markdown.rb delete mode 100644 dist/headerdefinition.xml delete mode 100644 dist/license.txt delete mode 100644 dist/pom.xml delete mode 100755 dist/release-utils.sh delete mode 100755 dist/release.sh delete mode 100644 dist/src/main/assembly/assembly.xml delete mode 100644 template/README.md delete mode 100644 template/pom.xml diff --git a/cdi-add-interceptor-binding/pom.xml b/cdi-add-interceptor-binding/pom.xml index 514f12078..5fce24733 100644 --- a/cdi-add-interceptor-binding/pom.xml +++ b/cdi-add-interceptor-binding/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-cdi-add-interceptor-binding - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: cdi-add-interceptor-binding CDI Portable Extension, add an interceptor binding: An example of a Portable Extension and some of the APIs / SPIs of CDI diff --git a/contacts-mobile-basic/functional-tests/pom.xml b/contacts-mobile-basic/functional-tests/pom.xml index 2fe25956a..cff08cccd 100644 --- a/contacts-mobile-basic/functional-tests/pom.xml +++ b/contacts-mobile-basic/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-contacts-mobile-basic-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Contacts test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/contacts-mobile-basic/pom.xml b/contacts-mobile-basic/pom.xml index 68bf31af1..8cb7c2237 100644 --- a/contacts-mobile-basic/pom.xml +++ b/contacts-mobile-basic/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.jboss.quickstarts.wfk jboss-contacts-mobile-basic - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: contacts-mobile-basic A Java EE 6 HTML5 mobile web application for use with JBoss. diff --git a/deltaspike-authorization/functional-tests/pom.xml b/deltaspike-authorization/functional-tests/pom.xml index 33295556f..111503016 100644 --- a/deltaspike-authorization/functional-tests/pom.xml +++ b/deltaspike-authorization/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk deltaspike-authorization-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: deltaspike-authorization test via WebDriver with Arquillian http://jboss.org/jbossas diff --git a/deltaspike-authorization/pom.xml b/deltaspike-authorization/pom.xml index 6a51e6f28..322ff080c 100644 --- a/deltaspike-authorization/pom.xml +++ b/deltaspike-authorization/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-authorization - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-authorization DeltaSpike Authorization: shows a custom authorization example using security binding types from DeltaSpike diff --git a/deltaspike-beanbuilder/pom.xml b/deltaspike-beanbuilder/pom.xml index c698fe79a..6fdab51e0 100644 --- a/deltaspike-beanbuilder/pom.xml +++ b/deltaspike-beanbuilder/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-beanbuilder - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-beanbuilder DeltaSpike BeanBuilder: show how to create new beans using DeltaSpike utilities diff --git a/deltaspike-beanmanagerprovider/functional-tests/pom.xml b/deltaspike-beanmanagerprovider/functional-tests/pom.xml index 409268fca..0d25ddb28 100644 --- a/deltaspike-beanmanagerprovider/functional-tests/pom.xml +++ b/deltaspike-beanmanagerprovider/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk deltaspike-beanmanagerprovider-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: deltaspike-beanmanagerprovider test via WebDriver with Arquillian http://jboss.org/jbossas diff --git a/deltaspike-beanmanagerprovider/pom.xml b/deltaspike-beanmanagerprovider/pom.xml index b28ef87ad..c09b4ac21 100644 --- a/deltaspike-beanmanagerprovider/pom.xml +++ b/deltaspike-beanmanagerprovider/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-beanmanagerprovider - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-beanmanagerprovider DeltaSpike Beanmanagerprovider: shows how to use DeltaSpike BeanManagerProvider to access CDI in a EntityListener diff --git a/deltaspike-deactivatable/pom.xml b/deltaspike-deactivatable/pom.xml index eda9bd1c3..f2c8fed92 100644 --- a/deltaspike-deactivatable/pom.xml +++ b/deltaspike-deactivatable/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-deactivatable - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-deactivatable DeltaSpike Deactivatable: Demonstrate usage of Deactivatable diff --git a/deltaspike-exception-handling/functional-tests/pom.xml b/deltaspike-exception-handling/functional-tests/pom.xml index 2ee071553..935e709c6 100644 --- a/deltaspike-exception-handling/functional-tests/pom.xml +++ b/deltaspike-exception-handling/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk deltaspike-exception-handling-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: deltaspike-exception-handling test via WebDriver with Arquillian http://jboss.org/jbossas diff --git a/deltaspike-exception-handling/pom.xml b/deltaspike-exception-handling/pom.xml index a0ced3d2a..2df37b450 100644 --- a/deltaspike-exception-handling/pom.xml +++ b/deltaspike-exception-handling/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-exception-handling - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-exception-handling DeltaSpike Exception Handling: Exception being handled by different handlers and purpose diff --git a/deltaspike-helloworld-jms/functional-tests/pom.xml b/deltaspike-helloworld-jms/functional-tests/pom.xml index 0eeddcbb4..0cdb0cde6 100644 --- a/deltaspike-helloworld-jms/functional-tests/pom.xml +++ b/deltaspike-helloworld-jms/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk deltaspike-helloworld-jms-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: deltaspike-helloworld-jms test via WebDriver with Arquillian http://jboss.org/jbossas diff --git a/deltaspike-helloworld-jms/pom.xml b/deltaspike-helloworld-jms/pom.xml index 90978fdd8..8ea89bf2a 100644 --- a/deltaspike-helloworld-jms/pom.xml +++ b/deltaspike-helloworld-jms/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-helloworld-jms - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-helloworld-jms deltaspike-helloworld-jms: Helloworld JMS producer/consumer client with DeltaSpike property configuration diff --git a/deltaspike-partialbean-advanced/pom.xml b/deltaspike-partialbean-advanced/pom.xml index 22f48b48f..c9c4f7f3b 100644 --- a/deltaspike-partialbean-advanced/pom.xml +++ b/deltaspike-partialbean-advanced/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-partialbean-advanced - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-partialbean-advanced DeltaSpike PartialBean: Demonstrates a more advanced usage scenario involving the DeltaSpike Partial Bean module diff --git a/deltaspike-partialbean-basic/pom.xml b/deltaspike-partialbean-basic/pom.xml index ad17b3955..6cc46bbb9 100644 --- a/deltaspike-partialbean-basic/pom.xml +++ b/deltaspike-partialbean-basic/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-partialbean-basic - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-partialbean-basic DeltaSpike InvocationHandler: Demonstrates the basics of using the DeltaSpike PartialBean module diff --git a/deltaspike-projectstage/functional-tests/pom.xml b/deltaspike-projectstage/functional-tests/pom.xml index 3fe60e565..8437b2371 100644 --- a/deltaspike-projectstage/functional-tests/pom.xml +++ b/deltaspike-projectstage/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk deltaspike-projectstage-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: deltaspike-projectstage test via WebDriver with Arquillian http://jboss.org/jbossas diff --git a/deltaspike-projectstage/pom.xml b/deltaspike-projectstage/pom.xml index bef113558..3a929ba97 100644 --- a/deltaspike-projectstage/pom.xml +++ b/deltaspike-projectstage/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-deltaspike-projectstage - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: deltaspike-projectstage DeltaSpike Project Stage: shows how to use DeltaSpike ProjectStage that allows to use implementations depending on the current environment diff --git a/dist/github-flavored-markdown.rb b/dist/github-flavored-markdown.rb deleted file mode 100755 index 059b2605c..000000000 --- a/dist/github-flavored-markdown.rb +++ /dev/null @@ -1,153 +0,0 @@ -#!/usr/bin/env ruby -# -# JBoss, Home of Professional Open Source -# Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual -# contributors by the @authors tag. See the copyright.txt in the -# distribution for a full listing of individual contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -require 'rubygems' -require 'redcarpet' -require 'nokogiri' -require 'fileutils' -require 'pygments.rb' -require 'rexml/document' - -# create a custom renderer that allows highlighting of code blocks -class HTMLWithPygmentsAndPants < Redcarpet::Render::HTML - include Redcarpet::Render::SmartyPants - def block_code(code, language) - Pygments.highlight(code, :lexer => language, :options => {:encoding => 'utf-8'}) - end - - #method copied from: https://gist.github.com/suan/5692767 - def header(title, level) - @headers ||= [] - - title_elements = REXML::Document.new(title) - flattened_title = title_elements.inject('') do |flattened, element| - flattened += if element.respond_to?(:text) - element.text - else - element.to_s - end - end - permalink = flattened_title.downcase.gsub(/[^a-z0-9\s]/, '').gsub(/\W+/, "-") - - # for extra credit: implement this as its own method - if @headers.include?(permalink) - permalink += "_1" - # my brain hurts - loop do - break if !@headers.include?(permalink) - # generate titles like foo-bar_1, foo-bar_2 - permalink.gsub!(/\_(\d+)$/, "_#{$1.to_i + 1}") - end - end - @headers << permalink - %(\n#{title}\n) - end -end - - -def find(p, tag) - if p.text - r = p.text[/^(#{tag}: )(.+)$/, 2] - if r - p['id'] = 'metadata' - return r - end - end -end - -def find_split(p, tag) - s = find(p, tag) - if s - return s.split(',').sort - end -end - -def metadata(source_path, html) - # TODO canonicalise path - toc_file='dist/target/toc.html' - # Markdown doesn't have an metadata syntax, so all we can do is pray ;-) - # Look for a paragraph that contains tags, which we define by convention - page_content = Nokogiri::HTML(html) - technologies = [] - level = "" - prerequisites = [] - summary = "" - page_content.css('p').each do |p| - t = find_split(p, 'Technologies') - if t - technologies = t - end - l = find(p, 'Level') - if l - level = l - end - pr = find_split(p, 'Prerequisites') - if pr - prerequisites = pr - end - s = find(p, 'Summary') - if s - summary = s - end - - end - dir = source_path[/([^\/]+)\/([^\/]+).md$/, 1] - filename = source_path[/([^\/]+)\/([^\/]+).md$/, 2] - if dir - output = "#{dir}#{' '.concat(technologies.map{|u| u} * ', ')}#{summary}#{level}#{' '.concat(prerequisites.map{|u| u} * ', ')}\n" - FileUtils.mkdir_p(File.dirname(toc_file)) - File.open(toc_file, 'a').write(output) - end -end - -def markdown(source_path) - renderer = HTMLWithPygmentsAndPants.new(optionize [ - :with_toc_data, - :xhtml - ]) - markdown = Redcarpet::Markdown.new(renderer, optionize([ - :fenced_code_blocks, - :no_intra_emphasis, - :tables, - :autolink, - :strikethrough, - :space_after_headers, - :with_toc_data - ])) - text = source_path.read - toc_file='dist/target/toc.html' - if File.exist?(toc_file) - qs_toc_content=File.open('dist/target/toc.html').read - qs_toc = "#{qs_toc_content}
Quickstart NameDemonstrated TechnologiesDescriptionExperience Level RequiredPrerequisites
" - text.gsub!("\[TOC-quickstart\]", qs_toc) - end - toc = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC).render(text) - text.gsub!("\[TOC\]", toc) - rendered = markdown.render(text) - metadata(source_path.path, rendered) - rendered = rendered.gsub(/README.md/, "README.html").gsub(/CONTRIBUTING.md/, "CONTRIBUTING.html") - 'README' + rendered + '' - end - -def optionize(options) - options.each_with_object({}) { |option, memo| memo[option] = true } -end - -puts markdown(ARGF) - diff --git a/dist/headerdefinition.xml b/dist/headerdefinition.xml deleted file mode 100644 index a005641bc..000000000 --- a/dist/headerdefinition.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - /* - * - */ - (\\s|\\t)*/\\*.*$ - .*\\*/(\\s|\\t)*$ - false - true - - - - - ]]> - $]]> - - (\s|\t)*$]]> - false - true - - - - - ]]> - - (\s|\t)*$]]> - false - true - - - diff --git a/dist/license.txt b/dist/license.txt deleted file mode 100644 index 66acf5bb3..000000000 --- a/dist/license.txt +++ /dev/null @@ -1,14 +0,0 @@ -JBoss, Home of Professional Open Source -Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual -contributors by the @authors tag. See the copyright.txt in the -distribution for a full listing of individual contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/dist/pom.xml b/dist/pom.xml deleted file mode 100644 index 117b076a6..000000000 --- a/dist/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 4.0.0 - - org.jboss - jboss-parent - 6-beta-2 - - - org.jboss.quickstarts.wfk - jboss-wfk-quickstarts-dist - 2.6.0-SNAPSHOT - pom - JBoss WFK Quickstarts Distribution - JBoss WFK Quickstarts Distribution - https://github.com/jboss-developer/jboss-wfk-quickstarts - - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - - maven-assembly-plugin - - - distribution - package - - single - - - - src/main/assembly/assembly.xml - - jboss-wfk-quickstarts-${project.version} - - - - - - - - diff --git a/dist/release-utils.sh b/dist/release-utils.sh deleted file mode 100755 index e85d8a302..000000000 --- a/dist/release-utils.sh +++ /dev/null @@ -1,198 +0,0 @@ -#!/bin/bash -# -# JBoss, Home of Professional Open Source -# Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual -# contributors by the @authors tag. See the copyright.txt in the -# distribution for a full listing of individual contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -REQUIRED_BASH_VERSION=3.0.0 - -if [[ $BASH_VERSION < $REQUIRED_BASH_VERSION ]]; then - echo "You must use Bash version 3 or newer to run this script" - exit -fi - - -DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P) - -# DEFINE - -ARCHETYPES=("jboss-javaee6-webapp-archetype" "jboss-javaee6-webapp-ear-archetype") -QUICKSTARTS=("kitchensink" "kitchensink-ear") -VERSIONS_MAVEN_PLUGIN_VERSION=1.3.1 - -# SCRIPT - -HUMAN_READABLE_ARCHETYPES="" -i=0 -element_count=${#ARCHETYPES[@]} -index=0 -while [ "$index" -lt "$element_count" ] -do - if [ $index -ne 0 ] - then - HUMAN_READABLE_ARCHETYPES="${HUMAN_READABLE_ARCHETYPES}, " - fi - HUMAN_READABLE_ARCHETYPES="${HUMAN_READABLE_ARCHETYPES}${ARCHETYPES[index]}" - ((index++)) -done - - -usage() -{ -cat << EOF -usage: $0 options - -This script aids in releasing the quickstarts - -OPTIONS: - -u Updates version numbers in all POMs, used with -o and -n - -o Old version number to update from - -n New version number to update to - -r Regenerate the various quickstarts based on archetypes ${HUMAN_READABLE_ARCHETYPES} - -m Generate html versions of markdown readmes - -h Shows this message -EOF -} - -update() -{ - cd $DIR/../ - echo "Updating versions from $OLDVERSION TO $NEWVERSION for all Java files under $PWD" - perl -pi -e "s/${OLDVERSION}/${NEWVERSION}/g" `find . -name \*.java` - - echo "Performing updates to POMs" - poms=`find . -type f -iname "pom.xml" -maxdepth 3 | sort` - for pom in $poms - do - echo "Updating ${pom}" - mvn org.codehaus.mojo:versions-maven-plugin:${VERSIONS_MAVEN_PLUGIN_VERSION}:set -DnewVersion=${NEWVERSION} -f ${pom} -q - mvn org.codehaus.mojo:versions-maven-plugin:${VERSIONS_MAVEN_PLUGIN_VERSION}:commit -f ${pom} -q - done -} - -markdown_to_html() -{ - cd $DIR/../ - - # Clear the contents from toc.html file - rm dist/target/toc.html - touch dist/target/toc.html - - # Loop through the sorted quickstart directories and process them - # Exclude the template directory since it's not a quickstart - subdirs=`find . -maxdepth 1 -type d ! -iname ".*" ! -iname "template" | sort` - for subdir in $subdirs - do - readmes=`find $subdir -maxdepth 1 -iname readme.md` - for readme in $readmes - do - echo "Processing $readme" - output_filename=${readme//.md/.html} - output_filename=${output_filename//.MD/.html} - $DIR/github-flavored-markdown.rb $readme > $output_filename - done - done - # Now process the root readme - cd $DIR/../ - readme=README.md - echo "Processing $readme" - output_filename=${readme//.md/.html} - output_filename=${output_filename//.MD/.html} - $DIR/github-flavored-markdown.rb $readme > $output_filename - - # Now process the contributing markdown - cd $DIR/../ - markdown_filename=CONTRIBUTING.md - echo "Processing $markdown_filename" - output_filename=${markdown_filename//.md/.html} - output_filename=${output_filename//.MD/.html} - $DIR/github-flavored-markdown.rb $markdown_filename > $output_filename - - # Now process the release procedure markdown - cd $DIR/../ - markdown_filename=RELEASE_PROCEDURE.md - echo "Processing $markdown_filename" - output_filename=${markdown_filename//.md/.html} - output_filename=${output_filename//.MD/.html} - $DIR/github-flavored-markdown.rb $markdown_filename > $output_filename -} - -regenerate() -{ - TMPDIR="$DIR/target/regen" - ROOTDIR="$DIR/../" - - rm -rf $TMPDIR - - mkdir -p $TMPDIR - - cd $TMPDIR - - element_count=${#ARCHETYPES[@]} - index=0 - while [ "$index" -lt "$element_count" ] - do - archetype=${ARCHETYPES[index]} - quickstart=${QUICKSTARTS[index]} - package=${quickstart//-/_} - name="JBoss AS Quickstarts: $quickstart" - echo "**** Regenerating $quickstart from $archetype" - mvn archetype:generate -DarchetypeGroupId=org.jboss.spec.archetypes -DarchetypeArtifactId=$archetype -DarchetypeVersion=$VERSION -DartifactId=jboss-as-$quickstart -DgroupId=org.jboss.as.quickstarts -Dpackage=org.jboss.as.quickstarts.$package -Dversion=$VERSION -DinteractiveMode=false -Dname="${name}" - ((index++)) - rm -rf $ROOTDIR/$quickstart - mv $TMPDIR/jboss-as-$quickstart $ROOTDIR/$quickstart - done - -} - -OLDVERSION="1.0.0-SNAPSHOT" -NEWVERSION="1.0.0-SNAPSHOT" -VERSION="1.0.0-SNAPSHOT" -CMD="usage" - -while getopts “muo:n:r:” OPTION - -do - case $OPTION in - u) - CMD="update" - ;; - h) - usage - exit - ;; - o) - OLDVERSION=$OPTARG - ;; - n) - NEWVERSION=$OPTARG - ;; - r) - CMD="regenerate" - VERSION=$OPTARG - ;; - m) - CMD="markdown_to_html" - ;; - [?]) - usage - exit - ;; - esac -done - -$CMD - diff --git a/dist/release.sh b/dist/release.sh deleted file mode 100755 index 70090c147..000000000 --- a/dist/release.sh +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash -# -# JBoss, Home of Professional Open Source -# Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual -# contributors by the @authors tag. See the copyright.txt in the -# distribution for a full listing of individual contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -REQUIRED_BASH_VERSION=3.0.0 - -if [[ $BASH_VERSION < $REQUIRED_BASH_VERSION ]]; then - echo "You must use Bash version 3 or newer to run this script" - exit -fi - -DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P) - -# DEFINE - -VERSION_REGEX='([0-9]*)\.([0-9]*)([a-zA-Z0-9\.]*)' - -# EAP team email subject -EMAIL_SUBJECT="\${RELEASEVERSION} of JBoss Quickstarts released, please merge with https://github.com/jboss-eap/quickstart, tag and add to EAP maven repo build" -# EAP team email To ? -EMAIL_TO="mnovotny@redhat.com maschmid@redhat.com benevides@redhat.com" -EMAIL_FROM="\"JDF Publish Script\" " - - -# SCRIPT - -usage() -{ -cat << EOF -usage: $0 options - -This script performs a release of the Quickstarts - -OPTIONS: - -s Snapshot version number to update from - -n New snapshot version number to update to, if undefined, defaults to the version number updated from - -r Release version number -EOF -} - -notify_email() -{ - echo "***** Performing JBoss Quickstarts release notifications" - echo "*** Notifying JBoss EAP team" - subject=`eval echo $EMAIL_SUBJECT` - echo "Email from: " $EMAIL_FROM - echo "Email to: " $EMAIL_TO - echo "Subject: " $subject - # send email using sendmail - printf "Subject: $subject\nSee \$subject :)\n" | /usr/bin/env sendmail -f "$EMAIL_FROM" "$EMAIL_TO" -} - -release() -{ - BRANCH=$(parse_git_branch) - git checkout -b $RELEASEVERSION - echo "Regenerating html from markdown" - $DIR/release-utils.sh -m - echo "Releasing JBoss AS Quickstarts version $RELEASEVERSION" - $DIR/release-utils.sh -u -o $SNAPSHOTVERSION -n $RELEASEVERSION - echo "Removing unnecessary files" - git rm --cached -r dist/ - git rm --cached -r template/ - git commit -a -m "Prepare for $RELEASEVERSION release" - echo "Creating tag for $RELEASEVERSION" - git tag $RELEASEVERSION - mvn clean install -f $DIR/pom.xml - echo "Your zip file was generated at $DIR/target/jboss-wfk-quickstarts-$RELEASEVERSION-dist.zip" - $DIR/release-utils.sh -u -o $RELEASEVERSION -n $NEWSNAPSHOTVERSION - echo "Adding unnecessary files again..." - git add dist/ - git add template/ - git commit -a -m "Prepare for development of $NEWSNAPSHOTVERSION" - git checkout $BRANCH - #echo "Building Distribution zip" - #git checkout $RELEASEVERSION - #echo "Uploading distribution to http://download.jboss.org/jbossas/$MAJOR_VERSION.$MINOR_VERSION/jboss-as-$RELEASEVERSION/jboss-wfk-quickstarts-$RELEASEVERSION-dist.zip" - #rsync -Pv --protocol=28 $DIR/target/jboss-wfk-quickstarts-$RELEASEVERSION-dist.zip jbossas@filemgmt.jboss.org:downloads_htdocs/jbossas/$MAJOR_VERSION.$MINOR_VERSION/jboss-wfk-$RELEASEVERSION/ - read -p "Do you want to send release notifcations to $EAP_EMAIL_TO[y/N]?" yn - case $yn in - [Yy]* ) notify_email;; - esac - echo "Don't forget to push the tag and the branch" -# echo " git push --tags upstream refs/heads/$RELEASEVERSION master" - echo " git push --tags upstream $BRANCH" -} - -parse_git_branch() { - git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' -} - - -SNAPSHOTVERSION="UNDEFINED" -RELEASEVERSION="UNDEFINED" -NEWSNAPSHOTVERSION="UNDEFINED" -MAJOR_VERSION="UNDEFINED" -MINOR_VERSION="UNDEFINED" - -while getopts “n:r:s:” OPTION - -do - case $OPTION in - h) - usage - exit - ;; - s) - SNAPSHOTVERSION=$OPTARG - ;; - r) - RELEASEVERSION=$OPTARG - ;; - n) - NEWSNAPSHOTVERSION=$OPTARG - ;; - [?]) - usage - exit - ;; - esac -done - -if [[ $RELEASEVERSION =~ $VERSION_REGEX ]]; then - MAJOR_VERSION=${BASH_REMATCH[1]} - MINOR_VERSION=${BASH_REMATCH[2]} -fi - -if [ "$NEWSNAPSHOTVERSION" == "UNDEFINED" ] -then - NEWSNAPSHOTVERSION=$SNAPSHOTVERSION -fi - -if [ "$MAJOR_VERSION" == "UNDEFINED" -o "$MINOR_VERSION" == "UNDEFINED" ] -then - echo "\nUnable to extract major and minor versions\n" - usage - exit -fi - -if [ "$SNAPSHOTVERSION" == "UNDEFINED" -o "$RELEASEVERSION" == "UNDEFINED" ] -then - echo "\nMust specify -r and -s\n" - usage - exit -fi - -release - diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml deleted file mode 100644 index 4916f6c37..000000000 --- a/dist/src/main/assembly/assembly.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - dist - jboss-wfk-quickstarts-${project.version} - - zip - - - - - ${project.basedir}/.. - / - - kitchensink-cordova/.project - kitchensink-cordova-contacts/.project - - - - ${project.basedir}/.. - / - - dist/** - template/** - **/target/** - **/.project - **/.settings/** - **/.classpath - **/.gitignore - - - - - diff --git a/helloworld-gwt/functional-tests/pom.xml b/helloworld-gwt/functional-tests/pom.xml index 11125ad56..0a523245d 100644 --- a/helloworld-gwt/functional-tests/pom.xml +++ b/helloworld-gwt/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-helloworld-gwt-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Hello World test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/helloworld-gwt/pom.xml b/helloworld-gwt/pom.xml index a714790b2..6e0ec832d 100644 --- a/helloworld-gwt/pom.xml +++ b/helloworld-gwt/pom.xml @@ -21,7 +21,7 @@ org.jboss.quickstarts.wfk jboss-helloworld-gwt - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: helloworld-gwt JBoss WFK Quickstart: Hello World with GWT front-end client diff --git a/helloworld-html5/functional-tests/pom.xml b/helloworld-html5/functional-tests/pom.xml index 285e1a75b..17171aa60 100644 --- a/helloworld-html5/functional-tests/pom.xml +++ b/helloworld-html5/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-helloworld-html5-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Hello World test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/helloworld-html5/pom.xml b/helloworld-html5/pom.xml index 8491e42aa..ddc9440a4 100644 --- a/helloworld-html5/pom.xml +++ b/helloworld-html5/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-helloworld-html5 - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: helloworld-html5 JBoss WFK Quickstart: HTML5 + REST Helloworld diff --git a/helloworld-rf/functional-tests/pom.xml b/helloworld-rf/functional-tests/pom.xml index 839348757..74be9dd02 100644 --- a/helloworld-rf/functional-tests/pom.xml +++ b/helloworld-rf/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-helloworld-rf-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Hello World test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/helloworld-rf/pom.xml b/helloworld-rf/pom.xml index 3e893bc65..958deec3f 100644 --- a/helloworld-rf/pom.xml +++ b/helloworld-rf/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-helloworld-rf - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: helloworld-rf JBoss WFK Quickstarts: Helloworld using RichFaces diff --git a/kitchensink-angularjs-bootstrap/functional-tests/pom.xml b/kitchensink-angularjs-bootstrap/functional-tests/pom.xml index 097b6a9cf..a8714a44b 100644 --- a/kitchensink-angularjs-bootstrap/functional-tests/pom.xml +++ b/kitchensink-angularjs-bootstrap/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-kitchensink-angularjs-bootstrap-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/kitchensink-angularjs-bootstrap/pom.xml b/kitchensink-angularjs-bootstrap/pom.xml index e38cd73ab..b6642828f 100644 --- a/kitchensink-angularjs-bootstrap/pom.xml +++ b/kitchensink-angularjs-bootstrap/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-angularjs-bootstrap - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-angularjs-bootstrap A starter Java EE 6 webapp project for use on JBoss EAP 6, generated from the jboss-javaee6-webapp archetype, using AngularJS for the view and Twitter Bootstrap for styling diff --git a/kitchensink-angularjs/functional-tests/pom.xml b/kitchensink-angularjs/functional-tests/pom.xml index c2f613aa6..c02a99ee9 100644 --- a/kitchensink-angularjs/functional-tests/pom.xml +++ b/kitchensink-angularjs/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-kitchensink-angularjs-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/kitchensink-angularjs/pom.xml b/kitchensink-angularjs/pom.xml index 00f0cf4b7..3a3f909bb 100644 --- a/kitchensink-angularjs/pom.xml +++ b/kitchensink-angularjs/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-angularjs - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-angularjs A starter Java EE 6 webapp project for use on JBoss EAP 6, generated from the jboss-javaee6-webapp archetype, using AngularJS for the view diff --git a/kitchensink-backbone/functional-tests/pom.xml b/kitchensink-backbone/functional-tests/pom.xml index 6894d6aff..8a60593c2 100644 --- a/kitchensink-backbone/functional-tests/pom.xml +++ b/kitchensink-backbone/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-kitchensink-backbone-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/kitchensink-backbone/pom.xml b/kitchensink-backbone/pom.xml index 980d0bd55..2ecd97544 100644 --- a/kitchensink-backbone/pom.xml +++ b/kitchensink-backbone/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-backbone - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-backbone A Backbone.js and Java EE 6 HTML5 mobile web application for use with JBoss. diff --git a/kitchensink-deltaspike/functional-tests/pom.xml b/kitchensink-deltaspike/functional-tests/pom.xml index 6663dfeb3..05c551abc 100644 --- a/kitchensink-deltaspike/functional-tests/pom.xml +++ b/kitchensink-deltaspike/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-kitchensink-deltaspike-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss EAP 6 by WebDriver diff --git a/kitchensink-deltaspike/pom.xml b/kitchensink-deltaspike/pom.xml index 322335872..7175ad743 100644 --- a/kitchensink-deltaspike/pom.xml +++ b/kitchensink-deltaspike/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-deltaspike - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-deltaspike A starter Java EE 6 webapp project for use on JBoss EAP 6, generated from the jboss-javaee6-webapp archetype diff --git a/kitchensink-html5-mobile/pom.xml b/kitchensink-html5-mobile/pom.xml index 2a0e4994b..a30ede2ea 100644 --- a/kitchensink-html5-mobile/pom.xml +++ b/kitchensink-html5-mobile/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-html5-mobile - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-html5-mobile diff --git a/kitchensink-rf/functional-tests/pom.xml b/kitchensink-rf/functional-tests/pom.xml index d79c6f887..10f32d84e 100644 --- a/kitchensink-rf/functional-tests/pom.xml +++ b/kitchensink-rf/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-kitchensink-rf-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/kitchensink-rf/pom.xml b/kitchensink-rf/pom.xml index 71ad1a998..4c6042746 100644 --- a/kitchensink-rf/pom.xml +++ b/kitchensink-rf/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-kitchensink-rf - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: kitchensink-rf JBoss WFK Quickstart: Based on the kitchensink quickstart but adds RichFaces diff --git a/pom.xml b/pom.xml index d293a1277..79f8f083c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.jboss.quickstarts.eap --> jboss-wfk-quickstarts-parent - 2.6.0-SNAPSHOT + 2.6.0.Final pom JBoss WFK Quickstart: Parent JBoss AS Quickstarts Parent diff --git a/richfaces-validation/functional-tests/pom.xml b/richfaces-validation/functional-tests/pom.xml index ca5c9ac6e..5d84bc23c 100644 --- a/richfaces-validation/functional-tests/pom.xml +++ b/richfaces-validation/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-richfaces-validation-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Richfaces Validation test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/richfaces-validation/pom.xml b/richfaces-validation/pom.xml index f242099c3..00453f08d 100644 --- a/richfaces-validation/pom.xml +++ b/richfaces-validation/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-richfaces-validation - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: richfaces-validation diff --git a/shrinkwrap-resolver/pom.xml b/shrinkwrap-resolver/pom.xml index 34ee51ea8..7f46c1690 100644 --- a/shrinkwrap-resolver/pom.xml +++ b/shrinkwrap-resolver/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-shrinkwrap-resolver - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: shrinkwrap-resolver A starter Java EE 6 webapp project for use on JBoss EAP 6, generated from the jboss-javaee6-webapp archetype diff --git a/spring-greeter/functional-tests/pom.xml b/spring-greeter/functional-tests/pom.xml index cd05303d8..2305cdaa5 100644 --- a/spring-greeter/functional-tests/pom.xml +++ b/spring-greeter/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-greeter-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Greeter Spring test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-greeter/pom.xml b/spring-greeter/pom.xml index 713aa6e5d..99c48ead3 100644 --- a/spring-greeter/pom.xml +++ b/spring-greeter/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.jboss.quickstarts.wfk jboss-spring-greeter - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-greeter JBoss WFK Quickstart: Spring Greeter diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml b/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml index 5190a3218..347f17a8a 100644 --- a/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml +++ b/spring-kitchensink-asyncrequestmapping/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-kitchensink-asyncrequestmapping-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-kitchensink-asyncrequestmapping/pom.xml b/spring-kitchensink-asyncrequestmapping/pom.xml index 9eb6c6b22..4b9d736f2 100644 --- a/spring-kitchensink-asyncrequestmapping/pom.xml +++ b/spring-kitchensink-asyncrequestmapping/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-kitchensink-asyncrequestmapping - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-kitchensink-asyncrequestmapping diff --git a/spring-kitchensink-basic/functional-tests/pom.xml b/spring-kitchensink-basic/functional-tests/pom.xml index edc9044fd..ebeba7f11 100644 --- a/spring-kitchensink-basic/functional-tests/pom.xml +++ b/spring-kitchensink-basic/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-kitchensink-basic-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-kitchensink-basic/pom.xml b/spring-kitchensink-basic/pom.xml index 260376d13..90f0394a8 100644 --- a/spring-kitchensink-basic/pom.xml +++ b/spring-kitchensink-basic/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-kitchensink-basic - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-kitchensink-basic diff --git a/spring-kitchensink-controlleradvice/functional-tests/pom.xml b/spring-kitchensink-controlleradvice/functional-tests/pom.xml index d99c79c86..0ca21889f 100644 --- a/spring-kitchensink-controlleradvice/functional-tests/pom.xml +++ b/spring-kitchensink-controlleradvice/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-kitchensink-controlleradvice-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-kitchensink-controlleradvice/pom.xml b/spring-kitchensink-controlleradvice/pom.xml index 8b8cb5eca..dd85c43ef 100644 --- a/spring-kitchensink-controlleradvice/pom.xml +++ b/spring-kitchensink-controlleradvice/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-kitchensink-controlleradvice - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-kitchensink-controlleradvice diff --git a/spring-kitchensink-matrixvariables/functional-tests/pom.xml b/spring-kitchensink-matrixvariables/functional-tests/pom.xml index f1d0ab725..3767cacd2 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/pom.xml +++ b/spring-kitchensink-matrixvariables/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-kitchensink-matrixvariables-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-kitchensink-matrixvariables/pom.xml b/spring-kitchensink-matrixvariables/pom.xml index aabb353f8..d58b65f68 100644 --- a/spring-kitchensink-matrixvariables/pom.xml +++ b/spring-kitchensink-matrixvariables/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-kitchensink-matrixvariables - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-kitchensink-matrixvariables diff --git a/spring-kitchensink-springmvctest/functional-tests/pom.xml b/spring-kitchensink-springmvctest/functional-tests/pom.xml index 963ce5db6..bdba37646 100644 --- a/spring-kitchensink-springmvctest/functional-tests/pom.xml +++ b/spring-kitchensink-springmvctest/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-kitchensink-springmvctest-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Kitchensink test via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver diff --git a/spring-kitchensink-springmvctest/pom.xml b/spring-kitchensink-springmvctest/pom.xml index 4210f383c..2e57f6a87 100644 --- a/spring-kitchensink-springmvctest/pom.xml +++ b/spring-kitchensink-springmvctest/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-kitchensink-springmvctest - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-kitchensink-springmvctest diff --git a/spring-petclinic/functional-tests/pom.xml b/spring-petclinic/functional-tests/pom.xml index 36b17e910..a48f5c0c3 100644 --- a/spring-petclinic/functional-tests/pom.xml +++ b/spring-petclinic/functional-tests/pom.xml @@ -20,7 +20,7 @@ org.jboss.as.quickstarts.wfk jboss-spring-petclinic-test-webdriver - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss AS Quickstarts: Spring Petclinic Demo ftest via WebDriver with Arquillian This project tests a starter Java EE 6 webapp project for use on JBoss EAP 6 by WebDriver diff --git a/spring-petclinic/pom.xml b/spring-petclinic/pom.xml index 3996a9527..6d2d9e1c7 100644 --- a/spring-petclinic/pom.xml +++ b/spring-petclinic/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.jboss.quickstarts.wfk jboss-spring-petclinic - 2.6.0-SNAPSHOT + 2.6.0.Final JBoss WFK Quickstart: spring-petclinic JBoss WFK Quickstart: PetClinic diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 5fc54caa7..eff7bf736 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -20,7 +20,7 @@ org.jboss.quickstarts.wfk jboss-spring-resteasy - 2.6.0-SNAPSHOT + 2.6.0.Final war JBoss WFK Quickstart: spring-resteasy diff --git a/template/README.md b/template/README.md deleted file mode 100644 index 388009c7d..000000000 --- a/template/README.md +++ /dev/null @@ -1,251 +0,0 @@ -QUICKSTART_NAME: Brief Description of the Quickstart -====================================================== -Author: YOUR_NAME and optional CONTACT_INFO -Level: [one of the following: Beginner, Intermediate, or Advanced] -Technologies: (list technologies used here) -Summary: (a brief description of the quickstart to appear in the table ) -Prerequisites: (list any quickstarts that must be deployed prior to running this one) -Target Product: (EAP, WFK, JDG, etc.) -Product Versions: (EAP 6.1, EAP 6.2, WFK 2.6, etc.) -Source: (The URL for the repository that is the source of record for this quickstart) - - -_This file is meant to serve as a template or guideline for your own quickstart README.md file. Be sure to replace QUICKSTART_NAME and YOUR_NAME, with the appropriate values._ - -Contributor instructions are prefixed with 'Contributor: ' - -What is it? ------------ - -Contributor: This is where you provide an overview of what the quickstart demonstrates. For example: - - * What are the technologies demonstrated by the quickstart? - * What does it do when you run it? - -You should include any information that would help the user understand the quickstart. - -If possible, give an overview, including any code they should look at to understand how it works.. - - -System requirements -------------------- - -Contributor: For example: - - -The application this project produces is designed to be run on Red Hat JBoss Enterprise Application Platform (EAP) 6.1 or later with the Red Hat JBoss Web Framework Kit (WFK) 2.6. - -All you need to build this project is Java 6.0 (Java SDK 1.6) or later, Maven 3.0 or later. - - -Configure Maven ---------------- - -Contributor: You can copy or link to the Maven configuration information in the README file in the root folder of the quickstarts. For example: - -If you have not yet done so, you must [Configure Maven](../README.md#configure-maven) before testing the quickstarts. - - -Configure Optional Components -------------------------- - -Contributor: If your quickstart requires any additional components, decribe how to set them up here. If your quickstart requires a secured user, PostgreSQL, or Byteman, you can link to the instructions in the README file located in the root folder of the quickstart directory. Here are some examples: - - * This quickstart uses a secured management interface and requires that you create a management (or application) user to access the running application. Instructions to set up a Management (or Application) user can be found here: - - * [Add a Management User](../README.md#add-a-management-user) - - * [Add an Application User](../README.md#add-an-application-user) - - * This quickstart requires the PostgreSQL database. Instructions to install an configure PostgreSQL can be found here: [Install and Configure the PostgreSQL Database](../README.md#install-and-configure-the-postgresql-database) - - * This quickstart uses Byteman to help demonstrate crash recovery. Instructions to install and configure Byteman can be found here: [Install and Configure Byteman](../README.md#install-and-configure-byteman) - - -Start the JBoss EAP Server -------------------------- - -Contributor: Does this quickstart require one or more running servers? If so, you must show how to start the server. If you start the server in one of the following 3 ways, you can simply copy the instructions in the README file located in the root folder of the quickstart directory: - - * Start the Default JBoss EAP Server - - * Start the JBoss EAP Server with the Full Profile - - * Start the JBoss EAP Server with Custom Options. You will need to provide the argument string to pass on the command line, for example: - - `--server-config=../../docs/examples/configs/standalone-xts.xml` - -Contributor: If the server is started in a different manner than above, give the specific instructions. - - -Build and Deploy the Quickstart -------------------------- - -Contributor: If the quickstart is built and deployed using the standard Maven commands, "mvn clean package" and "mvn jboss-as:deploy", copy the following: - -_NOTE: The following build command assumes you have configured your Maven user settings. If you have not, you must include Maven setting arguments on the command line. See [Build and Deploy the Quickstarts](../README.md#build-and-deploy-the-quickstarts) for complete instructions and additional options._ - -1. Make sure you have started the JBoss EAP server as described above. -2. Open a command line and navigate to the root directory of this quickstart. -3. Type this command to build and deploy the archive: - - mvn clean package jboss-as:deploy -4. This will deploy `target/jboss-QUICKSTART_NAME.war` (or `target/jboss-QUICKSTART_NAME.ear`) to the running instance of the server. - -Contributor: Be sure to replace the QUICKSTART_NAME. If this quickstart requires different or additional instructions, be sure to modify or add those instructions here. - - -Access the application (For quickstarts that have a UI component) ---------------------- - -Contributor: Provide the URL to access the running application. Be sure to make the URL a hyperlink as below, substituting the your quickstart name for the QUICKSTART_NAME. - - Access the running application in a browser at the following URL: - - -Contributor: Briefly describe what you will see when you access the application. For example: - - You will be presented with a simple form for adding key/value pairs and a checkbox to indicate whether the updates should be executed using an unmanaged component. - - If the box is checked, the updates will be executed within a session bean method. - If the box is not checked, the transactions and JPA updates will run in a servlet instead of session beans. - - To list all existing key/value pairs, leave the key input box empty. - - To add or update the value of a key, enter a key and value input boxe and click the submit button to see the results. - -Contributor: Add any information that will help them run and understand your quickstart. - - -Undeploy the Archive --------------------- - -Contributor: For example: - -1. Make sure you have started the JBoss EAP server as described above. -2. Open a command line and navigate to the root directory of this quickstart. -3. When you are finished testing, type this command to undeploy the archive: - - mvn jboss-as:undeploy - - -Run the Arquillian Tests (For quickstarts that contain Arquillian tests) -------------------------- - -Contributor: For example: - -This quickstart provides Arquillian tests. By default, these tests are configured to be skipped as Arquillian tests require the use of a container. - -_NOTE: The following commands assume you have configured your Maven user settings. If you have not, you must include Maven setting arguments on the command line. See [Run the Arquillian Tests](../README.md#run-the-arquillian-tests) for complete instructions and additional options._ - -1. Make sure you have started the JBoss EAP server as described above. -2. Open a command line and navigate to the root directory of this quickstart. -3. Type the following command to run the test goal with the following profile activated: - - mvn clean test -Parq-jbossas-remote - -Contributor: The quickstart README should show what to expect from the the tests - -* Copy and paste output from the JUnit tests to show what to expect in the console from the tests. - -* Copy and paste log messages output by the application to show what to expect in the server log when running the tests. - - - -Run the Quickstart in JBoss Developer Studio or Eclipse -------------------------------------- -Contributor: For example: - -You can also start the server and deploy the quickstarts from Eclipse using JBoss tools. For more information, see [Use JBoss Developer Studio or Eclipse to Run the Quickstarts](../README.md#use-jboss-developer-studio-or-eclipse-to-run-the-quickstarts) - -Debug the Application ------------------------------------- - -Contributor: For example: - -If you want to debug the source code or look at the Javadocs of any library in the project, run either of the following commands to pull them into your local repository. The IDE should then detect them. - - mvn dependency:sources - mvn dependency:resolve -Dclassifier=javadoc - - - -Build and Deploy the Quickstart - to OpenShift -------------------------- - -Contributor: If the quickstart deploys to OpenShift, you can use the following template a starting point to describe the process. Be sure to note: - -* APPLICATION_NAME should be replaced with a variation of the quickstart name, for example: myquickstart -* QUICKSTART_NAME should be replaced with your quickstart name, for example: my-quickstart - -### Create an OpenShift Account and Domain - -If you do not yet have an OpenShift account and domain, [Sign in to OpenShift](https://openshift.redhat.com/app/login) to create the account and domain. [Get Started with OpenShift](https://openshift.redhat.com/app/getting_started) will show you how to install the OpenShift Express command line interface. - -### Create the OpenShift Application - -Open a shell command prompt and change to a directory of your choice. Enter the following command, replacing APPLICATION_TYPE with `jbosseap-6` for quickstarts running on JBoss Enterprise Application Platform 6.1 or later: - - rhc app create -a APPLICATION_NAME -t APPLICATION_TYPE - -_NOTE_: The domain name for this application will be APPLICATION_NAME-YOUR_DOMAIN_NAME.rhcloud.com`. Here we use the _quickstart_ domain. You will need to replace it with your own OpenShift domain name. - -This command creates an OpenShift application named and will run the application inside the `jbosseap-6` container. You should see some output similar to the following: - - Creating application: APPLICATION_NAME - Now your new domain name is being propagated worldwide (this might take a minute)... - Warning: Permanently added 'APPLICATION_NAME-quickstart.rhcloud.com,107.22.36.32' (RSA) to the list of known hosts. - Confirming application 'APPLICATION_NAME' is available: Success! - - APPLICATION_NAME published: http://APPLICATION_NAME-quickstart.rhcloud.com/ - git url: ssh://b92047bdc05e46c980cc3501c3577c1e@APPLICATION_NAME-quickstart.rhcloud.com/~/git/APPLICATION_NAME.git/ - Successfully created application: APPLICATION_NAME - -The create command creates a git repository in the current directory with the same name as the application. Notice that the output also reports the URL at which the application can be accessed. Make sure it is available by typing the published url into a browser or use command line tools such as curl or wget. - -### Migrate the Quickstart Source - -Now that you have confirmed it is working you can migrate the quickstart source. You do not need the generated default application, so navigate to the new git repository directory and tell git to remove the source and pom files: - - cd APPLICATION_NAME - git rm -r src pom.xml - -Copy the source for the QUICKSTART_NAME quickstart into this new git repository: - - cp -r QUICKSTART_HOME/QUICKSTART_NAME/src . - cp QUICKSTART_HOME/QUICKSTART_NAME/pom.xml . - -### Configure the OpenShift Server - -Contributor: Here you describe any modifications needed for the `.openshift/config/standalone.xml` file. See other quickstart README.md files for examples. - -### Deploy the OpenShift Application - -You can now deploy the changes to your OpenShift application using git as follows: - - git add src pom.xml - git commit -m "QUICKSTART_NAME quickstart on OpenShift" - git push - -The final push command triggers the OpenShift infrastructure to build and deploy the changes. - -Note that the `openshift` profile in `pom.xml` is activated by OpenShift, and causes the war build by openshift to be copied to the `deployments` directory, and deployed without a context path. - -### Test the OpenShift Application - -When the push command returns you can test the application by getting the following URL either via a browser or using tools such as curl or wget: - -* - -You can use the OpenShift command line tools or the OpenShift web console to discover and control the application. - -### Destroy the OpenShift Application - -When you are finished with the application you can destroy it as follows: - - rhc app destroy -a APPLICATION_NAME - -_Note_: There is a limit to the number of applications you can deploy concurrently to OpenShift. If the `rhc app create` command returns an error indicating you have reached that limit, you must destroy an existing application before you continue. - -* To view the list of your OpenShift applications, type: `rhc domain show` -* To destroy an existing application, type the following, substituting the application name you want to destroy: `rhc app destroy -a APPLICATION_NAME_TO_DESTROY` diff --git a/template/pom.xml b/template/pom.xml deleted file mode 100644 index 2a373fa77..000000000 --- a/template/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - 4.0.0 - - org.jboss.quickstarts.eap - jboss-QUICKSTART_NAME - 2.6.0-SNAPSHOT - war - JBoss PRODUCT_TYPE Quickstart: QUICKSTART_NAME-OPTIONAL_SUBFOLDER_NAME - QUICKSTART_NAME: A short description of this quickstart - - http://jboss.org/jbossas - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - - UTF-8 - - - - 7.4.Final - - 3.0.2.Final - - - - - 2.1.1 - - - 1.6 - 1.6 - - - - - - - - org.jboss.spec - jboss-javaee-6.0 - ${version.jboss.spec.javaee.6.0} - pom - import - - - - - - - - - javax.enterprise - cdi-api - provided - - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.1_spec - provided - - - - - org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec - provided - - - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - provided - - - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - provided - - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.1_spec - provided - - - - - - - ${project.artifactId} - - - maven-war-plugin - ${version.war.plugin} - - - false - - - - - org.jboss.as.plugins - jboss-as-maven-plugin - ${version.jboss.maven.plugin} - - - - - -