You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/09/21 09:51:49 UTC
[turbine-fulcrum-security] 01/02: adjust svn to git,
ignore generated files in module torque (but be aware,
that we have currently the classes om.TorqueTurbineRolePermission,
TorqueTurbineUserGroupRole and TorqueTurbineUserGroupRolePeerImpl,
which need to override abstract methods (getTurbinePermission,
getTurbineRole, doSelectJoinTurbineGroup
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git
commit afdc028f6242b53d575890055c80cc7fff3833c5
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Tue Sep 21 10:46:30 2021 +0100
adjust svn to git, ignore generated files in module torque (but be aware, that we have currently the classes om.TorqueTurbineRolePermission, TorqueTurbineUserGroupRole and TorqueTurbineUserGroupRolePeerImpl, which need to override abstract methods (getTurbinePermission, getTurbineRole, doSelectJoinTurbineGroup
---
.asf.yaml | 21 +++++++++++++++++++++
.gitignore | 22 ++++++++++++++++++++++
api/pom.xml | 8 +++-----
dist/pom.xml | 5 -----
hibernate/pom.xml | 5 ++---
ldap/pom.xml | 6 +-----
memory/pom.xml | 7 +++----
nt/pom.xml | 11 +++++------
pom.xml | 27 +++++++++++++++------------
src/changes/changes.xml | 11 ++++++++++-
torque/pom.xml | 9 ++++-----
11 files changed, 86 insertions(+), 46 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..0e8eaea
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+github:
+ features:
+ # Enable issue management
+ issues: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae22123
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+target/
+*.log
+
+.classpath
+.project
+.settings/
+
+# Idea IntelliJ
+*.ipr
+*.iws
+*.iml
+.idea/
+
+pom.xml.*
+
+# ignore generated, but review the exceptions
+torque/src/java/org/apache/fulcrum/security/torque/om/TorqueBasic*
+torque/src/java/org/apache/fulcrum/security/torque/om/TorqueDynamic*
+torque/src/java/org/apache/fulcrum/security/torque/om/*Mapper.java
+torque/src/java/org/apache/fulcrum/security/torque/om/*Peer.java
+torque/src/java/org/apache/fulcrum/security/torque/om/Turbine*.java
+torque/src/java/org/apache/fulcrum/security/torque/om/TorqueTurbine*.java
\ No newline at end of file
diff --git a/api/pom.xml b/api/pom.xml
index aca9a53..85ee01e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -26,12 +26,10 @@
<artifactId>fulcrum-security-api</artifactId>
<name>Fulcrum Security API</name>
<description>Fulcrum Security Basic API</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-api</url>
-
+ <url>https://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-api</url>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/api</url>
</scm>
<dependencies>
diff --git a/dist/pom.xml b/dist/pom.xml
index 74c7171..7356979 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -29,11 +29,6 @@
<packaging>pom</packaging>
<name>Fulcrum Security Distribution Build</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
- </scm>
<!-- NOTE: These dependency declarations are only required to sort this project to the
end of the line in the multimodule build.
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
index 76be83b..c08237f 100644
--- a/hibernate/pom.xml
+++ b/hibernate/pom.xml
@@ -32,10 +32,9 @@
that uses Hibernate as a database backend.
</description>
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-hibernate/</url>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/hibernate</url>
</scm>
<build>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 7c95a0b..0acdbdd 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -29,11 +29,7 @@
<version>1.1.1-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-ldap</url>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/ldap/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/ldap/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/</url>
- </scm>
+
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
diff --git a/memory/pom.xml b/memory/pom.xml
index 05c26cd..519c496 100644
--- a/memory/pom.xml
+++ b/memory/pom.xml
@@ -29,11 +29,10 @@
Fulcrum Security Memory Impl is an implementation of the Fulcrum Security API
that uses simple HashMaps as a backend. It is meant mainly for test purposes.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-memory</url>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-memory</url>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/memory</url>
</scm>
<build>
diff --git a/nt/pom.xml b/nt/pom.xml
index 284b796..d479377 100644
--- a/nt/pom.xml
+++ b/nt/pom.xml
@@ -23,12 +23,11 @@
Fulcrum Security NT Impl is an implementation of the Fulcrum Security API
that uses a Microsoft Windows NT Server as a authentication source.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-nt</url>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/nt/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/nt/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/</url>
- </scm>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-nt/</url>
+
+ <scm>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/nt/</url>
+ </scm>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index f7297ee..e848b3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,19 +32,21 @@
<name>Fulcrum Security Master Build</name>
<url>https://turbine.apache.org/fulcrum/fulcrum-security/</url>
- <!-- Required for staging to work -->
- <distributionManagement>
- <site>
- <id>turbine.apache.org</id>
- <url>https://turbine.apache.org/fulcrum/fulcrum-security/</url>
- </site>
- </distributionManagement>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
+ <tag>HEAD</tag>
</scm>
+
+ <!-- distributionManagement required for staging to work, id and url defined in parent, adapt turbine.site.path -->
+ <distributionManagement>
+ <site>
+ <name>Fulcrum Security Website</name>
+ <id>apache.org</id>
+ <url>https://github.com/apache/turbine-fulcrum-security/</url>
+ </site>
+ </distributionManagement>
<developers>
<developer>
@@ -150,6 +152,7 @@
<configuration>
<content>${siteContent.path}</content>
<tryUpdate>false</tryUpdate>
+ <scmBranch>asf-site</scmBranch>
</configuration>
</plugin>
<plugin>
@@ -170,6 +173,7 @@
<excludePackageNames>org.apache.fulcrum.security.torque.om.*</excludePackageNames>
</configuration>
</plugin>
+
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
@@ -235,8 +239,7 @@
</reporting>
<properties>
- <turbine.site.path>fulcrum/fulcrum-security</turbine.site.path>
- <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/security</turbine.scmPubCheckoutDirectory>
+ <turbine.site.path>turbine-fulcrum-security</turbine.site.path>
<turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
<siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL -->
</properties>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 28fd76f..740ae62 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,7 +23,16 @@
<author email="epugh@upstate.com">Eric Pugh</author>
</properties>
<body>
- <release version="2.0.0" description="In Subversion">
+ <release version="2.0.1" description="In VC">
+ <action type="update" dev="gk">
+ - Torque: use by default Turbinegroup not TurbineRole from generated doSelectJoinTurbine* method, as this will be used as key in lookup in acl roleSets.
+ - add groupSet to interface to TurbineAccessControlList
+ - add transient avalon logger to TurbineAccessControlList constructor
+ - use model manager to fetch global group (model manager should be set always)
+ - Add Torque 5.0. schemata, update to Turbine parent v8
+ </action>
+ </release>
+ <release version="2.0.0" description="2020-01-04">
<action type="update" dev="painter">Java Dependency update: Bump dbcp2 from 2.8.0 to 2.9.0</action>
<action type="fix" dev="gk">
-Use of interfaces TurbineRolePermissionPeerMapper and TurbineUserGroupRoleModelPeerMapper in fulcrum-turbine-schema.xml
diff --git a/torque/pom.xml b/torque/pom.xml
index eb77a57..3f8c3c8 100644
--- a/torque/pom.xml
+++ b/torque/pom.xml
@@ -23,11 +23,10 @@
Fulcrum Security Torque Impl is an implementation of the Fulcrum Security API
that uses Apache DB Torque as a database backend.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-torque</url>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-torque</url>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+ <url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}/torque</url>
</scm>
<properties>
@@ -58,7 +57,7 @@
<forkCount>1</forkCount>
</configuration>
</plugin>
-
+
</plugins>
</build>