Author: gk
Date: Tue May 9 13:27:23 2017
New Revision: 1794574
URL: http://svn.apache.org/viewvc?rev=1794574&view=rev
Log:
- cleanup using new security snapshot in archetype-resources/pom.xml
- no dependency to local fulcrum, cft. also torque-security-schema.xml and
roleConfiguration.xml
- TODO remove SNAPSHOT in archetype pom after releasing fulcrum security
Removed:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/fulcrum/
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/ (props changed)
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 9 13:27:23 2017
@@ -1,7 +1,5 @@
.classpath
-
-.settings
-
.project
-
+.settings
+bin
target
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
Tue May 9 13:27:23 2017
@@ -239,68 +239,76 @@ under the License.
<groupId>mysql</groupId>
<version>5.1.40</version>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.turbine</groupId>
- <artifactId>turbine</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
- <!-- yaafi is optional. NOTICE: 1.0.7 has group org.apache.turbine not
org.apache.fulcrum -->
- <dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.turbine</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
- </dependency>
- <!-- if using intake -->
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-intake</artifactId>
- <version>1.2.2</version>
- </dependency>
- <!-- include some optional dependencies required in example
componentConfiguration.xml -->
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-cache</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-upload</artifactId>
- <version>1.0.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-security-torque</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
+ <artifactId>turbine</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </dependency>
+ <!-- yaafi is optional. NOTICE: 1.0.7 has group org.apache.turbine not
org.apache.fulcrum -->
+ <dependency>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+ <!-- if using intake -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-intake</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <!-- include some optional dependencies required in example
componentConfiguration.xml -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-cache</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-upload</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <!-- using snapshot, until released -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-security-memory</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <!-- using snapshot, until released -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-security-torque</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <!-- using snapshots, could be removed if turbine is updated fro 1.1.0
to 1.1.1 -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-security-api</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
Tue May 9 13:27:23 2017
@@ -79,10 +79,4 @@ public class TurbineGroup
setGroupId(id);
}
- @Override
- public String getDatabaseName()
- {
- return "default";
- }
-
}
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
Tue May 9 13:27:23 2017
@@ -1,11 +1,6 @@
package ${package}.om;
-import java.sql.Connection;
-import java.util.Set;
-
-import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.torque.TorqueException;
-import org.apache.torque.om.SimpleKey;
/**
@@ -63,37 +58,4 @@ public class TurbineRole
setRoleId(id);
}
- /**
- * @TODO
- */
- @Override
- public void update(Connection con) throws TorqueException {
- Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
- if (userGroupRoleSet != null)
- {
-
-
- }
-
- try
- {
- save(con);
- }
- catch (Exception e)
- {
- throw new TorqueException(e);
- }
- }
-
- @Override
- public String getDatabaseName() {
- return "default";
- }
-
- @Override
- public void delete() throws TorqueException {
- TurbineRolePeer.doDelete(SimpleKey.keyFor(getEntityId()));
-
- }
-
}
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
Tue May 9 13:27:23 2017
@@ -7,8 +7,6 @@ import java.util.Set;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.torque.TorqueException;
-import org.apache.torque.criteria.Criteria;
-import org.apache.torque.om.SimpleKey;
/**
@@ -79,15 +77,6 @@ public class TurbineUser
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HgetDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return "default";
- }
-
- /**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection)
*/
@Override
@@ -95,7 +84,7 @@ public class TurbineUser
{
Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
- List<${package}.om.TurbineUserGroupRole> ugrs =
getTurbineUserGroupRolesJoinTurbineUser(new Criteria(), con);
+ List<${package}.om.TurbineUserGroupRole> ugrs =
getTurbineUserGroupRoles();
for (${package}.om.TurbineUserGroupRole ttugr : ugrs)
{
@@ -109,40 +98,4 @@ public class TurbineUser
setUserGroupRoleSet(userGroupRoleSet);
}
- /**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$Hupdate(java.sql.Connection)
- *
- * @TODO
- */
- @Override
- public void update(Connection con) throws TorqueException
- {
- Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
- if (userGroupRoleSet != null)
- {
-
-
- }
-
- try
- {
- save(con);
- }
- catch (Exception e)
- {
- throw new TorqueException(e);
- }
- }
-
- /**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$Hdelete()
- */
- @Override
- public void delete() throws TorqueException
- {
- TurbineUserPeer.doDelete(SimpleKey.keyFor(getEntityId()));
- }
-
-
-
}
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
Tue May 9 13:27:23 2017
@@ -35,7 +35,7 @@
defaultIdMethod="idbroker">
- <table name="TURBINE_PERMISSION" idMethod="idbroker"
baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">
+ <table name="TURBINE_PERMISSION" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbinePermission">
<column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaType="object"/>
<column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -45,7 +45,7 @@
</table>
- <table name="TURBINE_ROLE" idMethod="idbroker"
baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbineRole">
+ <table name="TURBINE_ROLE" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineRole">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
<column name="ROLE_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -55,7 +55,7 @@
</table>
- <table name="TURBINE_GROUP" idMethod="idbroker"
baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbineGroup">
+ <table name="TURBINE_GROUP" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineGroup">
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="64"
javaName="EntityName"/>
@@ -79,7 +79,7 @@
</table>
<!-- org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity -->
- <table name="TURBINE_USER" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineTurbineSecurityEntity"
+ <table name="TURBINE_USER" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser"
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object" javaName="EntityId"/>
<column name="LOGIN_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml?rev=1794574&r1=1794573&r2=1794574&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
Tue May 9 13:27:23 2017
@@ -85,22 +85,22 @@
name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
early-init="true"
-
default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineUserManagerImpl"/>
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineUserManagerImpl"/>
<role
name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
-
default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
<role
name="org.apache.fulcrum.security.RoleManager"
shorthand="roleManager"
-
default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
<role
name="org.apache.fulcrum.security.PermissionManager"
shorthand="permissionManager"
-
default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl"/>
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbinePermissionManagerImpl"/>
<role
name="org.apache.fulcrum.security.torque.peer.PeerManager"
@@ -134,7 +134,7 @@
<role
name="org.apache.fulcrum.security.ModelManager"
shorthand="modelManager"
-
default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineModelManagerImpl"/>
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineModelManagerImpl"/>
<role
name="org.apache.fulcrum.security.authenticator.Authenticator"
@@ -146,28 +146,6 @@
shorthand="aclFactory"
default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
- <!-- use torque managers for database mysql et al. -->
- <!-- <role
- name="org.apache.fulcrum.security.UserManager"
- shorthand="userManager"
- early-init="true"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineUserManagerImpl"/>
- <role
- name="org.apache.fulcrum.security.GroupManager"
- shorthand="groupManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
- <role
- name="org.apache.fulcrum.security.RoleManager"
- shorthand="roleManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
- <role
- name="org.apache.fulcrum.security.PermissionManager"
- shorthand="permissionManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbinePermissionManagerImpl"/>
- <role
- name="org.apache.fulcrum.security.ModelManager"
- shorthand="modelManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineModelManagerImpl"/-->
<!-- role
name="org.apache.fulcrum.json.JsonService"
