From 4991bef81c7e9eb8f3f94309b1c3a1f9b8cc02ee Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 31 May 2012 14:14:50 +0200 Subject: Cleanup bin & add eclipse launch configurations --- bin/UserCode.bat | 6 -- bin/ant.bat | 110 ------------------------------ bin/clearAll.bat | 13 ++++ bin/conf/server.conf | 4 +- bin/eclipse/Cristal 2.3 Kernel GUI.launch | 19 ++++++ bin/eclipse/Cristal 2.3 Server.launch | 21 ++++++ bin/env.bat | 5 -- bin/itemServer.bat | 7 -- bin/itemServer.sh | 15 ---- bin/lcp.bat | 9 --- bin/openldap/README | 5 ++ bin/openldap/cristal2.schema | 49 +++++++++++++ bin/openldap/slapd.conf | 20 ++++++ bin/runGUI.bat | 6 -- bin/runOutcomeEditor.bat | 5 -- 15 files changed, 129 insertions(+), 165 deletions(-) delete mode 100755 bin/UserCode.bat delete mode 100755 bin/ant.bat create mode 100644 bin/clearAll.bat create mode 100644 bin/eclipse/Cristal 2.3 Kernel GUI.launch create mode 100644 bin/eclipse/Cristal 2.3 Server.launch delete mode 100755 bin/env.bat delete mode 100755 bin/itemServer.bat delete mode 100755 bin/itemServer.sh delete mode 100755 bin/lcp.bat create mode 100644 bin/openldap/README create mode 100644 bin/openldap/cristal2.schema create mode 100644 bin/openldap/slapd.conf delete mode 100755 bin/runGUI.bat delete mode 100755 bin/runOutcomeEditor.bat (limited to 'bin') 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 @@ + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + 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/bin/openldap/README b/bin/openldap/README new file mode 100644 index 0000000..6bfdabc --- /dev/null +++ b/bin/openldap/README @@ -0,0 +1,5 @@ +cristal2.schema goes in OpenLDAP/schemas, or change the include line to point to it here. + +edit your slapd.conf to include it, and replace the env vars with your local path. +edit the suffix and rootdn and rootpass +use this slapd to help you diff --git a/bin/openldap/cristal2.schema b/bin/openldap/cristal2.schema new file mode 100644 index 0000000..2370964 --- /dev/null +++ b/bin/openldap/cristal2.schema @@ -0,0 +1,49 @@ +attributetype ( 1.3.6.1.4.1.96.64.10.1 NAME 'intsyskey' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + +attributetype ( 1.3.6.1.4.1.96.64.10.6 NAME 'ior' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.96.64.10.7 NAME 'cristalprop' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +objectclass ( 1.3.6.1.4.1.96.64.10.10 NAME 'cristalentity' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( intsyskey $ ior $ cristalprop ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.13 NAME 'cristalcontext' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( intsyskey ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.15 NAME 'aliasObject' SUP alias STRUCTURAL + MUST ( cn $ objectclass $ aliasedObjectName ) ) + +# agent +attributetype ( 1.3.6.1.4.1.96.64.10.8 NAME 'jobList' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + + # uid must store userName if agent (for authentication to work) +objectclass ( 1.3.6.1.4.1.96.64.10.14 NAME 'cristalagent' SUP cristalentity STRUCTURAL + MUST ( userPassword $ uid ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.16 NAME 'cristalrole' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( jobList $ uniqueMember ) ) + +# old + +attributetype ( 1.3.6.1.4.1.96.64.10.2 NAME 'propval' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +objectclass ( 1.3.6.1.4.1.96.64.10.11 NAME 'cristalproperty' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( propval ) ) + diff --git a/bin/openldap/slapd.conf b/bin/openldap/slapd.conf new file mode 100644 index 0000000..65cebf1 --- /dev/null +++ b/bin/openldap/slapd.conf @@ -0,0 +1,20 @@ +# $OpenLDAP: pkg/ldap/servers/slapd/slapd.conf,v 1.8.8.7 2001/09/27 20:00:31 kurt Exp $ +# +# See slapd.conf(5) for details on configuration options. +# This file should NOT be world readable. +# +include D:/openldap-2_0_19_debug/schema/core.schema +include D:/openldap-2_0_19_debug/schema/cristal2.schema +pidfile D:/openldap-2_0_19_debug/slapd.pid +argsfile D:/openldap-2_0_19_debug/slapd.args + + +# if no access controls are present, the default is: +# Allow read by all +# rootdn can always write! + +database ldbm +suffix "o=cern,c=ch" +rootdn "cn=Directory Manager,o=cern,c=ch" +rootpw estrella +index objectClass eq 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 -- cgit v1.2.3