Skip to content

Commit

Permalink
Add complete version info.
Browse files Browse the repository at this point in the history
  • Loading branch information
@juanjmerono
juanjmerono committed Feb 13, 2017
1 parent 43b270e commit 72a05e7
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions kickroster-classic/src/main/java/demo/RosterBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.richfaces.VersionBean;
import org.richfaces.model.selection.Selection;
import org.sakaiproject.authz.api.Member;
import org.sakaiproject.exception.IdUnusedException;
import org.sakaiproject.site.api.Group;
import org.sakaiproject.site.api.Site;
import org.sakaiproject.site.api.SiteService;
Expand Down Expand Up @@ -48,7 +48,7 @@ public class RosterBean {
public void setToolManager(ToolManager toolManager) { this.toolManager = toolManager; }

public String getVersion() {
return FacesContext.class.getPackage().getImplementationVersion();
return FacesContext.class.getPackage().getImplementationVersion() + " RichFaces: " + VersionBean._version._versionInfo + " PrimeFaces: 1.1";
}

public List<Participant> getDataModel() {
Expand Down
3 changes: 2 additions & 1 deletion kickroster-prime/src/main/java/demo/RosterBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.primefaces.context.RequestContext;
import org.sakaiproject.authz.api.Member;
import org.sakaiproject.exception.IdUnusedException;
import org.sakaiproject.site.api.Group;
Expand Down Expand Up @@ -40,7 +41,7 @@ public class RosterBean {
public void setToolManager(ToolManager toolManager) { this.toolManager = toolManager; }

public String getVersion() {
return FacesContext.class.getPackage().getImplementationVersion();
return FacesContext.class.getPackage().getImplementationVersion() + " PrimeFaces: " + RequestContext.getCurrentInstance().getApplicationContext().getConfig().getBuildVersion();
}

public List<Participant> getDataModel() {
Expand Down
2 changes: 1 addition & 1 deletion kickroster-prime/src/webapp/pages/index.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:p="http://primefaces.org/ui"
template="/templates/template.xhtml">

<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/>: <h:outputText value="#{rosterBean.version}"/></ui:define>
<ui:define name="pageHeader"><h:outputText value="#{msgs.title}: #{rosterBean.version}"/></ui:define>

<ui:define name="body">
<h:outputText value="#{msgs.mainTitle}"/>
Expand Down
2 changes: 1 addition & 1 deletion kickroster-prime/src/webapp/pages/lindex.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:p="http://primefaces.org/ui"
template="/templates/template.xhtml">

<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/>: <h:outputText value="#{rosterBean.version}"/></ui:define>
<ui:define name="pageHeader"><h:outputText value="#{msgs.title}": #{rosterBean.version}"/></ui:define>

<ui:define name="body">
<h:outputText value="#{msgs.mainTitle}"/>
Expand Down
3 changes: 2 additions & 1 deletion kickroster-rich/src/main/java/demo/RosterBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.richfaces.VersionBean;
import org.sakaiproject.authz.api.Member;
import org.sakaiproject.site.api.Group;
import org.sakaiproject.site.api.Site;
Expand All @@ -39,7 +40,7 @@ public class RosterBean {
public void setToolManager(ToolManager toolManager) { this.toolManager = toolManager; }

public String getVersion() {
return FacesContext.class.getPackage().getImplementationVersion();
return FacesContext.class.getPackage().getImplementationVersion() + " RichFaces: " + VersionBean.VERSION;
}

public List<Participant> getDataModel() {
Expand Down
2 changes: 1 addition & 1 deletion kickroster-rich/src/webapp/pages/index.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich"
template="/templates/template.xhtml">

<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/>: <h:outputText value="#{rosterBean.version}"/></ui:define>
<ui:define name="pageHeader"><h:outputText value="#{msgs.title}: #{rosterBean.version}"/></ui:define>

<ui:define name="body">
<h:form id="form">
Expand Down
2 changes: 1 addition & 1 deletion kickroster-rich/src/webapp/pages/lindex.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich"
template="/templates/template.xhtml">

<ui:define name="pageHeader"><h:outputText value="#{msgs.title}"/>: <h:outputText value="#{rosterBean.version}"/></ui:define>
<ui:define name="pageHeader"><h:outputText value="#{msgs.title}: #{rosterBean.version}"/></ui:define>

<ui:define name="body">
<h:form id="form">
Expand Down

0 comments on commit 72a05e7

Please sign in to comment.