You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/11/08 00:14:42 UTC

svn commit: r1199003 [1/2] - in /turbine/maven/archetypes/trunk/turbine-webapp-2.3.3: ./ src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/arche...

Author: tv
Date: Mon Nov  7 23:14:41 2011
New Revision: 1199003

URL: http://svn.apache.org/viewvc?rev=1199003&view=rev
Log:
Initial version of a maven archetype for Turbine 2.3.3 web applications

Added:
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/actions/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/layouts/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/navigations/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/pages/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/scheduledjobs/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/containerConfiguration.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/intake.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/log4j.properties   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/powered-by-logo.gif   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine-project.png   (with props)
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/skin.props
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/layouts/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/layouts/Default.vm
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/navigations/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/screens/
    turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Index.vm

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.turbine</groupId>
+  <artifactId>turbine-webapp</artifactId>
+  <version>2.3.3-SNAPSHOT</version>
+  <packaging>maven-archetype</packaging>
+
+  <name>Archetype - turbine-webapp</name>
+  <url>http://maven.apache.org</url>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.1</version>
+      </extension>
+    </extensions>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<archetype-descriptor 
+  xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+  name="turbine-2.3.3-velocity">
+
+  <requiredProperties>
+    <requiredProperty key="turbine_app_name">
+      <defaultValue>My Turbine Web Application</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="turbine_intake_file">
+      <defaultValue>intake.xml</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="turbine_database_name">
+      <defaultValue>turbine</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="turbine_database_adapter">
+      <defaultValue>mysql</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="turbine_database_jndipath">
+      <defaultValue>java:comp/env/jdbc/Turbine</defaultValue>
+    </requiredProperty>
+  </requiredProperties>
+
+  <fileSets>
+    <fileSet filtered="true" packaged="true" encoding="UTF-8">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/*.java</include>
+        <include>**/*.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="false" encoding="UTF-8">
+      <directory>src/main/torque-schema</directory>
+      <includes>
+        <include>**/*.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="false" encoding="UTF-8">
+      <directory>src/main/webapp/WEB-INF</directory>
+      <includes>
+        <include>**/*.xml</include>
+        <include>**/*.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="false" packaged="false" encoding="UTF-8">
+      <directory>src/main/webapp/templates</directory>
+      <includes>
+        <include>**/*.vm</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="false" packaged="false" encoding="UTF-8">
+      <directory>src/main/webapp/resources</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</archetype-descriptor>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="UTF-8"?>
+#*
+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.
+*#
+#set($dollar = '$')
+#macro (var
+$label)${dollar}{${label}}#end
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>${package}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>war</packaging>
+
+    <name>${turbine_app_name}</name>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>#var("project.build.directory")/torque/schema</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/torque-schema</directory>
+                <includes>
+                    <include>*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven.compile.source}</source>
+                    <target>${maven.compile.target}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.torque</groupId>
+                <artifactId>torque-maven-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <schemaDir>#var("project.build.directory")/torque/schema</schemaDir>
+
+                    <!-- Define the Override directory location -->
+                    <!-- templatePath>#var("project.build.directory")/torque/templates</templatePath -->
+                    <useClasspath>true</useClasspath>
+                    <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                    <targetDatabase>${turbine_database_adapter}</targetDatabase>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>om</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>om</goal>
+                        </goals>
+                        <configuration>
+                            <!-- These settings will allow you to customize 
+                                the way your Peer-based object model is created. -->
+                            <targetPackage>${package}.om</targetPackage>
+                            <outputDir>#var("project.build.sourceDirectory")</outputDir>
+                            <baseOutputDir>#var("project.build.directory")/generated-sources/torque</baseOutputDir>
+                            <baseReportFile>report.#var("project.artifact.artifactId").om.base.generation</baseReportFile>
+                            <reportFile>report.#var("project.artifact.artifactId").om.generation</reportFile>
+
+                            <addGetByNameMethod>true</addGetByNameMethod>
+                            <addIntakeRetrievable>true</addIntakeRetrievable>
+                            <addSaveMethod>true</addSaveMethod>
+                            <addTimeStamp>true</addTimeStamp>
+                            <basePrefix>Base</basePrefix>
+                            <complexObjectModel>true</complexObjectModel>
+                            <correctGetters>true</correctGetters>
+                            <useManagers>false</useManagers>
+                            <objectIsCaching>true</objectIsCaching>
+                            <saveException>TorqueException</saveException>
+                            <enableJava5Features>true</enableJava5Features>
+                            <runOnlyOnSchemaChange>true</runOnlyOnSchemaChange>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>datadtd torque security</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>datadtd</goal>
+                        </goals>
+                        <configuration>
+                            <projectName>torque-security</projectName>
+                            <xmlFile>#var("project.build.directory")/torque/schema/torque-security-schema.xml</xmlFile>
+                            <outputDir>#var("project.build.directory")/torque/schema</outputDir>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>datadtd application specific</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>datadtd</goal>
+                        </goals>
+                        <configuration>
+                            <projectName>application</projectName>
+                            <xmlFile>#var("project.build.directory")/torque/schema/application-schema.xml</xmlFile>
+                            <outputDir>#var("project.build.directory")/torque/schema</outputDir>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>schema sql</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>sql</goal>
+                            <goal>id-table-init-sql</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>datasql torque security</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>datasql</goal>
+                        </goals>
+                        <configuration>
+                            <dataXmlFile>#var("project.build.directory")/torque/schema/torque-security-data.xml</dataXmlFile>
+                            <dataDtd>#var("project.build.directory")/torque/schema/torque-security-data.dtd</dataDtd>
+
+                            <reportFile>torque-security-data.sql</reportFile>
+                            <schemaIncludes>torque-security-schema.xml</schemaIncludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>datasql application specific</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>datasql</goal>
+                        </goals>
+                        <configuration>
+                            <dataXmlFile>#var("project.build.directory")/torque/schema/application-data.xml</dataXmlFile>
+                            <dataDtd>#var("project.build.directory")/torque/schema/application-data.dtd</dataDtd>
+                            <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+
+                            <reportFile>application-data.sql</reportFile>
+                            <schemaIncludes>application-schema.xml</schemaIncludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <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>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+            <version>1.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-email</groupId>
+            <artifactId>commons-email</artifactId>
+            <version>1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dumbster</groupId>
+                    <artifactId>dumbster</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-api</artifactId>
+            <version>4.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-impl</artifactId>
+            <version>4.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.fulcrum</groupId>
+            <artifactId>fulcrum-yaafi</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.torque</groupId>
+            <artifactId>village</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.torque</groupId>
+            <artifactId>torque-runtime</artifactId>
+            <version>3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-logkit</groupId>
+                    <artifactId>avalon-logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>turbine</groupId>
+            <artifactId>turbine</artifactId>
+            <version>2.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-logkit</groupId>
+                    <artifactId>avalon-logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>excalibur-component</groupId>
+                    <artifactId>excalibur-component</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>excalibur-instrument</groupId>
+                    <artifactId>excalibur-instrument-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>excalibur-logger</groupId>
+                    <artifactId>excalibur-logger</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>excalibur-pool</groupId>
+                    <artifactId>excalibur-pool-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>fulcrum</groupId>
+                    <artifactId>fulcrum-yaafi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>hsqldb</groupId>
+                    <artifactId>hsqldb</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stratum</groupId>
+                    <artifactId>stratum</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>torque</groupId>
+                    <artifactId>torque</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>torque</groupId>
+                    <artifactId>village</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>texen</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compile.source>1.6</maven.compile.source>
+        <maven.compile.target>1.6</maven.compile.target>
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    </properties>
+</project>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties Mon Nov  7 23:14:41 2011
@@ -0,0 +1,19 @@
+#*
+# 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.
+*#
+l10nkey=US-English value
\ No newline at end of file

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/L10N_en_US.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java Mon Nov  7 23:14:41 2011
@@ -0,0 +1,64 @@
+package ${package}.modules.screens;
+#*
+ * 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.
+*#
+
+import org.apache.turbine.util.RunData;
+import org.apache.velocity.context.Context;
+
+import org.apache.turbine.modules.screens.VelocitySecureScreen;
+
+/**
+ * This class provides the data required for displaying content in the
+ * Velocity page. 
+ */
+public class Index extends VelocitySecureScreen
+{
+	/**
+	 * This method is called by the Turbine framework when the
+	 * associated Velocity template, Index.vm is requested
+	 * 
+	 * @param data the Turbine request data
+	 * @param context the Velocity context
+	 * @throws Exception a generic Exception
+	 */
+	@Override
+	protected void doBuildTemplate(RunData data, Context context)
+			throws Exception
+	{
+		context.put("success", "Congratulations, it worked!");
+	}
+
+	/**
+	 * This method is called bythe Turbine framework to determine if
+	 * the current user is allowed to use this screen. If this method
+	 * returns false, the doBuildTemplate() method will not be called.
+	 * If a redirect to some "access denied" page is required, do the
+	 * necessary redirect here.
+	 * 
+	 * @param data the Turbine request data
+	 * @return true if this screen may be accessed
+	 * @throws Exception a generic Exception
+	 */
+	@Override
+	protected boolean isAuthorized(RunData data) throws Exception
+	{
+		// use data.getACL() 
+		return true;
+	}
+}

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+#*
+ 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.
+*#
+<!DOCTYPE dataset SYSTEM "file://application-data.dtd">
+
+<!-- =============================================================================== -->
+<!--                                                                                 -->
+<!-- Application Data in XML. Add your custom values to this file                    -->
+<!--                                                                                 -->
+<!-- @version $Id: application-data.xml 615328 2008-01-25 20:25:05Z tv $ -->
+<!--                                                                                 -->
+<!-- =============================================================================== -->
+
+<dataset name="all"/>
+

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+#*
+ 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.
+*#
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
+
+<!-- ============================================================================== -->
+<!--                                                                                -->
+<!--  Database Definition for the Application                                       -->
+<!--                                                                                -->
+<!--  @version $Id: application-schema.xml 615328 2008-01-25 20:25:05Z tv $  -->
+<!--                                                                                -->
+<!-- ============================================================================== -->
+
+<database name="${turbine_database_name}">
+    <table name="table1">
+        <column name="test_col1" type="INTEGER" />
+        <column name="test_col2" type="VARCHAR" size="10" />
+        <!-- Add your database schema here -->
+    </table>
+</database>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ 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.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
+
+<!-- ========================================================================= -->
+<!--                                                                           -->
+<!-- Table definition for the ID Broker Table used by Torque                   -->
+<!--                                                                           -->
+<!-- @version $Id: id-table-schema.xml 615328 2008-01-25 20:25:05Z tv $ -->
+<!--                                                                           -->
+<!-- ========================================================================= -->
+
+<database name="@DATABASE_DEFAULT@"
+  defaultIdMethod="idbroker"
+  defaultJavaType="primitive"
+  defaultJavaNamingMethod="underscore"
+  package="@DATABASE_PACKAGE@">
+  <table name="ID_TABLE" idMethod="idbroker">
+    <column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER" javaName="IdTableId"/>
+    <column name="TABLE_NAME" required="true" size="255" type="VARCHAR" javaName="TableName"/>
+    <column name="NEXT_ID" required="true" type="INTEGER" javaName="NextId"/>
+    <column name="QUANTITY" required="true" type="INTEGER" javaName="Quantity"/>
+
+    <unique>
+      <unique-column name="TABLE_NAME"/>
+    </unique>
+
+  </table>
+</database>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+#*
+ 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.
+*#
+<!DOCTYPE dataset SYSTEM "file://torque-security-data.dtd">
+
+<!-- =============================================================================== -->
+<!--                                                                                 -->
+<!-- Default Values for Admin and normal User                                        -->
+<!--                                                                                 -->
+<!-- @version $Id: turbine-security-data.xml 615328 2008-01-25 20:25:05Z tv $ -->
+<!--                                                                                 -->
+<!-- =============================================================================== -->
+
+<dataset name="all">
+
+  <TurbineUser UserId="1"
+               UserName="admin"
+               Password="password"
+               FirstName=""
+               LastName="Admin"/>
+
+  <TurbineUser UserId="2"
+               UserName="user"
+               Password="password"
+               FirstName=""
+               LastName="User"/>
+
+  <!-- Turbine Permissions -->
+
+  <TurbinePermission PermissionId="1" Name="TurbineAdmin"/>
+  <TurbinePermission PermissionId="2" Name="Turbine"/>
+
+  <!-- Turbine Roles -->
+
+  <TurbineRole RoleId="1" Name="TurbineAdmin"/>
+  <TurbineRole RoleId="2" Name="TurbineUser"/>
+
+ <!-- Turbine Groups -->
+
+  <TurbineGroup GroupId="1" Name="global"/>
+  <TurbineGroup GroupId="2" Name="Turbine"/>
+
+  <TurbineRolePermission RoleId="1" PermissionId="1"/>
+  <TurbineRolePermission RoleId="2" PermissionId="2"/>
+
+  <!-- Associate Users, Groups, and Roles -->
+
+  <TurbineUserGroupRole UserId="1" GroupId="2" RoleId="1"/>
+  <TurbineUserGroupRole UserId="2" GroupId="2" RoleId="2"/>
+
+</dataset>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/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-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml Mon Nov  7 23:14:41 2011
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ 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.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
+
+<!-- ======================================================================== -->
+<!--                                                                          -->
+<!--  Turbine Torque based Security Service Schema                            -->
+<!--                                                                          -->
+<!-- $Id: turbine-security-schema.xml 615328 2008-01-25 20:25:05Z tv $ -->
+<!--                                                                          -->
+<!-- ======================================================================== -->
+
+<database name="${turbine_database_name}">
+
+  <table name="TURBINE_PERMISSION" idMethod="idbroker">
+    <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR" javaName="Name"/>
+
+    <unique>
+      <unique-column name="PERMISSION_NAME"/>
+    </unique>
+
+  </table>
+
+  <table name="TURBINE_ROLE" idMethod="idbroker">
+    <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="ROLE_NAME" required="true" size="64" type="VARCHAR" javaName="Name"/>
+
+    <unique>
+        <unique-column name="ROLE_NAME"/>
+    </unique>
+
+  </table>
+
+  <table name="TURBINE_GROUP" idMethod="idbroker">
+    <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="GROUP_NAME" required="true" type="VARCHAR" size="64" javaName="Name"/>
+
+    <unique>
+        <unique-column name="GROUP_NAME"/>
+    </unique>
+
+  </table>
+
+  <table name="TURBINE_ROLE_PERMISSION">
+    <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
+
+    <foreign-key foreignTable="TURBINE_ROLE">
+      <reference local="ROLE_ID" foreign="ROLE_ID"/>
+    </foreign-key>
+
+    <foreign-key foreignTable="TURBINE_PERMISSION">
+      <reference local="PERMISSION_ID" foreign="PERMISSION_ID"/>
+    </foreign-key>
+  </table>
+
+  <table name="TURBINE_USER" idMethod="idbroker">
+    <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="LOGIN_NAME" required="true" size="64" type="VARCHAR" javaName="UserName"/>
+    <column name="PASSWORD_VALUE" required="true" size="16" type="VARCHAR" javaName="Password"/>
+    <column name="FIRST_NAME" required="true" size="64" type="VARCHAR"/>
+    <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="CREATED" type="TIMESTAMP" javaName="CreateDate"/>
+    <column name="LAST_LOGIN" type="TIMESTAMP"/>
+    <column name="OBJECTDATA" type="VARBINARY"/>
+
+    <unique>
+        <unique-column name="LOGIN_NAME"/>
+    </unique>
+
+  </table>
+
+  <table name="TURBINE_USER_GROUP_ROLE">
+    <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
+    <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
+
+    <foreign-key foreignTable="TURBINE_USER">
+      <reference local="USER_ID" foreign="USER_ID"/>
+    </foreign-key>
+
+    <foreign-key foreignTable="TURBINE_GROUP">
+      <reference local="GROUP_ID" foreign="GROUP_ID"/>
+    </foreign-key>
+
+    <foreign-key foreignTable="TURBINE_ROLE">
+      <reference local="ROLE_ID" foreign="ROLE_ID"/>
+    </foreign-key>
+  </table>
+
+</database>

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties?rev=1199003&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties Mon Nov  7 23:14:41 2011
@@ -0,0 +1,55 @@
+#*
+# 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.
+*#
+# -------------------------------------------------------------------
+#
+# This is the configuration file for Torque.
+#
+# Note that strings containing "," (comma) characters must backslash
+# escape the comma (i.e. '\,')
+#
+# -------------------------------------------------------------------
+#
+#  T O R Q U E  P R O P E R T I E S
+#
+# -------------------------------------------------------------------
+# These are your database settings. Look in the
+# org.apache.torque.pool.* packages for more information.
+#
+# The parameters to connect to the default database.  You MUST
+# configure these properly.
+# -------------------------------------------------------------------
+
+torque.database.default=${turbine_database_name}
+torque.database.turbine.adapter=${turbine_database_adapter}
+
+# Using JNDI
+torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+torque.dsfactory.${turbine_database_name}.jndi.path=${turbine_database_jndipath}
+torque.dsfactory.${turbine_database_name}.jndi.ttl=300000
+
+# Determines if the quantity column of the IDBroker's id_table should
+# be increased automatically if requests for ids reaches a high
+# volume.
+
+torque.idbroker.cleverquantity=true
+
+# Determines whether the managers cache instances of the business objects.
+# And also whether the MethodResultCache will really cache results.
+
+torque.manager.useCache = true

Propchange: turbine/maven/archetypes/trunk/turbine-webapp-2.3.3/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain