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.5 by tdb, Wed Nov 22 09:36:38 2000 UTC vs.
Revision 1.6 by tdb, Thu Nov 23 01:44:05 2000 UTC

# Line 62 | Line 62 | class FilterMain {
62              objRef = ncRef.resolve(ncRef.to_name("iscream.Logger"));
63              Logger logger = LoggerHelper.narrow(objRef);
64              
65 –            objRef = ncRef.resolve(ncRef.to_name("iscream.FilterManager"));
66 –            FilterManager filterManager = FilterManagerHelper.narrow(objRef);
67 –            
65              logger.write(toString, Logger.SYSINIT, "coming up");
66              
67              
# Line 76 | Line 73 | class FilterMain {
73              
74              // read some config here
75              int port = 0;
76 +            String parentFilterName = null;
77    
78              // did we?
79              if (myConfig == null) {
# Line 87 | Line 85 | class FilterMain {
85                  try {
86                      //QUERY HERE.... ???
87                      port = new Integer(myConfig.getProperty("Filter.listenPort")).intValue();
88 +                    parentFilterName = myConfig.getProperty("Filter.parentFilter");
89                  } catch (org.omg.CORBA.MARSHAL e) {
90                      System.out.println("Caught org.omg.CORBA.MARSHAL, must be a null we got back");
91                      //System.exit(1);
# Line 100 | Line 99 | class FilterMain {
99              // **** INITIAL FILTER MANAGER COMMUNICATIONS HERE
100              
101              // get a root (CHANGE to use FilterManager)
102 <            objRef = ncRef.resolve(ncRef.to_name("iscream.Filter.root1"));
103 <            Filter root = FilterHelper.narrow(objRef);
105 <            
106 <            // register ourselves
107 <            
108 <            // **** END COMMENT
102 >            objRef = ncRef.resolve(ncRef.to_name("iscream.Filter." + parentFilterName));
103 >            Filter parentFilter = FilterHelper.narrow(objRef);
104  
105              // SETUP our Servant
106              
107              // create the FilterServant
108 <            FilterServant filterServant = new FilterServant(logger, root, ourName);
109 <            
108 >            FilterServant filterServant = new FilterServant(logger, parentFilter, ourName, new Integer(port).toString() , new Integer(port).toString());
109 >
110 >            // register ourselves
111 >
112              // and advertise it to the naming context
113              objRef = poa.servant_to_reference(filterServant);
114              ncRef.bind(ncRef.to_name("iscream.Filter."+ourName), objRef);
115 +
116 +            // **** END COMMENT
117              
118              // END SETUP
119              
# Line 140 | Line 139 | class FilterMain {
139              **************************************************************/
140                                      
141              logger.write(toString, Logger.SYSINIT, "starting Filter UDP listener");
142 <            UDPReader udpReader = new UDPReader(port, root, logger);
142 >            UDPReader udpReader = new UDPReader(port, parentFilter, logger);
143              udpReader.start();
144              logger.write(toString, Logger.SYSINIT, "Filter UDP listener started");
145  
146              // TEST
147 <            root.receiveXML("<?xml version=\"1.0\" encoding=\"ISO8859-1\"?><packet><test>This is just a debugging test, we ("+ourName+") are live on port: "+port+"</test></packet>");
147 >            parentFilter.receiveXML("<?xml version=\"1.0\" encoding=\"ISO8859-1\"?><packet><test>This is just a debugging test, we ("+ourName+") are live on port: "+port+"</test></packet>");
148              
149              // start the POA off
150              poa.the_POAManager().activate();

Diff Legend

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