Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 7d5f018b by Tuomas Riihimäki
Options

Primefaces 5.0-RC2

1 parent c082628a
Inline Side-by-side
Showing with 30 additions and 19 deletions
code/MoyaEventMgmtWeb/pom.xml
...@@ -32,6 +32,12 @@ ...@@ -32,6 +32,12 @@
<id>iudex</id> <id>iudex</id>
<url>http://iudex.fi/maven/</url> <url>http://iudex.fi/maven/</url>
</repository> </repository>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -47,7 +53,7 @@ ...@@ -47,7 +53,7 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>4.0</version> <version>5.0-RC2</version>
</dependency> </dependency>
......
code/MoyaTerminalWeb/WebContent/WEB-INF/web.xml
...@@ -67,14 +67,4 @@ ...@@ -67,14 +67,4 @@
<persistence-unit-ref> <persistence-unit-ref>
<persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name> <persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name>
</persistence-unit-ref> </persistence-unit-ref>
<servlet>
<description>JAX-RS Tools Generated - Do not modify</description>
<servlet-name>JAX-RS Servlet</servlet-name>
<servlet-class></servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>JAX-RS Servlet</servlet-name>
<url-pattern>/jaxrs/*</url-pattern>
</servlet-mapping>
</web-app> </web-app>
\ No newline at end of file
code/MoyaTerminalWeb/pom.xml
...@@ -35,6 +35,18 @@ ...@@ -35,6 +35,18 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>iudex</id>
<url>http://iudex.fi/maven/</url>
</repository>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
...@@ -49,7 +61,7 @@ ...@@ -49,7 +61,7 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>4.0</version> <version>5.0-RC2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.bull.javamelody</groupId> <groupId>net.bull.javamelody</groupId>
......
code/MoyaWeb/pom.xml
...@@ -36,11 +36,16 @@ ...@@ -36,11 +36,16 @@
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>iudex</id> <id>iudex</id>
<url>http://iudex.fi/maven/</url> <url>http://iudex.fi/maven/</url>
</repository> </repository>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -76,7 +81,7 @@ ...@@ -76,7 +81,7 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>4.0</version> <version>5.0-RC2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserSearchView.java
...@@ -102,8 +102,7 @@ public class UserSearchView extends PaginationView<UserWrapper> { ...@@ -102,8 +102,7 @@ public class UserSearchView extends PaginationView<UserWrapper> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public List<EventUser> load(int first, int pageSize, String sortField, public List<EventUser> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
SortOrder sortOrder, Map<String, String> filters) {
UserSearchQuery sq = getSearchQuery(); UserSearchQuery sq = getSearchQuery();
sq.setPagesize(pageSize); sq.setPagesize(pageSize);
if (pageSize > 0) { if (pageSize > 0) {
...@@ -140,8 +139,7 @@ public class UserSearchView extends PaginationView<UserWrapper> { ...@@ -140,8 +139,7 @@ public class UserSearchView extends PaginationView<UserWrapper> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public List<UserWrapper> load(int first, int pageSize, String sortField, public List<UserWrapper> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
SortOrder sortOrder, Map<String, String> filters) {
UserSearchQuery sq = getSearchQuery(); UserSearchQuery sq = getSearchQuery();
sq.setPagesize(pageSize); sq.setPagesize(pageSize);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!