ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java (file contents):
Revision 1.3 by tdb, Tue Nov 21 23:14:00 2000 UTC vs.
Revision 1.12 by ajm, Wed Nov 29 21:27:39 2000 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 + package uk.ac.ukc.iscream.filter;
3  
4   //---IMPORTS---
5   import uk.ac.ukc.iscream.core.*;
# Line 62 | Line 63 | class FilterMain {
63              objRef = ncRef.resolve(ncRef.to_name("iscream.Logger"));
64              Logger logger = LoggerHelper.narrow(objRef);
65              
65 –            //objRef = ncRef.resolve(ncRef.to_name("iscream.FilterManager"));
66 –            //FilterManager filterManager = FilterManagerHelper.narrow(objRef);
67 –            
66              logger.write(toString, Logger.SYSINIT, "coming up");
67              
68              
# Line 75 | Line 73 | class FilterMain {
73              Configuration myConfig = configManager.getConfiguration(ourName);
74              
75              // read some config here
76 <            int port = 0;
76 >            int UDPport = 0;
77 >            int TCPport = 0;
78 >            String parentFilterName = null;
79    
80              // did we?
81              if (myConfig == null) {
# Line 86 | Line 86 | class FilterMain {
86                  // get the property
87                  try {
88                      //QUERY HERE.... ???
89 <                    port = new Integer(myConfig.getProperty("Filter.listenPort")).intValue();
89 >                    UDPport = new Integer(myConfig.getProperty("Filter.UDPlistenPort")).intValue();
90 >                    TCPport = new Integer(myConfig.getProperty("Filter.TCPlistenPort")).intValue();
91 >                    parentFilterName = myConfig.getProperty("Filter.parentFilter");
92                  } catch (org.omg.CORBA.MARSHAL e) {
93                      System.out.println("Caught org.omg.CORBA.MARSHAL, must be a null we got back");
94                      //System.exit(1);
# Line 97 | Line 99 | class FilterMain {
99              
100              // **** END COMMENT
101              
102 +            // **** INITIAL FILTER MANAGER COMMUNICATIONS HERE
103 +            
104 +            // get a root (CHANGE to use FilterManager)
105 +            objRef = ncRef.resolve(ncRef.to_name("iscream.Filter." + parentFilterName));
106 +            Filter parentFilter = FilterHelper.narrow(objRef);
107 +
108              // SETUP our Servant
109              
110              // create the FilterServant
111 <            FilterServant filterServant = new FilterServant(logger, ourName);
112 <            
111 >            logger.write(toString, Logger.DEBUG, "firing servant with parent - " + parentFilterName);
112 >            FilterServant filterServant = new FilterServant(logger, parentFilter, ourName, new Integer(TCPport).toString() , new Integer(UDPport).toString());
113 >
114 >            // register ourselves
115 >
116              // and advertise it to the naming context
117              objRef = poa.servant_to_reference(filterServant);
118              ncRef.bind(ncRef.to_name("iscream.Filter."+ourName), objRef);
119 +
120 +            // **** END COMMENT
121              
122              // END SETUP
123              
124 +
125              /**************************************************************
126                Here would be an ideal place to start another thread to do
127                the listening part of the Filter. Ideally it should just be
# Line 127 | Line 141 | class FilterMain {
141                        - our "identifier" name
142              
143              **************************************************************/
144 <            
144 >                                    
145              logger.write(toString, Logger.SYSINIT, "starting Filter UDP listener");
146 <            //UDPReader udpReader = new UDPReader(port, logger);
147 <            //udpReader.start();
146 >            UDPReader udpReader = new UDPReader(UDPport, parentFilter, logger);
147 >            udpReader.start();
148              logger.write(toString, Logger.SYSINIT, "Filter UDP listener started");
149 <            
150 <            // **** INITIAL FILTER MANAGER COMMUNICATIONS HERE
151 <            
152 <            // get a root (CHANGE to use FilterManager)
153 <            objRef = ncRef.resolve(ncRef.to_name("iscream.Filter.root1"));
154 <            Filter root = FilterHelper.narrow(objRef);
141 <            
142 <            // register ourselves
143 <            
144 <            // **** END COMMENT
145 <            
149 >
150 >            logger.write(toString, Logger.SYSINIT, "starting Filter TCP listener");
151 >            TCPReader tcpReader = new TCPReader(logger, configManager, TCPport, parentFilter);
152 >            tcpReader.start();
153 >            logger.write(toString, Logger.SYSINIT, "Filter TCP listener started");
154 >
155              // TEST
156 <            root.receiveXML("This is just a debugging test, we ("+ourName+") are live on port: "+port);
156 >            //parentFilter.receiveXML("<?xml version=\"1.0\" encoding=\"ISO8859-1\"?><packet><test>This is just a debugging test, we ("+ourName+") are live on UDPport: "+UDPport+"</test></packet>");
157              
158              // start the POA off
159              poa.the_POAManager().activate();
# Line 168 | Line 177 | class FilterMain {
177       * properly.
178       */
179      public static void usage() {
180 <        System.out.println("USAGE: java Filter <name>");
180 >        System.out.println("USAGE: java FilterMain <name>");
181          System.out.println("WHERE <name>:");
182          System.out.println("      The unique identifier for the Filter in the system.");
183          System.exit(1);
# Line 186 | Line 195 | class FilterMain {
195  
196   //---STATIC ATTRIBUTES---
197  
198 < }            
198 > }            

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines