Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

Commit

Permalink
Merge pull request #39 from slotties/develop
Browse files Browse the repository at this point in the history
1.0 release
  • Loading branch information
slotties committed Dec 1, 2015
2 parents 526fcd3 + 2b9619a commit f8112f5
Show file tree
Hide file tree
Showing 67 changed files with 3,614 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
*.class
# Build
target
build
.gradle
/gradle

# Mobile Tools for Java (J2ME)
.mtj.tmp/
# IntelliJ
.idea
*.iml

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# Tool directories
data
30 changes: 30 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
allprojects {
group = 'com.github.slotties.gw2trades'
version = '0.1-SNAPSHOT'
}

def javaLangLevel = 1.8

allprojects {
apply plugin: 'idea'
}

subprojects {
apply plugin: 'java'
apply plugin: 'groovy'

sourceCompatibility = javaLangLevel
targetCompatibility = javaLangLevel

repositories {
mavenLocal()
mavenCentral()
}
}

idea {
project {
jdkName = javaLangLevel
languageLevel = javaLangLevel
}
}
53 changes: 53 additions & 0 deletions deployment/conf/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
user nginx;
worker_processes auto;
error_log /var/log/nginx/error.log;
pid /run/nginx.pid;

events {
worker_connections 1024;
}

http {
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;

sendfile on;
tcp_nopush on;
tcp_nodelay on;
keepalive_timeout 65;
types_hash_max_size 2048;

include /etc/nginx/mime.types;
default_type application/octet-stream;

# Load modular configuration files from the /etc/nginx/conf.d directory.
# See http://nginx.org/en/docs/ngx_core_module.html#include
# for more information.
include /etc/nginx/conf.d/*.conf;

server {
listen 80 default_server;
listen [::]:80 default_server;
server_name _;

# Load configuration files for the default server block.
include /etc/nginx/default.d/*.conf;

location ~ ^/$ {
return 301 /index.html;
}

location / {
proxy_pass http://localhost:8080;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-for $remote_addr;
port_in_redirect off;
proxy_redirect default;
proxy_connect_timeout 300;
}
}
}
18 changes: 18 additions & 0 deletions deployment/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

SRC_DIR=$1
APP_DIR=$2
VERSION=$3

if [ "$SRC_DIR" == "" ] || [ "$APP_DIR" == "" ] || [ "$VERSION" == "" ]; then
echo "Syntax: deploy.sh SRC_DIR APP_DIR VERSION"
exit 1
fi

rm -rf $APP_DIR/import
unzip $SRC_DIR/import/build/distributions/gw2trades-importer-$VERSION.zip -d $APP_DIR/
mv $APP_DIR/gw2trades-importer-0.1-SNAPSHOT $APP_DIR/import
chmod u+x $APP_DIR/import/*.sh

rm -rf $APP_DIR/server/*
cp -v $SRC_DIR/server/build/libs/server-$VERSION.jar $APP_DIR/server
25 changes: 25 additions & 0 deletions deployment/import.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

IMPORTER_SH=$1
LOG_DIR=$2
INDEX_DIR=$3

if [ ! -f "$IMPORTER_SH" ]; then
echo "Could not find $IMPORTER_SH"
exit 1
fi
if [ ! -d "$LOG_DIR" ]; then
echo "Could not find log directory $LOG_DIR"
exit 1
fi
if [ ! -d "$INDEX_DIR" ]; then
echo "Could not find index directory $INDEX_DIR"
exit 1
fi

IMPORT_LOG="$LOG_DIR/import_`date +%Y-%m-%d:%H:%M:%S`.log"

echo Logging to $IMPORT_LOG
bash $IMPORTER_SH "$INDEX_DIR" > $IMPORT_LOG 2>&1

curl "http://localhost/admin/reopenRepository"
25 changes: 25 additions & 0 deletions deployment/server.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

SERVER_JAR=$1
LOG_DIR=$2
INDEX_DIR=$3

if [ ! -f "$SERVER_JAR" ]; then
echo "Could not find $SERVER_JAR"
exit 1
fi
if [ ! -d "$LOG_DIR" ]; then
echo "Could not find log directory $LOG_DIR"
exit 1
fi
if [ ! -d "$INDEX_DIR" ]; then
echo "Could not find index directory $INDEX_DIR"
exit 1
fi

SERVER_LOG="$LOG_DIR/server_`date +%Y-%m-%d_%H-%M-%S`.log"
SERVER_GC_LOG="$LOG_DIR/server_`date +%Y-%m-%d_%H-%M-%S`.gc"
JAVA_OPTS="-Xms2g -Xmx2g -XX:+PrintGC -XX:+PrintGCDateStamps -Xloggc:$SERVER_GC_LOG -XX:+UseG1GC"

echo Logging to $SERVER_LOG and $SERVER_GC_LOG
java $JAVA_OPTS -jar $SERVER_JAR --server.port=8080 --server.address=localhost --index.dir=$INDEX_DIR > $SERVER_LOG 2>&1
160 changes: 160 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
#!/usr/bin/env bash

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
echo "$*"
}

die ( ) {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Loading

0 comments on commit f8112f5

Please sign in to comment.