Updated according to api changes to the Application Context in the core container. Related to SESPRINGPYTHONPY-74.

Russ Miles · Russ Miles · commit 78f28cbf8b2f · 2008-09-26T11:05:46.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@166 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/docs/reference/src/components.xml b/docs/reference/src/components.xml
@@ -65,7 +65,7 @@
 
 <programlisting><![CDATA[
 appContext = XmlApplicationContext("myAppContext.xml")
-movieLister = appContext.getComponent("MovieLister")
+movieLister = appContext.get_component("MovieLister")
 ]]></programlisting>
 
 			<para>By injecting components into other components, the program looking up this movieLister
diff --git a/docs/reference/src/remoting.xml b/docs/reference/src/remoting.xml
@@ -72,7 +72,7 @@ print service.getData("Hello")
 				
 <programlisting><![CDATA[
 appContext = XmlApplicationContext("applicationContext.xml")
-service = appContext.getComponent("service")
+service = appContext.get_component("service")
 print service.getData("Hello")
 
 "You got remote data => Hello"
diff --git a/docs/reference/src/samples.xml b/docs/reference/src/samples.xml
@@ -527,7 +527,7 @@ if __name__ == "__main__":
         # the channel and the bot that supports it.
         applicationContext = CoilyWebClient()
 
-        cherrypy.root = applicationContext.getComponent(componentId = "root")
+        cherrypy.root = applicationContext.get_component(componentId = "root")
         cherrypy.server = MiddlewareServer()
 
         # Configure cherrypy programmatically.
@@ -540,7 +540,7 @@ if __name__ == "__main__":
                                 "/scripts": {"static_filter.on": True, "static_filter.dir": "js"}
                             })
 
-        middleware = applicationContext.getComponent(componentId = "filterChainProxy")
+        middleware = applicationContext.get_component(componentId = "filterChainProxy")
         middleware.application = wsgiApp
 
         # Start the CherryPy server.
diff --git a/samples/petclinic/cherrypy/petclinic-client-xml.py b/samples/petclinic/cherrypy/petclinic-client-xml.py
@@ -60,8 +60,8 @@ def make_security_filter(manager):
         cherrypy.tools.securityFilter = cherrypy.Tool('before_handler', filter_chainer, priority=75)
         return securityFilter
     
-    manager = applicationContext.getComponent("authenticationManager")
-    accessDecisionManager = applicationContext.getComponent("accessDecisionManager")
+    manager = applicationContext.get_component("authenticationManager")
+    accessDecisionManager = applicationContext.get_component("accessDecisionManager")
     objectDefinitionSource = [
                              ("/vets.*", ["VET_ANY"]),
                              ("/editOwner.*", ["VET_ANY", "OWNER"]),
@@ -98,8 +98,8 @@ def make_security_filter(manager):
                     }
     }
 
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "root"), '/', config=conf)
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "loginForm"), '/login', config=login_conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "root"), '/', config=conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "loginForm"), '/login', config=login_conf)
 
     cherrypy.engine.start()
     cherrypy.engine.block()
diff --git a/samples/petclinic/cherrypy/petclinic-client.py b/samples/petclinic/cherrypy/petclinic-client.py
@@ -60,8 +60,8 @@ def make_security_filter(manager):
         cherrypy.tools.securityFilter = cherrypy.Tool('before_handler', filter_chainer, priority=75)
         return securityFilter
     
-    manager = applicationContext.getComponent("authenticationManager")
-    accessDecisionManager = applicationContext.getComponent("accessDecisionManager")
+    manager = applicationContext.get_component("authenticationManager")
+    accessDecisionManager = applicationContext.get_component("accessDecisionManager")
     objectDefinitionSource = [
                              ("/vets.*", ["VET_ANY"]),
                              ("/editOwner.*", ["VET_ANY", "OWNER"]),
@@ -98,8 +98,8 @@ def make_security_filter(manager):
                     }
     }
 
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "root"), '/', config=conf)
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "loginForm"), '/login', config=login_conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "root"), '/', config=conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "loginForm"), '/login', config=login_conf)
 
     cherrypy.engine.start()
     cherrypy.engine.block()
diff --git a/samples/petclinic/cherrypy/petclinic-xml.py b/samples/petclinic/cherrypy/petclinic-xml.py
@@ -62,8 +62,8 @@ def make_security_filter(manager):
         cherrypy.tools.securityFilter = cherrypy.Tool('before_handler', filter_chainer, priority=75)
         return securityFilter
     
