summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xauth.sh1
-rw-r--r--build.xml234
-rwxr-xr-xclient.sh7
-rwxr-xr-xinput.sh1
-rwxr-xr-xoutput.sh1
-rw-r--r--server.policy12
-rwxr-xr-xserver.sh7
-rw-r--r--src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java2
-rwxr-xr-xstart-java.sh8
9 files changed, 260 insertions, 13 deletions
diff --git a/auth.sh b/auth.sh
deleted file mode 100755
index dd0fe2f..0000000
--- a/auth.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -Djava.library.path=./lib -jar yalpPGSqlAuth.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/build.xml b/build.xml
index 66b2b53..1777a52 100644
--- a/build.xml
+++ b/build.xml
@@ -1,3 +1,236 @@
+<<<<<<< HEAD
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="yalp" default="all" basedir=".">
+ <property name="srcInterfaces" value="src/YalpInterfaces"/>
+
+ <property name="srcInputs" value="src/YalpInputs"/>
+ <property name="srcOutputs" value="src/YalpOutputs"/>
+ <property name="srcAuth" value="src/YalpAuth"/>
+ <property name="srcServer" value="src/YalpServer"/>
+ <property name="srcClients" value="src/YalpClients"/>
+ <property name="srcPgSqlInputIndexer" value="${srcInputs}/YalpPGSqlInput/YalpPGSQLIndexer"/>
+ <property name="srcVlcTelnetOutput" value="${srcOutputs}/YalpVlcTelnetOutput"/>
+ <property name="srcPGSqlInput" value="${srcInputs}/YalpPGSqlInput"/>
+ <property name="srcPGSqlAuth" value="${srcAuth}/YalpPGSqlAuth"/>
+
+ <property name="srcSwtClient" value="${srcClients}/SwtClient"/>
+ <property name="srcSwtClientGUI" value="${srcSwtClient}/GUI"/>
+
+ <property name="src" value="src/"/>
+ <property name="doc" value="doc/"/>
+ <property name="sqldoc" value="${doc}/sql"/>
+ <property name="javadoc" value="${doc}/java"/>
+ <property name="doxydoc" value="${doc}/doxygen"/>
+ <property name="build" value="build/"/>
+ <property name="lib" value="lib/"/>
+
+ <property name="log4jLibs" value="lib/log4j-1.2.15.jar"/>
+ <property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/>
+ <property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar /usr/share/java/swt.jar"/>
+ <property name="indexerLibs" value="lib/yajil-0.3.3.jar"/>
+ <property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/>
+
+ <property name="idlj" value="../idlj.sh"/>
+ <property name="psqldoc" value="./postgresql_autodoc/postgresql_autodoc"/>
+
+ <path id="project.class.path">
+ <pathelement location="{lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+
+ <target name="all" depends="vlctelnetoutput, pgsqlinput, pgsqlindexer, pgsqlauth, server, swtclient" description="builds server and client">
+ <echo>Doing all</echo>
+ </target>
+
+ <target name="interfaces" description="Create stubs/skeletons from idl">
+ <mkdir dir="${build}"/>
+ <exec dir="${src}" executable="${idlj}">
+ <arg value="yalp.idl"/>
+ </exec>
+ <javac srcdir="${srcInterfaces}" destdir="${build}"/>
+ </target>
+
+ <target name ="server" depends="interfaces" description="builds the Server">
+ <javac debug="true" srcdir="${srcServer}" destdir="${build}"/>
+ <jar destfile="yalpServer.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpServer.YalpServer"/>
+ <attribute name="Class-Path" value="${log4jLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name ="outputs" description="builds output base files">
+ <javac debug="true" srcdir="${srcOutputs}" destdir="${build}"/>
+ </target>
+
+ <target name ="vlctelnetoutput" depends="interfaces, outputs" description="builds the vlctelnetoutput">
+ <javac debug="true" srcdir="${srcVlcTelnetOutput}" destdir="${build}"/>
+ <jar destfile="yalpVlcTelnetOutput.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpOutputs.YalpVlcTelnetOutput.YalpVlcTelnetOutput"/>
+ <attribute name="Class-Path" value="${vlctelnetLibs} ${log4jLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name ="inputs" description="builds input base files">
+ <javac debug="true" srcdir="${srcInputs}" destdir="${build}"/>
+ </target>
+
+ <target name ="pgsqlinput" depends="interfaces, inputs" description="builds the pgsql input plugin">
+ <javac debug="true" srcdir="${srcPGSqlInput}" destdir="${build}"/>
+ <jar destfile="yalpPGSqlInput.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSqlInput"/>
+ <attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="pgsqlindexer" description="indexer for pgsqlinputplugin">
+ <mkdir dir="${build}/indexer"/>
+ <javac debug="true" srcdir="${srcPgSqlInputIndexer}" destdir="${build}/indexer"/>
+ <jar destfile="yalpPGSqlIndexer.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSQLIndexer.YalpPGSQLIndexer"/>
+ <attribute name="Class-Path" value="${indexerLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name ="auth" description="builds auth base files">
+ <javac debug="true" srcdir="${srcAuth}" destdir="${build}"/>
+ </target>
+
+ <target name ="pgsqlauth" depends="interfaces, auth" description="builds the pgsql auth plugin">
+ <javac debug="true" srcdir="${srcPGSqlAuth}" destdir="${build}"/>
+ <jar destfile="yalpPGSqlAuth.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpAuth.YalpPGSqlAuth.YalpPGSqlAuth"/>
+ <attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name ="clients" depends="interfaces" description="builds the client bsae files">
+ <javac debug="true" srcdir="${srcClients}" destdir="${build}"/>
+ </target>
+
+ <target name ="swtclient" depends="clients" description="builds SWT GUI">
+ <javac debug="true" srcdir="${srcSwtClient}" destdir="${build}"/>
+ <jar destfile="yalpSWTClient.jar" basedir="${build}">
+ <path id="project.class.path">
+ <pathelement location="${lib}"/>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${additional.path}"/>
+ </path>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="YalpClients.SwtClient.SwtClient"/>
+ <attribute name="Class-Path" value="${swtLibs}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="swtgui" depends="swtclient">
+ <javac debug="true" srcdir="${srcSwtGUI}" destdir="${build}">
+ <classpath refid="project.class.path"/>
+ </javac>
+ </target>
+
+ <target name="clean" depends="cleandoc" description="Removes previous build">
+ <delete verbose="true">
+ <fileset dir="${build}"/>
+ <fileset dir="${srcInterfaces}"/>
+ </delete>
+ </target>
+
+ <target name="runserver" depends="server" description="starts Server">
+ <java jar="server.jar" fork="true"/>
+ </target>
+
+ <target name="runclient" depends="swtclient" description="starts Client">
+ <java jar="client.jar" fork="true"/>
+ </target>
+
+ <target name="cleandoc" depends="cleandoxydoc, cleansqldoc, cleanjavadoc"/>
+
+ <target name="cleansqldoc" description="Removes previous sqldoc">
+ <delete verbose="true">
+ <fileset dir="${sqldoc}"/>
+ </delete>
+ </target>
+
+ <target name="cleandoxydoc" description="Removes previous doxygen">
+ <delete verbose="true">
+ <fileset dir="${doxydoc}"/>
+ </delete>
+ </target>
+
+ <target name="cleanjavadoc" description="Removes previous javadoc">
+ <delete verbose="true">
+ <fileset dir="${javadoc}"/>
+ </delete>
+ </target>
+
+ <target name="doc" depends="cleandoc" description="generates javadoc">
+ <javadoc packagenames="org.umlgraph.doclet.*, YalpAuth.*, YalpServer, YalpClients.*, YalpInterfaces, YalpOutputs.*, YalpInputs.*" sourcepath="src" author="true" version="true" private="true" use="true" destdir="${javadoc}">
+ <doclet name="org.umlgraph.doclet.UmlGraphDoc" path="./build-tools/UmlGraph-5.2.jar">
+ <param name="-inferrel"/>
+ <param name="-inferdep"/>
+ <param name="-hide" value="java.*"/>
+ <param name="-collpackages" value="java.util.*"/>
+ <param name="-qualify"/>
+ <param name="-postfixpackage"/>
+ <param name="-nodefontsize" value="9"/>
+ <param name="-nodefontpackagesize" value="7"/>
+ <param name="-link" value="http://java.sun.com/javase/6/docs/guide/javadoc/doclet/spec"/>
+ <param name="-link" value="http://java.sun.com/javase/6/docs/api"/>
+ </doclet>
+ </javadoc>
+ <exec dir="." executable="${psqldoc}">
+ <arg line="-d yalp -f ${sqldoc}/yalp -h localhost -u yalp -p 5432 --password=yalp -l ./postgresql_autodoc"/>
+ </exec>
+ <exec dir="." executable="/usr/bin/doxygen">
+ <arg line="yalp.doxy"/>
+ </exec>
+ </target>
+
+</project>
+=======
<?xml version="1.0" encoding="UTF-8"?>
<project name="yalp" default="all" basedir=".">
@@ -229,3 +462,4 @@
</target>
</project>
+>>>>>>> c62ff958823168d7622b397609220db8b67fa731
diff --git a/client.sh b/client.sh
deleted file mode 100755
index e8adf20..0000000
--- a/client.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-export LD_LIBRARY_PATH=/usr/lib/jni
-CLASSPATH=/usr/share/java/swt.jar
-java -Dswt.library.path=/usr/lib/jni \
--Djava.library.path=/usr/share/java -jar yalpSWTClient.jar \
--cp /usr/share/java/swt-gtk-3.4.jar \
--ORBInitialPort 1050 -ORBInitialHost localhost \
--ORBInitRef NameService=corbaloc:iiop:localhost:1050/NameService
diff --git a/input.sh b/input.sh
deleted file mode 100755
index b77419f..0000000
--- a/input.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -Djava.library.path=./lib -jar yalpPGSqlInput.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/output.sh b/output.sh
deleted file mode 100755
index cdad4fd..0000000
--- a/output.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -Djava.library.path=./lib -jar yalpVlcTelnetOutput.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/server.policy b/server.policy
index 5ff3c7e..224e0c6 100644
--- a/server.policy
+++ b/server.policy
@@ -1,8 +1,20 @@
+<<<<<<< HEAD
grant {
permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
+ permission java.net.SocketPermission "localhost:1050","connect,accept,resolve";
permission java.util.PropertyPermission "id3.default_language", "read";
permission java.util.PropertyPermission "id3.default_encoding", "read";
};
+=======
+grant {
+ permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
+ permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
+ permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
+ permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
+ permission java.util.PropertyPermission "id3.default_language", "read";
+ permission java.util.PropertyPermission "id3.default_encoding", "read";
+};
+>>>>>>> c62ff958823168d7622b397609220db8b67fa731
diff --git a/server.sh b/server.sh
index bb38d65..66cd5fd 100755
--- a/server.sh
+++ b/server.sh
@@ -1,4 +1,7 @@
-/usr/bin/orbd -ORBInitialPort 1050 &
+/usr/bin/orbd \
+-J-Djava.net.preferIPv4Stack=true \
+-J-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \
+-ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 &
sleep 4
-java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost
+./start-java.sh yalpServer.jar
killall -9 orbd
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
index 676fe3c..d497c3d 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
@@ -22,7 +22,7 @@ import YalpInterfaces.*;
*/
public class YalpPGSqlAuth {
- private YalpAuthInterfaceImpl con;
+ private YalpAuthPluginImpl con;
private DatabaseDefines config;
public static void main(String[] args)
diff --git a/start-java.sh b/start-java.sh
new file mode 100755
index 0000000..9652578
--- /dev/null
+++ b/start-java.sh
@@ -0,0 +1,8 @@
+java \
+-Djava.net.preferIPv4Stack=true \
+-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \
+-Djava.library.path=./lib \
+-jar $@ \
+-ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 \
+-ORBInitRef NameService=corbaloc:iiop:127.0.0.1:1050/NameService \
+-ORBDottedDecimalAddresses 1
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-12 07:58:01 +0000