Skip to content
GitLab
Commit b4743f8f authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '224-remove-the-jetty-assembly-build' into 'master' 

removed assembly jetty

Closes #224

See merge request genesys-pgr/genesys-server!125
parents 9bd43760 8207ffe0
Hide whitespace changes
Inline Side-by-side
README.md
View file @ b4743f8f
......@@ -12,40 +12,6 @@ docker run dockerhub.croptrust.org/genesys-pgr/genesys-server:2.2
The genesys container can be configured via environment variables (`-e` docker flag).
## Running genesys2-server with jetty
Obtain a copy of `genesys2-server-X.Y.Z-jetty.zip` archive by building the project. The zip can be found in target/ directory.
```shell
mvn clean package
```
Download a **stable-9** copy of [jetty](http://download.eclipse.org/jetty/) and unpack it to your favorite location.
Unpack `genesys2-server-X.Y.Z-jetty.zip` archive and move its contents into the jetty directory, next to existing `demo-base` and `webapps` directories.
Start jetty from the `genesys2-server-X.Y.Z-jetty` base
```shell
cd genesys2-server-X.Y.Z-jetty/
java -jar ../start.jar
```
STDOUT is used for logging.
This configuration uses HSQL database and is intended for testing genesys2-server. To change the database settings, edit `genesys2-server-X.Y.Z-jetty/resources/genesys.properties` file:
```.properties
# mysql
db.url=jdbc:mysql://localhost/genesys?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
db.driverClassName=com.mysql.jdbc.Driver
db.username=root
db.password=mysql
hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
```
The complete list of available configuration options and their default values can be found in [spring.properties](/src/main/resources/spring/spring.properties).
## Running genesys2-server with maven
- Clone genesys2-server to your computer
......
assembly/assembly-jetty.xml deleted 100644 → 0
View file @ 9bd43760
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>jetty</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.build.finalName}-jetty</baseDirectory>
<files>
<file>
<source>${project.build.directory}/${project.build.finalName}.war</source>
<destName>webapps/genesys2-server.war</destName>
<fileMode>0644</fileMode>
</file>
</files>
<fileSets>
<fileSet>
<directory>assembly/jetty/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
assembly/jetty/resources/genesys.properties deleted 100644 → 0
View file @ 9bd43760
#DB connection properties
#Persistent HSQLDB
db.path=./data/genesys/hsql/genesys
db.url=jdbc:hsqldb:file:${db.path};sql.syntax_mys=true
db.driverClassName=org.hsqldb.jdbc.JDBCDriver
db.username=sa
db.password=
db.showSql=false
db.hbm2ddl=true
hibernate.dialect=org.hibernate.dialect.HSQLDialect
base.hostname=${base.host}:8082
# Directories
lucene.indexDir=./data/genesys/lucene/
download.files.dir=./data/genesys/tmp
cdn.server=${base.hostname}
# Google API Key
google.api.key=AIzaSyBEvPuc8j5ps5GDQ3tdnTJaffKhfOdxFVc
# Google+ OAuth configuration for G+ signin
google.consumerKey=
google.consumerSecret=
# reCAPTCHA API: These are our keys for localhost
captcha.privateKey=6Lfb5w4TAAAAADoSaBZsxx832HH5YHdCdEiS2v0s
captcha.siteKey=6Lfb5w4TAAAAAI6pD_4l5uIwXEaUJ6KQmhU9cyjx
# ITPGRFA Easy-SMTA account (if you have one)
itpgrfa.easysmta.url=https://mls.planttreaty.org/itt/index.php?r=extsys/userinfo
itpgrfa.easysmta.username=bar
itpgrfa.easysmta.password=foo
# Google Analytics Account (UA-XYZ)
google.analytics.account=
# Content creation on startup
auto.createContent=false
# Mail server properties
mail.host=localhost
mail.port=25
mail.user.password=
mail.user.name=
mail.smtp.ssl.enable=true
mail.smtp.starttls.enable=true
mail.smtp.auth=true
mail.transport.protocol=smtp
mail.user.from=test@localhost
mail.requests.to=test@localhost
# Transifex
transifex.project=your-genesys-project
transifex.username=
transifex.password=
# File repository S3 parameter values
s3.accessKey=
s3.secretKey=
s3.bucket=
s3.region=
assembly/jetty/start.d/http.ini deleted 100644 → 0
View file @ 9bd43760
# ---------------------------------------
# Module: http
--module=http
### HTTP Connector Configuration
## Connector host/address to bind to
# jetty.http.host=0.0.0.0
## Connector port to listen on
jetty.http.port=8082
## Connector idle timeout in milliseconds
jetty.http.idleTimeout=30000
## Connector socket linger time in seconds (-1 to disable)
# jetty.http.soLingerTime=-1
## Number of acceptors (-1 picks default based on number of cores)
# jetty.http.acceptors=-1
## Number of selectors (-1 picks default based on number of cores)
# jetty.http.selectors=-1
## ServerSocketChannel backlog (0 picks platform default)
# jetty.http.acceptorQueueSize=0
## Thread priority delta to give to acceptor threads
# jetty.http.acceptorPriorityDelta=0
## HTTP Compliance: RFC7230, RFC2616, LEGACY
# jetty.http.compliance=RFC7230
assembly/jetty/start.d/jsp.ini deleted 100644 → 0
View file @ 9bd43760
# ---------------------------------------
# Module: jsp
--module=jsp
# JSP Configuration
# Select JSP implementation, choices are
# glassfish : The reference implementation
# default in jetty <= 9.1
# apache : The apache version
# default jetty >= 9.2
# jsp-impl=apache
# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line
# -Dorg.apache.jasper.compiler.disablejsr199=true
assembly/jetty/start.d/jstl.ini deleted 100644 → 0
View file @ 9bd43760
# ---------------------------------------
# Module: jstl
--module=jstl
# JSTL Configuration
# The glassfish jsp-impl includes JSTL by default and this module
# is not required to activate it.
# The apache jsp-impl does not include JSTL by default and this module
# is required to put JSTL on the container classpath
assembly/jetty/start.ini deleted 100644 → 0
View file @ 9bd43760
#
# Example of providing a demo configuration, using a ${jetty.base}
#
# Additional ini files are in demo-base/start.d
#
# ---------------------------------------
# Module: server
--module=server
### Common HTTP configuration
## Scheme to use to build URIs for secure redirects
# jetty.httpConfig.secureScheme=https
## Port to use to build URIs for secure redirects
# jetty.httpConfig.securePort=8443
## Response content buffer size (in bytes)
# jetty.httpConfig.outputBufferSize=32768
## Max response content write length that is buffered (in bytes)
# jetty.httpConfig.outputAggregationSize=8192
## Max request headers size (in bytes)
# jetty.httpConfig.requestHeaderSize=8192
## Max response headers size (in bytes)
# jetty.httpConfig.responseHeaderSize=8192
## Whether to send the Server: header
jetty.httpConfig.sendServerVersion=false
## Whether to send the Date: header
jetty.httpConfig.sendDateHeader=false
## Max per-connection header cache size (in nodes)
# jetty.httpConfig.headerCacheSize=512
## Whether, for requests with content, delay dispatch until some content has arrived
# jetty.httpConfig.delayDispatchUntilContent=true
## Maximum number of error dispatches to prevent looping
# jetty.httpConfig.maxErrorDispatches=10
## Maximum time to block in total for a blocking IO operation (default -1 is to use idleTimeout on progress)
# jetty.httpConfig.blockingTimeout=-1
### Server configuration
## Whether ctrl+c on the console gracefully stops the Jetty server
jetty.server.stopAtShutdown=true
## Dump the state of the Jetty server, components, and webapps after startup
# jetty.server.dumpAfterStart=false
## Dump the state of the Jetty server, components, and webapps before shutdown
# jetty.server.dumpBeforeStop=false
# ---------------------------------------
# Module: resources
--module=resources
# ---------------------------------------
# Module: servlets
--module=servlets
assembly/jetty/webapps/genesys2-server.d/override-web.xml deleted 100644 → 0
View file @ 9bd43760
<?xml version="1.0" encoding="UTF-8"?>
<web-app
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<!-- This web.xml format file is an override file that is applied to the test webapp AFTER
it has been configured by the default descriptor and the WEB-INF/web.xml descriptor -->
<!-- Add or override context init parameter -->
<context-param>
<param-name>spring.profiles.active</param-name>
<param-value>dev</param-value>
</context-param>
</web-app>
assembly/jetty/webapps/genesys2-server.xml deleted 100644 → 0
View file @ 9bd43760
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set>
<Set name="war"><Property name="jetty.webapps" default="."/>/genesys2-server.war</Set>
<Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set>
<Set name="overrideDescriptor"><Property name="jetty.webapps" default="."/>/genesys2-server.d/override-web.xml</Set>
</Configure>
pom.xml
View file @ b4743f8f
......@@ -686,24 +686,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<configuration>
<descriptors>
<descriptor>assembly/assembly-jetty.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
......
Supports Markdown
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