| commit | 6e7ab1c83c6f4087419da4493f7a115c9e198ac3 | [log] [tgz] |
|---|---|---|
| author | gk <gk@13f79535-47bb-0310-9956-ffa450edef68> | Wed Jul 22 06:53:42 2015 +0000 |
| committer | gk <gk@13f79535-47bb-0310-9956-ffa450edef68> | Wed Jul 22 06:53:42 2015 +0000 |
| tree | d9aedff763b8ede471cceebebab612c49b829c45 | |
| parent | 456bd04c393606b7baf12d08fa84a37d0fa565e0 [diff] |
- removed security snapshots - fix conflicting name - add idMethod (using idBroker as an example) git-svn-id: https://svn.apache.org/repos/asf/turbine/maven/archetypes@1692225 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml index c64a49c..46cb189 100644 --- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml +++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
@@ -224,17 +224,17 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-memory</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-torque</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>junit</groupId>
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml index 2eaa6f3..cba8f3f 100644 --- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml +++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
@@ -28,7 +28,7 @@ <!-- ============================================================================== --> <database name="${turbine_database_name}"> - <table name="table1"> + <table name="table1" idMethod="idbroker"> <column name="test_col1" type="INTEGER" /> <column name="test_col2" type="VARCHAR" size="10" /> <!-- Add your database schema here -->
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml index a2327f1..35daf91 100644 --- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml +++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
@@ -80,7 +80,7 @@ <column name="LAST_NAME" required="true" size="64" type="VARCHAR"/> <column name="EMAIL" size="64" type="VARCHAR"/> <column name="CONFIRM_VALUE" size="16" type="VARCHAR" javaName="Confirmed"/> - <column name="MODIFIED" type="TIMESTAMP"/> + <column name="MODIFIEDDATE" type="TIMESTAMP" javaName="ModifiedDate"/> <column name="CREATED" type="TIMESTAMP" javaName="CreateDate"/> <column name="LAST_LOGIN" type="TIMESTAMP"/> <column name="OBJECTDATA" type="VARBINARY"/>