Centralizing openjpa log config
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/66965fcd Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/66965fcd Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/66965fcd Branch: refs/heads/master Commit: 66965fcd657f960531af0d61a0ff037d2c3a14a7 Parents: fcdf64d Author: Martin Stockhammer <marti...@apache.org> Authored: Sun May 21 22:36:27 2017 +0200 Committer: Martin Stockhammer <marti...@apache.org> Committed: Sun May 21 22:36:27 2017 +0200 ---------------------------------------------------------------------- pom.xml | 5 +++-- .../src/test/resources/spring-context.xml | 12 +++++++++--- .../src/test/resources/spring-context.xml | 12 +++++++++--- redback-data-management/pom.xml | 1 + .../src/test/resources/spring-context.xml | 2 +- .../redback-common-integrations/pom.xml | 1 + .../src/test/resources/spring-context.xml | 2 +- .../redback-rest/redback-rest-services/pom.xml | 1 + .../src/test/resources/spring-context.xml | 11 ++++++++--- .../src/test/resources/spring-context.xml | 6 ++++-- .../src/test/resources/spring-context.xml | 6 +++--- .../src/test/resources/spring-context.xml | 12 +++++++++--- .../src/test/resources/spring-context.xml | 6 ++++-- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 12 +++++++++--- redback-rbac/redback-rbac-role-manager/pom.xml | 1 + .../src/test/resources/spring-context.xml | 12 ++++++++---- redback-system/src/test/resources/spring-context.xml | 11 ++++++++--- .../src/test/resources/spring-context.xml | 12 +++++++++--- .../src/test/resources/spring-context.xml | 5 +++-- 20 files changed, 93 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1d088d2..960ee46 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ </distributionManagement> <properties> - <springVersion>4.3.5.RELEASE</springVersion> + <springVersion>4.3.8.RELEASE</springVersion> <slf4jVersion>1.7.12</slf4jVersion> <log4j2Version>2.8.2</log4j2Version> @@ -88,7 +88,8 @@ <redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver> <siteDeployDirectory>${user.home}/archiva-sites/redback-core-site-deploy</siteDeployDirectory> <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory> - + + <openjpa.Log>DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR</openjpa.Log> </properties> <repositories> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml index 4dae1ae..f429aa7 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml @@ -20,10 +20,16 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="true"> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="authenticator#user-manager" class="org.apache.archiva.redback.authentication.users.UserManagerAuthenticator"> <property name="userManager" ref="userManager#memory"/> <property name="securityPolicy" ref="userSecurityPolicy"/> @@ -46,7 +52,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -61,4 +67,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml index 7c2f43d..0f14790 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml @@ -20,10 +20,16 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="true"> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userManager#cached" class="org.apache.archiva.redback.users.cached.CachedUserManager"> <property name="userImpl" ref="userManager#memory"/> <property name="usersCache" ref="cache#users"/> @@ -63,7 +69,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -79,4 +85,4 @@ <tx:annotation-driven /> <!-- **** jpa init *** --> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-data-management/pom.xml ---------------------------------------------------------------------- diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml index 38f948d..7bb4b53 100644 --- a/redback-data-management/pom.xml +++ b/redback-data-management/pom.xml @@ -124,6 +124,7 @@ <basedir>${basedir}</basedir> <derby.system.home>${project.build.directory}/test-home</derby.system.home> <plexus.home>${project.build.directory}/test-home</plexus.home> + <openjpa.Log>${openjpa.Log}</openjpa.Log> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-data-management/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml index 6aa7b54..36479cb 100644 --- a/redback-data-management/src/test/resources/spring-context.xml +++ b/redback-data-management/src/test/resources/spring-context.xml @@ -46,7 +46,7 @@ Needed because of the dependency redback-user-cache -> redback-user-jpa <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-integrations/redback-common-integrations/pom.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml index d46ef86..bd3603b 100644 --- a/redback-integrations/redback-common-integrations/pom.xml +++ b/redback-integrations/redback-common-integrations/pom.xml @@ -227,6 +227,7 @@ <systemPropertyVariables> <basedir>${basedir}</basedir> <derby.system.home>${project.build.directory}/test-home</derby.system.home> + <openjpa.Log>${openjpa.Log}</openjpa.Log> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml index db51f86..97f151c 100644 --- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml @@ -59,7 +59,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-integrations/redback-rest/redback-rest-services/pom.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml index c6b0aca..f09dc0d 100644 --- a/redback-integrations/redback-rest/redback-rest-services/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml @@ -276,6 +276,7 @@ <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> <ldapPort>${ldapPort}</ldapPort> <rest.test.timeout>${rest.test.timeout}</rest.test.timeout> + <openjpa.Log>${openjpa.Log}</openjpa.Log> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml index 7ac179b..ed79866 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml @@ -20,9 +20,14 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + <context:property-placeholder system-properties-mode="OVERRIDE"/> <alias name="userConfiguration#redback" alias="userConfiguration#default"/> @@ -64,7 +69,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -80,4 +85,4 @@ <tx:annotation-driven /> <!-- **** jpa init *** --> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml index dece9ff..8732f46 100644 --- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml @@ -26,6 +26,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> <property name="registry" ref="test-conf"/> </bean> @@ -57,7 +59,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -72,4 +74,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml index 20eba14..3f0430c 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> <context:component-scan base-package="org.apache.archiva.redback.keys.jpa" /> - + <context:property-placeholder system-properties-mode="OVERRIDE"/> <bean name="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> @@ -42,7 +42,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -58,4 +58,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml index c44ceca..b0d6d50 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml @@ -20,10 +20,16 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="false"> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> <property name="registry" ref="test-conf"/> @@ -83,7 +89,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -99,4 +105,4 @@ <tx:annotation-driven /> <!-- **** jpa init *** --> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml index 49574be..2b51c2e 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml @@ -27,6 +27,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> <context:component-scan base-package="org.apache.archiva.redback.rbac.jpa" /> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> <property name="registry" ref="test-conf"/> @@ -49,7 +51,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -64,4 +66,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml index 95334b6..b39b36c 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml @@ -125,7 +125,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml index bdfb48e..82d44ed 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml @@ -20,10 +20,16 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> <property name="registry" ref="test-conf"/> </bean> @@ -50,7 +56,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -66,4 +72,4 @@ <tx:annotation-driven /> <!-- **** jpa init *** --> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-role-manager/pom.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml index cfddff3..f801535 100644 --- a/redback-rbac/redback-rbac-role-manager/pom.xml +++ b/redback-rbac/redback-rbac-role-manager/pom.xml @@ -127,6 +127,7 @@ <forkMode>always</forkMode> <systemPropertyVariables> <basedir>${basedir}</basedir> + <openjpa.Log>${openjpa.Log}</openjpa.Log> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml index 413dd1b..a1edde5 100755 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml @@ -20,11 +20,15 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="false"> - + <context:property-placeholder system-properties-mode="OVERRIDE"/> <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> <property name="registry" ref="test-conf"/> @@ -75,7 +79,7 @@ Needed because of the dependency redback-user-cache -> redback-user-jpa <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -90,4 +94,4 @@ Needed because of the dependency redback-user-cache -> redback-user-jpa <tx:annotation-driven /> <!-- **** jpa init *** --> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-system/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml index 8cbae93..4e5625e 100644 --- a/redback-system/src/test/resources/spring-context.xml +++ b/redback-system/src/test/resources/spring-context.xml @@ -20,9 +20,14 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + <context:property-placeholder system-properties-mode="OVERRIDE"/> <bean name="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <property name="jpaVendorAdapter" > @@ -35,7 +40,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -63,4 +68,4 @@ <alias name="userManager#configurable" alias="userManager#default"/> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml index 9a5ddde..48d2deb 100644 --- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml @@ -20,10 +20,16 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="true"> + <context:property-placeholder system-properties-mode="OVERRIDE"/> + <bean name="userManager#cached" class="org.apache.archiva.redback.users.cached.CachedUserManager"> <property name="userImpl" ref="userManager#memory"/> <property name="usersCache" ref="cache#users"/> @@ -57,7 +63,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -72,4 +78,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/66965fcd/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml index 20ab65e..e3aa79c 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml @@ -27,6 +27,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd";> + <context:property-placeholder system-properties-mode="OVERRIDE"/> <context:component-scan base-package="org.apache.archiva.redback.users.jpa" /> @@ -61,7 +62,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR" /> + <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> @@ -77,4 +78,4 @@ <tx:annotation-driven /> -</beans> \ No newline at end of file +</beans>
