# HG changeset patch # User ymh # Date 1404835518 -7200 # Node ID 32abe8b3e50168756dda85fccaff7380278a5925 # Parent bfbc253de80fc01c365d428edf32a137192ca4cf add gradle build diff -r bfbc253de80f -r 32abe8b3e501 .hgignore --- a/.hgignore Wed Jul 02 17:08:49 2014 +0200 +++ b/.hgignore Tue Jul 08 18:05:18 2014 +0200 @@ -2,7 +2,10 @@ syntax: regexp ^\.project$ ^server/target$ +^server/build$ +^server/\.gradle$ ^server/renkan\-[a-z]+/target$ +^server/renkan\-[a-z]+/build$ ^metadataplayer/libs$ ^metadataplayer/metadataplayer$ ^standalone/renkan/css$ diff -r bfbc253de80f -r 32abe8b3e501 server/build.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/build.gradle Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,63 @@ +allprojects { + apply plugin: 'maven' + + group = 'org.iri_research.renkan' + version = '0.7.10' + + + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint" + } + } +} + +ext { + organization = "IRI" + + junit_version = '4.11' + slf4j_log4j12_version = '1.7.5' + spring_version = '3.2.6.RELEASE' + javax_servlet_version = '3.0.1' + java_inject_version = '1' + commons_codec_version = '1.8' + jackson_version = '2.2.3' + joda_time_version = '2.3' + spring_data_commons_version = '1.6.3.RELEASE' + spring_data_jpa_version = '1.4.3.RELEASE' + spring_data_mongodb_version = '1.3.3.RELEASE' + spring_security_version = '3.2.0.RELEASE' + jetty_version = '8.1.15.v20140411' + persistence_api_version = '1.0.2' + mongo_java_driver_version = '2.11.4' +} + +subprojects { + apply plugin: 'java' + sourceCompatibility = 1.7 + targetCompatibility = 1.7 + + + repositories { + mavenLocal() + mavenCentral() + + maven { url "http://repo.maven.apache.org/maven2" } + maven { url "http://maven.springframework.org/release" } + maven { url "http://maven.springframework.org/milestone" } + maven { url "http://repo.springsource.org/release" } + maven { url "http://repo.springsource.org/libs-release" } + } + + test { + testLogging { + events "passed", "skipped", "failed"//, "standardOut", "standardError" + } + } + + dependencies { + testCompile group: 'junit', name: 'junit', version:junit_version + runtime group: 'org.slf4j', name: 'slf4j-log4j12', version:slf4j_log4j12_version + } + +} diff -r bfbc253de80f -r 32abe8b3e501 server/gradle/wrapper/gradle-wrapper.jar Binary file server/gradle/wrapper/gradle-wrapper.jar has changed diff -r bfbc253de80f -r 32abe8b3e501 server/gradle/wrapper/gradle-wrapper.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/gradle/wrapper/gradle-wrapper.properties Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,6 @@ +#Wed Jul 02 17:20:02 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff -r bfbc253de80f -r 32abe8b3e501 server/gradlew --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/gradlew Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,164 @@ +#!/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="-Djava.awt.headless=true -Duser.timezone=\"UTC\"" + +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 + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# 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\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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"` + + # 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 "$@" diff -r bfbc253de80f -r 32abe8b3e501 server/gradlew.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/gradlew.bat Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= "-Djava.awt.headless=true -Duser.timezone=^"UTC^"" + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-core/build.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/renkan-core/build.gradle Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,36 @@ + +description = 'renkan-core' + +repositories { + mavenCentral() +} + +ext { + commons_collections_version = '4.0' + uuid_generator_version = '3.1.3' +} + +dependencies { + compile group: 'javax.inject', name: 'javax.inject', version:java_inject_version + compile group: 'commons-codec', name: 'commons-codec', version:commons_codec_version + compile group: 'org.apache.commons', name: 'commons-collections4', version:commons_collections_version + compile group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version:uuid_generator_version + compile group: 'joda-time', name: 'joda-time', version:joda_time_version + compile group: 'org.springframework', name: 'spring-core', version:spring_version + compile group: 'org.springframework', name: 'spring-beans', version:spring_version + compile group: 'org.springframework', name: 'spring-jdbc', version:spring_version + compile group: 'org.springframework', name: 'spring-context', version:spring_version + compile group: 'org.springframework.data', name: 'spring-data-commons', version:spring_data_commons_version + compile group: 'org.springframework.data', name: 'spring-data-jpa', version:spring_data_jpa_version + compile group: 'org.springframework.data', name: 'spring-data-mongodb', version:spring_data_mongodb_version + compile group: 'org.springframework.security', name: 'spring-security-core', version:spring_security_version + compile group: 'javax.persistence', name: 'persistence-api', version:persistence_api_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:jackson_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:jackson_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:jackson_version + compile group: 'com.fasterxml.jackson.jaxrs', name: 'jackson-jaxrs-json-provider', version:jackson_version + compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version:jackson_version + compile group: 'org.mongodb', name: 'mongo-java-driver', version:mongo_java_driver_version + testCompile group: 'org.springframework', name: 'spring-test', version:spring_version + testRuntime group: 'org.slf4j', name: 'slf4j-log4j12', version:slf4j_log4j12_version +} diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-management/build.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/renkan-management/build.gradle Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,39 @@ + +description = 'renkan-management' + +ext { + spring_shell_version = '1.0.0.RELEASE' +} + +dependencies { + compile project(':renkan-core') + compile group: 'org.springframework.shell', name: 'spring-shell', version:spring_shell_version + runtime group: 'org.springframework', name: 'spring-webmvc', version:spring_version + runtime group: 'javax.servlet', name: 'javax.servlet-api', version:javax_servlet_version +} + +buildscript { + repositories { jcenter() } + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.1' + } +} + +apply plugin: 'com.github.johnrengelman.shadow' + +jar { + manifest { + attributes 'Main-Class': 'org.springframework.shell.Bootstrap' + } +} + +shadowJar { + exclude 'META-INF/*.SF' + exclude 'META-INF/*.DSA' + exclude 'META-INF/*.RSA' + + append('META-INF/spring.handlers') + append('META-INF/spring.schemas') + +} + diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-management/pom.xml --- a/server/renkan-management/pom.xml Wed Jul 02 17:08:49 2014 +0200 +++ b/server/renkan-management/pom.xml Tue Jul 08 18:05:18 2014 +0200 @@ -36,16 +36,19 @@ org.slf4j slf4j-log4j12 ${slf4j-log4j12-version} + runtime org.springframework spring-webmvc ${spring-version} + runtime javax.servlet javax.servlet-api ${javax-servlet-api-version} + runtime junit @@ -142,8 +145,8 @@ true - executable - renkan-management-full-${project.version} + full + diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-web/build.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/renkan-web/build.gradle Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,163 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'org.akhikhl.gretty:gretty:1.0.0' + } +} + +repositories { + maven { url "lib" } + jcenter() +} + +apply plugin: 'war' +apply plugin: 'org.akhikhl.gretty' + +description = '' + +gretty { + servletContainer = 'jetty8' + host = '0.0.0.0' + port = 8080 + contextPath = '/renkan' +} + + +ext { + javax_ws_rs_api_version = '2.0' + javax_annotation_api_version = '1.2' + cometd_version = '2.7.0' + coweb_version = '1.0.1-SNAPSHOT' + cowebx_version = '1.0' + jersey_version = '2.5.1' + thymeleaf_version = '2.1.3.RELEASE' + thymeleaf_extra_version = '2.1.1.RELEASE' + thymeleaf_joda_dialect_version = '0.0.3' + commons_io_version = '2.4' + guava_version = '17.0' + nekohtml_version = '1.9.19' + validation_api_version = '1.1.0.Final' + hibernate_validator_version = '5.0.1.Final' + jstl_version = '1.2' + json_path_assert_version = '0.9.1' +} + + +dependencies { + compile project(':renkan-core') + compile group: 'javax.inject', name: 'javax.inject', version:java_inject_version + compile group: 'javax.servlet', name: 'javax.servlet-api', version:javax_servlet_version + compile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version:javax_ws_rs_api_version + compile group: 'javax.annotation', name: 'javax.annotation-api', version:javax_annotation_api_version + compile(group: 'org.cometd.java', name: 'bayeux-api', version:cometd_version) { + exclude group: 'org.eclipse.jetty' + } + compile(group: 'org.cometd.java', name: 'cometd-java-common', version:cometd_version) { + exclude group: 'org.eclipse.jetty' + } + compile(group: 'org.cometd.java', name: 'cometd-java-annotations', version:cometd_version) { + exclude group: 'org.eclipse.jetty' + } + compile(group: 'org.cometd.java', name: 'cometd-websocket-jetty', version:cometd_version) { + exclude group: 'org.eclipse.jetty' + } + compile (group: 'org.opencoweb', name: 'coweb-bots', version:coweb_version) { + exclude group: 'org.eclipse.jetty' + } + compile (group: 'org.opencoweb', name: 'coweb-server', version:coweb_version) { + exclude group: 'org.eclipse.jetty' + } + providedCompile (group: 'org.opencoweb', name: 'coweb-javascript', version:coweb_version) { + exclude group: 'org.eclipse.jetty' + } + providedCompile group: 'org.opencoweb.cowebx', name: 'cowebx-widgets-dojo', version:cowebx_version + compile group: 'org.glassfish.jersey.core', name: 'jersey-server', version:jersey_version + compile group: 'org.glassfish.jersey.ext', name: 'jersey-spring3', version:jersey_version + compile group: 'org.mongodb', name: 'mongo-java-driver', version:mongo_java_driver_version + compile group: 'org.springframework', name: 'spring-core', version:spring_version + compile group: 'org.springframework', name: 'spring-context', version:spring_version + compile group: 'org.springframework', name: 'spring-web', version:spring_version + compile group: 'org.springframework', name: 'spring-webmvc', version:spring_version + compile group: 'org.springframework.data', name: 'spring-data-commons', version:spring_data_commons_version + compile group: 'org.springframework.data', name: 'spring-data-jpa', version:spring_data_jpa_version + compile group: 'org.springframework.data', name: 'spring-data-mongodb', version:spring_data_mongodb_version + compile group: 'javax.persistence', name: 'persistence-api', version:persistence_api_version + compile group: 'org.thymeleaf', name: 'thymeleaf', version:thymeleaf_version + compile group: 'org.thymeleaf', name: 'thymeleaf-spring3', version:thymeleaf_version + compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity3', version:thymeleaf_extra_version + compile group: 'org.thymeleaf.extras', name: 'thymeleaf-joda-dialect', version:thymeleaf_joda_dialect_version + compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version:nekohtml_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:jackson_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:jackson_version + compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:jackson_version + compile group: 'com.fasterxml.jackson.jaxrs', name: 'jackson-jaxrs-json-provider', version:jackson_version + compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version:jackson_version + compile group: 'commons-codec', name: 'commons-codec', version:commons_codec_version + compile group: 'org.springframework.security', name: 'spring-security-core', version:spring_security_version + compile group: 'org.springframework.security', name: 'spring-security-web', version:spring_security_version + compile group: 'org.springframework.security', name: 'spring-security-config', version:spring_security_version + compile group: 'org.springframework.security', name: 'spring-security-acl', version:spring_security_version + compile group: 'org.springframework.security', name: 'spring-security-taglibs', version:spring_security_version + compile group: 'de.undercouch', name: 'bson4jackson', version:jackson_version + compile group: 'joda-time', name: 'joda-time', version:joda_time_version + compile group: 'javax.validation', name: 'validation-api', version:validation_api_version + compile group: 'org.hibernate', name: 'hibernate-validator', version:hibernate_validator_version + compile group: 'com.google.guava', name: 'guava', version:guava_version + runtime group: 'javax.servlet', name: 'jstl', version:jstl_version + runtime group: 'org.eclipse.jetty.aggregate', name: 'jetty-all', version:jetty_version + testCompile group: 'org.glassfish.jersey.test-framework.providers', name: 'jersey-test-framework-provider-grizzly2', version:jersey_version + testCompile group: 'org.springframework', name: 'spring-test', version:spring_version + testCompile group: 'com.jayway.jsonpath', name: 'json-path-assert', version:json_path_assert_version + testCompile group: 'commons-io', name: 'commons-io', version:commons_io_version +} + +//apply overlay + +war { + manifest { attributes( + "Implementation-Vendor": organization, + "Implementation-Title": project.name, + "Implementation-Version": project.version, + "Implementation-Vendor-Id": project.group, + "Built-By": "$System.env.USER", + "Build-Jdk": org.gradle.internal.SystemProperties.javaVersion, + "Specification-Vendor": organization, + "Specification-Title": project.name, + "Specification-Version": project.version + ) } + + // coweb-javascript + from({ zipTree(configurations.providedCompile.filter{ it.name.startsWith('coweb-javascript') && it.name.endsWith(".war")}.singleFile)}) { + exclude "META-INF/**" + exclude "WEB-INF/**" + into "lib" + } + + from( {zipTree(configurations.providedCompile.filter{ it.name.startsWith('cowebx-widgets-dojo') && it.name.endsWith(".war")}.singleFile)}) { + exclude "META-INF/**" + exclude "WEB-INF/**" + into "lib/cowebx/dojo" + } + + from("../../client/dist/js") { + include "*.js" + into "static/js" + } + from("../../client/dist/lib") { + into "static/lib" + } + from("../../client/dist/css") { + include "*.css" + into "static/css" + } + from("../../client/dist/img") { + into "static/img" + } + from("../../client/dist/data") { + include "properties.json" + into "static/data" + } +} + diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-web/pom.xml --- a/server/renkan-web/pom.xml Wed Jul 02 17:08:49 2014 +0200 +++ b/server/renkan-web/pom.xml Tue Jul 08 18:05:18 2014 +0200 @@ -20,11 +20,11 @@ 3.2.0.RELEASE 1.6.3.RELEASE 1.4.3.RELEASE - 8.1.14.v20131031 - 8.1.14.v20131031 + 8.1.15.v20140411 + 8.1.15.v20140411 4.11 - 2.1.1.RELEASE - 2.1.0.RELEASE + 2.1.3.RELEASE + 2.1.1.RELEASE 0.0.3 2.7.0 2.2.3 @@ -80,6 +80,7 @@ maven-war-plugin 2.3 + false true @@ -146,19 +147,6 @@ maven-surefire-plugin ${surefire-version} - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - package - - jar - - - - @@ -225,31 +213,211 @@ org.cometd.java bayeux-api ${cometd-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.cometd.java cometd-java-common ${cometd-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.cometd.java cometd-java-annotations ${cometd-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.cometd.java cometd-websocket-jetty ${cometd-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.opencoweb coweb-bots ${coweb-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.opencoweb coweb-server ${coweb-version} + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-websocket + + org.opencoweb diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-web/src/main/java/org/iri_research/renkan/coweb/event/ViewSyncEventManager.java --- a/server/renkan-web/src/main/java/org/iri_research/renkan/coweb/event/ViewSyncEventManager.java Wed Jul 02 17:08:49 2014 +0200 +++ b/server/renkan-web/src/main/java/org/iri_research/renkan/coweb/event/ViewSyncEventManager.java Tue Jul 08 18:05:18 2014 +0200 @@ -145,6 +145,7 @@ targetView.setZoomLevel(newZoomLevel); obj_changed = true; } + break; default: try { Object new_value = values.get(fieldname); diff -r bfbc253de80f -r 32abe8b3e501 server/renkan-web/src/main/webapp/WEB-INF/renkan.properties --- a/server/renkan-web/src/main/webapp/WEB-INF/renkan.properties Wed Jul 02 17:08:49 2014 +0200 +++ b/server/renkan-web/src/main/webapp/WEB-INF/renkan.properties Tue Jul 08 18:05:18 2014 +0200 @@ -8,4 +8,4 @@ renkan.pagination.size = 2 renkan.coweb.debug = false -renkan.coweb.websocket = true \ No newline at end of file +renkan.coweb.websocket = false \ No newline at end of file diff -r bfbc253de80f -r 32abe8b3e501 server/settings.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/settings.gradle Tue Jul 08 18:05:18 2014 +0200 @@ -0,0 +1,8 @@ +rootProject.name = 'renkan' +include ':renkan-core' +include ':renkan-web' +include ':renkan-management' + +project(':renkan-core').projectDir = "$rootDir/renkan-core" as File +project(':renkan-web').projectDir = "$rootDir/renkan-web" as File +project(':renkan-management').projectDir = "$rootDir/renkan-management" as File \ No newline at end of file