Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history
- Package naming correction
- Console update check added
  • Loading branch information
autumoswitzerland committed Oct 7, 2024
1 parent 78dba36 commit 9e673ef
Show file tree
Hide file tree
Showing 24 changed files with 275 additions and 21 deletions.
30 changes: 30 additions & 0 deletions bin/version.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
echo OFF
REM ------------------------------------------------------------------------------
REM
REM beetRoot Update Check
REM Version: 1.0
REM
REM ------------------------------------------------------------------------------


pushd %cd%

REM
REM ROOT path
REM
for %%d in (%~dp0..) do set ROOT=%%~fd
cd %ROOT%

REM
REM Build the classpath
REM
set CLASSPATH=%ROOT%/lib/*



REM
REM Encode
REM
java -DROOTPATH="%ROOT%" -classpath "%CLASSPATH%" ch.autumo.beetroot.utils.system.Update %*

popd
57 changes: 57 additions & 0 deletions bin/version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/bin/bash


#------------------------------------------------------------------------------
#
# beetRoot Update Check
# Version: 1.0
#
#------------------------------------------------------------------------------


pushd() {
command pushd "$@" > /dev/null
}
popd() {
command popd > /dev/null
}

pushd `pwd`

#
# ROOT path
#
cd "$(dirname "$0")/.."
ROOT=`pwd`

#
# Base classpath
#
CLASSPATH=${ROOT}

#
# Dynamically build the classpath
#
COUNT=0
LIB_CLASSPATH=
for i in `ls ${ROOT}/lib/*.jar`
do
if [ $COUNT -eq 0 ]; then
LIB_CLASSPATH=${i}
else
LIB_CLASSPATH=${LIB_CLASSPATH}:${i}
fi
COUNT=$((c+1))
done
CLASSPATH=${CLASSPATH}:${LIB_CLASSPATH}



#
# Encode
#
java \
-cp "${CLASSPATH}" \
ch.autumo.beetroot.utils.system.Update $*

popd
Binary file modified db/h2/db/test/beetroot.mv.db
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import ch.autumo.beetroot.security.SecureApplication;
import ch.autumo.beetroot.utils.Helper;
import ch.autumo.beetroot.utils.security.Security;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import ch.autumo.beetroot.utils.database.DB;
import ch.autumo.beetroot.utils.database.DBField;
import ch.autumo.beetroot.utils.database.H2Url;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* Database manager.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/BeetRootWebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
import ch.autumo.beetroot.utils.common.MIME;
import ch.autumo.beetroot.utils.database.DB;
import ch.autumo.beetroot.utils.security.Security;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;
import ch.autumo.beetroot.utils.web.TwoFA;
import ch.autumo.beetroot.utils.web.Web;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/Session.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import ch.autumo.beetroot.handler.users.User;
import ch.autumo.beetroot.utils.common.LowerCaseList;
import ch.autumo.beetroot.utils.systen.GUIDGenerator;
import ch.autumo.beetroot.utils.system.GUIDGenerator;

/**
* User session.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import ch.autumo.beetroot.handler.HandlerResponse;
import ch.autumo.beetroot.mailing.MailerFactory;
import ch.autumo.beetroot.utils.common.Time;
import ch.autumo.beetroot.utils.systen.GUIDGenerator;
import ch.autumo.beetroot.utils.system.GUIDGenerator;

/**
* Default login handler.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/plant/Fertilizer.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import ch.autumo.beetroot.BeetRootDatabaseManager;
import ch.autumo.beetroot.utils.bean.Beans;
import ch.autumo.beetroot.utils.database.DBField;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* Fertilizer for plant.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/plant/Plant.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import ch.autumo.beetroot.BeetRootDatabaseManager;
import ch.autumo.beetroot.utils.Helper;
import ch.autumo.beetroot.utils.common.Colors;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* PLANT - beetRoot CRUD Generator.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/server/BaseServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
import ch.autumo.beetroot.utils.UtilsException;
import ch.autumo.beetroot.utils.common.Colors;
import ch.autumo.beetroot.utils.security.SSL;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;
import ch.autumo.beetroot.utils.web.Web;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import ch.autumo.beetroot.BeetRootConfigurationManager;
import ch.autumo.beetroot.Constants;
import ch.autumo.beetroot.server.action.Download;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* Client/Server file transfer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import java.io.IOException;

import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* Ping upload request.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import ch.autumo.beetroot.BeetRootConfigurationManager;
import ch.autumo.beetroot.server.action.Download;
import ch.autumo.beetroot.server.modules.FileStorage;
import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/autumo/beetroot/utils/Helper.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.diogonunes.jcolor.Ansi;
import com.diogonunes.jcolor.Attribute;

import ch.autumo.beetroot.utils.systen.OS;
import ch.autumo.beetroot.utils.system.OS;

/**
* Helper methods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static void main(String args[]) {
private static final class Help {
private static final String SHELL_EXT = SystemUtils.IS_OS_UNIX ? "sh" : "bat";
private static final String USAGEA = Colors.darkYellow("pwencoder."+SHELL_EXT+" <mode> \"<password to encode>\"");
private static final String USAGE0 = Colors.darkYellow("pwencoder.sh 1 \"mySecretPass\"");
private static final String USAGE0 = Colors.darkYellow("pwencoder."+SHELL_EXT+" \"mySecretPass\"");
public static final String TEXT =
"" + LINE_SEPARATOR +
"" + LINE_SEPARATOR +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import ch.autumo.beetroot.security.SecureApplication;
import ch.autumo.beetroot.security.password.PasswordHashProvider;
import ch.autumo.beetroot.utils.UtilsException;
import ch.autumo.beetroot.utils.systen.GUIDGenerator;
import ch.autumo.beetroot.utils.system.GUIDGenerator;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*
*/
package ch.autumo.beetroot.utils.systen;
package ch.autumo.beetroot.utils.system;

import java.net.InetAddress;
import java.net.NetworkInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*
*/
package ch.autumo.beetroot.utils.systen;
package ch.autumo.beetroot.utils.system;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
Loading

0 comments on commit 9e673ef

Please sign in to comment.