diff --git a/docs/bin/run.sh b/docs/bin/run.sh old mode 100644 new mode 100755 index 736eae3..513ab7d --- a/docs/bin/run.sh +++ b/docs/bin/run.sh @@ -1,6 +1,35 @@ #!/bin/sh -CLASSPATH="."; -for I in ../lib/*.jar; do - CLASSPATH="$CLASSPATH:$I" -done -java -Xmx100m -server -cp "$CLASSPATH" jnode.main.Main ../etc/jnode.nix.conf \ No newline at end of file +ROOT="`dirname $(readlink -f $0)`/../" +PIDFILE="$ROOT/jnode.pid"; +JAR="$ROOT/lib" + +cd $ROOT +if [ "$1" == "" ]; then + echo "Usage: $0 (stop|start|restart|build)" +fi +case "$1" in + start) + if [ -f $PIDFILE ]; then + echo "jNode already running..." + exit + fi + for I in $JAR/*.jar; do A="$A:$I"; done + nohup java -Xmx300m -server -cp "$A" jnode.main.Main jnode.conf & + echo -ne $! > $PIDFILE + ;; + stop) + if [ -f $PIDFILE ]; then + kill `cat $PIDFILE` + rm -f $PIDFILE + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 (stop|start|restart)" + exit 0; + ;; +esac + diff --git a/jnode-assembly/distribution-core.xml b/jnode-assembly/distribution-core.xml deleted file mode 100644 index 82e207a..0000000 --- a/jnode-assembly/distribution-core.xml +++ /dev/null @@ -1,40 +0,0 @@ - - ${buildNumber} - - zip - - false - - - - true - - - jnode:jnode-core - - - jnode/lib - false - - - false - runtime - jnode/lib - - - - - - - - ${basedir}/../ - jnode/ - - LICENSE - NOTICE - - - - \ No newline at end of file diff --git a/jnode-assembly/distribution-dev.xml b/jnode-assembly/distribution-dev.xml new file mode 100644 index 0000000..0dd09e3 --- /dev/null +++ b/jnode-assembly/distribution-dev.xml @@ -0,0 +1,110 @@ + + dev-${buildNumber} + + zip + + false + + + true + + jnode:jnode-core + jnode:jnode-dumb-module + jnode:jnode-httpd-module + jnode:jnode-mail-module + jnode:jnode-nntp + jnode:jnode-pointchecker-module + jnode:jnode-rss + jnode:jnode-xmpp + + + jnode/lib + false + + + false + runtime + jnode/lib + + + + + + + + + ${basedir}/../jdbc-drivers + jnode/lib + + *.jar + + + + ${basedir}/../docs/nodelist + jnode/nodelist + + NODELIST + + + + ${basedir}/../docs/bin + jnode/bin + + *.* + + + + ${basedir}/../docs/docs + jnode/docs + + *.* + + + + ${basedir}/../docs/configs + jnode/etc + + *.* + + + + ./ + jnode/files + + */** + + + + ./ + jnode/inbound + + */** + + + + ./ + jnode/log + + */** + + + + ./ + jnode/tmp + + */** + + + + ${basedir}/.. + jnode/ + + LICENSE + NOTICE + + + + \ No newline at end of file diff --git a/jnode-assembly/distribution-rss.xml b/jnode-assembly/distribution-rss.xml deleted file mode 100644 index 4e82f8e..0000000 --- a/jnode-assembly/distribution-rss.xml +++ /dev/null @@ -1,40 +0,0 @@ - - ${buildNumber} - - zip - - false - - - - true - - - jnode:jnode-rss - - - jnode/lib - false - - - false - runtime - jnode/lib - - - - - - - - ${basedir}/../ - jnode/ - - LICENSE - NOTICE - - - - \ No newline at end of file diff --git a/jnode-assembly/distribution-stable.xml b/jnode-assembly/distribution-stable.xml new file mode 100644 index 0000000..bca774f --- /dev/null +++ b/jnode-assembly/distribution-stable.xml @@ -0,0 +1,106 @@ + + stable-${buildNumber} + + zip + + false + + + true + + jnode:jnode-core + jnode:jnode-httpd-module + jnode:jnode-mail-module + jnode:jnode-rss + + + jnode/lib + false + + + false + runtime + jnode/lib + + + + + + + + + ${basedir}/../jdbc-drivers + jnode/lib + + *.jar + + + + ${basedir}/../docs/nodelist + jnode/nodelist + + NODELIST + + + + ${basedir}/../docs/bin + jnode/bin + + *.* + + + + ${basedir}/../docs/docs + jnode/docs + + *.* + + + + ${basedir}/../docs/configs + jnode/etc + + *.* + + + + ./ + jnode/files + + */** + + + + ./ + jnode/inbound + + */** + + + + ./ + jnode/log + + */** + + + + ./ + jnode/tmp + + */** + + + + ${basedir}/.. + jnode/ + + LICENSE + NOTICE + + + + \ No newline at end of file diff --git a/jnode-assembly/pom.xml b/jnode-assembly/pom.xml index c0f29e9..00fdbb1 100644 --- a/jnode-assembly/pom.xml +++ b/jnode-assembly/pom.xml @@ -1,90 +1,74 @@ - - - jnode - jnode - 1.0 - - 4.0.0 + + + jnode + jnode + 1.0 + + 4.0.0 - jnode-assembly - pom - jnode-assembly - jnode assembly module - 1.5 + jnode-assembly + pom + jnode-assembly + jnode assembly module + 1.5 - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 - - - validate - - create - - - - - 8 - - - - maven-assembly-plugin - 2.4 - - - release - package - - single - - - ${project.build.directory}/dist - false - jnode-${project.version}-release - - distribution-release.xml - - - - - core - package - - single - - - ${project.build.directory}/dist - false - jnode-${project.version}-core - - distribution-core.xml - - - - - rss - package - - single - - - ${project.build.directory}/dist - false - jnode-${project.version}-rss - - distribution-rss.xml - - - - - - - + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.2 + + + validate + + create + + + + + 8 + + + + maven-assembly-plugin + 2.4 + + + stable + package + + single + + + ${project.build.directory}/dist + false + jnode-${project.version} + + distribution-stable.xml + + + + + dev + package + + single + + + ${project.build.directory}/dist + false + jnode-${project.version} + + distribution-dev.xml + + + + + + + diff --git a/jnode-dumb-module/pom.xml b/jnode-dumb-module/pom.xml index 260ec27..eb6c86e 100644 --- a/jnode-dumb-module/pom.xml +++ b/jnode-dumb-module/pom.xml @@ -4,10 +4,10 @@ jnode jnode - 1.0-SNAPSHOT + 1.0 jnode-dumb-module - 1.0 + 0.1 jnode-dumb-module Dumb module @@ -15,7 +15,7 @@ jnode jnode-core provided - 1.0 + 1.5 diff --git a/jnode-httpd-module/src/org/jnode/httpd/routes/get/EchoareaCSVRoute.java b/jnode-httpd-module/src/org/jnode/httpd/routes/get/EchoareaCSVRoute.java index 061faf9..b693a27 100644 --- a/jnode-httpd-module/src/org/jnode/httpd/routes/get/EchoareaCSVRoute.java +++ b/jnode-httpd-module/src/org/jnode/httpd/routes/get/EchoareaCSVRoute.java @@ -43,9 +43,9 @@ public Object handle(Request req, Response resp) { csv.setName(row[0]); csv.setDescription(row[1]); csv.setNum(new Long(row[2])); - csv.setLatest(new Long(row[3])); + csv.setLatest(new Long(row[3])/1000L); ORMManager.get(EchoareaCSV.class).save(csv); - sb.append(csv.getName() + "," + csv.getLatest()/1000L + "," + sb.append(csv.getName() + "," + csv.getLatest() + "," + csv.getNum() + "," + csv.getDescription() + "\r\n"); } diff --git a/jnode-xmpp-module/pom.xml b/jnode-xmpp-module/pom.xml index 2ad5ee1..38f8e11 100644 --- a/jnode-xmpp-module/pom.xml +++ b/jnode-xmpp-module/pom.xml @@ -6,10 +6,10 @@ jnode jnode - 1.0-SNAPSHOT + 1.0 jnode-xmpp - 1.0 + 0.1 jnode-xmpp @@ -21,7 +21,7 @@ jnode jnode-core provided - 1.0 + 1.5