Skip to content

Commit 94609da

Browse files
committed
Prepare for development of 2.7.0-SNAPSHOT
1 parent edc386c commit 94609da

File tree

60 files changed

+745
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+745
-53
lines changed

cdi-add-interceptor-binding/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-cdi-add-interceptor-binding</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: cdi-add-interceptor-binding</name>
2626
<description>CDI Portable Extension, add an interceptor binding: An example of a Portable Extension and some of the APIs / SPIs of CDI</description>

contacts-mobile-basic/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>jboss-contacts-mobile-basic-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss AS Quickstarts: Contacts test via WebDriver with Arquillian</name>
2525
<description>This project tests a starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6 by WebDriver</description>
2626

contacts-mobile-basic/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-contacts-mobile-basic</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: contacts-mobile-basic</name>
2626
<description>A Java EE 6 HTML5 mobile web application for use with JBoss.</description>

deltaspike-authorization/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>deltaspike-authorization-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss WFK Quickstart: deltaspike-authorization test via WebDriver with Arquillian</name>
2525

2626
<url>http://jboss.org/jbossas</url>

deltaspike-authorization/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-authorization</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-authorization</name>
2626
<description>DeltaSpike Authorization: shows a custom authorization example using security binding types from DeltaSpike</description>

deltaspike-beanbuilder/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-beanbuilder</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-beanbuilder</name>
2626
<description>DeltaSpike BeanBuilder: show how to create new beans using DeltaSpike utilities</description>

deltaspike-beanmanagerprovider/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>deltaspike-beanmanagerprovider-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss WFK Quickstart: deltaspike-beanmanagerprovider test via WebDriver with Arquillian</name>
2525

2626
<url>http://jboss.org/jbossas</url>

deltaspike-beanmanagerprovider/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-beanmanagerprovider</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-beanmanagerprovider</name>
2626
<description>DeltaSpike Beanmanagerprovider: shows how to use DeltaSpike BeanManagerProvider to access CDI in a EntityListener</description>

deltaspike-deactivatable/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-deactivatable</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-deactivatable</name>
2626
<description>DeltaSpike Deactivatable: Demonstrate usage of Deactivatable</description>

deltaspike-exception-handling/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>deltaspike-exception-handling-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss WFK Quickstart: deltaspike-exception-handling test via WebDriver with Arquillian</name>
2525

2626
<url>http://jboss.org/jbossas</url>

deltaspike-exception-handling/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-exception-handling</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-exception-handling</name>
2626
<description>DeltaSpike Exception Handling: Exception being handled by different handlers and purpose</description>

deltaspike-helloworld-jms/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>deltaspike-helloworld-jms-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss WFK Quickstart: deltaspike-helloworld-jms test via WebDriver with Arquillian</name>
2525

2626
<url>http://jboss.org/jbossas</url>

deltaspike-helloworld-jms/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-helloworld-jms</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-helloworld-jms</name>
2626
<description>deltaspike-helloworld-jms: Helloworld JMS producer/consumer client with DeltaSpike property configuration</description>

deltaspike-partialbean-advanced/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-partialbean-advanced</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-partialbean-advanced</name>
2626
<description>DeltaSpike PartialBean: Demonstrates a more advanced usage scenario involving the DeltaSpike Partial Bean module</description>

deltaspike-partialbean-basic/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-partialbean-basic</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-partialbean-basic</name>
2626
<description>DeltaSpike InvocationHandler: Demonstrates the basics of using the DeltaSpike PartialBean module</description>

deltaspike-projectstage/functional-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.as.quickstarts.wfk</groupId>
2222
<artifactId>deltaspike-projectstage-test-webdriver</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<name>JBoss WFK Quickstart: deltaspike-projectstage test via WebDriver with Arquillian</name>
2525

2626
<url>http://jboss.org/jbossas</url>

deltaspike-projectstage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>org.jboss.quickstarts.wfk</groupId>
2222
<artifactId>jboss-deltaspike-projectstage</artifactId>
23-
<version>2.6.0.Final</version>
23+
<version>2.7.0-SNAPSHOT</version>
2424
<packaging>war</packaging>
2525
<name>JBoss WFK Quickstart: deltaspike-projectstage</name>
2626
<description>DeltaSpike Project Stage: shows how to use DeltaSpike ProjectStage that allows to use implementations depending on the current environment</description>

