You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2016/10/14 19:40:51 UTC
archiva git commit: Changing transaction handling
Repository: archiva
Updated Branches:
refs/heads/jpa b7174c444 -> e7143b5e7
Changing transaction handling
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e7143b5e
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e7143b5e
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e7143b5e
Branch: refs/heads/jpa
Commit: e7143b5e780a3cf66b16c8510961df199d86defa
Parents: b7174c4
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Oct 14 21:40:10 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Oct 14 21:40:10 2016 +0200
----------------------------------------------------------------------
.../archiva/web/security/ArchivaUserManagerAuthenticator.java | 1 +
.../src/main/resources/META-INF/spring-context.xml | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/e7143b5e/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
index 0a74e39..b1cbc9c 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
@@ -209,6 +209,7 @@ public class ArchivaUserManagerAuthenticator
{
log.warn( "Login for user {} and userManager {} failed, message: {}", source.getUsername(),
userManager.getId(), e.getMessage() );
+ e.printStackTrace();
resultException = e;
authnResultErrors.add( new AuthenticationFailureCause( AuthenticationConstants.AUTHN_RUNTIME_EXCEPTION,
"Login for user " + source.getUsername()
http://git-wip-us.apache.org/repos/asf/archiva/blob/e7143b5e/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index d295d09..3c5ad2e 100755
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -58,6 +58,11 @@
</bean>
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager" >
+ <property name="entityManagerFactory" ref="entityManagerFactory" />
+ </bean>
+
+ <tx:annotation-driven transaction-manager="transactionManager"/>
</beans>
\ No newline at end of file