Author: tv
Date: Tue Nov 6 14:20:46 2012
New Revision: 1406143
URL: http://svn.apache.org/viewvc?rev=1406143&view=rev
Log:
Fixed missing dependencies and wrong class names as reported on the mailing list
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/changes/changes.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/changes/changes.xml?rev=1406143&r1=1406142&r2=1406143&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/changes/changes.xml
(original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/changes/changes.xml
Tue Nov 6 14:20:46 2012
@@ -25,6 +25,12 @@
<body>
<release version="1.0.0" date="in Subversion">
+ <action dev="tv" type="fix">
+ Fixed missing dependencies and wrong class names as reported on the
mailing list
+ </action>
+ <action dev="tv" type="add">
+ Add information required for a release to the POM
+ </action>
<action dev="tv" type="add">
Initial version
</action>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml?rev=1406143&r1=1406142&r2=1406143&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
Tue Nov 6 14:20:46 2012
@@ -18,8 +18,7 @@ specific language governing permissions
under the License.
*#
#set($dollar = '$')
-#macro (var
-$label)${dollar}{${label}}#end
+#macro (var $label)${dollar}{${label}}#end
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -213,6 +212,16 @@ $label)${dollar}{${label}}#end
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.6</version>
</dependency>
+ <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>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties?rev=1406143&r1=1406142&r2=1406143&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
Tue Nov 6 14:20:46 2012
@@ -361,8 +361,8 @@ services.VelocityService.classname=org.a
# -------------------------------------------------------------------
services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
-services.RunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
-services.RunDataService.default.cookie.parser=org.apache.turbine.util.parser.DefaultCookieParser
+services.RunDataService.default.parameter.parser=org.apache.fulcrum.parser.DefaultParameterParser
+services.RunDataService.default.cookie.parser=org.apache.fulcrum.parser.DefaultCookieParser
# -------------------------------------------------------------------
#
@@ -663,7 +663,9 @@ services.SecurityService.secure.password
#
# Name and location to the configuration file for the components.
#
-services.AvalonComponentService.containerConfiguration =
WEB-INF/conf/containerConfiguration.xml
+#set($dollar = '$')
+#macro (var $label)${dollar}{${label}}#end
+services.AvalonComponentService.containerConfiguration =
#var("applicationRoot")/WEB-INF/conf/containerConfiguration.xml
services.AvalonComponentService.earlyInit= true
# -------------------------------------------------------------------
