summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath1
-rw-r--r--.gitignore6
-rwxr-xr-xbin/UserCode.bat6
-rwxr-xr-xbin/ant.bat110
-rw-r--r--bin/clearAll.bat13
-rwxr-xr-xbin/conf/server.conf4
-rw-r--r--bin/eclipse/Cristal 2.3 Kernel GUI.launch19
-rw-r--r--bin/eclipse/Cristal 2.3 Server.launch21
-rwxr-xr-xbin/env.bat5
-rwxr-xr-xbin/itemServer.bat7
-rwxr-xr-xbin/itemServer.sh15
-rwxr-xr-xbin/lcp.bat9
-rw-r--r--bin/openldap/README (renamed from src/main/resources/openldap/README)0
-rw-r--r--bin/openldap/cristal2.schema (renamed from src/main/resources/openldap/cristal2.schema)0
-rw-r--r--bin/openldap/slapd.conf (renamed from src/main/resources/openldap/slapd.conf)0
-rwxr-xr-xbin/runGUI.bat6
-rwxr-xr-xbin/runOutcomeEditor.bat5
-rw-r--r--pom.xml8
18 files changed, 67 insertions, 168 deletions
diff --git a/.classpath b/.classpath
index 04034f2..d65dfc7 100644
--- a/.classpath
+++ b/.classpath
@@ -9,5 +9,6 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry kind="lib" path="/cristal-dev/cristaldev.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/.gitignore b/.gitignore
index 1ad4887..dd843fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-db
-doc
-cristal.preferences
+/db
+/cristal.preferences
+/*.txt
/target
diff --git a/bin/UserCode.bat b/bin/UserCode.bat
deleted file mode 100755
index 8c19296..0000000
--- a/bin/UserCode.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-title Cristal 2 Usercode Agent
-call env.bat
-cd %CRISTAL_HOME%
-del %CRISTAL_HOME%\ucLog.txt
-java -classpath %LOCALCLASSPATH% com.c2kernel.process.UserCodeProcess -logFile %CRISTAL_HOME%\ucLog.txt -logLevel 0 -config %CRISTAL_HOME%\bin\conf\client.conf -connect %1
diff --git a/bin/ant.bat b/bin/ant.bat
deleted file mode 100755
index c90887a..0000000
--- a/bin/ant.bat
+++ /dev/null
@@ -1,110 +0,0 @@
-@echo off
-
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-if not "%OS%"=="Windows_NT" goto win9xStart
-:winNTStart
-@setlocal
-
-rem %~dp0 is name of current script under NT
-set DEFAULT_ANT_HOME=%~dp0
-
-rem : operator works similar to make : operator
-set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME%\..
-
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
-set DEFAULT_ANT_HOME=
-
-rem Need to check if we are using the 4NT shell...
-if "%eval[2+2]" == "4" goto setup4NT
-
-rem On NT/2K grab all arguments at once
-set ANT_CMD_LINE_ARGS=%*
-goto doneStart
-
-:setup4NT
-set ANT_CMD_LINE_ARGS=%$
-goto doneStart
-
-:win9xStart
-rem Slurp the command line arguments. This loop allows for an unlimited number of
-rem agruments (up to the command line limit, anyway).
-
-set ANT_CMD_LINE_ARGS=
-
-:setupArgs
-if %1a==a goto doneStart
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-:doneStart
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-
-rem find ANT_HOME
-if not "%ANT_HOME%"=="" goto checkJava
-
-rem check for ant in Program Files on system drive
-if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
-set ANT_HOME=%SystemDrive%\Program Files\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\nul goto checkCDrive
-set ANT_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\nul goto noAntHome
-set ANT_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
-goto end
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
-if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" %JAVA_HOME%\lib\tools.jar
-if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" %JAVA_HOME%\lib\classes.zip
-goto checkJikes
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java
-echo.
-echo Warning: JAVA_HOME environment variable is not set.
-echo If build fails because sun.* classes could not be found
-echo you will need to set the JAVA_HOME environment variable
-echo to the installation directory of java.
-echo.
-
-:checkJikes
-if not "%JIKESPATH%" == "" goto runAntWithJikes
-
-:runAnt
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikes
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" -Djikes.class.path="%JIKESPATH%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
-
-:end
-set LOCALCLASSPATH=
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
-
-if not "%OS%"=="Windows_NT" goto mainEnd
-:winNTend
-@endlocal
-
-:mainEnd
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
diff --git a/bin/clearAll.bat b/bin/clearAll.bat
new file mode 100644
index 0000000..ba4a351
--- /dev/null
+++ b/bin/clearAll.bat
@@ -0,0 +1,13 @@
+@echo off
+
+title Database Clearing
+
+net stop OpenLDAP
+
+echo Deleting XML and LDAP databases
+
+del /Q /S ..\db\*.*
+
+net start OpenLDAP
+
+echo Done
diff --git a/bin/conf/server.conf b/bin/conf/server.conf
index a5a99d4..f1b981b 100755
--- a/bin/conf/server.conf
+++ b/bin/conf/server.conf
@@ -1,4 +1,4 @@
LocalCentre=andy
ClusterStorage=LDAPClusterStorage,XMLClusterStorage
-XMLStorage.root=C:/Users/andrew/workspace/cristal-kernel/db
-ItemServer.Console.allow=localhost,andrew
+XMLStorage.root=C:/Users/abranson/workspace/cristal-kernel/db
+ItemServer.Console.allow=localhost,andrew,pcuwe01
diff --git a/bin/eclipse/Cristal 2.3 Kernel GUI.launch b/bin/eclipse/Cristal 2.3 Kernel GUI.launch
new file mode 100644
index 0000000..5d08a9d
--- /dev/null
+++ b/bin/eclipse/Cristal 2.3 Kernel GUI.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/gui/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.gui.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin\conf\client.conf -connect ${file_prompt}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-kernel"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
diff --git a/bin/eclipse/Cristal 2.3 Server.launch b/bin/eclipse/Cristal 2.3 Server.launch
new file mode 100644
index 0000000..5ae97e5
--- /dev/null
+++ b/bin/eclipse/Cristal 2.3 Server.launch
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="\cristal-kernel\bin\eclip"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/StandardServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.StandardServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin\conf\server.conf"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-kernel"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256m"/>
+</launchConfiguration>
diff --git a/bin/env.bat b/bin/env.bat
deleted file mode 100755
index f387d0e..0000000
--- a/bin/env.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-set CRISTAL_HOME=%CD:~0,-4%
-set PATH=%PATH%;%CD%\win32
-set LOCALCLASSPATH=%CRISTAL_HOME%\build\classes
-for %%i in ("%CRISTAL_HOME%\lib\*.jar") do call "lcp.bat" %%i
diff --git a/bin/itemServer.bat b/bin/itemServer.bat
deleted file mode 100755
index d154472..0000000
--- a/bin/itemServer.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-title ItemServer
-call env.bat
-cd %CRISTAL_HOME%
-del %CRISTAL_HOME%\serverLog.txt
-java -Xmx256m -Xbootclasspath/p:%CRISTAL_HOME%\lib\OB.jar -classpath %LOCALCLASSPATH% com.c2kernel.process.StandardServer -logFile %CRISTAL_HOME%\serverLog.txt -logLevel 0 -config %CRISTAL_HOME%\bin\conf\server.conf -connect %1
-pause \ No newline at end of file
diff --git a/bin/itemServer.sh b/bin/itemServer.sh
deleted file mode 100755
index 3b32543..0000000
--- a/bin/itemServer.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-CRISTAL2_HOME=/home/dracor/workspace/cristal-kernel
-
-for i in ${CRISTAL2_HOME}/lib/*.jar;
- do
- test -f $i || continue
- LOCALCLASSPATH=${LOCALCLASSPATH}:${i}
- echo ${i}
- done
-
-LOCALCLASSPATH=${LOCALCLASSPATH}:${CRISTAL2_HOME}/build/lib/c2kernel.jar
-
-rm -f ${CRISTAL2_HOME}/serverLog.txt
-java -Xmx256m -Xbootclasspath/p:${CRISTAL2_HOME}/lib/OB.jar -classpath ${LOCALCLASSPATH} com.c2kernel.process.StandardServer -logFile ${CRISTAL2_HOME}/serverLog.txt -logLevel 8 -config ${CRISTAL2_HOME}/bin/conf/server.conf -connect ${CRISTAL2_HOME}/connect/uwe.clc
diff --git a/bin/lcp.bat b/bin/lcp.bat
deleted file mode 100755
index f2bb801..0000000
--- a/bin/lcp.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-set _CLASSPATHCOMPONENT=%1
-:argCheck
-if %2a==a goto gotAllArgs
-shift
-set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
-goto argCheck
-:gotAllArgs
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
-
diff --git a/src/main/resources/openldap/README b/bin/openldap/README
index 6bfdabc..6bfdabc 100644
--- a/src/main/resources/openldap/README
+++ b/bin/openldap/README
diff --git a/src/main/resources/openldap/cristal2.schema b/bin/openldap/cristal2.schema
index 2370964..2370964 100644
--- a/src/main/resources/openldap/cristal2.schema
+++ b/bin/openldap/cristal2.schema
diff --git a/src/main/resources/openldap/slapd.conf b/bin/openldap/slapd.conf
index 65cebf1..65cebf1 100644
--- a/src/main/resources/openldap/slapd.conf
+++ b/bin/openldap/slapd.conf
diff --git a/bin/runGUI.bat b/bin/runGUI.bat
deleted file mode 100755
index 90ce2b8..0000000
--- a/bin/runGUI.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-title Cristal 2 Gui
-call env.bat
-cd %CRISTAL_HOME%
-del %CRISTAL_HOME%\guiLog.txt
-java -classpath %LOCALCLASSPATH% com.c2kernel.gui.Main -logFile %CRISTAL_HOME%\guiLog.txt -logLevel 0 -config %CRISTAL_HOME%\bin\conf\client.conf -connect %1
diff --git a/bin/runOutcomeEditor.bat b/bin/runOutcomeEditor.bat
deleted file mode 100755
index 58f3700..0000000
--- a/bin/runOutcomeEditor.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-title OutcomeEditor
-call env.bat
-cd %CRISTAL_HOME%
-java -classpath %LOCALCLASSPATH% com.c2kernel.gui.tabs.outcome.form.OutcomeEditor %1 %2
diff --git a/pom.xml b/pom.xml
index 45fa6ff..9be89fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,9 @@
<version>2.3.1</version>
<name>cristal-kernel</name>
<description>CRISTAL kernel</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<dependencies>
<dependency>
<groupId>xerces</groupId>
@@ -63,6 +66,11 @@
<artifactId>jldap</artifactId>
<version>4.3</version>
</dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 03:42:27 +0000