diff --git a/builder/addheader.sh b/builder/addheader.sh deleted file mode 100755 index 878e580..0000000 --- a/builder/addheader.sh +++ /dev/null @@ -1,8 +0,0 @@ -FILE="$1" -if [ -f "$FILE" ]; then - cp "$FILE" "$FILE.tmp" && \ - cat header > "$FILE" && \ - cat "$FILE.tmp" >> "$FILE" && \ - rm "$FILE.tmp" && \ - echo "$FILE done" -fi diff --git a/builder/build.sh b/builder/build.sh deleted file mode 100755 index 46b50fc..0000000 --- a/builder/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -TIME=$(A="`git rev-parse HEAD`" && echo ${A:0:8}) -TEMP="`mktemp -d --tmpdir="."`" -DIR="$TEMP/jnode" -for I in bin docs etc files inbound lib log nodelist tmp; do - mkdir -p "$DIR/$I"; - if [ -d "$I" ]; then cp -rv "$I" "$DIR"; fi -done - -mvn clean package -f ../pom.xml -pl jnode-core,jnode-httpd-module,jnode-mail-module,jnode-rss -am && \ -echo "Run!" -for I in jnode-core jnode-httpd-module jnode-mail-module jnode-rss; do - RPATH="../$I" - find "$RPATH/target/" -name '*.jar' -exec mv -v '{}' "$DIR/lib" ';' -done - -# Runs jNode -for I in $DIR/lib/*.jar; do - A="`echo $I|sed -r "s#$DIR#..#"`" - N="$N:$A" - W="$W;$A" -done - -echo "#!/bin/sh" > "$DIR/bin/run.sh" -echo "java -cp \"$N\" jnode.main.Main ../etc/jnode.nix.conf" >> "$DIR/bin/run.sh" -echo "java -cp \"`echo $W|sed 's/\\//\\\\/g'`\" jnode.main.Main ..\\etc\\jnode.win.conf" > "$DIR/bin/run.bat" - -cd "$TEMP" -zip -r ../jnode-1.4-release-multidb-$TIME.zip jnode -cd .. -rm -r "$TEMP" - diff --git a/builder/docs/CONTACTS.txt b/builder/docs/CONTACTS.txt deleted file mode 100644 index 0472f84..0000000 --- a/builder/docs/CONTACTS.txt +++ /dev/null @@ -1,11 +0,0 @@ -Lead developer/Project manager: - Ivan 'kreon' Agarkov; Moscow, Russia - Netmail: 2:5020/848, 2:5020/849 - Email: ivan.agarkov@gmail.com - ICQ: 2515521 - Jabber: kreon@xmpp.ru - -Developer: - Kirill Temnenkov; Moscow, Russia - Netmail: 2:5020/828 - Email: kirill@temnenkov.com \ No newline at end of file diff --git a/builder/docs/INSTALL.en.txt b/builder/docs/INSTALL.en.txt deleted file mode 100644 index afc7632..0000000 --- a/builder/docs/INSTALL.en.txt +++ /dev/null @@ -1,25 +0,0 @@ -1. Open etc/jnode.xxx.conf and change your configuration as described. - -2. Configure your mail settings for mail sending function & points autoregistration - -3. Run bin/run.sh if you are running on Linux/FreeBSD/OS X or bin\run.bat if on Windows. - -4. At the first run, jNode will add some entries to database. Look for messages and don't miss your technical point info! - For example: - 18-01-2014 17:45:29 [00000001] InstallUtil [+] owner point account created - 18-01-2014 17:45:29 [00000001] InstallUtil - FTN: 2:9999/9999.1 - Aka: Rodriguez bender - Password: 7e3fb3d2 - -5. Use data you got in previous step to config your point system. It's easy! -Keep in mind that jNode is a server-side software and it don't provides any UI for message handling. - -6. You will find a netmail to your technical point with account to use web control panel. Also you will see it in console output. -Usualy admin panel is located at http://127.0.0.1:8080/secure/index.html - -7. Log in and configure your node. - -8. Enjoy and keep you software updated. - - diff --git a/builder/docs/INSTALL.ru.koi8.txt b/builder/docs/INSTALL.ru.koi8.txt deleted file mode 100644 index e0f5ff1..0000000 --- a/builder/docs/INSTALL.ru.koi8.txt +++ /dev/null @@ -1,25 +0,0 @@ -1. etc/jnode.xxx.conf - -2. mail_module.conf . - -3. bin/run.sh *nix mac, bin/run.bat *win - -4. jNode ţ. . - : - 18-01-2014 17:45:29 [00000001] InstallUtil [+] owner point account created - 18-01-2014 17:45:29 [00000001] InstallUtil - FTN: 2:9999/9999.1 - Aka: Rodriguez bender - Password: 7e3fb3d2 - -5. jNode , UI. - - , 3. - -6. . . - http://127.0.0.1:8080/secure/index.html - -7. . , , . - -8. ! :-) - . - diff --git a/builder/docs/INSTALL.ru.txt b/builder/docs/INSTALL.ru.txt deleted file mode 100644 index 58bdcf8..0000000 --- a/builder/docs/INSTALL.ru.txt +++ /dev/null @@ -1,25 +0,0 @@ -1. Отредактировать etc/jnode.xxx.conf - -2. Отредактировать mail_module.conf если хотите чтоб работала почта и регистрация пойнтов. - -3. Запустить bin/run.sh дл *nix и mac, bin/run.bat для *win - -4. Во время первого запуска jNode создаст базу и заполнит её. Не пропустите информацию о техническом пойнте. - Пример вывода: - 18-01-2014 17:45:29 [00000001] InstallUtil [+] owner point account created - 18-01-2014 17:45:29 [00000001] InstallUtil - FTN: 2:9999/9999.1 - Aka: Rodriguez bender - Password: 7e3fb3d2 - -5. jNode это серверное ПО, не предназначенное для непосредственного редактирования почты через UI. -Сконфигурируйте пойнт-систему с данными, полученными в пункте 3. - -6. После коннекта в нетмыло упадет письмо с логином и паролем для админки. В консоли они будут продублированы. -Обычно админка находится по адресу http://127.0.0.1:8080/secure/index.html - -7. Зайдите в админку и настройте узел. Линки, эхи, роутинг итд. - -8. Удачи! :-) -И не забывайте обновлять софт. - diff --git a/builder/docs/INSTALL.ru.win.txt b/builder/docs/INSTALL.ru.win.txt deleted file mode 100644 index 5b6afeb..0000000 --- a/builder/docs/INSTALL.ru.win.txt +++ /dev/null @@ -1,25 +0,0 @@ -1. etc/jnode.xxx.conf - -2. mail_module.conf . - -3. bin/run.sh *nix mac, bin/run.bat *win - -4. jNode . . - : - 18-01-2014 17:45:29 [00000001] InstallUtil [+] owner point account created - 18-01-2014 17:45:29 [00000001] InstallUtil - FTN: 2:9999/9999.1 - Aka: Rodriguez bender - Password: 7e3fb3d2 - -5. jNode , UI. - - , 3. - -6. . . - http://127.0.0.1:8080/secure/index.html - -7. . , , . - -8. ! :-) - . - diff --git a/builder/etc/httpd_module.conf b/builder/etc/httpd_module.conf deleted file mode 100644 index f14d5dd..0000000 --- a/builder/etc/httpd_module.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Port to listen on -port = 8080 -# Enable auto point register; default false -#pointreg = true -# Enable auto link register; default false; -#linkreg = true -# External html files; default is off -#external = /var/www diff --git a/builder/etc/jnode.nix.conf b/builder/etc/jnode.nix.conf deleted file mode 100644 index 43e76bb..0000000 --- a/builder/etc/jnode.nix.conf +++ /dev/null @@ -1,75 +0,0 @@ -# Node config v. 1.0 - -# Node's name -info.stationname = Sample Node - -# Node's locatiom -info.location = The City Of Country - -# Your name -info.sysop = Rodriguez bender - -# Nodelists flags -info.ndl = 115200,TCP,BINKP - -# Your node's FTN address -info.address = 2:9999/9999 - -# JDBC URL - see JDBC documentation -# We have mySQL, postgreSQL and h2 drivers set -jdbc.url = jdbc:h2:../etc/jnode - -#jdbc.url = jdbc:mysql://localhost/jnode -#jdbc.url = jdbc:postgresql://localhost/jnode - -jdbc.user = jnode -jdbc.pass = jnode - -# binkp protocol settings - -# run server -binkp.server = true -# run client ( poll ) -binkp.client = true - -# address to listen -# change to 0.0.0.0 to listen everywhere -binkp.bind = 0.0.0.0 - -# Listen port for binkp protocol -binkp.port = 24554 - -# The folder for incoming files -binkp.inbound = ../inbound - -# protocol setting -binkp.timeout = 90 -binkp.size = 1000 -binkp.temp = ../tmp - -# First poll delay -poll.delay = 600 -# Next polls delay -poll.period = 600 -# Log level, 5->1 -log.level = 4 - -# path to latest nodelist (r/o) -nodelist.path = ../nodelist/nodelist -# path to nodelist index (r/w) -nodelist.index = ../nodelist/nodelist.idx -# Uncomment this if you want turn off fileechoes -fileecho.enable = true -# Fileecho base dir -fileecho.path = ../files - -# Uncomment to enable posting statistics -stat.enable = true -# Echoarea in which posters write statistics -stat.area = node.stat -# Uncomment to enable user scripts running on schedule -jscript.enable = 1 - -# do not edit if you don't know what is it -modules = org.jnode.httpd.HttpdModule:../etc/httpd_module.conf,org.jnode.mail.MailModule:../etc/mail_module.conf - diff --git a/builder/etc/jnode.win.conf b/builder/etc/jnode.win.conf deleted file mode 100644 index 3c3f302..0000000 --- a/builder/etc/jnode.win.conf +++ /dev/null @@ -1,75 +0,0 @@ -# Node config v. 1.0 - -# Node's name -info.stationname = Sample Node - -# Node's locatiom -info.location = The City Of Country - -# Your name -info.sysop = Rodriguez bender - -# Nodelists flags -info.ndl = 115200,TCP,BINKP - -# Your node's FTN address -info.address = 2:9999/9999 - -# JDBC URL - see JDBC documentation -# We have mySQL, postgreSQL and h2 drivers set -jdbc.url = jdbc:h2:..\\etc\\jnode - -#jdbc.url = jdbc:mysql://localhost/jnode -#jdbc.url = jdbc:postgresql://localhost/jnode - -jdbc.user = jnode -jdbc.pass = jnode - -# binkp protocol settings - -# run server -binkp.server = true -# run client ( poll ) -binkp.client = true - -# address to listen -# change to 0.0.0.0 to listen everywhere -binkp.bind = 0.0.0.0 - -# Listen port for binkp protocol -binkp.port = 24554 - -# The folder for incoming files -binkp.inbound = ..\\inbound - -# protocol setting -binkp.timeout = 90 -binkp.size = 1000 -binkp.temp = ..\\tmp - -# First poll delay -poll.delay = 600 -# Next polls delay -poll.period = 600 -# Log level, 5->1 -log.level = 4 - -# path to latest nodelist (r\\o) -nodelist.path = ..\\nodelist\\nodelist -# path to nodelist index (r\\w) -nodelist.index = ..\\nodelist\\nodelist.idx -# Uncomment this if you want turn off fileechoes -fileecho.enable = true -# Fileecho base dir -fileecho.path = ..\\files - -# Uncomment to enable posting statistics -stat.enable = true -# Echoarea in which posters write statistics -stat.area = node.stat -# Uncomment to enable user scripts running on schedule -jscript.enable = 1 - -# do not edit if you don't know what is it -modules = org.jnode.httpd.HttpdModule:..\\etc\\httpd_module.conf,org.jnode.mail.MailModule:..\\etc\\mail_module.conf - diff --git a/builder/etc/mail_module.conf b/builder/etc/mail_module.conf deleted file mode 100644 index f5c0427..0000000 --- a/builder/etc/mail_module.conf +++ /dev/null @@ -1,6 +0,0 @@ -smtp.from=Super Node -smtp.host=smtp.googlemail.com -smtp.port=25 -smtp.password=******** -smtp.user=user.gmail -robot=mailsender diff --git a/builder/header b/builder/header deleted file mode 100644 index f97b469..0000000 --- a/builder/header +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the jNode FTN Platform Develpoment Team (jNode Team) - * under one or more contributor license agreements. - * See the NOTICE file distributed with this work for - * additional information regarding copyright ownership. - * The jNode Team licenses this file to you under the - * Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - diff --git a/builder/bin/run.bat b/docs/bin/run.bat similarity index 100% rename from builder/bin/run.bat rename to docs/bin/run.bat diff --git a/builder/bin/run.sh b/docs/bin/run.sh similarity index 100% rename from builder/bin/run.sh rename to docs/bin/run.sh diff --git a/docs/configs/httpd_module.conf b/docs/configs/httpd_module.conf index 062a7a1..f14d5dd 100644 --- a/docs/configs/httpd_module.conf +++ b/docs/configs/httpd_module.conf @@ -5,4 +5,4 @@ port = 8080 # Enable auto link register; default false; #linkreg = true # External html files; default is off -#external = /var/www \ No newline at end of file +#external = /var/www diff --git a/docs/configs/jnode.nix.conf b/docs/configs/jnode.nix.conf index 4160f9f..43e76bb 100644 --- a/docs/configs/jnode.nix.conf +++ b/docs/configs/jnode.nix.conf @@ -18,6 +18,10 @@ info.address = 2:9999/9999 # JDBC URL - see JDBC documentation # We have mySQL, postgreSQL and h2 drivers set jdbc.url = jdbc:h2:../etc/jnode + +#jdbc.url = jdbc:mysql://localhost/jnode +#jdbc.url = jdbc:postgresql://localhost/jnode + jdbc.user = jnode jdbc.pass = jnode @@ -30,7 +34,7 @@ binkp.client = true # address to listen # change to 0.0.0.0 to listen everywhere -binkp.bind = 127.0.0.1 +binkp.bind = 0.0.0.0 # Listen port for binkp protocol binkp.port = 24554 @@ -43,9 +47,6 @@ binkp.timeout = 90 binkp.size = 1000 binkp.temp = ../tmp -# binkp threads pool size - uncomment this if you want customize binkp threads pool size, default 10 -binkp.threads = 10 - # First poll delay poll.delay = 600 # Next polls delay @@ -54,7 +55,7 @@ poll.period = 600 log.level = 4 # path to latest nodelist (r/o) -nodelist.path = ../nodelist/nodelist.* +nodelist.path = ../nodelist/nodelist # path to nodelist index (r/w) nodelist.index = ../nodelist/nodelist.idx # Uncomment this if you want turn off fileechoes @@ -70,4 +71,5 @@ stat.area = node.stat jscript.enable = 1 # do not edit if you don't know what is it -modules = org.jnode.httpd.HttpdModule:../etc/httpd_module.conf \ No newline at end of file +modules = org.jnode.httpd.HttpdModule:../etc/httpd_module.conf,org.jnode.mail.MailModule:../etc/mail_module.conf + diff --git a/docs/configs/jnode.win.conf b/docs/configs/jnode.win.conf index 7be8bfa..3c3f302 100644 --- a/docs/configs/jnode.win.conf +++ b/docs/configs/jnode.win.conf @@ -18,6 +18,10 @@ info.address = 2:9999/9999 # JDBC URL - see JDBC documentation # We have mySQL, postgreSQL and h2 drivers set jdbc.url = jdbc:h2:..\\etc\\jnode + +#jdbc.url = jdbc:mysql://localhost/jnode +#jdbc.url = jdbc:postgresql://localhost/jnode + jdbc.user = jnode jdbc.pass = jnode @@ -30,22 +34,19 @@ binkp.client = true # address to listen # change to 0.0.0.0 to listen everywhere -binkp.bind = 127.0.0.1 +binkp.bind = 0.0.0.0 # Listen port for binkp protocol -binkp.port = 24556 +binkp.port = 24554 # The folder for incoming files binkp.inbound = ..\\inbound # protocol setting binkp.timeout = 90 -binkp.size = 32767 +binkp.size = 1000 binkp.temp = ..\\tmp -# размер пула потоков binkp - раскомментируйте, если хотите изменить значение (по умолчанию - 10) -#binkp.threads = 10 - # First poll delay poll.delay = 600 # Next polls delay @@ -70,5 +71,5 @@ stat.area = node.stat jscript.enable = 1 # do not edit if you don't know what is it -modules = org.jnode.httpd.HttpdModule:..\\etc\\httpd_module.conf +modules = org.jnode.httpd.HttpdModule:..\\etc\\httpd_module.conf,org.jnode.mail.MailModule:..\\etc\\mail_module.conf diff --git a/builder/nodelist/nodelist b/docs/nodelist/NODELIST similarity index 100% rename from builder/nodelist/nodelist rename to docs/nodelist/NODELIST diff --git a/builder/lib/h2-1.3.174.jar b/jdbc-drivers/h2-1.3.174.jar similarity index 100% rename from builder/lib/h2-1.3.174.jar rename to jdbc-drivers/h2-1.3.174.jar diff --git a/builder/lib/mysql-connector-java-5.1.28-bin.jar b/jdbc-drivers/mysql-connector-java-5.1.28-bin.jar similarity index 100% rename from builder/lib/mysql-connector-java-5.1.28-bin.jar rename to jdbc-drivers/mysql-connector-java-5.1.28-bin.jar diff --git a/builder/lib/postgresql-9.2-1003-jdbc4.jar b/jdbc-drivers/postgresql-9.2-1003-jdbc4.jar similarity index 100% rename from builder/lib/postgresql-9.2-1003-jdbc4.jar rename to jdbc-drivers/postgresql-9.2-1003-jdbc4.jar diff --git a/jnode-assembly/distribution-release.xml b/jnode-assembly/distribution-release.xml index 85bb754..bab5163 100644 --- a/jnode-assembly/distribution-release.xml +++ b/jnode-assembly/distribution-release.xml @@ -33,35 +33,35 @@ - ${basedir}/../builder/lib + ${basedir}/../jdbc-drivers jnode/lib *.jar - ${basedir}/../builder/nodelist + ${basedir}/../docs/nodelist jnode/nodelist - nodelist + NODELIST - ${basedir}/../builder/bin + ${basedir}/../docs/bin jnode/bin *.* - ${basedir}/../builder/docs + ${basedir}/../docs/docs jnode/docs - * + *.* - ${basedir}/../builder/etc + ${basedir}/../docs/configs jnode/etc *.* @@ -96,7 +96,7 @@ - ${basedir}/../ + ${basedir}/.. jnode/ LICENSE diff --git a/jnode-assembly/distribution-rss.xml b/jnode-assembly/distribution-rss.xml index 5606359..4e82f8e 100644 --- a/jnode-assembly/distribution-rss.xml +++ b/jnode-assembly/distribution-rss.xml @@ -27,6 +27,14 @@ - - + + + ${basedir}/../ + jnode/ + + LICENSE + NOTICE + + + \ No newline at end of file