Repository: cloudstack Updated Branches: refs/heads/master aaeadc5c4 -> 093fa6f0a
removed unused class ramework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/093fa6f0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/093fa6f0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/093fa6f0 Branch: refs/heads/master Commit: 093fa6f0a53bd031a09e4042c3aa25860bc947e5 Parents: aaeadc5 Author: Anthony Xu <anthony...@citrix.com> Authored: Tue Sep 23 16:48:14 2014 -0700 Committer: Anthony Xu <anthony...@citrix.com> Committed: Tue Sep 23 16:48:14 2014 -0700 ---------------------------------------------------------------------- .../spring-core-system-context-inheritable.xml | 5 --- .../utils/db/TransactionContextInterceptor.java | 40 -------------------- 2 files changed, 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/093fa6f0/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml ---------------------------------------------------------------------- diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml index 2d454ac..6a1d0ea 100644 --- a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml +++ b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml @@ -40,13 +40,8 @@ <!-- AOP --> - <bean id="transactionContextInterceptor" class="com.cloud.utils.db.TransactionContextInterceptor" /> <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" /> <aop:config> - <aop:advisor advice-ref="transactionContextInterceptor" - pointcut="target(com.cloud.utils.db.GenericDaoBase)" /> - <aop:advisor advice-ref="transactionContextInterceptor" - pointcut="execution(* com.cloud.utils.db.EntityManager.*(..))" /> <aop:advisor advice-ref="actionEventInterceptor" pointcut="execution(* *(..)) && @annotation(com.cloud.event.ActionEvent)" /> <aop:advisor advice-ref="actionEventInterceptor" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/093fa6f0/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java ---------------------------------------------------------------------- diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java b/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java deleted file mode 100644 index bd747b1..0000000 --- a/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.cloud.utils.db; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; - -public class TransactionContextInterceptor implements MethodInterceptor { - - public TransactionContextInterceptor() { - - } - - @Override - public Object invoke(MethodInvocation m) throws Throwable { - TransactionLegacy txn = TransactionLegacy.open(m.getMethod().getName()); - try { - return m.proceed(); - } finally { - txn.close(); - } - } - -}