-    manager = applicationContext.getComponent("authenticationManager")
-    accessDecisionManager = applicationContext.getComponent("accessDecisionManager")
+    manager = applicationContext.get_component("authenticationManager")
+    accessDecisionManager = applicationContext.get_component("accessDecisionManager")
     objectDefinitionSource = [
                              ("/vets.*", ["VET_ANY"]),
                              ("/editOwner.*", ["VET_ANY", "OWNER"]),
@@ -100,8 +100,8 @@ def make_security_filter(manager):
                     }
     }
 
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "root"), '/', config=conf)
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "loginForm"), '/login', config=login_conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "root"), '/', config=conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "loginForm"), '/login', config=login_conf)
 
     cherrypy.engine.start()
     cherrypy.engine.block()
diff --git a/samples/petclinic/cherrypy/petclinic.py b/samples/petclinic/cherrypy/petclinic.py
@@ -62,8 +62,8 @@ def make_security_filter(manager):
         cherrypy.tools.securityFilter = cherrypy.Tool('before_handler', filter_chainer, priority=75)
         return securityFilter
     
-    manager = applicationContext.getComponent("authenticationManager")
-    accessDecisionManager = applicationContext.getComponent("accessDecisionManager")
+    manager = applicationContext.get_component("authenticationManager")
+    accessDecisionManager = applicationContext.get_component("accessDecisionManager")
     objectDefinitionSource = [
                              ("/vets.*", ["VET_ANY"]),
                              ("/editOwner.*", ["VET_ANY", "OWNER"]),
@@ -100,8 +100,8 @@ def make_security_filter(manager):
                     }
     }
 
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "root"), '/', config=conf)
-    cherrypy.tree.mount(applicationContext.getComponent(componentId = "loginForm"), '/login', config=login_conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "root"), '/', config=conf)
+    cherrypy.tree.mount(applicationContext.get_component(componentId = "loginForm"), '/login', config=login_conf)
 
     cherrypy.engine.start()
     cherrypy.engine.block()
diff --git a/samples/springirc/coily b/samples/springirc/coily
@@ -230,7 +230,7 @@ if __name__ == "__main__":
         # the channel and the bot that supports it.
         applicationContext = CoilyWebClient()
 
-        cherrypy.root = applicationContext.getComponent(componentId = "root")
+        cherrypy.root = applicationContext.get_component(componentId = "root")
         cherrypy.server = MiddlewareServer()
 
         # Configure cherrypy programmatically.
@@ -243,7 +243,7 @@ if __name__ == "__main__":
                                 "/scripts": {"static_filter.on": True, "static_filter.dir": "js"}
                             })
 
-        middleware = applicationContext.getComponent(componentId = "filterChainProxy")
+        middleware = applicationContext.get_component(componentId = "filterChainProxy")
         middleware.application = wsgiApp
 
         # Start the CherryPy server.
diff --git a/samples/springwiki/springwiki-noxml.py b/samples/springwiki/springwiki-noxml.py
@@ -55,7 +55,7 @@ def start(self, middleware):
     # to objects. In this case, it is being assigned an object that was created in the
     # IoC container, allowing the web server components to be totally decoupled from the
     # view component.
-    cherrypy.root = applicationContext.getComponent(componentId = "read")
+    cherrypy.root = applicationContext.get_component(componentId = "read")
     
     cherrypy.server = MiddlewareServer()
 
@@ -133,7 +133,7 @@ def start(self, middleware):
                             }
                         })
     
-    middleware = applicationContext.getComponent(componentId = "filterChainProxy")
+    middleware = applicationContext.get_component(componentId = "filterChainProxy")
     middleware.application = wsgiApp
     
     # Start the CherryPy server.
diff --git a/samples/springwiki/springwiki.py b/samples/springwiki/springwiki.py
@@ -54,7 +54,7 @@ def start(self, middleware):
     # to objects. In this case, it is being assigned an object that was created in the
     # IoC container, allowing the web server components to be totally decoupled from the
     # view component.
-    cherrypy.root = applicationContext.getComponent(componentId = "read")
+    cherrypy.root = applicationContext.get_component(componentId = "read")
     
     cherrypy.server = MiddlewareServer()
 
@@ -132,7 +132,7 @@ def start(self, middleware):
                             }
                         })
     
-    middleware = applicationContext.getComponent(componentId = "filterChainProxy")
+    middleware = applicationContext.get_component(componentId = "filterChainProxy")
     middleware.application = wsgiApp
     
     # Start the CherryPy server.
diff --git a/src/springpython/context/__init__.py b/src/springpython/context/__init__.py
@@ -31,7 +31,7 @@ class ApplicationContext(object):
     ApplicationContext is a marker interface, used to identify constructs
     that can serve the role as an IoC container.
     """
-    def getComponent(self, componentId):
+    def get_component(self, componentId):
         """Abstract interface method"""
         raise NotImplementedError()
 
@@ -103,17 +103,17 @@ def __init__(self):
         for name, method in inspect.getmembers(self, inspect.ismethod):
             if name not in decoratorBasedApplicationContextMethods:
                 self.logger.debug("Eagerly fetching %s" % name)
-                self.components.append(self.getComponent(name))
+                self.components.append(self.get_component(name))
 
-        # Scan for any postProcessAfterInitialization components
+        # Scan for any post_process_after_initialization components
         for name, method in inspect.getmembers(self, inspect.ismethod):
             if name not in decoratorBasedApplicationContextMethods:
                 component = method()
-                if hasattr(component, "postProcessAfterInitialization"):
-                    self.logger.debug("Component " + name + " appears to have postProcessAfterInitialization, so I'm calling it")
-                    getattr(component, "postProcessAfterInitialization")(self)
+                if hasattr(component, "post_process_after_initialization"):
+                    self.logger.debug("Component " + name + " appears to have post_process_after_initialization, so I'm calling it")
+                    getattr(component, "post_process_after_initialization")(self)
         
-    def getComponent(self, componentId):
+    def get_component(self, componentId):
         return getattr(self, componentId)()
 
 decoratorBasedApplicationContextMethods = [name for (name, method) in inspect.getmembers(DecoratorBasedApplicationContext, inspect.ismethod)]
@@ -133,17 +133,17 @@ def __init__(self, configLocation):
         self.__pyContainer = PyContainer(config = configLocation)
         self.componentIds = self.__pyContainer.descriptions.keys()
         for componentId in self.componentIds:
-            component = self.getComponent(componentId)
+            component = self.get_component(componentId)
             if hasattr(component, "applicationContext"):
                 component.applicationContext = self
 
             # In case this is wrapping a Pyro method, you can't call the method
             # directly, or it might try to forward the request to a remote software.
-            if "postProcessAfterInitialization" in component.__dict__:
-                print "Component " + componentId + " appears to have postProcessAfterInitialization, so I'm calling it"
-                component.__dict__["postProcessAfterInitialization"]()
+            if "post_process_after_initialization" in component.__dict__:
+                print "Component " + componentId + " appears to have post_process_after_initialization, so I'm calling it"
+                component.__dict__["post_process_after_initialization"]()
 
-    def getComponent(self, componentId):
+    def get_component(self, componentId):
         return self.__pyContainer.getInstance(componentId)
 
     def dispose(self):
@@ -155,7 +155,7 @@ def __init__(self):
         self.applicationContext = None
         
 class ComponentPostProcessor(object):
-    def postProcessAfterInitialization(self):
+    def post_process_after_initialization(self):
         raise NotImplementedError()
     
 class ComponentNameAutoProxyCreator(ApplicationContextAware, ComponentPostProcessor):
diff --git a/src/springpython/database/transaction.py b/src/springpython/database/transaction.py
@@ -293,7 +293,7 @@ def __init__(self, tx_manager):
         self.tx_manager = tx_manager
         self.logger = logging.getLogger("springpython.database.transaction.AutoTransactionalComponent")
 
-    def postProcessAfterInitialization(self, container):
+    def post_process_after_initialization(self, container):
         """This setup is run after all objects in the container have been created."""
         for component in container.components:
             # Check every method in the component...
diff --git a/src/springpython/remoting/hessian/__init__.py b/src/springpython/remoting/hessian/__init__.py
@@ -33,7 +33,7 @@ def __setattr__(self, name, value):
     def __getattr__(self, name):
         if name == "service_url":
             return self.service_url
-        elif name == "postProcessAfterInitialization":
+        elif name == "post_process_after_initialization":
             raise AttributeError, name
         else:
             if self.client_proxy is None:
diff --git a/src/springpython/remoting/pyro/__init__.py b/src/springpython/remoting/pyro/__init__.py
@@ -73,7 +73,7 @@ def __setattr__(self, name, value):
     def __getattr__(self, name):
         if name == "service_url":
             return self.service_url
-        elif name == "postProcessAfterInitialization":
+        elif name == "post_process_after_initialization":
             raise AttributeError, name
         else:
             if self.client_proxy is None:
diff --git a/src/springpython/security/web.py b/src/springpython/security/web.py
@@ -95,7 +95,7 @@ def __call__(self, environ, start_response):
             if re.compile(urlPattern).match(environ["PATH_INFO"].lower()):
                 for filter in chainOfFilters:
                         try:
-                            filterChain.addFilter(self.applicationContext.getComponent(filter))
+                            filterChain.addFilter(self.applicationContext.get_component(filter))
                         except AttributeError, e:
                             filterChain.addFilter(filter)
                 break
diff --git a/test/springpythontest/aopTestCases.py b/test/springpythontest/aopTestCases.py
@@ -56,7 +56,7 @@ def testCreatingAProxyFactoryAndAddingAnInterceptorProgrammatically(self):
         self.assertEquals("sample", service.attribute)
         
     def testCreatingAProxyFactoryAndAddingAnInterceptorIoC(self):
-        factory = self.appContext.getComponent("factory")
+        factory = self.appContext.get_component("factory")
         service = factory.getProxy()
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it!</Wrapped>", service.method("test"))
@@ -80,18 +80,18 @@ def testCreatingAProxyFactoryComponentAndAddingAnInterceptorProgrammatically(sel
         self.assertEquals("sample", service.attribute)
 
     def testCreatingAProxyFactoryComponentWithAnInterceptorIoC(self):
-        service = self.appContext.getComponent("sampleService4")
+        service = self.appContext.get_component("sampleService4")
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it!</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
 
     def testApplyingASingleConditionalPointcutIoC(self):
-        sampleService = self.appContext.getComponent("sampleService1")
+        sampleService = self.appContext.get_component("sampleService1")
         self.assertEquals(sampleService.doSomething(), "<Wrapped>Alright!</Wrapped>")
         self.assertEquals(sampleService.method("testdata"), "You made it!")
 
     def testApplyingTwoConditionalPointcutsIoC(self):
-        sampleService = self.appContext.getComponent("sampleService2")
+        sampleService = self.appContext.get_component("sampleService2")
         self.assertEquals(sampleService.doSomething(), "BEFORE => <Wrapped>Alright!</Wrapped> <= AFTER")
         self.assertEquals(sampleService.method("testdata"), "You made it!")
         
@@ -119,7 +119,7 @@ def testApplyingTwoConditionalPointcutsProgrammatically(self):
         self.assertEquals(sampleService.method("testdata"), "You made it!")
         
     def testCreatingAProxyFactoryComponentWithAnInterceptorByClassNameInsteadOfInstanceIoC(self):
-        service = self.appContext.getComponent("sampleService5")
+        service = self.appContext.get_component("sampleService5")
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it!</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
@@ -134,8 +134,8 @@ def __del__(self):
         PyroDaemonHolder.shutdown()
 
     def testWrappingPyroProxyOnClientSideIoC(self):
-        remoteService = self.appContext.getComponent("remoteService1")
-        clientService = self.appContext.getComponent("service1")
+        remoteService = self.appContext.get_component("remoteService1")
+        clientService = self.appContext.get_component("service1")
         self.assertEquals("You got remote data => test1", remoteService.getData("test1"))
         self.assertEquals("<Wrapped>You got remote data => test1</Wrapped>", clientService.getData("test1"))
         self.appContext.dispose()
@@ -144,8 +144,8 @@ def testWrappingPyroProxyOnClientSideIoC(self):
     # dependency. Each test works fine when the other is commented out. Must resolve.
     
     #def testWrappingPyroProxyOnServerSideIoC(self):
-    #    remoteService = self.appContext.getComponent("remoteService2")
-    #    clientService = self.appContext.getComponent("service2")
+    #    remoteService = self.appContext.get_component("remoteService2")
+    #    clientService = self.appContext.get_component("service2")
     #    self.assertEquals("<Wrapped>You got remote data => test2</Wrapped>", remoteService.getData("test2"))
     #    self.assertEquals("<Wrapped>You got remote data => test2</Wrapped>", clientService.getData("test2"))
     #    self.appContext.dispose()
diff --git a/test/springpythontest/contextTestCases.py b/test/springpythontest/contextTestCases.py
diff --git a/test/springpythontest/databaseCoreTestCases.py b/test/springpythontest/databaseCoreTestCases.py
diff --git a/test/springpythontest/databaseTransactionTestCases.py b/test/springpythontest/databaseTransactionTestCases.py
diff --git a/test/springpythontest/remotingTestCases.py b/test/springpythontest/remotingTestCases.py
diff --git a/test/springpythontest/securityEncodingTestCases.py b/test/springpythontest/securityEncodingTestCases.py
diff --git a/test/springpythontest/securityProviderTestCases.py b/test/springpythontest/securityProviderTestCases.py
diff --git a/test/springpythontest/securityVoteTestCases.py b/test/springpythontest/securityVoteTestCases.py
diff --git a/xml/schema/context/spring-python-context-1.0.xsd b/xml/schema/context/spring-python-context-1.0.xsd
