Author: vjrj_ Date: 2011-11-27 15:01:08 +0100 (Sun, 27 Nov 2011) New Revision: 1628 Added: trunk/docs/ Removed: trunk/README_FIRST trunk/doc/ trunk/script/copy_deploy.sh trunk/script/deploy_gwt.cmd Modified: trunk/ trunk/INSTALL trunk/README trunk/debian/TODO trunk/pom.xml trunk/script/demo-deploy.sh trunk/script/recordScreenCast.sh trunk/script/server.sh trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml trunk/src/main/resources/wave-server.properties Log: CLOSED - # 171: Package kune in one unique jar http://kune.ourproject.org/issues/ticket/171 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 client public target target-local Main-compile .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath target.old _accounts _certificates _deltas logs test-output .recommenders _sessions chromedriver.log kune-screencast* + pmd-eclipse.log .pmd www-test screenlog.0 client public target target-local Main-compile .settings .gwt-cache repository derby.log star-yellow-grey.png tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath target.old _accounts _certificates _deltas logs test-output .recommenders _sessions chromedriver.log kune-screencast* Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/INSTALL 2011-11-27 14:01:08 UTC (rev 1628) @@ -6,8 +6,12 @@ * Install java-jdk (>=6), maven2, mysql (> 5.0) and eclipse (well, this depends on what IDE do you use for development). In debian and derivatives: - sudo apt-get install subversion maven2 mercurial openjdk-6-jdk mysql-server +For development environment: + sudo apt-get install subversion maven2 mercurial openjdk-6-jdk mysql-server libjmagick6-jni +For production environment: + sudo apt-get install openjdk-6-jdk mysql-server libjmagick6-jni + ===MYSQL configuration=== ====Before db creation==== @@ -51,7 +55,7 @@ GRANT ALL PRIVILEGES ON kune_openfire.* TO kune@localhost IDENTIFIED BY 'db4kune'; FLUSH PRIVILEGES; -Although using this password ('db4kune') is useful for a quick and dirty getting started installation, you should consider seriously changing it to something different, since you are in high risk! In this case you should change the password acordingly in this other locations: +Although using this password ('db4kune') is useful for a quick and dirty getting started installation (useful for development), you should consider seriously changing it to something different, since you are in high risk! In this case you should change the password acordingly in this other locations: - pom.xml - script/liquibase-migrate.sh @@ -63,7 +67,7 @@ also if you want to select the database used (by default kune_dev). The db used in runtime is hardcoded (by now) in KuneRackModule.java -===Source code=== +===Source code (if you are installing Kune for development)=== See the DEVGUIDE for instructions of how to download the Kune code. @@ -73,8 +77,11 @@ NOTE: If you change the previous db passwords after this compiling, you have to repeat the "mvn compile" because if not, probably you will use an old persistence.xml. See TROUBLESHOOT for more details. -===Configure upload directory=== +===Configure directories=== + sudo mkdir -p /var/www/kune/ + sudo chown yourUser:yourUser /var/www/kune/ + sudo mkdir -p /var/lib/kune/uploads/ sudo chown yourUser:yourUser /var/lib/kune/uploads @@ -133,32 +140,61 @@ Run the server for the first time and initialize the db: - mvn exec:java +I you are installing kuen for development: + bin/server.sh # or mvn exec:java + +or for production + + bin/server.sh -j kune.jar # -h for more options + Once started for the first time the db is initialized. Then you should stop (Ctrl-C) and start the db migration process: ./script/liquibase-migrate.sh === Normal kune server start (after initialization) === -After that, as a norma, you can start the server using the script: +After that, you can start the server using the script: - ./script/server.sh + bin/server.sh -or running: +or (again) running in production: - mvn exec:java + bin/server.sh -j kune.jar # -h for more options ===Connecting to the server=== Open your browser and connect to http://localhost:8888/ +(or any other port you configured in wave-server.properties) + ==Production environment instructions== With mvn package -an executable target/kune-VERSION.one-jar.jar is generated in target directory. +an executable target/kune-VERSION-jar-with-dependencies.jar is generated in target directory. That you can use to start kune: +bin/server.sh -j kune.jar + +TODO: configure/select db via properties + +=== Adapting Kune to your site === + +Copy and adapt as much as possible to your needs these files: + +- src/main/resources/kune.properties +- src/main/resources/wave-server.properties +- src/main/resources/log4j.properties +- src/main/webapp/ws.html + +The best way to configure kune is to copy that files (for instance in /etc/kune/), to create a custom directory for ws.html and other of your custom html stuff (for instance /var/www/kune/), and add that directory to resources_base in wave-server.properties, for instance: + +resource_bases = your-www-dir,target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ + +The ws.html file is the home that you get at start-up and have some configurations also. You can change the html inside to your needs but follow the commentaries and try not to remove important parts that make kune to start. Also to change the main logo, favicon, etc. + +Note: Remember that if you are running kune using the source code (via mvn) and you change this src files in some point, you have to make 'mvn compile' so are copied to the target directoy. This is not applicable when you run kune via jar. + ==Appendix A: Configuration of Openfire xmpp server== Install openfire in your system: http://www.igniterealtime.org/downloads/index.jsp Modified: trunk/README =================================================================== --- trunk/README 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/README 2011-11-27 14:01:08 UTC (rev 1628) @@ -10,16 +10,3 @@ and for BUGS for inform about problems/feedback etc. -== Adapting Kune to your site == - -Adapt as much as possible to your needs this files: - -- src/main/resources/kune.properties -- src/main/resources/wave-server.properties -- src/main/resources/log4j.properties -- src/main/webapp/ws.html - -The last one is the home that you get at start-up and have some configurations also. You can change the html inside to your needs but follow the commentaries and try not to remove important parts that make kune to start. - -Note: Remember that if you change this files in some point, you have to make 'mvn compile' so are copied to the target directoy. - Deleted: trunk/README_FIRST =================================================================== --- trunk/README_FIRST 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/README_FIRST 2011-11-27 14:01:08 UTC (rev 1628) @@ -1,4 +0,0 @@ -WARNING -Please note that we are doing a big refactorization of Kune to adapt it to Wave. Also we are starting to use other libraries (for instance gin for IoC instead of our old Suco library). Then maybe /trunk/ it's a litle bit inestable because of that (for our old more stable code see tag 0.0.6-pre-wiab). - -New code (and refactorized) is under cc.kune package. Our old code (not yet refactorized or deprecated) is under org.ourproject.kune package waiting for be adapted or removed. Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/debian/TODO 2011-11-27 14:01:08 UTC (rev 1628) @@ -2,5 +2,4 @@ - create /var/lib/kune/uploads and give permissions - create /var/lib/kune/lucene - deps: libjmagick6-jni, csstidy -- cp -a $EXTSRC/source/locale/ src/main/java/org/ourproject/kune/app/public/js/ext/source/ Copied: trunk/docs (from rev 1611, trunk/doc) Property changes on: trunk/docs ___________________________________________________________________ Name: svn:ignore + screencasts Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/pom.xml 2011-11-27 14:01:08 UTC (rev 1628) @@ -139,8 +139,6 @@ </snapshots> </pluginRepository> <!-- cc --> - <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> --> <pluginRepository> <id>Codehaus Snapshots</id> <url>http://snapshots.repository.codehaus.org/</url> @@ -163,14 +161,6 @@ </url> <name>Google Web Toolkit Plugin Repository</name> </pluginRepository> - <pluginRepository> - <id>onejar-maven-plugin.googlecode.com-snap</id> - <url>http://onejar-maven-plugin.googlecode.com/svn/mavenrepo-snapshot</url> - </pluginRepository> - <pluginRepository> - <id>onejar-maven-plugin.googlecode.com</id> - <url>http://onejar-maven-plugin.googlecode.com/svn/mavenrepo</url> - </pluginRepository> </pluginRepositories> <dependencies> <dependency> @@ -276,8 +266,6 @@ <artifactId>dozer</artifactId> <version>4.0</version> </dependency> - <!-- <dependency> <groupId>com.calclab</groupId> <artifactId>suco</artifactId> - <version>0.6.5</version> </dependency> --> <dependency> <groupId>jmagick</groupId> <artifactId>jmagick</artifactId> @@ -370,8 +358,6 @@ <artifactId>hibernate-c3p0</artifactId> <version>3.3.1.GA</version> </dependency> - <!-- <dependency> <groupId>c3p0</groupId> <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> </dependency> --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -382,25 +368,21 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> - <!-- =roo --> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> - <!-- =roo --> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> - <!-- =roo --> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4j.version}</version> - <!-- =roo --> </dependency> <!-- REST: xml and json (stax) --> <dependency> @@ -484,7 +466,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.9</version> - <!-- =roo --> <scope>test</scope> </dependency> <dependency> @@ -851,14 +832,12 @@ </configuration> </plugin> <plugin> - <!-- =roo --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>2.1-beta-1</version> <!-- <configuration> <webXml>target/web.xml</webXml> </configuration> --> </plugin> <plugin> - <!-- =roo --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.1</version> @@ -870,7 +849,6 @@ </configuration> </plugin> <plugin> - <!-- =roo --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>2.4.2</version> @@ -879,7 +857,6 @@ </configuration> </plugin> <plugin> - <!-- =roo + custom --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.8.1</version> @@ -918,10 +895,15 @@ </executions> </plugin> <plugin> - <!-- =roo --> + <!-- See: http://bit.ly/rQBe3Z --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <archive> + <manifest> + <mainClass>cc.kune.wave.server.WaveMain</mainClass> + </manifest> + </archive> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> @@ -930,6 +912,7 @@ <scope>runtime</scope> <unpackOptions> <excludes> + <!-- FIXME this is needed? --> <exclude>**/gxt/**</exclude> <exclude>**/extjs/**</exclude> <exclude>**extjs**</exclude> @@ -941,7 +924,6 @@ </configuration> </plugin> <plugin> - <!-- =roo sin spring executions --> <artifactId>maven-eclipse-plugin</artifactId> <version>2.8</version> <configuration> @@ -964,13 +946,11 @@ </configuration> </plugin> <plugin> - <!-- =roo --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <version>2.5</version> </plugin> <plugin> - <!-- =roo --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-idea-plugin</artifactId> <version>2.2</version> @@ -980,7 +960,6 @@ </configuration> </plugin> <plugin> - <!-- =roo --> <groupId>org.codehaus.mojo</groupId> <artifactId>tomcat-maven-plugin</artifactId> <version>1.0</version> @@ -989,11 +968,9 @@ </configuration> </plugin> <plugin> - <!-- =roo --> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>7.1.2.v20100523</version> - <!-- <version>7.2.1.v20101111</version> --> + <version>8.0.1.v20110908</version> <configuration> <webAppConfig> <!-- <contextPath>/${project.name}</contextPath> --> @@ -1016,7 +993,6 @@ <goal>test-process</goal> </goals> </execution> </executions> </plugin> --> <!-- BETTER user: http://code.google.com/p/acris/wiki/AnnotationProcessing --> <plugin> - <!-- =roo --> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> <version>${gwtmaven.version}</version> @@ -1065,12 +1041,6 @@ </dependency> </dependencies> </plugin> - <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre - collaboration platform</description> <maintainer>Kune Development Team <[email protected]></maintainer> - <section>web</section> <priority>optional</priority> <architecture>all</architecture> - </configuration> <executions> <execution> <goals> <goal>deb</goal> </goals> - </execution> </executions> </plugin> --> <plugin> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> @@ -1120,120 +1090,11 @@ </archive> </configuration> <executions> - <!-- <execution> --> - <!-- <id>core</id> --> - <!-- <phase>package</phase> --> - <!-- <goals> --> - <!-- <goal>jar</goal> --> - <!-- </goals> --> - <!-- <configuration> --> - <!-- <classifier>core</classifier> --> - <!-- <includes> --> - <!-- <include>**/KunePlatform.gwt.xml**</include> --> - <!-- <include>**/i18n/I18nTranslationService.**</include> --> - <!-- <include>**/i18n/I18nTranslationServiceMocked.** </include> --> - <!-- <include>**/TextUtils.**</include> --> - <!-- <include>**/IconLabelEditable.**</include> --> - <!-- <include>**/QuickTipsHelper.**</include> --> - <!-- <include>**/RichText.gwt.xml**</include> --> - <!-- <include>**/BasicDialog.**</include> --> - <!-- <include>**/HorizontalLine.**</include> --> - <!-- <include>**/AbstractLabel.**</include> --> - <!-- <include>**/IconLabel.**</include> --> - <!-- <include> **/EditableIconLabel.**</include> --> - <!-- <include> **/EditableClickListener.**</include> --> - <!-- <include>**/KuneStringUtils.**</include> --> - <!-- <include>**/IconHyperlink*.**</include> --> - <!-- <include>**/LabelWrapper*.**</include> --> - <!-- <include>**/KuneUiUtils.**</include> --> - <!-- <include>**/View.**</include> --> - <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include> --> - <!-- <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> --> - <!-- <include>**/platf/client/dispatch/**</include> --> - <!-- </includes> --> - <!-- </configuration> --> - <!-- </execution> --> - <!-- <execution> --> - <!-- <id>helloworldmodule</id> --> - <!-- <phase>package</phase> --> - <!-- <goals> --> - <!-- <goal>jar</goal> --> - <!-- </goals> --> - <!-- <configuration> --> - <!-- <classifier>helloworldmodule</classifier> --> - <!-- <includes> --> - <!-- <include>**/HelloWorld*</include> --> - <!-- </includes> --> - <!-- </configuration> --> - <!-- </execution> --> </executions> </plugin> - <plugin> - <groupId>org.dstovall</groupId> - <artifactId>onejar-maven-plugin</artifactId> - <version>1.4.4-SNAPSHOT</version> - <executions> - <execution> - <configuration> - <!-- Optional --> - <onejarVersion>0.97</onejarVersion> - <!-- Optional, use only if you need to include native libraries - (dll's) --> - <!-- <binlibs> --> - <!-- <fileSet> --> - <!-- <directory>${project.build.directory}/${project.build.finalName}</directory> --> - <!-- <includes> --> - <!-- <include>**</include> --> - <!-- </includes> --> - <!-- </fileSet> --> - <!-- </binlibs> --> - <!-- Optional, default is false --> - <attachToBuild>true</attachToBuild> - <!-- Optional, default is "onejar" --> - <classifier>onejar</classifier> - </configuration> - <goals> - <goal>one-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- <plugin> --> - <!-- <groupId>org.codehaus.mojo</groupId> --> - <!-- <artifactId>selenium-maven-plugin</artifactId> --> - <!-- <configuration> --> - <!-- <port>4441</port> --> - <!-- </configuration> --> - <!-- <executions> --> - <!-- <execution> --> - <!-- <phase>pre-integration-test</phase> --> - <!-- <goals> --> - <!-- <goal>start-server</goal> --> - <!-- </goals> --> - <!-- <configuration> --> - <!-- <background>true</background> --> - <!-- </configuration> --> - <!-- </execution> --> - <!-- </executions> --> - <!-- </plugin> --> - <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version> - <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory> - <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks> - </includes> </fileset> </filesets> </configuration> </plugin> --> </plugins> - <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> --> <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes </outputDirectory> - <!-- <outputDirectory>war/WEB-INF/classes</outputDirectory> --> - <!-- <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> --> - <!-- <resources> --> - <!-- <resource> --> - <!-- <directory>src/main/resources</directory> --> - <!-- </resource> --> - <!-- <resource> --> - <!-- <directory>src/main/java</directory> --> - <!-- </resource> --> - <!-- </resources> --> <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> Deleted: trunk/script/copy_deploy.sh =================================================================== --- trunk/script/copy_deploy.sh 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/script/copy_deploy.sh 2011-11-27 14:01:08 UTC (rev 1628) @@ -1,8 +0,0 @@ -#!/bin/bash - -#script/css-compact-and-tidy.sh -script/css-update.sh - -rm src/main/webapp/gwt/org.ourproject.kune.app.Kune/ -R -mkdir src/main/webapp/gwt/org.ourproject.kune.app.Kune/ -cp target/kune-0.0.5/org.ourproject.kune.app.Kune/ src/main/webapp/gwt/ -R Modified: trunk/script/demo-deploy.sh =================================================================== --- trunk/script/demo-deploy.sh 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/script/demo-deploy.sh 2011-11-27 14:01:08 UTC (rev 1628) @@ -1,4 +1,4 @@ #!/bin/bash # from time to time use --delete -rsync --delete --progress -C -r -p target/kune-0.0.5/org.ourproject.kune.app.Kune/ [email protected]:/home/ourproject/kunedemo/src/main/webapp/gwt/org.ourproject.kune.app.Kune/ +rsync --delete --progress -C -r -p target/kune-0.1.0-SNAPSHOT/ws/ [email protected]:/home/vjrj/kune-current/target-last/kune-0.1.0-SNAPSHOT/ws/ Deleted: trunk/script/deploy_gwt.cmd =================================================================== --- trunk/script/deploy_gwt.cmd 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/script/deploy_gwt.cmd 2011-11-27 14:01:08 UTC (rev 1628) @@ -1 +0,0 @@ -copy target\kune-0.0.5\org.ourproject.kune.Main\* src\main\webapp\gwt\org.ourproject.kune Modified: trunk/script/recordScreenCast.sh =================================================================== --- trunk/script/recordScreenCast.sh 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/script/recordScreenCast.sh 2011-11-27 14:01:08 UTC (rev 1628) @@ -16,5 +16,5 @@ if [[ $? -eq 0 ]] then - recordmydesktop -x 0 -y 83 --width $RWIDTH --height $RHEIGHT --fps 25 --no-sound -o kune-screencast.ogv + recordmydesktop -x 0 -y 83 --width $RWIDTH --height $RHEIGHT --fps 25 --no-sound -o doc/screencasts/kune-screencast.ogv fi Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/script/server.sh 2011-11-27 14:01:08 UTC (rev 1628) @@ -1,3 +1,124 @@ #!/bin/bash -mvn exec:java +# This script will start the kune server via a generated jar with the dependencies + +usage() { + echo "$0 [-j <jar file>] [-k <kune-config>] [-w <wave-config>] [-s <jaas config>] [Debug options] [other options] + Example: $0 -j target/kune-0.1.0-SNAPSHOT-jar-with-dependencies.jar -l IGNORE -d -p -u 20000 + +Options: +-j <jar file> : runs jar file generated via mvn package -Dmaven.test.skip=true +-a: run as a daemon (only root user) +-l LOGLEVEL : IGNORE|DEBUG|INFO|WARN + +Debug Options: +-d: debug +-u: Suspend the start (useful for debug the boot) +-p: port of debugger +" +} + +# Default values + +# See src/main/resources/kune.properties in svn +KUNE_CONFIG=/etc/kune.properties +# See src/main/resources/wave-server.properties in svn +WAVE_CONFIG=/etc/kune/wave-server.properties +# See src/main/resources/jaas.config in svn +JAAS_CONFIG=src/main/resources/jaas.config + +SUSPEND="n" +DEBUG="" +DEBUG_PORT="" +LOG_LEVEL="INFO" +LOGFILE=/var/log/kune.log +PIDFILE=/var/run/kune.pid + +while getopts “hj:k:w:s:up:l:da” OPTION +do + case $OPTION in + h) + usage + exit 1 + ;; + j) + JAR=$OPTARG + ;; + k) + KUNE_CONFIG=$OPTARG + ;; + w) + WAVE_CONFIG=$OPTARG + ;; + s) + JAAS_CONFIG=$OPTARG + ;; + p) + # Debug port + DEBUG_PORT=,address=$OPTARG + ;; + u) + SUSPEND="y" + ;; + a) + DAEMON="y" + ;; + l) + # TODO: use/configure src/main/resources/log4j.properties + LOG_LEVEL=$OPTARG + ;; + d) + DEBUG="y" + ;; + ?) + usage + exit + ;; + esac +done + +if [[ $LOG_LEVEL -ne "IGNORE" || $LOG_LEVEL -ne "DEBUG" || $LOG_LEVEL -ne "INFO" || $LOG_LEVEL -ne "WARN" ]] +then + usage + exit 1 +fi + +if [[ -n $DEBUG ]] +then + DEBUG_FLAGS=-Xrunjdwp:transport=dt_socket,server=y,suspend=$SUSPEND$DEBUG_PORT +fi + +USER=`id -u -n` +if [[ -n $DAEMON && USER -ne "root" ]] +then + echo "Error: Only root user can run kune as a deamon" + usage + exit 1 +fi + +if [[ -z $JAR ]] +then + # Just run kune using the code and mave + mvn exec:java +else + if [[ -n $DAEMON ]] + then + # FIXME Not sure if this is neccesary (if already configured in "/etc/security/limits.conf" + ulimit -n 65000 + # http://stackoverflow.com/questions/534648/how-to-daemonize-a-java-program + nohup java $DEBUG_FLAGS \ + -Dorg.eclipse.jetty.util.log.$LOG_LEVEL=true \ + -Djava.security.auth.login.config=$JAAS_CONFIG \ + -Dkune.server.config=$KUNE_CONFIG \ + -Dwave.server.config=$WAVE_CONFIG \ + -jar $JAR </dev/null > $LOGFILE 2>&1 & + echo $! > $PIDFILE + else + exec java $DEBUG_FLAGS \ + -Dorg.eclipse.jetty.util.log.$LOG_LEVEL=true \ + -Djava.security.auth.login.config=$JAAS_CONFIG \ + -Dkune.server.config=$KUNE_CONFIG \ + -Dwave.server.config=$WAVE_CONFIG \ + -jar $JAR + fi +fi \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-11-27 14:01:08 UTC (rev 1628) @@ -130,7 +130,9 @@ toTranslateTitle.setText(i18n.t("translate this:")); noteForTranslatorsTittle.setText(i18n.t("Notes:")); keyboardRecomendationTitle.setText(i18n.t("Tip:")); - keyboardRecomendation.setText(i18n.t("Click Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved")); + keyboardRecomendation.setText(i18n.t("You can resize the above textarea.") + + " " + + i18n.t("Click Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved")); } private void saveIfNeeded() { Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml 2011-11-27 14:01:08 UTC (rev 1628) @@ -39,6 +39,10 @@ padding: 5px; } + .textarea { + resize: both; + } + .tip { width: 180px; padding: 5px; @@ -74,7 +78,7 @@ </g:FlowPanel> <g:FlowPanel addStyleNames="{style.row}"> <g:Label ui:field="toLanguageTitle" addStyleNames="{style.titles} {style.cell}"/> - <g:TextArea ui:field='translation' addStyleNames="{style.cell}" + <g:TextArea ui:field='translation' addStyleNames="{style.cell}{style.textarea}" visibleLines="5"/> <g:FlowPanel styleName="k-button" addStyleNames="{style.cell} {style.copyicon} k-button k-btn k-5corners"> Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-11-24 03:35:38 UTC (rev 1627) +++ trunk/src/main/resources/wave-server.properties 2011-11-27 14:01:08 UTC (rev 1628) @@ -15,7 +15,7 @@ # A comma separated list of webApp source directories # Default value: ./war -resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ +resource_bases = /var/www/kune/,target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ ### Server-specific variables ###