Merge branch '2.3' of https://github.com/demoiselle/framework.git into 2.3

Cleverson Sacramento
2 parents 40489b2e 52738040
Showing 6 changed files with 10 additions and 10 deletions Show diff stats
documentation/quickstart/pt-BR/criacao.xml
documentation/quickstart/pt-BR/melhoria.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractStrategyBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AuthenticatorBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AuthorizerBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
@@ -425,7 +425,7 @@ public class BookmarkListMB extends AbstractListPageBean&lt;Bookmark, Long&gt; {
 			<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:
 		</para>
 		<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 	<ui:define name="body">
 		<h:form>
@@ -470,7 +470,7 @@ public class BookmarkListMB extends AbstractListPageBean&lt;Bookmark, Long&gt; {
 			<filename>menu.xhtml</filename> com o conteúdo seguinte:
 		</para>
 		<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 	<h:form>
 		<p:menubar>
@@ -130,7 +130,7 @@ public class BookmarkListMB extends AbstractListPageBean&lt;Bookmark, Long&gt; {
 			<filename>bookmark_edit.xhtml</filename> com o conteúdo seguinte:
 		</para>
 		<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-		xmlns:p="http://primefaces.prime.com.tr/ui"	xmlns:h="http://java.sun.com/jsf/html"
+		xmlns:p="http://primefaces.org/ui"	xmlns:h="http://java.sun.com/jsf/html"
 		xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 	<ui:define name="body">
 		<h:form prependId="false">
@@ -184,7 +184,7 @@ public class BookmarkListMB extends AbstractListPageBean&lt;Bookmark, Long&gt; {
 			<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:
 		</para>
 		<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 	<ui:define name="body">
 		<h:form>
@@ -242,7 +242,7 @@ public class BookmarkListMB extends AbstractListPageBean&lt;Bookmark, Long&gt; {
 			<filename>menu.xhtml</filename> conforme o conteúdo seguinte:
 		</para>
 		<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 	<h:form>
 		<p:menubar>
@@ -92,7 +92,7 @@ public abstract class AbstractStrategyBootstrap&lt;T, D extends T&gt; extends Abstract
 		try {
 			Configuration config = new PropertiesConfiguration("demoiselle.properties");
-			canonicalName = config.getString(getConfigurationKey(), getDefaultClass().getCanonicalName());
+			canonicalName = config.getString(getConfigKey(), getDefaultClass().getCanonicalName());
 			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 			result = (Class<T>) Class.forName(canonicalName, false, classLoader);
@@ -113,6 +113,6 @@ public abstract class AbstractStrategyBootstrap&lt;T, D extends T&gt; extends Abstract
 		return result;
 	}
-	public abstract String getConfigurationKey();
+	public abstract String getConfigKey();
 }
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authenticator;
 public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator, DefaultAuthenticator> {
-	public String getConfigurationKey() {
+	public String getConfigKey() {
 		return "frameworkdemoiselle.security.authenticator.class";
 	}
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authorizer;
 public class AuthorizerBootstrap extends AbstractStrategyBootstrap<Authorizer, DefaultAuthorizer> {
-	public String getConfigurationKey() {
+	public String getConfigKey() {
 		return "frameworkdemoiselle.security.authorizer.class";
 	}
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.transaction.Transaction;
 public class TransactionBootstrap extends AbstractStrategyBootstrap<Transaction, DefaultTransaction> {
-	public String getConfigurationKey() {
+	public String getConfigKey() {
 		return "frameworkdemoiselle.transaction.class";
 	}
	@@ -425,7 +425,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {		@@ -425,7 +425,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
425	<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:	425	<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:
426	</para>	426	</para>
427	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"	427	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
428	- xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"	428	+ xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
429	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">	429	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
430	<ui:define name="body">	430	<ui:define name="body">
431	<h:form>	431	<h:form>
	@@ -470,7 +470,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {		@@ -470,7 +470,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
470	<filename>menu.xhtml</filename> com o conteúdo seguinte:	470	<filename>menu.xhtml</filename> com o conteúdo seguinte:
471	</para>	471	</para>
472	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"	472	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
473	- xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"	473	+ xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
474	xmlns:ui="http://java.sun.com/jsf/facelets">	474	xmlns:ui="http://java.sun.com/jsf/facelets">
475	<h:form>	475	<h:form>
476	<p:menubar>	476	<p:menubar>
	@@ -130,7 +130,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {		@@ -130,7 +130,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
130	<filename>bookmark_edit.xhtml</filename> com o conteúdo seguinte:	130	<filename>bookmark_edit.xhtml</filename> com o conteúdo seguinte:
131	</para>	131	</para>
132	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"	132	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
133	- xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"	133	+ xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
134	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">	134	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
135	<ui:define name="body">	135	<ui:define name="body">
136	<h:form prependId="false">	136	<h:form prependId="false">
	@@ -184,7 +184,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {		@@ -184,7 +184,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
184	<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:	184	<filename>bookmark_list.xhtml</filename> com o conteúdo seguinte:
185	</para>	185	</para>
186	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"	186	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
187	- xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"	187	+ xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
188	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">	188	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
189	<ui:define name="body">	189	<ui:define name="body">
190	<h:form>	190	<h:form>
	@@ -242,7 +242,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {		@@ -242,7 +242,7 @@ public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
242	<filename>menu.xhtml</filename> conforme o conteúdo seguinte:	242	<filename>menu.xhtml</filename> conforme o conteúdo seguinte:
243	</para>	243	</para>
244	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"	244	<programlisting role="XML"><![CDATA[<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
245	- xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"	245	+ xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
246	xmlns:ui="http://java.sun.com/jsf/facelets">	246	xmlns:ui="http://java.sun.com/jsf/facelets">
247	<h:form>	247	<h:form>
248	<p:menubar>	248	<p:menubar>
	@@ -92,7 +92,7 @@ public abstract class AbstractStrategyBootstrap<T, D extends T> extends Abstract		@@ -92,7 +92,7 @@ public abstract class AbstractStrategyBootstrap<T, D extends T> extends Abstract
92		92
93	try {	93	try {
94	Configuration config = new PropertiesConfiguration("demoiselle.properties");	94	Configuration config = new PropertiesConfiguration("demoiselle.properties");
95	- canonicalName = config.getString(getConfigurationKey(), getDefaultClass().getCanonicalName());	95	+ canonicalName = config.getString(getConfigKey(), getDefaultClass().getCanonicalName());
96		96
97	ClassLoader classLoader = Thread.currentThread().getContextClassLoader();	97	ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
98	result = (Class<T>) Class.forName(canonicalName, false, classLoader);	98	result = (Class<T>) Class.forName(canonicalName, false, classLoader);
	@@ -113,6 +113,6 @@ public abstract class AbstractStrategyBootstrap<T, D extends T> extends Abstract		@@ -113,6 +113,6 @@ public abstract class AbstractStrategyBootstrap<T, D extends T> extends Abstract
113	return result;	113	return result;
114	}	114	}
115		115
116	- public abstract String getConfigurationKey();	116	+ public abstract String getConfigKey();
117		117
118	}	118	}
	@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authenticator;		@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authenticator;
41		41
42	public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator, DefaultAuthenticator> {	42	public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator, DefaultAuthenticator> {
43		43
44	- public String getConfigurationKey() {	44	+ public String getConfigKey() {
45	return "frameworkdemoiselle.security.authenticator.class";	45	return "frameworkdemoiselle.security.authenticator.class";
46	}	46	}
47		47
	@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authorizer;		@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.security.Authorizer;
41		41
42	public class AuthorizerBootstrap extends AbstractStrategyBootstrap<Authorizer, DefaultAuthorizer> {	42	public class AuthorizerBootstrap extends AbstractStrategyBootstrap<Authorizer, DefaultAuthorizer> {
43		43
44	- public String getConfigurationKey() {	44	+ public String getConfigKey() {
45	return "frameworkdemoiselle.security.authorizer.class";	45	return "frameworkdemoiselle.security.authorizer.class";
46	}	46	}
47		47
	@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.transaction.Transaction;		@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.transaction.Transaction;
41		41
42	public class TransactionBootstrap extends AbstractStrategyBootstrap<Transaction, DefaultTransaction> {	42	public class TransactionBootstrap extends AbstractStrategyBootstrap<Transaction, DefaultTransaction> {
43		43
44	- public String getConfigurationKey() {	44	+ public String getConfigKey() {
45	return "frameworkdemoiselle.transaction.class";	45	return "frameworkdemoiselle.transaction.class";
46	}	46	}
47		47