Skip to content

Commit

Permalink
Update to PrimeFaces 7.0RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
rafael-pestano committed Jan 30, 2019
1 parent de9885a commit 18f6094
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 15 deletions.
29 changes: 26 additions & 3 deletions pom.xml
View file
Expand Up @@ -25,6 +25,7 @@
<asciidoctorj.version>1.5.6</asciidoctorj.version>
<jruby.version>9.1.13.0</jruby.version>
<adminfaces.version>1.0.0-RC21-SNAPSHOT</adminfaces.version>
<primefaces.version>7.0.RC2</primefaces.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -70,7 +71,7 @@
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>7.0-SNAPSHOT</version>
<version>${primefaces.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -101,7 +102,6 @@
<version>1.59.0</version>
</dependency>


<!-- page statistics backup on drive -->
<dependency>
<groupId>com.google.apis</groupId>
Expand Down Expand Up @@ -292,7 +292,7 @@
<profile>
<id>swarm</id>
<properties>
<version.wildfly-swarm>2017.5.0</version.wildfly-swarm>
<version.wildfly-swarm>2018.3.3</version.wildfly-swarm>
</properties>

<dependencies>
Expand Down Expand Up @@ -354,6 +354,29 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version>
<executions>
<execution>
<id>default-copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<overwrite>true</overwrite>
<outputDirectory>src/main/webapp/sources</outputDirectory>
<resources>
<resource>
<directory>${build.sourceDirectory}</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Binary file modified showcase.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/main/webapp/WEB-INF/faces-config.xml
View file
Expand Up @@ -5,6 +5,13 @@
version="2.0">
<application>
<resource-handler>org.omnifaces.resourcehandler.CombinedResourceHandler</resource-handler>
<message-bundle>
showcase
</message-bundle>
<resource-bundle>
<base-name>showcase</base-name>
<var>msg</var>
</resource-bundle>
</application>

<application>
Expand Down
16 changes: 8 additions & 8 deletions src/main/webapp/WEB-INF/templates/template-top.xhtml
View file
Expand Up @@ -54,14 +54,14 @@
<p:tooltip for="admin-footer" escape="false" position="top"
showEvent="mouseover" hideEvent="mouseleave" hideDelay="2500"
value="Using &lt;a href='https://github.com/adminfaces/admin-template'
target='_blank'&gt;Admin Template &lt;span style='font-weight: 600'&gt;
#{adm['admin.version']}&lt;/span&gt;&lt;/a&gt;,
&lt;a href='https://github.com/adminfaces/admin-theme'
target='_blank'&gt;Admin theme &lt;span style='font-weight: 600'&gt;
#{adm['admin.version']}&lt;/span&gt;&lt;/a&gt; and &lt;a href='https://primefaces.org/'
target='_blank'&gt;PrimeFaces &lt;span style='font-weight: 600'&gt;
7.0-SNAPSHOT&lt;/span&gt;&lt;/a&gt;
"/>
target='_blank'&gt;Admin Template &lt;span style='font-weight: 600'&gt;
#{adm['admin.version']}&lt;/span&gt;&lt;/a&gt;,
&lt;a href='https://github.com/adminfaces/admin-theme'
target='_blank'&gt;Admin theme &lt;span style='font-weight: 600'&gt;
#{adm['admin.version']}&lt;/span&gt;&lt;/a&gt; and &lt;a href='https://primefaces.org/'
target='_blank'&gt;PrimeFaces &lt;span style='font-weight: 600'&gt;
#{msg['primefaces.version']}&lt;/span&gt;&lt;/a&gt;
"/>
Powered by <h:link value="AdminFaces - © 2017-2019" id="admin-footer" href="#" onclick="void(0);return false"/>
<div class="pull-right " style="color: gray">
Page views: <h:link id="link-stats" href="#" onclick="void(0);return false"> <span
Expand Down
5 changes: 2 additions & 3 deletions src/main/webapp/WEB-INF/templates/template.xhtml
View file
Expand Up @@ -55,12 +55,12 @@
target='_blank'&gt;Admin theme &lt;span style='font-weight: 600'&gt;
#{adm['admin.version']}&lt;/span&gt;&lt;/a&gt; and &lt;a href='https://primefaces.org/'
target='_blank'&gt;PrimeFaces &lt;span style='font-weight: 600'&gt;
7.0-SNAPSHOT&lt;/span&gt;&lt;/a&gt;
#{msg['primefaces.version']}&lt;/span&gt;&lt;/a&gt;
"/>
Powered by <h:link value="AdminFaces - © 2017-2019" id="admin-footer" href="#" onclick="void(0);return false"/>
<div class="pull-right " style="color: gray">
Page views: <h:link id="link-stats" href="#" onclick="void(0);return false"> <span
style="font-weight: 600"> #{analyticsMB.pageStats.totalPageViews}</span></h:link>
style="font-weight: 600"> #{analyticsMB.pageStats.totalPageViews}</span></h:link>
</div>

<p:tooltip for="link-stats" escape="false" position="top"
Expand All @@ -70,7 +70,6 @@

</div>


</ui:define>

<!-- below is just an example on how to define more tabs for control sidebar -->
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/adminfaces/showcase/ultil/DeployUtil.java
View file
Expand Up @@ -49,7 +49,7 @@ public static WebArchive deploy() {

//resources
war.addAsResource(new File(RESOURCES, "admin-config.properties"), "admin-config.properties");

war.addAsResource(new File(RESOURCES, "showcase.properties"), "showcase.properties");
war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory("src/main/webapp").as(GenericArchive.class), "/", Filters.include(".*\\.(xhtml|html|css|js|png|gif|jpg|ico)$"));
war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory("src/main/java/com/github/adminfaces/showcase").as(GenericArchive.class), "/sources/com/github/adminfaces/showcase", Filters.include(".*\\.java$"));
System.out.println(war.toString(true));
Expand Down

0 comments on commit 18f6094

Please sign in to comment.