You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/04/21 00:29:39 UTC
incubator-usergrid git commit: Removing references to
EntityManagerImpl to fix test runs.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 2ae6a3d15 -> 8dafe7b57
Removing references to EntityManagerImpl to fix test runs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8dafe7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8dafe7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8dafe7b5
Branch: refs/heads/two-dot-o-dev
Commit: 8dafe7b579e4db934c1d612a9b185022df9c4e1c
Parents: 2ae6a3d
Author: GERey <gr...@apigee.com>
Authored: Mon Apr 20 15:29:37 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Apr 20 15:29:37 2015 -0700
----------------------------------------------------------------------
.../main/resources/usergrid-core-context.xml | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8dafe7b5/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml b/stack/core/src/main/resources/usergrid-core-context.xml
index c5df523..b406b78 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -164,26 +164,8 @@
<constructor-arg ref="properties"/>
</bean>
-
-
- <bean id="entityManager" class="org.apache.usergrid.persistence.cassandra.EntityManagerImpl" scope="prototype"/>
-
<bean id="mailUtils" class="org.apache.usergrid.utils.MailUtils" />
-
- <bean id="traceTagAspect" class="org.apache.usergrid.persistence.cassandra.util.TraceTagAspect"/>
-
- <aop:config>
- <aop:aspect id="traceParticipant" ref="traceTagAspect">
- <!-- pointcut on the prescense of the TraceParticipant annotation only -->
- <aop:pointcut id="emTraceParticipant"
- expression="execution(* org.apache.usergrid.persistence.cassandra.*EntityManagerImpl.*(..)) and
- @annotation(org.apache.usergrid.persistence.cassandra.util.TraceParticipant)"/>
- <aop:around
- pointcut-ref="emTraceParticipant"
- method="applyTrace"/>
- </aop:aspect>
- </aop:config>
-
+
<!-- ============================================================== -->
<!-- Scheduler Settings from removed Scheduler Module's app context -->
<!-- ============================================================== -->