Download as
Browse Code »

Commit 7befa245b0e7a0876165521ae3e172c4387c35c5

Authored by Cleverson Sacramento
2 parents 40489b2e 52738040
Exists in master

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

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