Skip to content

Commit 6210635

Browse files
govertbuijsgovertbuijs
committed
Version bump / cleanup
1 parent 7aca283 commit 6210635

File tree

3 files changed

+140
-161
lines changed

3 files changed

+140
-161
lines changed

‎pom.xml

+133-127
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,141 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.powertac.weatherserver</groupId>
5-
<artifactId>WeatherServer</artifactId>
6-
<packaging>war</packaging>
7-
<version>1.0.1-SNAPSHOT</version>
8-
<name>Power TAC weather-server</name>
9-
<url>http://maven.apache.org</url>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.powertac.weatherserver</groupId>
6+
<artifactId>WeatherServer</artifactId>
7+
<packaging>war</packaging>
8+
<version>1.0.1-SNAPSHOT</version>
9+
<name>Power TAC weather-server</name>
10+
<url>http://maven.apache.org</url>
1011

11-
<repositories>
12-
<repository>
13-
<id>sonatype</id>
14-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
15-
</repository>
16-
</repositories>
12+
<repositories>
13+
<repository>
14+
<id>sonatype</id>
15+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
16+
</repository>
17+
</repositories>
1718

18-
<dependencies>
19-
<dependency>
20-
<groupId>junit</groupId>
21-
<artifactId>junit</artifactId>
22-
<version>4.10</version>
23-
<scope>test</scope>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.apache.myfaces.tomahawk</groupId>
27-
<artifactId>tomahawk20</artifactId>
28-
<version>1.1.11</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.myfaces.core</groupId>
32-
<artifactId>myfaces-api</artifactId>
33-
<version>2.0.2</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.apache.myfaces.core</groupId>
37-
<artifactId>myfaces-impl</artifactId>
38-
<version>2.0.2</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>javax.faces</groupId>
42-
<artifactId>jsf-api</artifactId>
43-
<version>2.0</version>
44-
<scope>provided</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>javax.servlet</groupId>
48-
<artifactId>servlet-api</artifactId>
49-
<version>2.5</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>javax.servlet</groupId>
53-
<artifactId>jstl</artifactId>
54-
<version>1.2</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>mysql</groupId>
58-
<artifactId>mysql-connector-java</artifactId>
59-
<version>5.1.18</version>
60-
</dependency>
19+
<dependencies>
20+
<dependency>
21+
<groupId>junit</groupId>
22+
<artifactId>junit</artifactId>
23+
<version>4.12</version>
24+
<scope>test</scope>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.apache.myfaces.core</groupId>
28+
<artifactId>myfaces-api</artifactId>
29+
<version>2.2.9</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.apache.myfaces.core</groupId>
33+
<artifactId>myfaces-impl</artifactId>
34+
<version>2.2.9</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>javax.faces</groupId>
38+
<artifactId>jsf-api</artifactId>
39+
<version>2.1</version>
40+
<scope>provided</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>javax.servlet</groupId>
44+
<artifactId>servlet-api</artifactId>
45+
<version>3.0-alpha-1</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>javax.servlet</groupId>
49+
<artifactId>jstl</artifactId>
50+
<version>1.2</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>mysql</groupId>
54+
<artifactId>mysql-connector-java</artifactId>
55+
<version>5.1.38</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>c3p0</groupId>
59+
<artifactId>c3p0</artifactId>
60+
<version>0.9.1.2</version>
61+
</dependency>
6162
</dependencies>
6263

63-
<build>
64-
<finalName>WeatherServer</finalName>
65-
<plugins>
66-
<plugin>
67-
<groupId>org.apache.maven.plugins</groupId>
68-
<artifactId>maven-war-plugin</artifactId>
69-
<configuration>
70-
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
71-
<warSourceDirectory>src/main/webapp/</warSourceDirectory>
72-
</configuration>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-compiler-plugin</artifactId>
77-
<version>2.0.2</version>
78-
<configuration>
79-
<source>1.6</source>
80-
<target>1.6</target>
81-
</configuration>
82-
</plugin>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-eclipse-plugin</artifactId>
86-
<inherited>true</inherited>
87-
<configuration>
88-
<classpathContainers>
89-
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
90-
<classpathContainer>org.eclipse.jdt.USER_LIBRARY/TOMCAT_7.0.25_LIBRARY</classpathContainer>
91-
</classpathContainers>
92-
</configuration>
93-
</plugin>
64+
<build>
65+
<finalName>WeatherServer</finalName>
66+
<plugins>
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-war-plugin</artifactId>
70+
<configuration>
71+
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
72+
<warSourceDirectory>src/main/webapp/</warSourceDirectory>
73+
</configuration>
74+
</plugin>
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-compiler-plugin</artifactId>
78+
<version>2.0.2</version>
79+
<configuration>
80+
<source>1.6</source>
81+
<target>1.6</target>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-eclipse-plugin</artifactId>
87+
<inherited>true</inherited>
88+
<configuration>
89+
<classpathContainers>
90+
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
91+
</classpathContainer>
92+
<classpathContainer>
93+
org.eclipse.jdt.USER_LIBRARY/TOMCAT_7.0.25_LIBRARY
94+
</classpathContainer>
95+
</classpathContainers>
96+
</configuration>
97+
</plugin>
9498

