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/02 18:16:20 UTC
[1/5] archiva-redback-core git commit: Fixing path of spring context
file
Repository: archiva-redback-core
Updated Branches:
refs/heads/jpa 30c3441cd -> e21719025
Fixing path of spring context file
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/4586b826
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/4586b826
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/4586b826
Branch: refs/heads/jpa
Commit: 4586b826d98e966908d45d69479fd119b791d894
Parents: 30c3441
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Oct 2 19:25:20 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Oct 2 19:25:20 2016 +0200
----------------------------------------------------------------------
.../main/resources/META-INF/spring-context.xml | 31 ++++++++++++++++++++
.../src/main/resources/spring-context.xml | 31 --------------------
2 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/4586b826/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/META-INF/spring-context.xml
new file mode 100644
index 0000000..a56a218
--- /dev/null
+++ b/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <context:component-scan base-package="org.apache.archiva.redback.users.jpa" />
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/4586b826/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/spring-context.xml
----------------------------------------------------------------------
diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/spring-context.xml
deleted file mode 100644
index a56a218..0000000
--- a/redback-users/redback-users-providers/redback-users-jpa/src/main/resources/spring-context.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.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.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <context:component-scan base-package="org.apache.archiva.redback.users.jpa" />
-
-</beans>
\ No newline at end of file
[5/5] archiva-redback-core git commit: Adding version for dependencies
Posted by ma...@apache.org.
Adding version for dependencies
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/e2171902
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/e2171902
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/e2171902
Branch: refs/heads/jpa
Commit: e217190250560c62b9d5c1cefcf236d9cdf6e111
Parents: d785f13
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Oct 2 20:15:49 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Oct 2 20:15:49 2016 +0200
----------------------------------------------------------------------
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/e2171902/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3e218ee..975be68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<version>${project.version}</version>
</dependency>
@@ -278,6 +283,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId>
<version>${project.version}</version>
</dependency>
[2/5] archiva-redback-core git commit: Adding final flag to jpa
implementations
Posted by ma...@apache.org.
Adding final flag to jpa implementations
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/ac89b6bb
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/ac89b6bb
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/ac89b6bb
Branch: refs/heads/jpa
Commit: ac89b6bb2db684760bd5581803c584a48f32f4e7
Parents: 4586b82
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Oct 2 20:14:10 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Oct 2 20:14:10 2016 +0200
----------------------------------------------------------------------
.../org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java | 5 ++++-
.../org/apache/archiva/redback/users/jpa/JpaUserManager.java | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/ac89b6bb/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
index 80580e4..184df40 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
@@ -449,5 +449,8 @@ public class JpaRbacManager extends AbstractRBACManager {
return em;
}
-
+ @Override
+ public boolean isFinalImplementation() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/ac89b6bb/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
----------------------------------------------------------------------
diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
index 448552d..33fa7b6 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
@@ -329,6 +329,8 @@ public class JpaUserManager extends AbstractUserManager {
}
-
-
+ @Override
+ public boolean isFinalImplementation() {
+ return true;
+ }
}
[4/5] archiva-redback-core git commit: Adding spring context for rbac
module
Posted by ma...@apache.org.
Adding spring context for rbac module
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/d785f136
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/d785f136
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/d785f136
Branch: refs/heads/jpa
Commit: d785f13635e112ea2e898eacd7795297d86ae898
Parents: f8ee2af
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Oct 2 20:15:26 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Oct 2 20:15:26 2016 +0200
----------------------------------------------------------------------
.../main/resources/META-INF/spring-context.xml | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/d785f136/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/resources/META-INF/spring-context.xml
new file mode 100644
index 0000000..937e21d
--- /dev/null
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,30 @@
+<?xml version="1.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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <context:component-scan base-package="org.apache.archiva.redback.rbac.jpa"/>
+</beans>
\ No newline at end of file
[3/5] archiva-redback-core git commit: Adding explicit dependencies
for JPA user/rbac implementations
Posted by ma...@apache.org.
Adding explicit dependencies for JPA user/rbac implementations
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/f8ee2af8
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/f8ee2af8
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/f8ee2af8
Branch: refs/heads/jpa
Commit: f8ee2af82544524942e63d46be65ccd108e1f9d6
Parents: ac89b6b
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Oct 2 20:14:34 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Oct 2 20:14:34 2016 +0200
----------------------------------------------------------------------
redback-integrations/redback-common-integrations/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f8ee2af8/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 34921ce..656dcf2 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -83,6 +83,14 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-configurable</artifactId>
</dependency>
<dependency>