Commit 8ff7b42d authored by Misagh Moayyed's avatar Misagh Moayyed
Browse files

Merge branch 'master' of github.com:UniconLabs/simple-cas4-overlay-template

Conflicts:
	pom.xml
parents 3cdb993a d6019577
......@@ -7,10 +7,10 @@ This overlay could be freely used as a starting template for local CAS maven war
# Versions
```xml
<cas.version>4.0.0</cas.version>
<cas.version>4.0.1</cas.version>
```
# Minimum Requirements
# Recommended Requirements
* JDK 1.7+
* Apache Maven 3+
* Servlet container supporting Servlet 3+ spec (e.g. Apache Tomcat 7+)
......@@ -19,14 +19,10 @@ This overlay could be freely used as a starting template for local CAS maven war
The `etc` directory contains the sample configuration files that would need to be copied to an external file system location (`/etc/cas` by default)
and configured to satisfy local CAS installation needs. Current files are:
* `(cas-4.0.0.properties | cas-4.1.0-SNAPSHOT.properties)`
* `cas.properties`
* `log4j.xml`
> NOTE: choose the cas.properties with appropriate version number in it (and rename to /etc/cas/cas.properties)
> as the contents have changed between 4.0.0 and 4.1.0
# Deployment
* Execute `mvn clean package`
* Deploy resultant `target/cas.war` to a Servlet3 container of choice
* Deploy resultant `target/cas.war` to a Servlet container of choice
......@@ -91,8 +91,7 @@ host.name=cas01.example.org
# It is often time helpful to externalize log4j.xml to a system path to preserve settings between upgrades.
# e.g. log4j.config.location=/etc/cas/log4j.xml
log4j.config.location=/etc/cas/log4j.xml
#
log4j refresh interval in millis
# log4j refresh interval in millis
log4j.refresh.interval=60000
##
......
......@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>2.6</version>
<configuration>
<warName>cas</warName>
<overlays>
......@@ -31,11 +31,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
<version>3.2</version>
</plugin>
</plugins>
......@@ -55,6 +51,8 @@
<properties>
<cas.version>4.0.2</cas.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment