IN PROGRESS - issue SESPRINGPYTHONPY-54: In transaction.py, rename TransactionalInterceptor's txWrapper as txDefinition (to be consistent with transactional_wrapper)

gregturn · gregturn · commit 827ec5c80a31 · 2008-08-28T00:04:32.000Z
http://jira.springframework.org/browse/SESPRINGPYTHONPY-54 Merged r58:60 to trunk. Reviewed changes, ran tests, and confirmed successful. /home/gregturn/workspace-spring/springpython/test/springpythontest/__init__.py:20: UserWarning: Expect three deprecation warnings: mysql, postgresql, and Sqlite have moved to the factory module. from springpythontest.databaseCoreTestCases import SqliteDatabaseTemplateTestCase /home/gregturn/workspace-spring/springpython/test/springpythontest/databaseCoreTestCases.py:32: DeprecationWarning: springpython.database's mysql module has moved to the factory module. from springpython.database import mysql /home/gregturn/workspace-spring/springpython/test/springpythontest/databaseCoreTestCases.py:33: DeprecationWarning: springpython.database's postgresql module has moved to the factory module. from springpython.database import postgresql /home/gregturn/workspace-spring/springpython/test/springpythontest/databaseCoreTestCases.py:34: DeprecationWarning: springpython.database's Sqlite module has moved to the factory module as Sqllite3ConnectionFactory. from springpython.database import Sqlite ...................................................................2008-08-27 20:02:49.154::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2008-08-27 20:02:49.232::INFO: jetty-6.1.11 2008-08-27 20:02:49.067::INFO: Started SocketConnector@0.0.0.0:8080 2008-08-27 20:02:54.972::WARN: Jetty is now shutting down. .2008-08-27 20:02:58.148::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2008-08-27 20:02:58.244::INFO: jetty-6.1.11 2008-08-27 20:02:58.365::INFO: Started SocketConnector@0.0.0.0:8080 2008-08-27 20:03:04.875::WARN: Jetty is now shutting down. .............................................................................................. Name Stmts Exec Cover Missing ----------------------------------------------------------------------------------- springpython 0 0 100% springpython.aop 144 130 90% 125, 200, 205, 220, 238, 268-270, 273-278 springpython.context 87 79 90% 92, 143-144, 159, 168-171 springpython.context.decorator 41 35 85% 82, 88-90, 94, 144, 147 springpython.context.pycontainer 1 1 100% springpython.context.pycontainer.factories 7 6 85% 5 springpython.context.pycontainer.objectify 244 118 48% 27-30, 34, 46-56, 68-69, 73-84, 88-100, 110-111, 114-115, 118-121, 128, 135-147, 153-156, 184-186, 196, 253, 256, 263-319, 354-357, 362-386 springpython.context.pycontainer.pycontainer 194 131 67% 28, 33, 72, 83, 98, 104, 111-119, 153-156, 168, 186, 192-211, 214, 217, 220, 223-236, 239-242, 261-264, 288 springpython.context.pycontainer.utils 11 11 100% springpython.context.scope 2 2 100% springpython.database 13 13 100% springpython.database.Sqlite 5 5 100% springpython.database.core 104 88 84% 27-29, 38-39, 43-45, 122-124, 132, 145, 160, 163, 175, 190 springpython.database.factory 76 48 63% 29, 45, 48, 58-62, 66-67, 70, 73, 77-81, 85-86, 89, 92, 116-120, 124-125 springpython.database.mysql 5 5 100% springpython.database.postgresql 5 5 100% springpython.database.transaction 180 168 93% 42, 45, 48, 89, 117-118, 159, 163, 167, 173, 187, 278 springpython.remoting 0 0 100% springpython.remoting.hessian 16 14 87% 35, 37 springpython.remoting.hessian.hessianlib 270 172 63% 80-83, 86, 94-95, 98, 112-115, 118-121, 124, 127, 136, 139, 143-144, 151, 154-156, 186-187, 192-193, 197-198, 202-203, 215-223, 226-231, 236-241, 246-255, 270-272, 280, 288, 299, 302, 305, 308, 311, 314, 317-319, 325, 350-359, 370-371, 379-380, 385, 416, 443, 458-460, 463, 476-481 springpython.remoting.pyro 36 32 88% 40, 52, 75, 77 springpython.remoting.pyro.PyroDaemonHolder 35 34 97% 67 springpython.security 18 18 100% springpython.security.context 48 31 64% 29, 36, 38, 40, 46-49, 52, 55-57, 60-62, 78, 84 springpython.security.context.SecurityContextHolder 28 22 78% 35, 39, 45-46, 50, 56 springpython.security.intercept 85 72 84% 30, 34, 39, 94, 101, 103-105, 113, 130-131, 134, 155 springpython.security.providers 71 66 92% 46, 49, 118, 124, 149 springpython.security.providers.dao 116 99 85% 29, 32, 35, 45, 74, 77, 83, 92-94, 99, 112, 115, 141, 144, 152, 162 springpython.security.providers.encoding 66 66 100% springpython.security.userdetails 33 33 100% springpython.security.userdetails.dao 46 45 97% 84 springpython.security.vote 134 121 90% 94, 133, 144, 168-173, 251-256 springpython.security.web 233 157 67% 43, 48, 128-130, 133-147, 194-195, 213, 230, 268, 274, 277, 283-286, 289, 303, 306-310, 332, 337, 340-352, 375-382, 388-391, 394-395, 401, 407-410, 413-414, 424-426, 429-433, 436-437 springpythontest 11 11 100% springpythontest.aopTestCases 117 107 91% 134, 154-163 springpythontest.contextTestCases 103 103 100% springpythontest.databaseCoreTestCases 419 332 79% 43-49, 52-58, 61-67, 70-76, 79-85, 88-94, 98-104, 107-125, 128-155, 533, 536-567, 570-574, 578, 581-617, 620-624, 635-636, 650-654 springpythontest.databaseTransactionTestCases 336 285 84% 113-114, 142, 152, 182, 192, 221, 231, 261, 271, 286, 299, 326, 336, 366, 376, 386, 389-428, 434, 437-480, 492-493, 512-521 springpythontest.remotingTestCases 102 101 99% 161 springpythontest.securityEncodingTestCases 160 160 100% springpythontest.securityProviderTestCases 185 185 100% springpythontest.securityUserDetailsTestCases 12 12 100% springpythontest.securityVoteTestCases 216 216 100% springpythontest.securityWebTestCases 158 153 96% 89, 130, 167, 202, 204 springpythontest.support 0 0 100% ----------------------------------------------------------------------------------- TOTAL 4173 3492 83% ---------------------------------------------------------------------- Ran 162 tests in 34.075s OK git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@61 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/src/springpython/database/transaction.py b/src/springpython/database/transaction.py
@@ -195,7 +195,7 @@ def __init__(self, txManager, transactionAttributes):
         self.txManager = txManager
 
     def invoke(self, invocation):
-        class txWrapper(TransactionCallback):
+        class txDefinition(TransactionCallback):
             def doInTransaction(s, status):
                 return invocation.proceed()
 
@@ -210,7 +210,7 @@ def doInTransaction(s, status):
             
         self.logger.debug("Call TransactionTemplate")
         try:
-            results = txTemplate.execute(txWrapper())
+            results = txTemplate.execute(txDefinition())
         except Exception, e:
             self.logger.debug("Exception => %s" % e)
             raise e
