You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/10/08 19:23:29 UTC
[turbine-archetypes] branch master updated: Merge Jeff's turbine-5
work with Georg's version
This is an automated email from the ASF dual-hosted git repository.
painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 19cc809 Merge Jeff's turbine-5 work with Georg's version
19cc809 is described below
commit 19cc809952d3cad33aa5517348801a2fa4a3ed16
Author: jlpainter <je...@gmail.com>
AuthorDate: Mon Oct 8 15:22:54 2018 -0400
Merge Jeff's turbine-5 work with Georg's version
---
NOTICE | 2 +-
README | 5 +
README.md | 222 +-----------------
pom.xml | 136 +++++------
.../META-INF/maven/archetype-metadata.xml | 5 +-
.../resources/archetype-resources/docs/README.txt | 1 +
src/main/resources/archetype-resources/pom.xml | 72 ++++--
.../main/java/flux/modules/actions/FluxLogin.java | 2 +-
.../main/java/flux/modules/actions/FluxLogout.java | 2 +-
.../java/flux/modules/actions/SecureAction.java | 2 +-
.../modules/actions/group/FluxGroupAction.java | 2 +-
.../actions/permission/FluxPermissionAction.java | 2 +-
.../flux/modules/actions/role/FluxRoleAction.java | 2 +-
.../src/main/java/flux/tools/FluxTool.java | 2 +-
.../src/main/java/modules/actions/LoginUser.java | 2 +-
.../main/java/modules/actions/LoginUserIntake.java | 2 +-
.../src/main/java/modules/actions/LogoutUser.java | 2 +-
.../src/main/java/modules/screens/Index.java | 132 +++++------
.../src/main/java/modules/screens/Password.java | 2 +-
.../main/java/modules/screens/SecureScreen.java | 2 +-
.../src/main/torque-schema/application-data.xml | 62 ++---
.../src/main/torque-schema/application-schema.xml | 106 ++++-----
.../src/main/torque-schema/id-table-schema.xml | 94 ++++----
.../main/torque-schema/torque-security-data.xml | 134 +++++------
.../main/torque-schema/torque-security-schema.xml | 250 ++++++++++-----------
.../WEB-INF/conf/TurbineConfigurationBuilder.xml | 27 ++-
.../WEB-INF/conf/TurbineResources.properties | 7 +-
.../src/main/webapp/WEB-INF/conf/intake.xml | 90 ++++----
.../src/main/webapp/WEB-INF/jetty-env.xml | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 219 +++++++++---------
.../src/test/conf/torque/TorqueTest.properties | 7 +-
.../resources/projects/first/archetype.properties | 3 +-
32 files changed, 704 insertions(+), 898 deletions(-)
diff --git a/NOTICE b/NOTICE
index a43064b..2342908 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Turbine Webapp Component
-Copyright 2006-2016 The Apache Software Foundation.
+Copyright 2006-2018 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README b/README
new file mode 100644
index 0000000..d7e9268
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+If you get that goal integration-test of maven-archetype-plugin fails with
+
+'Cannot run additions goals." cft. https://issues.apache.org/jira/browse/ARCHETYPE-488.
+
+Fastest workaround (Dez 2016) ist to copy mvn.cmd to mvn.bat.
\ No newline at end of file
diff --git a/README.md b/README.md
index e8d0f86..2389115 100644
--- a/README.md
+++ b/README.md
@@ -1,220 +1,2 @@
-# Apache Turbine Archetypes, Turbine 4.0 maven archetype
-
-About this archetype
-
-* This is a maven archetype to generate a skeleton Turbine application.
-
-* The base Turbine version is **[Turbine 4.0](http://turbine.apache.org/turbine/turbine-4.0/)**.
-
-## Quick Guide: How to use the new Turbine 4.0 maven archetype for skeleton application generation
-
-### Maven archetype
-
-#### Requirements
-
-- Java 6+ up to version Turbine 4.0.x, cft. [Getting Started with Turbine 4.0](http://turbine.apache.org/turbine/turbine-4.0/getting-started.html).
-- Database (Mysql 5.x like)
-
-#### Installation
-
-##### First step: Catalog setting
-
-First, find the remote arcehtype or generate a local one.
-
-###### Remote catalog
-```
-mvn archetype:generate
-```
-Find **turbine-webapp-4.0** in remote archetype catalog and select current version.
-
-###### Local catalog
-
-Checkout Git master/trunk and install into locale repository
-```
-git clone https://gitbox.apache.org/repos/asf/turbine-archetypes.git
-cd turbine-archetypes
-mvn install
-```
-Outlook: After the snapshot archetype is installed and the database is set up (see below), just add **-DarchetypeCatalog=local** as argument (see below), when generating the Turbine application.
-```
-mvn archetype:generate -DarchetypeCatalog=local -Dturbine_database_name=db_name ...
-```
-
-### Second step: Local database Setup
-
-Second, you should have a local database installed and configured prior to beginning the application setup below.
-
-As we are (currently) using MySQL by default you need to create the database in MySQL, e.g. with
-```
-mysql -u <privileged_user> -p
-mysql> create database <db_name>;
-mysql> \q
-```
-or other tools. The database should have been started and the database user granted enough rights.
-
-### Third step: Customization
-
-Next, you can invoke the Maven archetype for turbine-webapp-4.0 from
-the command line as shown below - please update values starting with 'groupId' as appropriate.
-```
-mvn archetype:generate \
- -DarchetypeGroupId=org.apache.turbine \
- -DarchetypeArtifactId=turbine-webapp-4.0 \
- -DarchetypeVersion=1.0.2-SNAPSHOT \
- -DgroupId=com.mycompany.webapp \
- -DartifactId=myhelloworld \
- -Dversion=1.0 \
- -Dturbine_app_name=HelloWorld \
- -Dturbine_database_adapter=mysql \
- -Dturbine_database_user=db_username \
- -Dturbine_database_password=db_password \
- -Dturbine_database_name=db_name \
- -Dturbine_database_url=jdbc:mysql://localhost:3306/ \
- -Dgoals=generate-sources,pre-integration-test
-```
-#### Notes
-
-When invoking *archetype:generate* like above, you already have set Turbine *Maven goals* **generate-sources**, **pre-integration-test**
-and you can then skip them later.
-
-**Be aware, when you set both mvn commands goals (which are maven phases actually), i.e with**
-```
--Dgoals=generate-sources, pre-integration-test
-```
-
- **you have to create the database (see above) before finishing the (interactive) archetype commands.**
-Otherwise you could catch up doing this later (cft. below, Project Start, which requires the database setup is finished).
-
-##### turbine_database_url
-
-Note that the database URL (*-Dturbine_database_url=<turbine_database_url>*)
-will be appended with your database name (*-Dturbine_database_name=db_name*) in the final pom.xml, so you do not need to specify that in
-the configuration.
-
-### Last Step: Project Start and Usage
-
-Next, change into the newly generated project folder, in our case
-```
-cd myhelloworld
-```
-Skip next two steps, if the build was successfull (requires database setup is finished)
-```
-mvn generate-sources
-```
-This will generate the OM layer and SQL code for creating the corresponding database tables.
-
-```
-mvn integration-test
-```
-This executes the SQL code to create the application schema defined in *src/main/torque-schema*.
-
-You should now check the database tables and if some data is missing
-insert the sample data file in **sample-mysql-data** (Torque 4.0 has disabled the datasql task).
-```
-mvn clean install
-```
-If you get an error like **_"The driver has not received any packets"_** probably the database is not up and running or the port may be another one.
-
-Last step on the command line is run the server by invoking
-```
-mvn jetty:run
-```
-Now you can launch your new Turbine application! Have fun!
-
-#### Logs
-
-Find the Logs in *src/main/webapp/logs*.
-
-#### Application
-
-Open a web browser to *http://localhost:8081/app*
-
-Hint: find the port in the configuration of the jetty-maven-plugin [Archetype pom template](src/main/resources/archetype-resources/pom.xml).
-
-Login should work with user admin/password or user/password.
-
-### Background
-
-By default [Intake](http://turbine.apache.org/fulcrum/fulcrum-intake/ "Fulcrum Intake") is used as an validation mechanism for authentication. You can change to the default login by setting
-
-*action.login=LoginUser* in **TurbineResources.properties** and changing *Login.vm* appropriately (commented form).
-
-### Tests
-
-Prerequisites
-- Ignored tests require at least Turbine version 4.0.1
-- Database was build successfully e.g. with archetype.
-- Running mysql
-
-If running from integration test, check/update
-- in **pom.xml** _turbine.core_ property,
-- **target/test-classes/projects/first/project/integrationtest/src/test/conf/torque/TorqueTest.properties** or
- **META-INF/maven/archetype-metadata.xml**
-
-The security test is by default skipped as it requires a running mysql. It tests many of the [Fulcrum Torque Turbine security aspects](http://turbine.apache.org/fulcrum/fulcrum-security/),
-activate it by calling
-```
-mvn test -DskipTests=false
-```
-CAVEAT: If initialization fails, double check your database credentials! If invalid the error might be somewhat hidden behind a
- Torque exception!
-
-### Eclipse
-
-To enable application development in Eclipse, run the following command
-and then import the project into Eclipse.
-```
-mvn eclipse:eclipse
-```
-Once imported, update your project to be managed by Maven
--> Right click on the project name
--> Configure
--> Convert to Maven project
-
-To test the application can be deployed by Eclipse, select the run
-configuration "Run On Server" if you have a container configured with
-your eclipse environment.
-
-#### Eclipse Debugging
-
-You could debug the app by setting the environment variable to something like this
-```
-set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n
-```
-before running the jetty server.
-
-### Starting developing
-
-Be aware of settings and some smaller restrictions, which mostly will be fixed in the upcoming releases.
-
-- Keep groups/roles lower case (which should be fixed in Fulcrum Security 1.1.1/Turbine 4.0)
-- abstract classes and managers are included (because of some minor bugs in Fulcrum Security 1.1.0, same as above)
-- LogoutUser action is included (fix in Turbine 4.0, getUserFromSession)
-- LoginUser action is included (to check for anonymous user, may be fixed in future release)
-- OM (Torque Object Mapper) stub classes are included (until configurable in schema with Torque version 2.1)
-- TurbineConfiguration returns a Commons configuration object, even if field is not assignable (will be fixed in Turbine 4.0, you can then assign e.g. to String instead, cft. SecureScreen)
-- Database connection is done initially by default with JNDI. If you want to change it, check Torque.properties and (1) for Tomcat, META-INF/context.xml or (2) for Jetty, WEB-INF/jetty-env.xml.
-
-## Docker
-
-We are in the process t provide a Docker example, which will simplify the installation process, if properly done. Contact us!
-
-
-## Changes
-[Changes.xml](src/changes/changes.xml)
-
-## License
-[Apache License Version 2.0](LICENSE)
-
-# General Issues
-
-## Maven Hint (Windows)
-If you get that goal integration-test of maven-archetype-plugin fails with
-
-"Cannot run additions goals." cft. https://issues.apache.org/jira/browse/ARCHETYPE-488.
-
-Fastest workaround (Dez 2016) ist to copy mvn.cmd to mvn.bat.
-
-## More Information
-
-[Archetype Blog Entry](https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine)
+# turbine-webapp-5.0
+Maven Archetype to generate a webapp utilizing Turbine 5.0
diff --git a/pom.xml b/pom.xml
index 8990b7f..ed7932b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,68 +1,68 @@
-<?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>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>18</version>
- </parent>
- <groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-5.0</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
-
- <name>Archetype - Turbine 5.0 WebApp</name>
- <description>This archetype sets up a web application project based on Apache Turbine 4.0</description>
- <url>http://turbine.apache.org</url>
-
- <inceptionYear>2011</inceptionYear>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</url>
- </scm>
-
-<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>3.0.1</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.1</version>
- <!-- skip tests in generated archetype's pom, here the integration-test would be skipped -->
- <!--configuration>
- <skip>true</skip>
- </configuration-->
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
+<?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>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-webapp-5.0</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Archetype - Turbine 5.0 WebApp</name>
+ <description>This archetype sets up a web application project based on Apache Turbine 4.0</description>
+ <url>http://turbine.apache.org</url>
+
+ <inceptionYear>2011</inceptionYear>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</developerConnection>
+ <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</url>
+ </scm>
+
+<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>3.0.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>3.0.1</version>
+ <!-- skip tests in generated archetype's pom, here the integration-test would be skipped -->
+ <!--configuration>
+ <skip>true</skip>
+ </configuration-->
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index bac4dcf..5679f93 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -40,11 +40,14 @@
<defaultValue>jdbc/turbine</defaultValue>
</requiredProperty>
<requiredProperty key="turbine_database_driver">
- <defaultValue>com.mysql.jdbc.Driver</defaultValue>
+ <defaultValue>com.mysql.cj.jdbc.Driver</defaultValue>
</requiredProperty>
<requiredProperty key="turbine_database_url">
<defaultValue>jdbc:mysql://localhost:3306/</defaultValue>
</requiredProperty>
+ <requiredProperty key="turbine_database_timezone">
+ <defaultValue>UTC</defaultValue>
+ </requiredProperty>
<requiredProperty key="turbine_database_user">
<defaultValue>db_user</defaultValue>
</requiredProperty>
diff --git a/src/main/resources/archetype-resources/docs/README.txt b/src/main/resources/archetype-resources/docs/README.txt
index fb6c31f..01ef0d2 100644
--- a/src/main/resources/archetype-resources/docs/README.txt
+++ b/src/main/resources/archetype-resources/docs/README.txt
@@ -57,6 +57,7 @@ mvn archetype:generate \
-Dturbine_database_user=db_username \
-Dturbine_database_password=db_password \
-Dturbine_database_name=helloworld \
+ -Dturbine_database_timezone=UTC \
-Dturbine_database_url=jdbc:mysql://localhost:3306/ \
-Dgoals=generate-sources,pre-integration-test
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index cbee837..5874ab4 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -73,7 +73,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.8.0</version>
<configuration>
<source>#var("maven.compile.source")</source>
<target>#var("maven.compile.target")</target>
@@ -152,7 +152,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -171,7 +171,7 @@ under the License.
<configuration>
<!-- Please update with your database configuration -->
<driver>${turbine_database_driver}</driver>
- <url>${turbine_database_url}${turbine_database_name}</url>
+ <url>${turbine_database_url}${turbine_database_name}?serverTimezone=${turbine_database_timezone}</url>
<username>${turbine_database_user}</username>
<password>${turbine_database_password}</password>
<onError>continue</onError>
@@ -184,7 +184,7 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>5.1.44</version>
+ <version>8.0.12</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@ -223,11 +223,11 @@ under the License.
</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 -->
+ Using jetty 9 as supporting java 8. Other specs cft. https://www.eclipse.org/jetty/documentation/9.4.x/what-jetty-version.html -->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.16.v20140903</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.4.12.v20180830</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<dumpOnStart>true</dumpOnStart>
@@ -251,13 +251,30 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>5.1.44</version>
+ <version>8.0.12</version>
</dependency>
+
+ <!-- Required for Java 9 and higher -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -266,15 +283,22 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>4.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine</artifactId>
<version>#var("turbine.core")</version>
+ <!-- should be resolved after upgrade to torque-4.1 -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- slf4j still optional in 4.0 -->
<dependency>
@@ -292,11 +316,10 @@ under the License.
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <!-- yaafi is optional. NOTICE: 1.0.7 has group org.apache.turbine not org.apache.fulcrum -->
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<!-- if using intake -->
<dependency>
@@ -305,6 +328,8 @@ under the License.
<version>#var("fulcrum.intake")</version>
</dependency>
<!-- include some optional dependencies required in example componentConfiguration.xml -->
+
+ <!-- cache 1.1.1-SNAPSHOT still not building properly -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-cache</artifactId>
@@ -313,7 +338,7 @@ under the License.
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -346,7 +371,7 @@ under the License.
<!-- dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<exclusions>
<exclusion>
<groupId>net.minidev</groupId>
@@ -364,7 +389,7 @@ under the License.
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -373,15 +398,14 @@ under the License.
<maven.compile.source>1.8</maven.compile.source>
<maven.compile.target>1.8</maven.compile.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <fulcrum.json>1.1.1</fulcrum.json>
- <fulcrum.intake>1.2.3</fulcrum.intake>
- <fulcrum.security>1.1.2</fulcrum.security>
+ <fulcrum.json>1.1.2-SNAPSHOT</fulcrum.json>
+ <fulcrum.intake>2.0.0-SNAPSHOT</fulcrum.intake>
+ <fulcrum.security>1.1.3-SNAPSHOT</fulcrum.security>
<turbine.core>5.0-SNAPSHOT</turbine.core>
<slf4j.version>1.7.25</slf4j.version>
<skipTests>true</skipTests>
</properties>
-
<profiles>
<profile>
<id>jetty</id>
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
index 09cba49..1414adc 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
@@ -21,7 +21,7 @@ package ${package}.flux.modules.actions;
*
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
import org.apache.fulcrum.security.util.UnknownEntityException;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogout.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogout.java
index a47af7c..60972d0 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogout.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogout.java
@@ -16,7 +16,7 @@ package ${package}.flux.modules.actions;
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/SecureAction.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/SecureAction.java
index 7e35060..8020f35 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/SecureAction.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/SecureAction.java
@@ -16,7 +16,7 @@ package ${package}.flux.modules.actions;
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.localization.LocalizationService;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
import org.apache.turbine.Turbine;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
index f04bfe0..a4c8087 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
@@ -16,7 +16,7 @@ package ${package}.flux.modules.actions.group;
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Group;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
index d9ada4f..08cb22d 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
@@ -16,7 +16,7 @@ package ${package}.flux.modules.actions.permission;
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Role;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
index a29471e..9df670b 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
@@ -18,7 +18,7 @@ package ${package}.flux.modules.actions.role;
import java.util.Iterator;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Permission;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
index 16b7778..e4002ad 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
@@ -18,7 +18,7 @@ package ${package}.flux.tools;
import java.util.List;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
index 3018954..b4e1963 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
@@ -19,7 +19,7 @@ package ${package}.modules.actions;
* under the License.
*#
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
index 4dca1f0..cd5f9f3 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
@@ -20,7 +20,7 @@ package ${package}.modules.actions;
*#
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java b/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java
index 2fea6dd..50a9d98 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java
@@ -19,7 +19,7 @@ package ${package}.modules.actions;
* under the License.
*#
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java b/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java
index 6f6fa70..de2a756 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/screens/Index.java
@@ -1,66 +1,66 @@
-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.fulcrum.json.JsonService;
-import org.apache.turbine.pipeline.PipelineData;
-import org.apache.turbine.services.TurbineServices;
-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
-{
-
- JsonService jsonService = (JsonService)TurbineServices.getInstance().getService(JsonService.ROLE);
- /**
- * 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(PipelineData 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.
- *
- * return always <code>true</code>true, to show this screen as default
- */
- @Override
- protected boolean isAuthorized(PipelineData data) throws Exception
- {
- // use data.getACL()
- return true;
- }
-}
+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.fulcrum.json.JsonService;
+import org.apache.turbine.pipeline.PipelineData;
+import org.apache.turbine.services.TurbineServices;
+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
+{
+
+ JsonService jsonService = (JsonService)TurbineServices.getInstance().getService(JsonService.ROLE);
+ /**
+ * 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(PipelineData 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.
+ *
+ * return always <code>true</code>true, to show this screen as default
+ */
+ @Override
+ protected boolean isAuthorized(PipelineData data) throws Exception
+ {
+ // use data.getACL()
+ return true;
+ }
+}
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/screens/Password.java b/src/main/resources/archetype-resources/src/main/java/modules/screens/Password.java
index aff1b2a..014807e 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/screens/Password.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/screens/Password.java
@@ -29,7 +29,7 @@ import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.security.SecurityService;
import org.apache.velocity.context.Context;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
/**
* This class provides a sample extending a secured screen
diff --git a/src/main/resources/archetype-resources/src/main/java/modules/screens/SecureScreen.java b/src/main/resources/archetype-resources/src/main/java/modules/screens/SecureScreen.java
index 2f90b62..f4ca0f2 100644
--- a/src/main/resources/archetype-resources/src/main/java/modules/screens/SecureScreen.java
+++ b/src/main/resources/archetype-resources/src/main/java/modules/screens/SecureScreen.java
@@ -29,7 +29,7 @@ import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.security.SecurityService;
import org.apache.velocity.context.Context;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
/**
* This class provides a sample implementation for creating a secured screen
diff --git a/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml b/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml
index eeef5cd..d6a23d5 100644
--- a/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml
+++ b/src/main/resources/archetype-resources/src/main/torque-schema/application-data.xml
@@ -1,31 +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"/>
-
+<?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"/>
+
diff --git a/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml b/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
index 8e867d5..95f9c04 100644
--- a/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
+++ b/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
@@ -1,53 +1,53 @@
-<?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.
--->
-
-<!-- ============================================================================== -->
-<!-- -->
-<!-- Database Definition for the Application -->
-<!-- -->
-<!-- @version $Id: application-schema.xml -->
-<!-- -->
-<!-- ============================================================================== -->
-
-<database xmlns="http://db.apache.org/torque/4.0/templates/database"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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="native">
-
-
- <!-- Simple author/book database example -->
- <table name="AUTHOR" idMethod="idbroker">
- <column name="AUTH_ID" required="true" primaryKey="true" type="INTEGER" />
- <column name="FIRST_NAME" required="true" size="64" type="VARCHAR" />
- <column name="LAST_NAME" required="true" size="64" type="VARCHAR" />
- </table>
-
- <table name="BOOK" idMethod="idbroker">
- <column name="BOOK_ID" required="true" primaryKey="true" type="INTEGER" />
- <column name="AUTH_ID" required="true" type="INTEGER" />
- <column name="TITLE" required="true" size="64" type="VARCHAR" />
- <column name="SUBJECT" required="true" size="64" type="VARCHAR" />
- <foreign-key foreignTable="AUTHOR">
- <reference local="AUTH_ID" foreign="AUTH_ID"></reference>
- </foreign-key>
- </table>
-</database>
+<?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.
+-->
+
+<!-- ============================================================================== -->
+<!-- -->
+<!-- Database Definition for the Application -->
+<!-- -->
+<!-- @version $Id: application-schema.xml -->
+<!-- -->
+<!-- ============================================================================== -->
+
+<database xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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="native">
+
+
+ <!-- Simple author/book database example -->
+ <table name="AUTHOR" idMethod="idbroker">
+ <column name="AUTH_ID" required="true" primaryKey="true" type="INTEGER" />
+ <column name="FIRST_NAME" required="true" size="64" type="VARCHAR" />
+ <column name="LAST_NAME" required="true" size="64" type="VARCHAR" />
+ </table>
+
+ <table name="BOOK" idMethod="idbroker">
+ <column name="BOOK_ID" required="true" primaryKey="true" type="INTEGER" />
+ <column name="AUTH_ID" required="true" type="INTEGER" />
+ <column name="TITLE" required="true" size="64" type="VARCHAR" />
+ <column name="SUBJECT" required="true" size="64" type="VARCHAR" />
+ <foreign-key foreignTable="AUTHOR">
+ <reference local="AUTH_ID" foreign="AUTH_ID"></reference>
+ </foreign-key>
+ </table>
+</database>
diff --git a/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml b/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
index 5002f21..3bfe67c 100644
--- a/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
+++ b/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
@@ -1,47 +1,47 @@
-<?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.
--->
-
-<!-- ========================================================================= -->
-<!-- -->
-<!-- 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 xmlns="http://db.apache.org/torque/4.0/templates/database"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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="native">
-
- <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>
+<?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.
+-->
+
+<!-- ========================================================================= -->
+<!-- -->
+<!-- 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 xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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="native">
+
+ <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>
diff --git a/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml b/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml
index 8503f8f..d89b851 100644
--- a/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml
+++ b/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml
@@ -1,67 +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>
+<?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>
diff --git a/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml b/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
index a4901fe..76c31da 100644
--- a/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
+++ b/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
@@ -1,125 +1,125 @@
-<?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.
--->
-
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Turbine Torque based Security Service Schema -->
-<!-- -->
-<!-- Schema documentation -->
-<!-- http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd -->
-<!-- http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd -->
-<!-- -->
-<!-- $Id: turbine-security-schema.xml 615328 2008-01-25 20:25:05Z tv $ -->
-<!-- -->
-<!-- ======================================================================== -->
-
-<database xmlns="http://db.apache.org/torque/4.0/templates/database"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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="none">
-
-
- <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>
- <unique-column name="PERMISSION_NAME"/>
- </unique>
-
- </table>
-
- <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>
- <unique-column name="ROLE_NAME"/>
- </unique>
-
- </table>
-
- <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>
- <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"/>
-
- <!-- Turbine service revokeAll(role) manages removal, but you might want to handle it just with onDelete="cascade" -->
- <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>
-
- <!-- org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity -->
- <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" 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"/>
- <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_DATE" type="TIMESTAMP" javaName="ModifiedDate"/>
- <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" interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
- <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"/>
- <!-- Turbine service revokeAll(user) manages removal, but you might want to handle it just with onDelete="cascade" -->
- <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>
+<?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.
+-->
+
+
+<!-- ======================================================================== -->
+<!-- -->
+<!-- Turbine Torque based Security Service Schema -->
+<!-- -->
+<!-- Schema documentation -->
+<!-- http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd -->
+<!-- http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd -->
+<!-- -->
+<!-- $Id: turbine-security-schema.xml 615328 2008-01-25 20:25:05Z tv $ -->
+<!-- -->
+<!-- ======================================================================== -->
+
+<database xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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="none">
+
+
+ <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>
+ <unique-column name="PERMISSION_NAME"/>
+ </unique>
+
+ </table>
+
+ <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>
+ <unique-column name="ROLE_NAME"/>
+ </unique>
+
+ </table>
+
+ <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>
+ <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"/>
+
+ <!-- Turbine service revokeAll(role) manages removal, but you might want to handle it just with onDelete="cascade" -->
+ <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>
+
+ <!-- org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity -->
+ <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" 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"/>
+ <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_DATE" type="TIMESTAMP" javaName="ModifiedDate"/>
+ <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" interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
+ <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"/>
+ <!-- Turbine service revokeAll(user) manages removal, but you might want to handle it just with onDelete="cascade" -->
+ <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>
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
index 3299313..7f6f936 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
@@ -1,15 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<configuration>
- <header>
- <!-- Meta data about the resulting combined configuration -->
- </header>
- <override><!-- only allowed configurations are user and turbine, realtive paths -->
- <properties config-name="user" fileName="usersettings.properties" config-optional="true" config-forceCreate="true"/>
- <!-- xml fileName="conf/test/TurbineResources.xml"/-->
- <properties config-name="turbine" fileName="TurbineResources.properties" throwExceptionOnMissing="true"/>
- </override>
- <additional>
- <!-- Configuration declarations that form a union configuration, always provide a unique config-name attribute -->
- </additional>
+ <header>
+ <!-- Meta data about the resulting combined configuration -->
+ </header>
+ <override><!-- only allowed configurations are user and turbine, realtive
+ paths -->
+ <properties config-name="user"
+ fileName="usersettings.properties" config-optional="true"
+ config-forceCreate="true" />
+ <!-- xml fileName="conf/test/TurbineResources.xml"/ -->
+ <properties config-name="turbine"
+ fileName="TurbineResources.properties" throwExceptionOnMissing="true" />
+ </override>
+ <additional>
+ <!-- Configuration declarations that form a union configuration, always
+ provide a unique config-name attribute -->
+ </additional>
</configuration>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
index 221dc0d..ba14724 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
@@ -593,6 +593,7 @@ services.VelocityService.runtime.conversion.handler = none
services.VelocityService.space.gobbling = bc
services.VelocityService.directive.if.emptycheck = false
+
# -------------------------------------------------------------------
#
# S C H E D U L E R S E R V I C E
@@ -642,13 +643,13 @@ services.SecurityService.wrapper.class = ${package}.wrapper.TurbineUserWrapper
#
# Name and location to the configuration file for the components.
#
-services.AvalonComponentService.containerConfiguration = /WEB-INF/conf/containerConfiguration.xml
+services.AvalonComponentService.containerConfiguration = WEB-INF/conf/containerConfiguration.xml
#
# Name and location to the configuration file for the component roles.
#
-#services.AvalonComponentService.componentRoles = /WEB-INF/conf/roleConfiguration.xml
+#services.AvalonComponentService.componentRoles = WEB-INF/conf/roleConfiguration.xml
#
-#services.AvalonComponentService.componentConfiguration = /WEB-INF/conf/componentConfiguration.xml
+#services.AvalonComponentService.componentConfiguration = WEB-INF/conf/componentConfiguration.xml
# -------------------------------------------------------------------
#
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/intake.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/intake.xml
index 7c00de2..c708a52 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/intake.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/intake.xml
@@ -1,45 +1,45 @@
-<?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.
-*#
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Default Intake file for Turbine Skeleton -->
-<!-- -->
-<!-- $Id: intake.xml 615350 2008-01-25 21:28:10Z tv $ -->
-<!-- -->
-<!-- ======================================================================== -->
-
-<input-data xmlns="http://turbine.apache.org/schema/intake/4.0"
- basePackage="${package}.">
- <group name="example" key="example" mapToObject="om.Table1">
- <field name="TestCol2" key="testCol2" type="String"/>
- </group>
- <group name="Login" key="login">
- <field name="Username" key="u" type="String">
- <!-- l10n keys -->
- <rule name="required" value="true">username_required_msg</rule>
- <rule name="minLength" value="4">username_min_length_msg</rule>
- <!--rule name="mask" value=".+@.+\..+">username_mask_msg</rule-->
- </field>
- <field name="Password" key="p" type="String">
- <rule name="required" value="true">password_msg</rule>
- </field>
-</group>
-</input-data>
+<?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.
+*#
+
+<!-- ======================================================================== -->
+<!-- -->
+<!-- Default Intake file for Turbine Skeleton -->
+<!-- -->
+<!-- $Id: intake.xml 615350 2008-01-25 21:28:10Z tv $ -->
+<!-- -->
+<!-- ======================================================================== -->
+
+<input-data xmlns="http://turbine.apache.org/schema/intake/4.0"
+ basePackage="${package}.">
+ <group name="example" key="example" mapToObject="om.Table1">
+ <field name="TestCol2" key="testCol2" type="String"/>
+ </group>
+ <group name="Login" key="login">
+ <field name="Username" key="u" type="String">
+ <!-- l10n keys -->
+ <rule name="required" value="true">username_required_msg</rule>
+ <rule name="minLength" value="4">username_min_length_msg</rule>
+ <!--rule name="mask" value=".+@.+\..+">username_mask_msg</rule-->
+ </field>
+ <field name="Password" key="p" type="String">
+ <rule name="required" value="true">password_msg</rule>
+ </field>
+</group>
+</input-data>
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
index 64f7b2c..6b19ed3 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
@@ -5,11 +5,11 @@
<Arg>
<New class="org.apache.commons.dbcp.BasicDataSource">
<Set name="driverClassName">${turbine_database_driver}</Set>
- <Set name="url">${turbine_database_url}${turbine_database_name}</Set>
+ <Set name="url">${turbine_database_url}${turbine_database_name}?serverTimezone=${turbine_database_timezone}</Set>
<Set name="username">${turbine_database_user}</Set>
<Set name="password">${turbine_database_password}</Set>
<Set name="validationQuery">SELECT 1</Set>
</New>
</Arg>
</New>
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 8fa11b6..045b05a 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,116 +1,103 @@
-<?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.
--->
-<web-app
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0" metadata-complete="true">
-
- <display-name>WebApp_ID</display-name>
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Web Application descriptor -->
-<!-- -->
-<!-- ======================================================================== -->
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Uncomment the following block if you want to use the Session Service -->
-<!-- -->
-<!-- ======================================================================== -->
-<!--
- <listener>
- <listener-class>org.apache.turbine.services.session.SessionListener</listener-class>
- </listener>
--->
-
- <servlet>
- <description>${turbine_app_name}</description>
- <servlet-name>Turbine</servlet-name>
- <servlet-class>org.apache.turbine.Turbine</servlet-class>
- <init-param>
- <param-name>applicationRoot</param-name>
- <param-value>webContext</param-value>
- </init-param>
- <init-param>
- <param-name>loggingRoot</param-name>
- <param-value>/.</param-value>
- </init-param>
- <init-param>
- <param-name>properties</param-name>
- <param-value>WEB-INF/conf/TurbineResources.properties</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Turbine</servlet-name>
- <url-pattern>/app/*</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>60</session-timeout><!-- in minutes -->
- <cookie-config>
- <max-age>3600</max-age> <!-- in seconds -->
- </cookie-config>
- </session-config>
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Redirect the home page of the application to the turbine servlet -->
-<!-- -->
-<!-- ======================================================================== -->
-
- <welcome-file-list>
- <welcome-file>app</welcome-file>
- </welcome-file-list>
-
-
- <!-- ======================================================================== -->
-<!-- -->
-<!-- JNDI Ressource -->
-<!-- ======================================================================== -->
-
- <resource-ref>
- <res-ref-name>${turbine_database_jndipath}</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Make sure that templates and logs are not available through -->
-<!-- the servlet container. Remove security constraints or add an authen- -->
-<!-- tication role if you need access to these paths. -->
-<!-- -->
-<!-- ======================================================================== -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>templates</web-resource-name>
- <url-pattern>/templates/*</url-pattern>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>logs</web-resource-name>
- <url-pattern>/logs/*</url-pattern>
- </web-resource-collection>
- <auth-constraint/>
- </security-constraint>
-</web-app>
+<?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. -->
+<web-app version="4.0"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- Web Application descriptor -->
+ <!-- -->
+ <!-- ======================================================================== -->
+
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- Uncomment the following block if you want to use the Session Service -->
+ <!-- -->
+ <!-- ======================================================================== -->
+ <!-- <listener> <listener-class>org.apache.turbine.services.session.SessionListener</listener-class>
+ </listener> -->
+
+ <servlet>
+ <description>${turbine_app_name}</description>
+ <servlet-name>Turbine</servlet-name>
+ <servlet-class>org.apache.turbine.Turbine</servlet-class>
+ <init-param>
+ <param-name>applicationRoot</param-name>
+ <param-value>webContext</param-value>
+ </init-param>
+ <init-param>
+ <param-name>loggingRoot</param-name>
+ <param-value>/.</param-value>
+ </init-param>
+ <init-param>
+ <param-name>properties</param-name>
+ <param-value>WEB-INF/conf/TurbineResources.properties</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Turbine</servlet-name>
+ <url-pattern>/app/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ <cookie-config>
+ <max-age>3600</max-age> <!-- in seconds -->
+ </cookie-config>
+ </session-config>
+
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- Redirect the home page of the application to the turbine servlet -->
+ <!-- -->
+ <!-- ======================================================================== -->
+
+ <welcome-file-list>
+ <welcome-file>app</welcome-file>
+ </welcome-file-list>
+
+
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- JNDI Ressource -->
+ <!-- ======================================================================== -->
+
+ <resource-ref>
+ <res-ref-name>${turbine_database_jndipath}</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- Make sure that templates and logs are not available through -->
+ <!-- the servlet container. Remove security constraints or add an authen- -->
+ <!-- tication role if you need access to these paths. -->
+ <!-- -->
+ <!-- ======================================================================== -->
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>templates</web-resource-name>
+ <url-pattern>/templates/*</url-pattern>
+ </web-resource-collection>
+ <web-resource-collection>
+ <web-resource-name>logs</web-resource-name>
+ <url-pattern>/logs/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint />
+ </security-constraint>
+</web-app>
diff --git a/src/main/resources/archetype-resources/src/test/conf/torque/TorqueTest.properties b/src/main/resources/archetype-resources/src/test/conf/torque/TorqueTest.properties
index 5375724..6ac350c 100644
--- a/src/main/resources/archetype-resources/src/test/conf/torque/TorqueTest.properties
+++ b/src/main/resources/archetype-resources/src/test/conf/torque/TorqueTest.properties
@@ -65,12 +65,12 @@ torque.database.${turbine_database_name}.adapter=${turbine_database_adapter}
#torque.defaults.pool.validationQuery = SELECT 1
#
#torque.defaults.connection.driver = ${turbine_database_driver}
-#torque.defaults.connection.url = ${turbine_database_url}${turbine_database_name}
+#torque.defaults.connection.url = ${turbine_database_url}${turbine_database_name}?serverTimeZone=${turbine_database_timezone}
#torque.defaults.connection.user = ${turbine_database_user}
#torque.defaults.connection.password = ${turbine_database_password}
#
torque.dsfactory.${turbine_database_name}.connection.driver = ${turbine_database_driver}
-torque.dsfactory.${turbine_database_name}.connection.url = ${turbine_database_url}${turbine_database_name}
+torque.dsfactory.${turbine_database_name}.connection.url = ${turbine_database_url}${turbine_database_name}?serverTimeZone=${turbine_database_timezone}
torque.dsfactory.${turbine_database_name}.connection.user = ${turbine_database_user}
torque.dsfactory.${turbine_database_name}.connection.password = ${turbine_database_password}
torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
@@ -78,6 +78,3 @@ torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.Sh
# Comment if not using shared data source factory
torque.database.default=${turbine_database_name}
-
-
-
diff --git a/src/test/resources/projects/first/archetype.properties b/src/test/resources/projects/first/archetype.properties
index 0a96356..1155d78 100644
--- a/src/test/resources/projects/first/archetype.properties
+++ b/src/test/resources/projects/first/archetype.properties
@@ -7,7 +7,8 @@ turbine_intake_file=intake.xml
turbine_database_name=turbine
turbine_database_adapter=auto
turbine_database_jndipath=jdbc/turbine
-turbine_database_driver=com.mysql.jdbc.Driver
+turbine_database_driver=com.mysql.cj.jdbc.Driver
+turbine_database_timezone=UTC
turbine_database_url=jdbc:mysql://localhost:3306/
turbine_database_user=db_user
turbine_database_password=db_password