Author: gk
Date: Thu Nov 30 15:59:46 2017
New Revision: 1816722
URL: http://svn.apache.org/viewvc?rev=1816722&view=rev
Log:
- add info and autoincrement by default in sql, schema
- fix pom #var -> $
- update war plugin version to 3.2.0
- add interfaces in schema tables. That means, that default (non generated) OM
classes turbineGroup, TurbineRole, TurbienPermission could be removed, but not
the TurbineUser OM class as its retrieveAttachedObjects overriding is needed -
otherwise the Fulcrum Security Torque provided OM class may be used, which are
not equal to the generated = TODO).
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java
(with props)
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java
(with props)
Removed:
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/TurbinePermission.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/sample-mysql-data/_turbine-security-data.sql
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/services/pull/RelatedTool.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/sample-mysql-data/_turbine-security-data.sql
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/sample-mysql-data/_turbine-security-data.sql?rev=1816722&r1=1816721&r2=1816722&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/sample-mysql-data/_turbine-security-data.sql
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/sample-mysql-data/_turbine-security-data.sql
Thu Nov 30 15:59:46 2017
@@ -1,8 +1,9 @@
##
## turbine-security-data.sql
##
-## Torque will not autogenerate these files anymore - please run
-## this SQL code maually to get your application up and running
+## Torque will not autogenerate these files anymore - but sql-maven-plugin!
+## If not, please run
+## this SQL code manually to get your application up and running
##
SET FOREIGN_KEY_CHECKS=0;
@@ -36,5 +37,15 @@ INSERT INTO `turbine_user_group_role` (`
(1, 2, 1),
(2, 2, 2),
(2, 1, 2);
+
+--
+ALTER TABLE TURBINE_USER MODIFY COLUMN USER_ID INT auto_increment;
+ALTER TABLE turbine_permission MODIFY COLUMN PERMISSION_ID INT auto_increment;
+ALTER TABLE turbine_role MODIFY COLUMN ROLE_ID INT auto_increment;
+ALTER TABLE turbine_group MODIFY COLUMN GROUP_ID INT auto_increment;
+
+
+##-- use ID_TABLE witk idMethod="idbroker" and set appropriate start_id and
end_id
+##-- INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
(1,'TURBINE_USER',start_id, end_id);
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=1816722&r1=1816721&r2=1816722&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
Thu Nov 30 15:59:46 2017
@@ -56,12 +56,11 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
+ <source>#var("maven.compile.source")</source>
+ <target>#var("maven.compile.target")</target>
+ <encoding>#var("project.build.sourceEncoding")</encoding>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.torque</groupId>
<artifactId>torque-maven-plugin</artifactId>
@@ -73,121 +72,119 @@ under the License.
<targetDatabase>${turbine_database_adapter}</targetDatabase>
</configuration>
<executions>
- <execution>
- <id>torque-om</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
- <configPackage>org.apache.torque.templates.om</configPackage>
-
<sourceDir>#var("project.basedir")/src/main/torque-schema</sourceDir>
- <loglevel>error</loglevel>
- <options>
- <torque.database>${turbine_database_adapter}</torque.database>
- <torque.om.package>${package}.om</torque.om.package>
-
<torque.om.addGetByNameMethods>false</torque.om.addGetByNameMethods>
-
<torque.om.save.saveException>TorqueException</torque.om.save.saveException>
-
<torque.om.useIsForBooleanGetters>true</torque.om.useIsForBooleanGetters>
- <torque.om.useManagers>false</torque.om.useManagers>
- <torque.om.addTimeStamp>true</torque.om.addTimeStamp>
- <torque.om.objectIsCaching>true</torque.om.objectIsCaching>
-
<torque.om.save.addSaveMethods>true</torque.om.save.addSaveMethods>
-
<torque.om.addGetByNameMethods>true</torque.om.addGetByNameMethods>
-
<torque.om.complexObjectModel>true</torque.om.complexObjectModel>
- </options>
- <outputDirMap>
- <modifiable>#var("project.build.sourceDirectory")</modifiable>
- </outputDirMap>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-mysql</id><!-- ${turbine_database_adapter} -->
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
- <configPackage>org.apache.torque.templates.sql</configPackage>
-
<sourceDir>#var("project.basedir")/src/main/torque-schema</sourceDir>
-
<defaultOutputDir>#var("project.build.directory")/generated-sql/torque/mysql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>mysql</torque.database>
- </options>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
+ <execution>
+ <id>torque-om</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.om</configPackage>
+
<sourceDir>#var("project.basedir")/src/main/torque-schema</sourceDir>
+ <loglevel>error</loglevel>
+ <options>
+
<torque.database>${turbine_database_adapter}</torque.database>
+ <torque.om.package>${package}.om</torque.om.package>
+
<torque.om.addGetByNameMethods>false</torque.om.addGetByNameMethods>
+
<torque.om.save.saveException>TorqueException</torque.om.save.saveException>
+
<torque.om.useIsForBooleanGetters>true</torque.om.useIsForBooleanGetters>
+ <torque.om.useManagers>false</torque.om.useManagers>
+ <torque.om.addTimeStamp>true</torque.om.addTimeStamp>
+
<torque.om.objectIsCaching>true</torque.om.objectIsCaching>
+
<torque.om.save.addSaveMethods>true</torque.om.save.addSaveMethods>
+
<torque.om.addGetByNameMethods>true</torque.om.addGetByNameMethods>
+
<torque.om.complexObjectModel>true</torque.om.complexObjectModel>
+ </options>
+ <!-- keeping defaultOutputDir in default
${project.build.directory}/generated-sources will havee the base classes there
-->
+ <!-- we want the classes, which may be custumoized in
the source directory. Ignore the warning about generated-java -->
+ <outputDirMap>
+
<modifiable>#var("project.build.sourceDirectory")</modifiable>
+ </outputDirMap>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mysql</id><!-- ${turbine_database_adapter}
-->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.sql</configPackage>
+
<sourceDir>#var("project.basedir")/src/main/torque-schema</sourceDir>
+
<defaultOutputDir>#var("project.build.directory")/generated-sql/torque/mysql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
<groupId>org.apache.torque</groupId>
<artifactId>torque-templates</artifactId>
<version>4.0</version>
</dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+
<X-Compile-Source-JDK>#var("maven.compile.source")</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>#var("maven.compile.target")</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
+ <!--
containerConfigXML>WEB-INF/build/context.xml</containerConfigXML -->
+ </configuration>
+ </plugin>
+ <!-- Required to execute torque database build -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <!-- Please update with your database configuration -->
+ <driver>${turbine_database_driver}</driver>
+ <url>${turbine_database_url}${turbine_database_name}</url>
+ <username>${turbine_database_user}</username>
+ <password>${turbine_database_password}</password>
+ <onError>continue</onError>
+ <autocommit>true</autocommit>
+ <orderFile>descending</orderFile>
+ </configuration>
+ <!-- update with your database driver dependency -->
+ <!-- this is mysql specific -->
+ <dependencies>
+ <dependency>
+ <artifactId>mysql-connector-java</artifactId>
+ <groupId>mysql</groupId>
+ <version>5.1.40</version>
+ </dependency>
+ </dependencies>
+ <!-- this is mysql specific -->
+ <executions>
+ <execution>
+ <id>create-db</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
<configuration>
- <archive>
- <manifestEntries>
-
<X-Compile-Source-JDK>#var("maven.compile.source")</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>#var("maven.compile.target")</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- <!--
containerConfigXML>WEB-INF/build/context.xml</containerConfigXML -->
- </configuration>
- </plugin>
-
-
- <!-- Required to execute torque database build -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.5</version>
- <configuration>
-
- <!-- Please update with your database configuration -->
- <driver>${turbine_database_driver}</driver>
- <url>${turbine_database_url}${turbine_database_name}</url>
- <username>${turbine_database_user}</username>
- <password>${turbine_database_password}</password>
- <onError>continue</onError>
- <autocommit>true</autocommit>
- <orderFile>descending</orderFile>
- </configuration>
-
- <!-- update with your database driver dependency -->
- <!-- this is mysql specific -->
- <dependencies>
- <dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
- <version>5.1.40</version>
- </dependency>
- </dependencies>
- <!-- this is mysql specific -->
- <executions>
- <execution>
- <id>create-db</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <orderFile>ascending</orderFile>
- <fileset>
-
<basedir>${project.build.directory}/generated-sql/torque/mysql</basedir>
- <!-- basedir>${basedir}/target/generated-sql</basedir -->
- <includes>
- <include>*.sql</include>
- </includes>
- </fileset>
+ <orderFile>ascending</orderFile>
+ <fileset>
+
<basedir>#var("project.build.directory")/generated-sql/torque/mysql</basedir>
+ <!-- basedir>${basedir}/target/generated-sql</basedir -->
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ </fileset>
</configuration>
</execution>
<execution>
@@ -199,36 +196,34 @@ under the License.
<configuration>
<orderFile>ascending</orderFile>
<srcFiles>
-
<srcFile>${project.basedir}/docs/sample-mysql-data/_application-data.sql</srcFile>
-
<srcFile>${project.basedir}/docs/sample-mysql-data/_turbine-security-data.sql</srcFile>
+
<srcFile>#var("project.basedir")/docs/sample-mysql-data/_application-data.sql</srcFile>
+
<srcFile>#var("project.basedir")/docs/sample-mysql-data/_turbine-security-data.sql</srcFile>
</srcFiles>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <!-- jetty:run checks deployed war http://localhost:8081/app/
-
- Using jetty 8 as supporting java 6. Other specs cft.
http://www.eclipse.org/jetty/documentation/9.3.0.v20150612/what-jetty-version.html
- -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.16.v20140903</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <dumpOnStart>true</dumpOnStart>
- <connectors>
- <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8081</port>
- </connector>
- </connectors>
- <!--webApp>
- <contextPath>/app</contextPath>
- </webApp-->
- </configuration>
- </plugin>
- </plugins>
+ </executions>
+ </plugin>
+ <!-- jetty:run checks deployed war http://localhost:8081/app/
+ Using jetty 8 as supporting java 6. Other specs cft.
http://www.eclipse.org/jetty/documentation/9.3.0.v20150612/what-jetty-version.html
-->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.1.16.v20140903</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <dumpOnStart>true</dumpOnStart>
+ <reload>manual</reload>
+ <connectors>
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8081</port>
+ </connector>
+ </connectors>
+ <!--webApp>
+ <contextPath>/app</contextPath>
+ </webApp-->
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -260,7 +255,7 @@ under the License.
<dependency>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>#var("turbine.core")</version>
</dependency>
<!-- yaafi is optional. NOTICE: 1.0.7 has group org.apache.turbine not
org.apache.fulcrum -->
<dependency>
@@ -339,6 +334,47 @@ under the License.
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<fulcrum.json>1.1.1</fulcrum.json>
<fulcrum.security>1.1.1</fulcrum.security>
+ <turbine.core>4.0</turbine.core>
</properties>
+
+ <profiles>
+ <profile>
+ <id>jetty</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>15000</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tomcat</id>
+ <build>
+ <defaultGoal>tomcat:run</defaultGoal>
+ <finalName>#var("pom.artifactId")</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <port>15000</port>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java?rev=1816722&view=auto
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java
(added)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java
Thu Nov 30 15:59:46 2017
@@ -0,0 +1,16 @@
+package ${package}.om;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Thu Sep 04 12:20:05 CEST 2014]
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+public class TurbinePermissionPeer
+ extends ${package}.om.BaseTurbinePermissionPeer implements
org.apache.fulcrum.security.torque.peer.Peer
+{
+
+}
Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java?rev=1816722&view=auto
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java
(added)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java
Thu Nov 30 15:59:46 2017
@@ -0,0 +1,20 @@
+package ${package}.om;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Mon Nov 25 16:49:55 CET 2013]
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+
+public class TurbinePermissionPeerImpl
+ extends ${package}.om.BaseTurbinePermissionPeerImpl implements
org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer<TurbinePermission>
+{
+ /** Serial version */
+ private static final long serialVersionUID = 138394595924L;
+
+}
Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermissionPeerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/services/pull/RelatedTool.java
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/services/pull/RelatedTool.java?rev=1816722&r1=1816721&r2=1816722&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/services/pull/RelatedTool.java
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/services/pull/RelatedTool.java
Thu Nov 30 15:59:46 2017
@@ -61,7 +61,7 @@ public class RelatedTool implements RunD
log.info("reading role for: "+user.getName());
if (data.getACL() != null && data.getACL() instanceof
TurbineAccessControlList) {
RoleSet roles =
((TurbineAccessControlList)data.getACL()).getRoles();
- if (roles.getSet().size() == 1) {
+ if (roles != null && roles.getSet().size() == 1) {
Role fulcrumRole = roles.getSet().iterator().next();
log.debug("acl role is: "+fulcrumRole.getName());
return fulcrumRole.getName();
@@ -77,7 +77,7 @@ public class RelatedTool implements RunD
}
return (role != null)? role.getName(): null;
} catch (Exception e) {
- log.error("DCRelatedLink - failure in reading role: ", e);
+ log.error("RelatedTool - failure in reading role: ", e);
return null;
}
}
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=1816722&r1=1816721&r2=1816722&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
Thu Nov 30 15:59:46 2017
@@ -32,11 +32,11 @@
xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
http://db.apache.org/torque/4.0/templates/database-strict.xsd";
name="${turbine_database_name}"
- defaultIdMethod="idbroker">
+ defaultIdMethod="none">
- <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"/>
+ <table name="TURBINE_PERMISSION" idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbinePermission"
interface="org.apache.fulcrum.security.model.turbine.entity.TurbinePermission">
+ <column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaType="object" javaName="EntityId" autoIncrement="true"/>
<column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<unique>
@@ -45,8 +45,8 @@
</table>
- <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"/>
+ <table name="TURBINE_ROLE" idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineRole"
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineRole">
+ <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object" javaName="EntityId" autoIncrement="true"/>
<column name="ROLE_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<unique>
@@ -55,8 +55,8 @@
</table>
- <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"/>
+ <table name="TURBINE_GROUP" idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineGroup"
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineGroup">
+ <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object" javaName="EntityId" autoIncrement="true"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="64"
javaName="EntityName"/>
<unique>
@@ -79,9 +79,9 @@
</table>
<!-- org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity -->
- <table name="TURBINE_USER" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser"
+ <table name="TURBINE_USER" idMethod="native"
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="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object" javaName="EntityId" autoIncrement="true"/>
<column name="LOGIN_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<column name="PASSWORD_VALUE" required="true" size="16" type="VARCHAR"
javaName="Password"/>
<column name="FIRST_NAME" required="true" size="64" type="VARCHAR"/>
