- turbine 4.0-M2 dep update
- Fixes and Updates
git-svn-id: https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0@1728428 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 6ecf682..fe7a548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</extension>
</extensions>
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 46cb189..d366988 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -50,6 +50,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -127,6 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<archive>
<manifestEntries>
@@ -138,13 +140,17 @@
</configuration>
</plugin>
- <!-- jetty:run checks deployed war http://localhost:8081/app/ -->
+ <!-- jetty:run checks deployed war http://localhost:8081/app/
+
+ Using jetty 8 as supporting java 6. Other specs cft. http://www.eclipse.org/jetty/documentation/9.3.0.v20150612/what-jetty-version.html
+ -->
<plugin>
- <groupId>org.eclipse.jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.2.9.v20150224</version>
+ <version>8.1.16.v20140903</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
+ <dumpOnStart>true</dumpOnStart>
<httpConnector>
<port>8081</port>
<host>localhost</host>
@@ -177,60 +183,33 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-runtime</artifactId>
- <version>4.0</version>
- <type>jar</type>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine</artifactId>
- <version>4.0-M2-SNAPSHOT</version>
+ <version>4.0-M2</version>
</dependency>
+ <!-- yaafi is optional. NOTICE: 1.0.7 has group org.apache.turbine not org.apache.fulcrum -->
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.7</version>
</dependency>
+ <!-- include some optional dependencies required in example componentConfiguration.xml -->
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-cache</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-upload</artifactId>
- <version>1.0.5</version>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-cache</artifactId>
+ <version>1.1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-security-api</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.0</version>
- </dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-upload</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-security-memory</artifactId>
+ <version>1.1.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-torque</artifactId>
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 8e254b4..0a4ac84 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
@@ -18,7 +18,7 @@
* under the License.
*#
-import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.velocity.context.Context;
import org.apache.turbine.modules.screens.VelocitySecureScreen;
@@ -38,7 +38,7 @@
* @throws Exception a generic Exception
*/
@Override
- protected void doBuildTemplate(RunData data, Context context)
+ protected void doBuildTemplate(PipelineData data, Context context)
throws Exception
{
context.put("success", "Congratulations, it worked!");
@@ -56,7 +56,7 @@
* @throws Exception a generic Exception
*/
@Override
- protected boolean isAuthorized(RunData data) throws Exception
+ protected boolean isAuthorized(PipelineData data) throws Exception
{
// use data.getACL()
return true;
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 d1329ff..bfc6dfb 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
@@ -26,10 +26,9 @@
<!-- -->
<!-- ======================================================================== -->
-<!DOCTYPE input-data SYSTEM "http://turbine.apache.org/dtd/intake_2_4.dtd">
-
-<input-data basePackage="${package}.">
- <group name="example" key="example" mapToObject="om.Table1">
- <field name="TestCol2" key="testCol2" type="String"/>
- </group>
+<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>
</input-data>