dist/github-flavored-markdown.rb

+153
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
#!/usr/bin/env ruby
2+
#
3+
# JBoss, Home of Professional Open Source
4+
# Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual
5+
# contributors by the @authors tag. See the copyright.txt in the
6+
# distribution for a full listing of individual contributors.
7+
#
8+
# Licensed under the Apache License, Version 2.0 (the "License");
9+
# you may not use this file except in compliance with the License.
10+
# You may obtain a copy of the License at
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
20+
require 'rubygems'
21+
require 'redcarpet'
22+
require 'nokogiri'
23+
require 'fileutils'
24+
require 'pygments.rb'
25+
require 'rexml/document'
26+
27+
# create a custom renderer that allows highlighting of code blocks
28+
class HTMLWithPygmentsAndPants < Redcarpet::Render::HTML
29+
include Redcarpet::Render::SmartyPants
30+
def block_code(code, language)
31+
Pygments.highlight(code, :lexer => language, :options => {:encoding => 'utf-8'})
32+
end
33+
34+
#method copied from: https://gist.github.com/suan/5692767
35+
def header(title, level)
36+
@headers ||= []
37+
38+
title_elements = REXML::Document.new(title)
39+
flattened_title = title_elements.inject('') do |flattened, element|
40+
flattened += if element.respond_to?(:text)
41+
element.text
42+
else
43+
element.to_s
44+
end
45+
end
46+
permalink = flattened_title.downcase.gsub(/[^a-z0-9\s]/, '').gsub(/\W+/, "-")
47+
48+
# for extra credit: implement this as its own method
49+
if @headers.include?(permalink)
50+
permalink += "_1"
51+
# my brain hurts
52+
loop do
53+
break if !@headers.include?(permalink)
54+
# generate titles like foo-bar_1, foo-bar_2
55+
permalink.gsub!(/\_(\d+)$/, "_#{$1.to_i + 1}")
56+
end
57+
end
58+
@headers << permalink
59+
%(\n<h#{level}><a id="#{permalink}" class="anchor" href="##{permalink}"><span class="anchor-icon"></span></a>#{title}</h#{level}>\n)
60+
end
61+
end
62+
63+
64+
def find(p, tag)
65+
if p.text
66+
r = p.text[/^(#{tag}: )(.+)$/, 2]
67+
if r
68+
p['id'] = 'metadata'
69+
return r
70+
end
71+
end
72+
end
73+
74+
def find_split(p, tag)
75+
s = find(p, tag)
76+
if s
77+
return s.split(',').sort
78+
end
79+
end
80+
81+
def metadata(source_path, html)
82+
# TODO canonicalise path
83+
toc_file='dist/target/toc.html'
84+
# Markdown doesn't have an metadata syntax, so all we can do is pray ;-)
85+
# Look for a paragraph that contains tags, which we define by convention
86+
page_content = Nokogiri::HTML(html)
87+
technologies = []
88+
level = ""
89+
prerequisites = []
90+
summary = ""
91+
page_content.css('p').each do |p|
92+
t = find_split(p, 'Technologies')
93+
if t
94+
technologies = t
95+
end
96+
l = find(p, 'Level')
97+
if l
98+
level = l
99+
end
100+
pr = find_split(p, 'Prerequisites')
101+
if pr
102+
prerequisites = pr
103+
end
104+
s = find(p, 'Summary')
105+
if s
106+
summary = s
107+
end
108+
109+
end
110+
dir = source_path[/([^\/]+)\/([^\/]+).md$/, 1]
111+
filename = source_path[/([^\/]+)\/([^\/]+).md$/, 2]
112+
if dir
113+
output = "<tr><td align='left'><a href='#{dir}/#{filename}.md' title='#{dir}'>#{dir}</td><td align='left'>#{' '.concat(technologies.map{|u| u} * ', ')}</td><td align='left'>#{summary}</td><td align='left'>#{level}</td><td align='left'>#{' '.concat(prerequisites.map{|u| u} * ', ')}</td></tr>\n"
114+
FileUtils.mkdir_p(File.dirname(toc_file))
115+
File.open(toc_file, 'a').write(output)
116+
end
117+
end
118+
119+
def markdown(source_path)
120+
renderer = HTMLWithPygmentsAndPants.new(optionize [
121+
:with_toc_data,
122+
:xhtml
123+
])
124+
markdown = Redcarpet::Markdown.new(renderer, optionize([
125+
:fenced_code_blocks,
126+
:no_intra_emphasis,
127+
:tables,
128+
:autolink,
129+
:strikethrough,
130+
:space_after_headers,
131+
:with_toc_data
132+
]))
133+
text = source_path.read
134+
toc_file='dist/target/toc.html'
135+
if File.exist?(toc_file)
136+
qs_toc_content=File.open('dist/target/toc.html').read
137+
qs_toc = "<table><thead><tr><th align='left'><strong>Quickstart Name</strong></th><th align='left'><strong>Demonstrated Technologies</strong></th><th align='left'><strong>Description</strong></th><th align='left'><strong>Experience Level Required</strong></th><th align='left'><strong>Prerequisites</strong></th></tr></thead><tbody>#{qs_toc_content}</table></table>"
138+
text.gsub!("\[TOC-quickstart\]", qs_toc)
139+
end
140+
toc = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC).render(text)
141+
text.gsub!("\[TOC\]", toc)
142+
rendered = markdown.render(text)
143+
metadata(source_path.path, rendered)
144+
rendered = rendered.gsub(/README.md/, "README.html").gsub(/CONTRIBUTING.md/, "CONTRIBUTING.html")
145+
'<!DOCTYPE html><html><head><title>README</title><link href="http://www.jboss.org/jdf/stylesheets/documentation.css" rel="stylesheet"></link><link href="http://www.jboss.org/jdf/stylesheets/pygments.css" rel="stylesheet"></link></head><body>' + rendered + '</body></html>'
146+
end
147+
148+
def optionize(options)
149+
options.each_with_object({}) { |option, memo| memo[option] = true }
150+
end
151+
152+
puts markdown(ARGF)
153+

dist/headerdefinition.xml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<!--
3+
JBoss, Home of Professional Open Source
4+
Copyright 2014, Red Hat, Inc. and/or its affiliates, and individual
5+
contributors by the @authors tag. See the copyright.txt in the
6+
distribution for a full listing of individual contributors.
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<additionalHeaders>
19+
<javadoc_style>
20+
<firstLine>/*</firstLine>
21+
<beforeEachLine> * </beforeEachLine>
22+
<endLine> */</endLine>
23+
<firstLineDetectionPattern>(\\s|\\t)*/\\*.*$</firstLineDetectionPattern>
24+
<lastLineDetectionPattern>.*\\*/(\\s|\\t)*$</lastLineDetectionPattern>
25+
<allowBlankLines>false</allowBlankLines>
26+
<isMultiline>true</isMultiline>
27+
</javadoc_style>
28+
<xml_style>
29+
<firstLine><![CDATA[<!--]]></firstLine>
30+
<beforeEachLine> </beforeEachLine>
31+
<endLine><![CDATA[-->]]></endLine>
32+
<skipLine><![CDATA[^<\?xml.*>$]]></skipLine>
33+
<firstLineDetectionPattern><![CDATA[(\s|\t)*<!--.*$]]></firstLineDetectionPattern>
34+
<lastLineDetectionPattern><![CDATA[.*-->(\s|\t)*$]]></lastLineDetectionPattern>
35+
<allowBlankLines>false</allowBlankLines>
36+
<isMultiline>true</isMultiline>
37+
</xml_style>
38+
<dynascript_style>
39+
<firstLine><![CDATA[<%--]]></firstLine>
40+
<beforeEachLine> </beforeEachLine>
41+
<endLine><![CDATA[--%>]]></endLine>
42+
<firstLineDetectionPattern><![CDATA[(\s|\t)*<%--.*$]]></firstLineDetectionPattern>
43+
<lastLineDetectionPattern><![CDATA[.*--%>(\s|\t)*$]]></lastLineDetectionPattern>
44+
<allowBlankLines>false</allowBlankLines>
45+
<isMultiline>true</isMultiline>
46+
</dynascript_style>
47+
</additionalHeaders>
48+

dist/license.txt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
JBoss, Home of Professional Open Source
2+
Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual
3+
contributors by the @authors tag. See the copyright.txt in the
4+
distribution for a full listing of individual contributors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.

0 commit comments

Comments
 (0)