95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-enforcer-plugin</artifactId>
98-
<version>1.1.1</version>
99-
<executions>
100-
<execution>
101-
<id>enforce-files-exist</id>
102-
<goals>
103-
<goal>enforce</goal>
104-
</goals>
105-
<configuration>
106-
<rules>
107-
<requireFilesExist>
108-
<files>
109-
<file>${project.basedir}/src/main/resources/weatherserver.properties</file>
110-
</files>
111-
</requireFilesExist>
112-
</rules>
113-
<fail>true</fail>
114-
</configuration>
115-
</execution>
116-
</executions>
117-
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-enforcer-plugin</artifactId>
102+
<version>1.1.1</version>
103+
<executions>
104+
<execution>
105+
<id>enforce-files-exist</id>
106+
<goals>
107+
<goal>enforce</goal>
108+
</goals>
109+
<configuration>
110+
<rules>
111+
<requireFilesExist>
112+
<files>
113+
<file>
114+
${project.basedir}/src/main/resources/weatherserver.properties
115+
</file>
116+
</files>
117+
</requireFilesExist>
118+
</rules>
119+
<fail>true</fail>
120+
</configuration>
121+
</execution>
122+
</executions>
123+
</plugin>
118124

119-
<!-- tomcat plugin -->
120-
<plugin>
121-
<groupId>org.apache.tomcat.maven</groupId>
122-
<artifactId>tomcat7-maven-plugin</artifactId>
123-
<version>2.0-beta-1</version>
124-
<configuration>
125-
<url>http://localhost:8080/manager/text</url>
126-
<username>admin</username>
127-
<password>admin</password>
128-
<path>/WeatherServer</path>
129-
<update>true</update>
130-
</configuration>
131-
</plugin>
132-
</plugins>
133-
</build>
125+
<!-- tomcat plugin -->
126+
<plugin>
127+
<groupId>org.apache.tomcat.maven</groupId>
128+
<artifactId>tomcat7-maven-plugin</artifactId>
129+
<version>2.0-beta-1</version>
130+
<configuration>
131+
<url>http://localhost:8080/manager/text</url>
132+
<username>admin</username>
133+
<password>admin</password>
134+
<path>/WeatherServer</path>
135+
<update>true</update>
136+
</configuration>
137+
</plugin>
138+
</plugins>
139+
</build>
134140
</project>
135141

‎src/main/webapp/WEB-INF/web.xml

-29
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<param-value>.xhtml</param-value>
4040
</context-param>
4141

42-
4342
<context-param>
4443
<param-name>org.apache.myfaces.PRETTY_HTML</param-name>
4544
<param-value>true</param-value>
@@ -61,34 +60,6 @@
6160
<listener-class>org.powertac.weatherserver.listeners.Initializer</listener-class>
6261
</listener>
6362

64-
<filter>
65-
<filter-name>ExtensionsFilter</filter-name>
66-
<filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
67-
<init-param>
68-
<description>
69-
Set the size limit for uploaded files.
70-
Format: 10 - 10 bytes
71-
10k - 10 KB
72-
10m - 10 MB
73-
1g - 1 GB
74-
</description>
75-
<param-name>uploadMaxFileSize</param-name>
76-
<param-value>100k</param-value>
77-
</init-param>
78-
79-
<init-param>
80-
<description>
81-
Set the path where the intermediary files will be stored.
82-
</description>
83-
<param-name>uploadRepositoryPath</param-name>
84-
<param-value>/temp</param-value>
85-
</init-param>
86-
</filter>
87-
<filter-mapping>
88-
<filter-name>ExtensionsFilter</filter-name>
89-
<servlet-name>Faces Servlet</servlet-name>
90-
</filter-mapping>
91-
9263
<servlet>
9364
<servlet-name>Faces Servlet</servlet-name>
9465
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>

‎src/main/webapp/index.xhtml

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
33
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml"
5-
xmlns:t="http://myfaces.apache.org/tomahawk">
5+
xmlns:h="http://java.sun.com/jsf/html">
66

77
<metadata xmlns="http://java.sun.com/jsf/core">
88
<event type="preRenderView" listener="#{rest.respond}"/>
@@ -57,9 +57,11 @@
5757
<br />
5858
<b>Available locations : </b>
5959
<br />
60-
<t:dataList value="#{actionIndex.getLocationList()}"
61-
layout="unorderedList" var="location" >
62-
<t:outputText value="#{location}" />
63-
</t:dataList>
60+
<br />
61+
<h:dataTable value="#{actionIndex.getLocationList()}" var="location">
62+
<h:column>
63+
<h:outputText value="#{location}"/>
64+
</h:column>
65+
</h:dataTable>
6466
</body>
6567
</html>

0 commit comments

Comments
 (0)