jdvb-cvs Mailing List for JDVB
Status: Inactive
Brought to you by:
hundalz
Menu
▾
▴
jdvb-cvs — CVS logs for JDVB
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
(36) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: pinder <hu...@us...> - 2006-02-26 13:36:02
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3433 Modified Files: build.xml Log Message: updated build file Index: build.xml =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 26 Feb 2006 12:35:23 -0000 1.7 --- build.xml 26 Feb 2006 13:35:56 -0000 1.8 *************** *** 81,99 **** <fileset dir="${basedir}"> <include name="build.*"/> ! </fileset> ! <fileset dir="${docs}"> ! <include name="**/*"/> ! </fileset> ! <fileset dir="${src}"> ! <include name="**/*"/> ! </fileset> ! <fileset dir="${bin}"> ! <include name="**/*"/> ! </fileset> ! <fileset dir="${lib}"> ! <include name="**/*"/> ! </fileset> ! <fileset dir="${conf}"> ! <include name="**/*"/> </fileset> </copy> --- 81,89 ---- <fileset dir="${basedir}"> <include name="build.*"/> ! <include name="src/**/*"/> ! <include name="docs/**/*"/> ! <include name="bin/**/*"/> ! <include name="lib/**/*"/> ! <include name="conf/**/*"/> </fileset> </copy> |
|
From: pinder <hu...@us...> - 2006-02-26 13:20:45
|
Update of /cvsroot/jdvb/jdvb-server/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28047/docs Added Files: CHANGES Log Message: added changesfile --- NEW FILE: CHANGES --- JDVB Changelog ============== JDVB 0.2 -------- - Using latest format for channels.conf. Video and Audio PID field is parameterised. - Single unified properties file. - Allow spaces in channel names - Log4j: everything logged to a file called jdvb.log JDVB 0.1 -------- - Initial Release |
|
From: pinder <hu...@us...> - 2006-02-26 12:42:12
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7295 Modified Files: build.properties Log Message: release Index: build.properties =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.properties 26 Feb 2006 12:26:54 -0000 1.1 --- build.properties 26 Feb 2006 12:42:09 -0000 1.2 *************** *** 1 **** ! version=0.2 \ No newline at end of file --- 1,2 ---- ! version=0.2 ! cvs.tag=0_2 \ No newline at end of file |
|
From: pinder <hu...@us...> - 2006-02-26 12:35:26
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182 Modified Files: build.xml Log Message: include sources for distro Index: build.xml =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 26 Feb 2006 12:26:54 -0000 1.6 --- build.xml 26 Feb 2006 12:35:23 -0000 1.7 *************** *** 9,12 **** --- 9,13 ---- <property name="jars" location="${build}/jars" /> <property name="zip" location="${build}/zip/${ant.project.name}-${version}" /> + <property name="docs" location="docs"/> <property name="src" location="src" /> <property name="conf" location="conf" /> *************** *** 78,81 **** --- 79,100 ---- <include name="**/*"/> </fileset> + <fileset dir="${basedir}"> + <include name="build.*"/> + </fileset> + <fileset dir="${docs}"> + <include name="**/*"/> + </fileset> + <fileset dir="${src}"> + <include name="**/*"/> + </fileset> + <fileset dir="${bin}"> + <include name="**/*"/> + </fileset> + <fileset dir="${lib}"> + <include name="**/*"/> + </fileset> + <fileset dir="${conf}"> + <include name="**/*"/> + </fileset> </copy> <zip basedir="${build}/zip" destfile="${build}/zip/${ant.project.name}-${version}.zip"/> |
|
From: pinder <hu...@us...> - 2006-02-26 12:27:05
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32532 Modified Files: build.xml Added Files: build.properties Log Message: added build.properties to define version updated dist task to create zip distro Index: build.xml =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 25 Feb 2006 15:19:51 -0000 1.5 --- build.xml 26 Feb 2006 12:26:54 -0000 1.6 *************** *** 3,10 **** --- 3,12 ---- <project name="JDVB" default="build" basedir="."> + <property file="build.properties" /> <property name="build" location="build" /> <property name="build.classes" location="${build}/classes" /> <property name="dist" location="${build}/dist" /> <property name="jars" location="${build}/jars" /> + <property name="zip" location="${build}/zip/${ant.project.name}-${version}" /> <property name="src" location="src" /> <property name="conf" location="conf" /> *************** *** 71,74 **** --- 73,83 ---- </fileset> </copy> + <mkdir dir="${zip}"/> + <copy todir="${zip}"> + <fileset dir="${jars}"> + <include name="**/*"/> + </fileset> + </copy> + <zip basedir="${build}/zip" destfile="${build}/zip/${ant.project.name}-${version}.zip"/> </target> --- NEW FILE: build.properties --- version=0.2 |
|
From: pinder <hu...@us...> - 2006-02-26 11:53:38
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17752 Modified Files: .cvsignore Log Message: spaces in channel names field offsets for channels.conf file to get video and audio pids Index: .cvsignore =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 Feb 2006 17:07:29 -0000 1.1 --- .cvsignore 26 Feb 2006 11:53:32 -0000 1.2 *************** *** 1 **** ! build \ No newline at end of file --- 1,2 ---- ! build ! tvb.conf |
|
From: pinder <hu...@us...> - 2006-02-26 11:53:37
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17752/src/uk/midearth/dvb/server Modified Files: RemoteDVB.java Log Message: spaces in channel names field offsets for channels.conf file to get video and audio pids Index: RemoteDVB.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RemoteDVB.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RemoteDVB.java 25 Feb 2006 14:06:58 -0000 1.4 --- RemoteDVB.java 26 Feb 2006 11:53:32 -0000 1.5 *************** *** 3,9 **** --- 3,12 ---- import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; + import java.util.ArrayList; + import java.util.List; import org.apache.log4j.Logger; + import uk.midearth.dvb.Constants; import uk.midearth.dvb.confParser.ConfParser; import uk.midearth.dvb.confParser.Configurator; *************** *** 32,36 **** public RemoteDVB(String newConfigFilename, String newConfFilename) ! throws RemoteException, JDVBException { LOG.info("RemoteDVB>> Creating remote RemoteDVB object"); confParser = new ConfParser(newConfigFilename); --- 35,39 ---- public RemoteDVB(String newConfigFilename, String newConfFilename) ! throws Exception { LOG.info("RemoteDVB>> Creating remote RemoteDVB object"); confParser = new ConfParser(newConfigFilename); *************** *** 74,78 **** class TzapThread extends Thread { ! private int timeout = 1000; private Process tzap = null; --- 77,81 ---- class TzapThread extends Thread { ! private int timeout = 2000; private Process tzap = null; *************** *** 97,131 **** try { - // System.out.println("RemoteDVB.TzapListner>> Getting - // runtime"); rt = Runtime.getRuntime(); ! // System.out.println("RemoteDVB.TzapListner>> starting tzap ! // with:"); ! // System.out.println(conf.get("tzap") + " -c " + ! // confParser.configFilename() + " " + ! // confParser.getChannel(channelNo).channelName()); ! tzap = rt ! .exec(conf.get("tzap") ! + " -c " ! + confParser.configFilename() ! + " " ! + confParser.getChannel(channelNo) ! .getChannelName()); ! // System.out.println("RemoteDVB.TzapListner>> sleeping"); sleep(timeout); ! // System.out.println("RemoteDVB.TzapListner>> starting ! // dvbstream:"); ! // System.out.println(conf.get("dvbstream") + " " + ! // confParser.getChannel(channelNo).videoPID() + ! // " " + confParser.getChannel(channelNo).audioPID()); ! dvbStream = rt.exec(conf.get("dvbstream") + " " ! + confParser.getChannel(channelNo).getVideoPID() ! + " " ! + confParser.getChannel(channelNo).getAudioPID()); ! // System.out.println("RemoteDVB.TzapListner>> sleeping ! // ..."); wait(); ! // System.out.println("RemoteDVB.TzapListner>> waking up ! // ..."); } catch (Exception e) { LOG.error("RemoteDVB.TzapListner>> Tzap died: " --- 100,129 ---- try { rt = Runtime.getRuntime(); ! ! List<String> commands = new ArrayList<String>(); ! commands.add(conf.get(Constants.PROPS_TZAP)); ! commands.add("-c"); ! commands.add(confParser.configFilename()); ! commands.add(confParser.getChannel(channelNo).getChannelName()); ! ! LOG.info("Executing: [" + commands + "]"); ! tzap = rt.exec(commands.toArray(new String[commands.size()])); ! ! LOG.debug("Sleeing for [" + timeout + "] ms"); sleep(timeout); ! ! commands.clear(); ! commands.add(conf.get(Constants.PROPS_DVBSTREAM)); ! commands.add(Integer.toString(confParser.getChannel(channelNo).getVideoPID())); ! commands.add(Integer.toString(confParser.getChannel(channelNo).getAudioPID())); ! ! LOG.info("Executing [" + commands + "]"); ! dvbStream = rt.exec(commands.toArray(new String[commands.size()])); ! ! LOG.info("Sleeping now..."); wait(); ! LOG.info("Waking up..."); ! } catch (Exception e) { LOG.error("RemoteDVB.TzapListner>> Tzap died: " |
|
From: pinder <hu...@us...> - 2006-02-26 11:53:36
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17752/src/uk/midearth/dvb Modified Files: Constants.java Channel.java Log Message: spaces in channel names field offsets for channels.conf file to get video and audio pids Index: Channel.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/Channel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Channel.java 19 Feb 2006 16:59:33 -0000 1.2 --- Channel.java 26 Feb 2006 11:53:32 -0000 1.3 *************** *** 43,45 **** --- 43,49 ---- return audioPID; } + + public String getChannelNameEscaped() { + return channelName.replace(" ", "\\ "); + } } Index: Constants.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/Constants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Constants.java 25 Feb 2006 15:19:51 -0000 1.1 --- Constants.java 26 Feb 2006 11:53:32 -0000 1.2 *************** *** 23,25 **** --- 23,29 ---- public static String PROPS_FILENAME = "props.filename"; + + public static String PROPS_AUDIOPID_FIELD = "audiopid.field"; + + public static String PROPS_VIDEOPID_FIELD = "videopid.field"; } |
|
From: pinder <hu...@us...> - 2006-02-26 11:53:36
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17752/src/uk/midearth/dvb/confParser Modified Files: ConfParser.java Log Message: spaces in channel names field offsets for channels.conf file to get video and audio pids Index: ConfParser.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser/ConfParser.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConfParser.java 24 Feb 2006 03:49:26 -0000 1.3 --- ConfParser.java 26 Feb 2006 11:53:32 -0000 1.4 *************** *** 21,25 **** // private int currentChannel = 0; ! public ConfParser(String newConfigFilename) { configFile = new File(newConfigFilename); if (configFile.isFile() && configFile.canRead()) { --- 21,26 ---- // private int currentChannel = 0; ! public ConfParser(String newConfigFilename) throws Exception { ! Configurator config = Configurator.getInstance(); configFile = new File(newConfigFilename); if (configFile.isFile() && configFile.canRead()) { *************** *** 29,32 **** --- 30,35 ---- String str; String[] configParts; + int videoFieldOffset = Integer.parseInt(config.get(Constants.PROPS_VIDEOPID_FIELD)); + int audioFieldOffset = Integer.parseInt(config.get(Constants.PROPS_AUDIOPID_FIELD)); while ((str = in.readLine()) != null) { if (str.length() > 0) { *************** *** 37,43 **** configParts[0], Integer ! .parseInt(configParts[configParts.length - 2]), Integer ! .parseInt(configParts[configParts.length - 1]))); } } --- 40,46 ---- configParts[0], Integer ! .parseInt(configParts[configParts.length - videoFieldOffset]), Integer ! .parseInt(configParts[configParts.length - audioFieldOffset]))); } } *************** *** 46,49 **** --- 49,53 ---- } catch (Exception ioe) { LOG.error("ConfParser>> IOException:: " + ioe.getMessage(),ioe); + throw ioe; } |
|
From: pinder <hu...@us...> - 2006-02-26 11:53:36
|
Update of /cvsroot/jdvb/jdvb-server/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17752/conf Modified Files: tvb.conf Log Message: spaces in channel names field offsets for channels.conf file to get video and audio pids Index: tvb.conf =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/conf/tvb.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tvb.conf 25 Feb 2006 15:19:51 -0000 1.2 --- tvb.conf 26 Feb 2006 11:53:32 -0000 1.3 *************** *** 14,15 **** --- 14,20 ---- # player to use dvbplayer=mplayer -really-quiet -vop pp=0x20000 -panscan 1 rtp://224.0.1.2:5004 + + # video and audio pid field numbers from the back of the channels.conf file. + # Starts with 1. + videopid.field=3 + audiopid.field=2 |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:59
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917 Modified Files: build.xml Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename Index: build.xml =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 19 Feb 2006 22:18:37 -0000 1.4 --- build.xml 25 Feb 2006 15:19:51 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- <property name="conf" location="conf" /> <property name="lib" location="lib" /> + <property name="bin" location="bin" /> <description>JDVB client and server applications</description> *************** *** 66,69 **** --- 67,73 ---- <include name="**/*.jar" /> </fileset> + <fileset dir="${bin}"> + <include name="**/*" /> + </fileset> </copy> </target> |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:59
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/src/uk/midearth/dvb/client Modified Files: ClientGUI.java Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename Index: ClientGUI.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client/ClientGUI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClientGUI.java 19 Feb 2006 22:18:37 -0000 1.3 --- ClientGUI.java 25 Feb 2006 15:19:51 -0000 1.4 *************** *** 5,8 **** --- 5,9 ---- import org.apache.log4j.Logger; + import uk.midearth.dvb.Constants; import uk.midearth.dvb.confParser.Configurator; *************** *** 146,156 **** public static void main(String[] argv) { try { ! if (argv.length != 1) { ! LOG.error("ClientGUI usage:"); ! LOG.error(" java ClientGUI [server config file]"); System.exit(1); } ! Configurator.load(argv[0]); SwingUtilities.invokeLater(new Runnable() { --- 147,164 ---- public static void main(String[] argv) { try { ! // if (argv.length != 1) { ! // LOG.error("ClientGUI usage:"); ! // LOG.error(" java ClientGUI [server config file]"); ! // System.exit(1); ! // } ! ! String propsFilename = System.getProperty(Constants.PROPS_FILENAME); ! ! if (propsFilename == null) { ! LOG.error("Please define a property file using -Dprops.filename=<filename>"); System.exit(1); } ! Configurator.load(propsFilename); SwingUtilities.invokeLater(new Runnable() { *************** *** 160,164 **** }); ! String configFilename = argv[0]; log("Working on " + configFilename); client = new ClientRMI(); --- 168,172 ---- }); ! String configFilename = propsFilename; log("Working on " + configFilename); client = new ClientRMI(); |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:59
|
Update of /cvsroot/jdvb/jdvb-server/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/conf Modified Files: tvb.conf Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename Index: tvb.conf =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/conf/tvb.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tvb.conf 19 Feb 2006 11:34:40 -0000 1.1 --- tvb.conf 25 Feb 2006 15:19:51 -0000 1.2 *************** *** 2,7 **** --- 2,9 ---- #server=your.own.server.com server=www.eample.org + daemon=false # port number, please make sure it's > 1024 port=1253 + channels.file=channels.conf # tzap location, change this to something useful, # run 'which tzap' to get the location. |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:59
|
Update of /cvsroot/jdvb/jdvb-server/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/build Added Files: .cvsignore Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename --- NEW FILE: .cvsignore --- classes dist jars |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:59
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/src/uk/midearth/dvb Added Files: Constants.java Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename --- NEW FILE: Constants.java --- package uk.midearth.dvb; public interface Constants { /** * Serial Version UID */ public static final long serialVersionUID = 1L; public static String PROPS_SERVER = "server"; public static String PROPS_DAEMON = "daemon"; public static String PROPS_PORT = "port"; public static String PROPS_CHANNELS = "channels.file"; public static String PROPS_DVBPLAYER = "dvbplayer"; public static String PROPS_DVBSTREAM = "dvbstream"; public static String PROPS_TZAP = "tzap"; public static String PROPS_FILENAME = "props.filename"; } |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:57
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/src/uk/midearth/dvb/server Modified Files: JDVBServer.java Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename Index: JDVBServer.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/JDVBServer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JDVBServer.java 25 Feb 2006 14:06:58 -0000 1.4 --- JDVBServer.java 25 Feb 2006 15:19:51 -0000 1.5 *************** *** 3,17 **** import org.apache.log4j.Logger; import uk.midearth.dvb.confParser.Configurator; public class JDVBServer { ! /** * Serial Version UID */ private static final long serialVersionUID = 1L; ! public static Logger LOG = Logger.getLogger(JDVBServer.class); - public JDVBServer() { --- 3,18 ---- import org.apache.log4j.Logger; + import uk.midearth.dvb.Constants; import uk.midearth.dvb.confParser.Configurator; + import uk.midearth.dvb.exception.JDVBException; public class JDVBServer { ! /** * Serial Version UID */ private static final long serialVersionUID = 1L; ! public static Logger LOG = Logger.getLogger(JDVBServer.class); public JDVBServer() { *************** *** 19,40 **** public static void main(String[] argv) { ! if ((argv.length != 2) && (argv.length != 3)) { ! LOG.error("JDVBServer usage:"); ! LOG.error(" java JDVBServer <channels config file> <server config file> [daemon]"); ! LOG.error("Quitting for now"); ! System.exit(1); ! } ! String configFilename = argv[0]; ! String serverFilename = argv[1]; ! Configurator.load(serverFilename); ! LOG.info("DVBServer>> Working on " + configFilename + " and " ! + serverFilename); ! //File newFile = new File(configFilename); ! if (argv.length == 3) { ! new RMI(configFilename, serverFilename, argv[2] ! .equalsIgnoreCase("daemon")); ! } else { ! new RMI(configFilename, serverFilename, false); } } --- 20,63 ---- public static void main(String[] argv) { ! // if ((argv.length != 2) && (argv.length != 3)) { ! // LOG.error("JDVBServer usage:"); ! // LOG.error(" java JDVBServer <channels config file> <server config ! // file> [daemon]"); ! // LOG.error("Quitting for now"); ! // System.exit(1); ! // } ! try { ! // the new method of getting properties is through a props.filename ! // system variable ! String propsFilename = System.getProperty("props.filename"); ! if (propsFilename == null) { ! LOG.error("Please define a property file using -Dprops.filename=<filename>"); ! System.exit(1); ! } ! ! // load the props filename ! Configurator.load(propsFilename); ! ! String configFilename = Configurator.getInstance().get( ! Constants.PROPS_CHANNELS); ! if (configFilename == null) { ! throw new JDVBException("Channels file not defined"); ! } ! String serverFilename = propsFilename; ! ! LOG.info("DVBServer>> Working on " + configFilename + " and " ! + serverFilename); ! // File newFile = new File(configFilename); ! ! if (argv.length == 3) { ! new RMI(configFilename, serverFilename, argv[2] ! .equalsIgnoreCase("daemon")); ! } else { ! new RMI(configFilename, serverFilename, false); ! } ! ! } catch (Throwable e) { ! LOG.error("General exception caught: " + e.getMessage(), e); } } |
|
From: pinder <hu...@us...> - 2006-02-25 15:19:57
|
Update of /cvsroot/jdvb/jdvb-server/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3917/bin Added Files: start_server.sh start_client.sh Log Message: added start/stop scripts no more commands line params. all use -Dprops.filename --- NEW FILE: start_client.sh --- #!/bin/bash java -Dprops.filename=tvb.conf -jar JDVBClient.jar --- NEW FILE: start_server.sh --- #!/bin/bash echo "Starting server" java -Dprops.filename=tvb.conf -jar JDVBServer.jar |
|
From: pinder <hu...@us...> - 2006-02-25 14:10:16
|
Update of /cvsroot/jdvb/jdvb-server/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6339/bin Log Message: Directory /cvsroot/jdvb/jdvb-server/bin added to the repository |
|
From: pinder <hu...@us...> - 2006-02-25 14:07:14
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4780/src/uk/midearth/dvb/server Modified Files: JDVBServer.java RemoteDVB.java Log Message: some bug fixes Index: JDVBServer.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/JDVBServer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JDVBServer.java 24 Feb 2006 03:49:26 -0000 1.3 --- JDVBServer.java 25 Feb 2006 14:06:58 -0000 1.4 *************** *** 3,6 **** --- 3,8 ---- import org.apache.log4j.Logger; + import uk.midearth.dvb.confParser.Configurator; + public class JDVBServer { *************** *** 25,28 **** --- 27,31 ---- String configFilename = argv[0]; String serverFilename = argv[1]; + Configurator.load(serverFilename); LOG.info("DVBServer>> Working on " + configFilename + " and " + serverFilename); Index: RemoteDVB.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RemoteDVB.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RemoteDVB.java 24 Feb 2006 03:49:26 -0000 1.3 --- RemoteDVB.java 25 Feb 2006 14:06:58 -0000 1.4 *************** *** 1,12 **** package uk.midearth.dvb.server; ! import java.rmi.*; ! import java.rmi.server.*; import org.apache.log4j.Logger; ! import uk.midearth.dvb.confParser.*; import uk.midearth.dvb.exception.JDVBException; public class RemoteDVB extends UnicastRemoteObject implements RemoteDVBInterface { --- 1,14 ---- package uk.midearth.dvb.server; ! import java.rmi.RemoteException; ! import java.rmi.server.UnicastRemoteObject; import org.apache.log4j.Logger; ! import uk.midearth.dvb.confParser.ConfParser; ! import uk.midearth.dvb.confParser.Configurator; import uk.midearth.dvb.exception.JDVBException; + public class RemoteDVB extends UnicastRemoteObject implements RemoteDVBInterface { |
|
From: pinder <hu...@us...> - 2006-02-24 03:49:36
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/src/uk/midearth/dvb/server Modified Files: JDVBServer.java RemoteDVB.java RMI.java Log Message: close use of System.out.println Index: JDVBServer.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/JDVBServer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JDVBServer.java 19 Feb 2006 16:59:32 -0000 1.2 --- JDVBServer.java 24 Feb 2006 03:49:26 -0000 1.3 *************** *** 18,29 **** public static void main(String[] argv) { if ((argv.length != 2) && (argv.length != 3)) { ! System.out.println("JDVBServer usage:"); ! System.out ! .println(" java JDVBServer <channels config file> <server config file> [daemon]"); System.exit(1); } String configFilename = argv[0]; String serverFilename = argv[1]; ! System.out.println("DVBServer>> Working on " + configFilename + " and " + serverFilename); //File newFile = new File(configFilename); --- 18,29 ---- public static void main(String[] argv) { if ((argv.length != 2) && (argv.length != 3)) { ! LOG.error("JDVBServer usage:"); ! LOG.error(" java JDVBServer <channels config file> <server config file> [daemon]"); ! LOG.error("Quitting for now"); System.exit(1); } String configFilename = argv[0]; String serverFilename = argv[1]; ! LOG.info("DVBServer>> Working on " + configFilename + " and " + serverFilename); //File newFile = new File(configFilename); Index: RMI.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RMI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RMI.java 19 Feb 2006 16:59:32 -0000 1.2 --- RMI.java 24 Feb 2006 03:49:26 -0000 1.3 *************** *** 24,28 **** public RMI(String configFilename, String serverFilename, boolean daemon) { try { ! conf = new Configurator(serverFilename); java.rmi.registry.LocateRegistry.createRegistry(Integer --- 24,28 ---- public RMI(String configFilename, String serverFilename, boolean daemon) { try { ! conf = Configurator.getInstance(); java.rmi.registry.LocateRegistry.createRegistry(Integer *************** *** 39,43 **** virtualConsole(); } catch (Exception e) { ! System.err.println("RMI>> Server failed: " + e); } } --- 39,43 ---- virtualConsole(); } catch (Exception e) { ! LOG.error("RMI>> Server failed: " + e.getMessage(), e); } } *************** *** 53,59 **** processCommand(command); } catch (IOException e) { ! System.err ! .println("RMI>> Error in handling input for console: " ! + e); } } --- 53,58 ---- processCommand(command); } catch (IOException e) { ! LOG.error("RMI>> Error in handling input for console: " ! + e.getMessage(), e); } } *************** *** 65,70 **** remoteDVB.stopNow(); } catch (RemoteException e) { ! System.out.println("RMI>> Failed to clean up server: " + e); ! e.printStackTrace(); } System.out.println("RMI>> Quitting... have a nice day"); --- 64,68 ---- remoteDVB.stopNow(); } catch (RemoteException e) { ! LOG.error("RMI>> Failed to clean up server: " + e.getMessage(), e); } System.out.println("RMI>> Quitting... have a nice day"); *************** *** 76,82 **** remoteDVB.stdOut(); } catch (RemoteException e) { ! System.out.println("RMI>> Failed to show stdout and stderr : " ! + e); ! e.printStackTrace(); } } --- 74,79 ---- remoteDVB.stdOut(); } catch (RemoteException e) { ! LOG.error("RMI>> Failed to show stdout and stderr : " ! + e.getMessage(), e); } } Index: RemoteDVB.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RemoteDVB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RemoteDVB.java 19 Feb 2006 16:59:32 -0000 1.2 --- RemoteDVB.java 24 Feb 2006 03:49:26 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- import uk.midearth.dvb.confParser.*; + import uk.midearth.dvb.exception.JDVBException; public class RemoteDVB extends UnicastRemoteObject implements *************** *** 29,36 **** public RemoteDVB(String newConfigFilename, String newConfFilename) ! throws RemoteException { ! System.out.println("RemoteDVB>> Creating remote RemoteDVB object"); confParser = new ConfParser(newConfigFilename); ! conf = new Configurator(newConfFilename); tzapThread.start(); } --- 30,37 ---- public RemoteDVB(String newConfigFilename, String newConfFilename) ! throws RemoteException, JDVBException { ! LOG.info("RemoteDVB>> Creating remote RemoteDVB object"); confParser = new ConfParser(newConfigFilename); ! conf = Configurator.getInstance(); tzapThread.start(); } *************** *** 126,131 **** // ..."); } catch (Exception e) { ! System.out.println("RemoteDVB.TzapListner>> Tzap died: " ! + e); e.printStackTrace(); } --- 127,132 ---- // ..."); } catch (Exception e) { ! LOG.error("RemoteDVB.TzapListner>> Tzap died: " ! + e.getMessage(), e); e.printStackTrace(); } *************** *** 160,167 **** } } catch (Exception e) { ! System.out ! .println("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e); ! e.printStackTrace(); } try { --- 161,166 ---- } } catch (Exception e) { ! LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e.getMessage(), e); } try { *************** *** 172,179 **** } } catch (Exception e) { ! System.out ! .println("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e); ! e.printStackTrace(); } } --- 171,176 ---- } } catch (Exception e) { ! LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e.getMessage(), e); } } *************** *** 187,194 **** } } catch (Exception e) { ! System.out ! .println("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e); ! e.printStackTrace(); } try { --- 184,189 ---- } } catch (Exception e) { ! LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e.getMessage(), e); } try { *************** *** 199,206 **** } } catch (Exception e) { ! System.out ! .println("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e); ! e.printStackTrace(); } } --- 194,199 ---- } } catch (Exception e) { ! LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: " ! + e.getMessage(), e); } } |
|
From: pinder <hu...@us...> - 2006-02-24 03:49:36
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/src/uk/midearth/dvb/confParser Modified Files: Configurator.java ConfParser.java Log Message: close use of System.out.println Index: ConfParser.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser/ConfParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConfParser.java 19 Feb 2006 16:59:31 -0000 1.2 --- ConfParser.java 24 Feb 2006 03:49:26 -0000 1.3 *************** *** 45,56 **** in.close(); } catch (Exception ioe) { ! System.out.println("ConfParser>> IOException:: " + ioe); ! ioe.printStackTrace(); } } else { ! System.out.println("ConfParser>> File " + configFile.getAbsolutePath() ! + " does not exist or can not be read."); System.exit(1); } --- 45,55 ---- in.close(); } catch (Exception ioe) { ! LOG.error("ConfParser>> IOException:: " + ioe.getMessage(),ioe); } } else { ! LOG.error("ConfParser>> File " + configFile.getAbsolutePath() ! + " does not exist or can not be read. Quitting"); System.exit(1); } Index: Configurator.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser/Configurator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Configurator.java 19 Feb 2006 22:18:37 -0000 1.3 --- Configurator.java 24 Feb 2006 03:49:26 -0000 1.4 *************** *** 54,65 **** in.close(); } catch (Exception ioe) { ! System.out.println("Configurator>> IOException:: " + ioe); ! ioe.printStackTrace(); } } else { ! System.out.println("Configurator>> File " + configFile.getAbsolutePath() ! + " does not exist or can not be read."); System.exit(1); } --- 54,64 ---- in.close(); } catch (Exception ioe) { ! LOG.error("Configurator>> IOException:: " + ioe.getMessage(), ioe); } } else { ! LOG.error("Configurator>> File " + configFile.getAbsolutePath() ! + " does not exist or can not be read. Quitting now"); System.exit(1); } |
|
From: pinder <hu...@us...> - 2006-02-24 03:49:36
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/src/uk/midearth/dvb/client Modified Files: ClientRMI.java Log Message: close use of System.out.println Index: ClientRMI.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client/ClientRMI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClientRMI.java 19 Feb 2006 22:18:37 -0000 1.3 --- ClientRMI.java 24 Feb 2006 03:49:25 -0000 1.4 *************** *** 3,6 **** --- 3,7 ---- import uk.midearth.dvb.confParser.*; import uk.midearth.dvb.server.*; + import java.rmi.*; import java.net.*; *************** *** 58,65 **** return remoteDVB.currentChannel(); } catch (RemoteException e) { ! System.out ! .println("ClientRMI>> Failed to get current running channel: " ! + e); ! e.printStackTrace(); return new String(""); } --- 59,64 ---- return remoteDVB.currentChannel(); } catch (RemoteException e) { ! LOG.error("ClientRMI>> Failed to get current running channel: " ! + e.getMessage(), e); return new String(""); } *************** *** 172,179 **** } catch (Exception e) { ! System.out ! .println("ClientRMI.Player >> Failed to start dvbplayer: " ! + e); ! e.printStackTrace(); } } --- 171,176 ---- } catch (Exception e) { ! LOG.error("ClientRMI.Player >> Failed to start dvbplayer: " ! + e.getMessage(), e); } } *************** *** 199,205 **** } } catch (Exception e) { ! System.out.println("ClientRMI.Player>> Failed to show stderr: " ! + e); ! e.printStackTrace(); } } --- 196,201 ---- } } catch (Exception e) { ! LOG.error("ClientRMI.Player>> Failed to show stderr: " ! + e.getMessage(),e); } } *************** *** 213,219 **** } } catch (Exception e) { ! System.out.println("ClientRMI.Player>> Failed to show stdout: " ! + e); ! e.printStackTrace(); } } --- 209,214 ---- } } catch (Exception e) { ! LOG.error("ClientRMI.Player>> Failed to show stdout: " ! + e.getMessage(), e); } } *************** *** 231,238 **** } } catch (Exception e) { ! System.out ! .println("ClientRMI.Player>> Failed to show stdout: " ! + e); ! e.printStackTrace(); } } --- 226,231 ---- } } catch (Exception e) { ! LOG.error("ClientRMI.Player>> Failed to show stdout: " ! + e.getMessage(), e); } } |
|
From: pinder <hu...@us...> - 2006-02-19 22:18:44
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9820/src/uk/midearth/dvb/confParser Modified Files: Configurator.java Log Message: good night Index: Configurator.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/confParser/Configurator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Configurator.java 19 Feb 2006 16:59:31 -0000 1.2 --- Configurator.java 19 Feb 2006 22:18:37 -0000 1.3 *************** *** 6,9 **** --- 6,12 ---- import org.apache.log4j.Logger; + import uk.midearth.dvb.exception.JDVBException; + + public class Configurator { private Hashtable<String, String> variables = new Hashtable<String, String>(); *************** *** 11,14 **** --- 14,21 ---- private File configFile; + private static Properties props = new Properties(); + + private static Configurator configurator; + /** * Serial Version UID *************** *** 17,22 **** public static Logger LOG = Logger.getLogger(Configurator.class); ! public Configurator(String newConfigFilename) { configFile = new File(newConfigFilename); if (configFile.isFile() && configFile.canRead()) { --- 24,32 ---- public static Logger LOG = Logger.getLogger(Configurator.class); + + protected Configurator() { + } ! protected Configurator(String newConfigFilename) { configFile = new File(newConfigFilename); if (configFile.isFile() && configFile.canRead()) { *************** *** 55,61 **** } } public String get(String newConfig) { ! return new String((String) variables.get(newConfig)); } } --- 65,107 ---- } } + + public static Configurator getInstance() throws JDVBException { + if (configurator == null) { + throw new JDVBException("Configurator is not initialised yet. Please call load() first"); + } + return configurator; + } + + private static void cleanUp() { + props.clear(); + } + + public static void load(String filename) { + if (configurator != null) { + cleanUp(); + } + try { + load(new FileInputStream(filename)); + } catch (FileNotFoundException e) { + LOG.warn("File not found: [" + filename + "]. Ignoring load.", e); + cleanUp(); + } + } + + public static void load(InputStream inputStream) { + if (configurator != null) { + cleanUp(); + } + configurator = new Configurator(); + try { + props.load(inputStream); + } catch (IOException e) { + LOG.warn("General IO exception. Ignoring load.", e); + cleanUp(); + } + } public String get(String newConfig) { ! return props.getProperty(newConfig); } } |
|
From: pinder <hu...@us...> - 2006-02-19 22:18:43
|
Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9820/src/uk/midearth/dvb/client Modified Files: ClientRMI.java ClientGUI.java Log Message: good night Index: ClientGUI.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client/ClientGUI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClientGUI.java 19 Feb 2006 16:59:30 -0000 1.2 --- ClientGUI.java 19 Feb 2006 22:18:37 -0000 1.3 *************** *** 5,8 **** --- 5,10 ---- import org.apache.log4j.Logger; + import uk.midearth.dvb.confParser.Configurator; + import java.awt.*; import java.awt.event.*; *************** *** 22,31 **** private static JButton playerButton = new JButton("Start Player Anyway"); ! /** * Serial Version UID */ private static final long serialVersionUID = 1L; ! public static Logger LOG = Logger.getLogger(ClientGUI.class); --- 24,34 ---- private static JButton playerButton = new JButton("Start Player Anyway"); ! ! /** * Serial Version UID */ private static final long serialVersionUID = 1L; ! public static Logger LOG = Logger.getLogger(ClientGUI.class); *************** *** 142,166 **** public static void main(String[] argv) { ! if (argv.length != 1) { ! System.out.println("ClientGUI usage:"); ! System.out.println(" java ClientGUI [server config file]"); ! System.exit(1); ! } ! ! SwingUtilities.invokeLater(new Runnable() { ! public void run() { ! createGUI(); } - }); ! String configFilename = argv[0]; ! log("Working on " + configFilename); ! client = new ClientRMI(configFilename); ! getChannels(); ! statusField.setText("Server playing: " + client.currentServerChannel()); ! chanList.setSelectedValue(client.currentServerChannel(), true); ! playerButton.setEnabled(true); } } --- 145,176 ---- public static void main(String[] argv) { ! try { ! if (argv.length != 1) { ! LOG.error("ClientGUI usage:"); ! LOG.error(" java ClientGUI [server config file]"); ! System.exit(1); } ! Configurator.load(argv[0]); ! ! SwingUtilities.invokeLater(new Runnable() { ! public void run() { ! createGUI(); ! } ! }); ! String configFilename = argv[0]; ! log("Working on " + configFilename); ! client = new ClientRMI(); ! getChannels(); ! ! statusField.setText("Server playing: " ! + client.currentServerChannel()); ! chanList.setSelectedValue(client.currentServerChannel(), true); ! playerButton.setEnabled(true); ! } catch (Throwable t) { ! LOG.error("Caught OVERALL exception: ", t); ! } } } Index: ClientRMI.java =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/client/ClientRMI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClientRMI.java 19 Feb 2006 16:59:30 -0000 1.2 --- ClientRMI.java 19 Feb 2006 22:18:37 -0000 1.3 *************** *** 26,32 **** // private ClientGUI console; ! public ClientRMI(String configFilename) { try { ! conf = new Configurator(configFilename); remoteDVB = (RemoteDVBInterface) Naming.lookup("//" + conf.get("server") + ":" + conf.get("port") --- 26,32 ---- // private ClientGUI console; ! public ClientRMI() throws Exception { try { ! conf = Configurator.getInstance(); remoteDVB = (RemoteDVBInterface) Naming.lookup("//" + conf.get("server") + ":" + conf.get("port") *************** *** 35,49 **** } catch (NotBoundException e) { ! System.out.println("ClientRMI>> Failed to bind to remote object: " ! + e); ! e.printStackTrace(); } catch (MalformedURLException e) { ! System.out.println("ClientRMI>> Malformed URL in server: " + e); ! e.printStackTrace(); } catch (RemoteException e) { ! System.out.println("ClientRMI>> Remote Exception: " + e); ! e.printStackTrace(); } catch (Exception e) { ! e.printStackTrace(); } --- 35,50 ---- } catch (NotBoundException e) { ! LOG.error("ClientRMI>> Failed to bind to remote object: " ! + e.getMessage(), e); ! throw e; } catch (MalformedURLException e) { ! LOG.error("ClientRMI>> Malformed URL in server: " + e.getMessage(), e); ! throw e; } catch (RemoteException e) { ! LOG.error("ClientRMI>> Remote Exception: " + e.getMessage(), e); ! throw e; } catch (Exception e) { ! LOG.error("General exception: ", e); ! throw e; } |
|
From: pinder <hu...@us...> - 2006-02-19 22:18:43
|
Update of /cvsroot/jdvb/jdvb-server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9820 Modified Files: build.xml Log Message: good night Index: build.xml =================================================================== RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 19 Feb 2006 17:07:29 -0000 1.3 --- build.xml 19 Feb 2006 22:18:37 -0000 1.4 *************** *** 10,15 **** --- 10,23 ---- <property name="conf" location="conf" /> <property name="lib" location="lib" /> + <description>JDVB client and server applications</description> + + <path id="compile.libs"> + <fileset dir="${lib}"> + <include name="*.jar"/> + </fileset> + </path> + <target name="init"> <tstamp /> *************** *** 21,29 **** <target name="build" depends="clean,init"> - <path id="compile.libs"> - <fileset dir="${lib}"> - <include name="*.jar"/> - </fileset> - </path> <javac srcdir="${src}" destdir="${build.classes}"> --- 29,32 ---- *************** *** 33,44 **** <target name="dist" depends="build"> ! <copy todir="${dist}"> ! <fileset dir="${conf}"> ! <include name="**/*.conf" /> ! </fileset> ! <fileset dir="${lib}"> ! <include name="**/*.jar" /> ! </fileset> ! </copy> <jar jarfile="${jars}/JDVBServer.jar"> <fileset dir="${build.classes}"> --- 36,43 ---- <target name="dist" depends="build"> ! <pathconvert property="jar.classpath" pathsep=" "> ! <path refid="compile.libs"></path> ! <map from="${lib}/" to=""/> ! </pathconvert> <jar jarfile="${jars}/JDVBServer.jar"> <fileset dir="${build.classes}"> *************** *** 47,50 **** --- 46,50 ---- <manifest> <attribute name="Main-Class" value="uk.midearth.dvb.server.JDVBServer" /> + <attribute name="Class-Path" value=". ${jar.classpath}"/> </manifest> </jar> *************** *** 55,60 **** --- 55,70 ---- <manifest> <attribute name="Main-Class" value="uk.midearth.dvb.client.ClientGUI" /> + <attribute name="Class-Path" value=". ${jar.classpath}"/> </manifest> </jar> + <copy todir="${jars}"> + <fileset dir="${conf}"> + <include name="**/*.conf" /> + <include name="**/*.xml" /> + </fileset> + <fileset dir="${lib}"> + <include name="**/*.jar" /> + </fileset> + </copy> </target> |
