Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.1.0-rc1 #1

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

v1.1.0-rc1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
888eba5
optimized docker run
CExBBartolome Oct 23, 2015
a85717c
added postgres-9.4 drivers and sample command
CExBBartolome Oct 26, 2015
6a93442
changed postgres version to 9.4-1204-jdbc41
CExBBartolome Oct 26, 2015
6aa842b
fixed commmand line example for Postgres persistence
CExBBartolome Oct 27, 2015
4149a60
added slf4j dependencies
CExBBartolome Oct 27, 2015
0839fdb
Merge pull request #2 from CExBBartolome/feature/slf4j
CExBBartolome Oct 27, 2015
2e633ce
Merge pull request #3 from CExBBartolome/postgres-9.4
CExBBartolome Oct 27, 2015
71d491e
added servlet load on startup
CExBBartolome Oct 27, 2015
3b29ca4
Merge pull request #4 from CExBBartolome/feature/load-on-startup
CExBBartolome Oct 27, 2015
f6870fe
updated CHANGELOG in README.md
CExBBartolome Oct 27, 2015
2995c01
indent tab -> space in web.xml
CExBBartolome Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ ENV PORT 8080

EXPOSE $PORT

CMD ["sh", "/usr/src/app/run.sh"]
RUN ["mvn", "package"]
RUN ["mvn", "jetty:start"]
cmd mvn -Djetty.host=${HOST} -Djetty.port=${PORT} -e jetty:run
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This command doesn't seem to be in the correct docker format.

19 changes: 19 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,19 @@ Will download, build, run the server on the default port 8080

Will download, build, run the server on port 8090

mvn -Dorg.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX \
-Dorg.quartz.jobStore.tablePrefix=QRTZ_ \
-Dorg.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate \
-Dorg.quartz.jobStore.dataSource=qzDS \
-Dorg.quartz.dataSource.qzDS.driver=org.postgresql.Driver \
-Dorg.quartz.dataSource.qzDS.URL=jdbc:postgresql://localhost:5432/dbname \
-Dorg.quartz.dataSource.qzDS.user=postgres \
-Dorg.quartz.dataSource.qzDS.password=secret \
-Dorg.quartz.dataSource.qzDS.maxConnections=30 \
-e jetty:run

Will download, build, run the server, and persist jobs into the Postgres database specified

# Compile war file to /target directory:

mvn package
Expand All @@ -61,3 +74,9 @@ Problem accessing /scheduler/api. Reason:
HTTP method GET is not supported by this URL

This is good and what you should expect from a GET. The URL will only support POST, PUT and DELETE.

# CHANGELOG
- Added `load-on-startup` entry in `web.xml`
- Added JDBC drivers for PostgreSQL 9.4
- Added slf4j for logging
- Removed `virtualHosts` entry in `jetty-web.xml`
26 changes: 26 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,25 @@
<version>2.2.1</version>
</dependency>

<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>

<dependency>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is log4j logging out to sysout?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
</dependency>

<!-- jetty -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down Expand Up @@ -98,6 +117,13 @@
<version>4.3.3</version>
</dependency>

<!-- postgres 9.4 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4-1204-jdbc41</version>
</dependency>

</dependencies>


Expand Down
5 changes: 0 additions & 5 deletions run.sh
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/webapp/WEB-INF/jetty-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,4 @@
<!--<Set name="contextPath">/</Set>-->
<Set name="contextPath">/scheduler</Set>
<Set name="war"><Property name="jetty.home"/>/target/scheduler.war</Set>
<Set name="virtualHosts">
<Array type="java.lang.String">
<Item>127.0.0.1</Item>
<Item>localhost</Item>
<Item>_TARGETIP_</Item>
</Array>
</Set>
</Configure>
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<servlet>
<servlet-name>API</servlet-name>
<servlet-class>com.nearform.http.API</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>API</servlet-name>
Expand Down