You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/02/11 17:10:32 UTC
svn commit: r506060 - in /jakarta/turbine/core/trunk: ./ conf/ conf/test/
Author: tv
Date: Sun Feb 11 08:10:31 2007
New Revision: 506060
URL: http://svn.apache.org/viewvc?view=rev&rev=506060
Log:
Try to merge the configurations and dependencies from Fulcrum and Turbine 2.3
Added:
jakarta/turbine/core/trunk/conf/test/fulcrumContainerConfiguration.xml
Modified:
jakarta/turbine/core/trunk/conf/componentConfiguration.xml
jakarta/turbine/core/trunk/conf/test/CompleteTurbineResources.properties
jakarta/turbine/core/trunk/conf/test/Log4j.properties
jakarta/turbine/core/trunk/conf/test/TurbineConfiguration.xml
jakarta/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
jakarta/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
jakarta/turbine/core/trunk/project.properties
jakarta/turbine/core/trunk/project.xml
Modified: jakarta/turbine/core/trunk/conf/componentConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/componentConfiguration.xml?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/componentConfiguration.xml (original)
+++ jakarta/turbine/core/trunk/conf/componentConfiguration.xml Sun Feb 11 08:10:31 2007
@@ -12,7 +12,7 @@
<configfile>/WEB-INF/conf/Torque.properties</configfile>
</torque>
<cache cacheInitialSize="20" cacheCheckFrequency="5"/>
- <mimetype/>
+ <mimetype/>
<crypto>
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
@@ -28,7 +28,7 @@
<bundle>org.apache.fulcrum.localization.MissingBundle</bundle>
</bundles>
</localization>
- <intake>
+ <intake>
<serialDataPath>target/appData.ser</serialDataPath>
<xmlPaths>
<xmlPath>conf/test/intake.xml</xmlPath>
Modified: jakarta/turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ jakarta/turbine/core/trunk/conf/test/CompleteTurbineResources.properties Sun Feb 11 08:10:31 2007
@@ -97,15 +97,6 @@
# -------------------------------------------------------------------
#
-# D A T A B A S E S E T T I N G S
-#
-# -------------------------------------------------------------------
-# Turbine uses the decoupled torque now!!
-# The database settings are now in Torque.properties
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
# F R A M E W O R K S E T T I N G S
#
# -------------------------------------------------------------------
@@ -254,19 +245,6 @@
# -------------------------------------------------------------------
#
-# P E E R S
-#
-# -------------------------------------------------------------------
-# Supplies Turbine with information about the database schema, which
-# can simplify any required Peer classes.
-#
-# Default: org.apache.turbine.util.db.map.TurbineMapBuilder
-# -------------------------------------------------------------------
-
-database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
-
-# -------------------------------------------------------------------
-#
# M E S S A G E S
#
# -------------------------------------------------------------------
@@ -326,19 +304,19 @@
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineYaafiComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
-services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
+#services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
-services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
-services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
-services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
+#services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
+#services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
+#services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
#services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
-services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
+#services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
# Default
#services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
services.SecurityService.classname=org.apache.turbine.test.MockSecurityService
@@ -367,17 +345,6 @@
# -------------------------------------------------------------------
#
-# C A C H E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Interval at which the cache will be checked. The default is
-# 5000ms or 5 seconds.
-
-services.GlobalCacheService.cache.check.frequency = 5000
-
-# -------------------------------------------------------------------
-#
# A S S E M B L E R B R O K E R S E R V I C E
#
# -------------------------------------------------------------------
@@ -589,76 +556,6 @@
# -------------------------------------------------------------------
#
-# U P L O A D S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Whether the files should be automatically picked up by
-# ParameterParser.
-
-services.UploadService.automatic=true
-
-#
-# The directory where files will be temporarily stored.
-#
-services.UploadService.repository=.
-
-#
-# The maximum size of a request that will be processed.
-#
-services.UploadService.size.max=1048576
-
-#
-# The maximum size of a request that will have it's elements cached in
-# memory by TurbineUploadService class.
-#
-services.UploadService.size.threshold=10240
-
-# -------------------------------------------------------------------
-#
-# L O C A L I Z A T I O N S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Default ResourceBundle and language/country codes used by the
-# TurbineLocalizationService.
-#
-locale.default.bundle=MyBundle
-locale.default.language=en
-locale.default.country=US
-
-#
-# This will set the charset= portion of the ContentType: header.
-# Leave commented out unless you want to return stuff as a different
-# charset.
-#
-# locale.default.charset=
-
-# -------------------------------------------------------------------
-#
-# M I M E T Y P E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# This property specifies a file containing mappings between MIME
-# content types and the corresponding file name extensions. The
-# service itself contains a hardcoded set of most common mappings.
-# The file must use the same syntax as the mime.types file of
-# the Apache Server, i.e.
-# <mimetype> <ext1> <ext2>...
-#
-#services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
-
-# This property specifies a file containing mappings between locales
-# and the corresponding character encodings. The service itself
-# contains a hardcoded set of most common mappings.
-# The file should use the Java property file syntax, i.e.
-# <lang_country_variant>=<charset>
-#
-#services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
-
-# -------------------------------------------------------------------
-#
# S C H E D U L E R S E R V I C E
#
# -------------------------------------------------------------------
@@ -1077,72 +974,6 @@
#
services.IntakeService.serialize.path=WEB-INF/appData.ser
-#--------------------------------------------------------------------
-#
-# P A R A M E T E R P A R S E R
-#
-#--------------------------------------------------------------------
-#
-# This variable controls the case folding applied to URL variable
-# names.
-#
-# Allowed values: none, lower, upper
-# Default: lower
-#
-
-url.case.folding=lower
-
-# -------------------------------------------------------------------
-#
-# C O M P O N E N T S E R V I C E
-#
-# -------------------------------------------------------------------
-# Components implementing the lifecycle interfaces can be loaded,
-# configured and initialized by Turbine
-# -------------------------------------------------------------------
-# THE COMPOINENTSERVICE IS DEPRECATED!!!!
-# You should use the AvalonComponentService instead!
-# -------------------------------------------------------------------
-
-#
-# Here you define the names of the various components to load. These
-# names are used as identifiers later so you can choose them freely. It
-# is, however, sensible to use the same names as the component projects
-# that you want to load.
-#
-services.ComponentService.name = torque
-
-#
-# This is the class of the component to be loaded.
-#
-# It must implement the org.apache.stratum.lifecycle.Initializable and
-# org.apache.stratum.lifecycle.Configurable interface to be loaded.
-#
-# It may implement the org.apache.stratum.lifecycle.Disposable interface.
-# If it does, the Component is disposed at shutdown (Servlet destroy()) time.
-#
-services.ComponentService.torque.classname = org.apache.torque.Torque
-
-#
-# This is the path to the Config file of the Component. It is relative
-# to the Root of the Application (either the Webroot given by the Servlet
-# Container or the Root given to TurbineConfig at startup time)
-#
-services.ComponentService.torque.config = /WEB-INF/conf/Torque.properties
-
-#
-# Properties can be given directly to Components. This sets the "foo"
-# property for torque to "bar".
-#
-#services.ComponentService.torque.property.foo = bar
-
-#
-# This is an example of how to load Fulcrum as a component
-#
-#services.ComponentService.name = fulcrum
-#services.ComponentService.fulcrum.classname = org.apache.fulcrum.Fulcrum
-#services.ComponentService.fulcrum.config = /WEB-INF/conf/Fulcrum.properties
-
# -------------------------------------------------------------------
#
# A V A L O N C O M P O N E N T S E R V I C E
@@ -1153,20 +984,9 @@
# -------------------------------------------------------------------
#
-# Name and location to the configuration file for the components.
-#
-services.AvalonComponentService.componentConfiguration = conf/test/fulcrumComponentConfiguration.xml
-
-#
-# Name and location to the configuration file for the component roles.
-#
-services.AvalonComponentService.componentRoles = conf/test/fulcrumRoleConfiguration.xml
-
+# Name and location to the configuration file for the container.
#
-# If you want to run Torque from the Avalon Component Service, you must load it
-# at startup time
-#services.AvalonComponentService.lookup = org.apache.torque.avalon.Torque
-
+services.AvalonComponentService.containerConfiguration = conf/test/fulcrumContainerConfiguration.xml
# -------------------------------------------------------------------
#
@@ -1187,5 +1007,3 @@
#
# Default: none
# -------------------------------------------------------------------
-
-
Modified: jakarta/turbine/core/trunk/conf/test/Log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/Log4j.properties?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/Log4j.properties (original)
+++ jakarta/turbine/core/trunk/conf/test/Log4j.properties Sun Feb 11 08:10:31 2007
@@ -6,10 +6,10 @@
#
# ------------------------------------------------------------------------
-log4j.rootLogger = FATAL, log
+log4j.rootLogger = DEBUG, log
# we want to see any errors thrown by Turbine.java, primarily in the handleException method
-log4j.category.org.apache.turbine.Turbine=ERROR
+log4j.category.org.apache.turbine.Turbine=DEBUG
log4j.appender.log = org.apache.log4j.ConsoleAppender
log4j.appender.log.target = System.out
Modified: jakarta/turbine/core/trunk/conf/test/TurbineConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/TurbineConfiguration.xml?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/TurbineConfiguration.xml (original)
+++ jakarta/turbine/core/trunk/conf/test/TurbineConfiguration.xml Sun Feb 11 08:10:31 2007
@@ -2,7 +2,7 @@
<configuration>
<xml fileName="conf/test/TurbineResources.xml"/>
- <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="conf/test/TemplateService.properties"/>
+ <properties fileName="conf/test/TemplateService.properties"/>
</configuration>
Modified: jakarta/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml (original)
+++ jakarta/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml Sun Feb 11 08:10:31 2007
@@ -4,8 +4,8 @@
-->
<componentConfig>
- <cache cacheInitialSize="20" cacheCheckFrequency="5"/>
- <mimetype/>
+ <cache cacheInitialSize="20" cacheCheckFrequency="5"/>
+ <mimetype/>
<crypto>
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
@@ -19,7 +19,7 @@
<bundle>org.apache.turbine.services.localization.BarBundle</bundle>
</bundles>
</localization>
- <intake>
+ <intake>
<serialDataPath>target/appData.ser</serialDataPath>
<xmlPaths>
<xmlPath>conf/test/intake.xml</xmlPath>
Added: jakarta/turbine/core/trunk/conf/test/fulcrumContainerConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/fulcrumContainerConfiguration.xml?view=auto&rev=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/fulcrumContainerConfiguration.xml (added)
+++ jakarta/turbine/core/trunk/conf/test/fulcrumContainerConfiguration.xml Sun Feb 11 08:10:31 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fulcrum-yaafi>
+ <componentRoles>
+ <location>conf/test/fulcrumRoleConfiguration.xml</location>
+ </componentRoles>
+ <componentConfiguration>
+ <location>conf/test/fulcrumComponentConfiguration.xml</location>
+ </componentConfiguration>
+ <parameters>
+ <location>conf/test/fulcrumParameterConfiguration.properties</location>
+ </parameters>
+</fulcrum-yaafi>
Modified: jakarta/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml (original)
+++ jakarta/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml Sun Feb 11 08:10:31 2007
@@ -42,13 +42,12 @@
<role
name="org.apache.fulcrum.upload.UploadService"
shorthand="upload"
- default-class="org.apache.fulcrum.upload.DefaultUploadService"
- />
+ default-class="org.apache.fulcrum.upload.DefaultUploadService"/>
+
<role
name="org.apache.fulcrum.parser.ParameterParser"
shorthand="parser"
- default-class="org.apache.fulcrum.parser.DefaultParameterParser"
- />
+ default-class="org.apache.fulcrum.parser.DefaultParameterParser"/>
<!--role name="org.apache.torque.avalon.Torque"
shorthand="torque"
Modified: jakarta/turbine/core/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/project.properties?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/project.properties (original)
+++ jakarta/turbine/core/trunk/project.properties Sun Feb 11 08:10:31 2007
@@ -29,7 +29,7 @@
# contain all the jars needed to build Turbine, even if a jar
# is missing on ibiblio
#========================================================================
-maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
+maven.repo.remote=http://repo1.maven.org/maven/,http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
maven.checkstyle.format = turbine
#maven.home = ${user.home}/maven
@@ -39,10 +39,20 @@
# Display the version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
-compile.debug = on
-compile.optimize = off
-compile.deprecation = off
-maven.compile.deprecation = off
+#
+# Compilation options
+maven.compile.source = 1.3
+maven.compile.target = 1.3
+maven.compile.debug = on
+maven.compile.optimize = off
+maven.compile.deprecation = on
+
+#
+# Add information on compilation options to the Manifest
+maven.jar.manifest.attributes.list=X-Compile-Source-JDK,X-Compile-Target-JDK
+maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
+maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
+
maven.test.ignore.failures=false
maven.junit.fork=true
@@ -71,5 +81,4 @@
turbine.nightly.dist.dir = \
/www/jakarta.apache.org/builds/jakarta-turbine/turbine-2/nightly
-
Modified: jakarta/turbine/core/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/trunk/project.xml?view=diff&rev=506060&r1=506059&r2=506060
==============================================================================
--- jakarta/turbine/core/trunk/project.xml (original)
+++ jakarta/turbine/core/trunk/project.xml Sun Feb 11 08:10:31 2007
@@ -35,7 +35,12 @@
<gumpRepositoryId>jakarta</gumpRepositoryId>
<shortDescription>A servlet based framework.</shortDescription>
- <description>Turbine is a servlet based framework that allows experienced Java developers to quickly build secure web applications. Parts of Turbine can also be used independently of the web portion of Turbine as well. In other words, we strive to make portions of Turbine easily available for use in other applications.</description>
+ <description>
+ Turbine is a servlet based framework that allows experienced Java developers
+ to quickly build secure web applications. Parts of Turbine can also be used independently
+ of the web portion of Turbine as well. In other words, we strive to make portions of
+ Turbine easily available for use in other applications.
+ </description>
<url>http://jakarta.apache.org/turbine/turbine/development/turbine-2.4/</url>
<issueTrackingUrl>http://issues.apache.org/jira/browse/TRB</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
@@ -50,25 +55,49 @@
<versions>
<version>
- <id>2.1</id>
+ <name>2.1</name>
<tag>TURBINE_2_1</tag>
</version>
<version>
- <id>2.2</id>
+ <name>2.2</name>
<tag>TURBINE_2_2_0</tag>
</version>
<version>
- <id>2.3-rc1</id>
+ <name>2.3-rc1</name>
<tag>TURBINE_2_3_RC1</tag>
</version>
<version>
- <id>2.3-rc2</id>
+ <name>2.3-rc2</name>
<tag>TURBINE_2_3_RC2</tag>
</version>
<version>
- <id>2.3</id>
+ <name>2.3</name>
<tag>TURBINE_2_3</tag>
</version>
+ <version>
+ <name>2.3.1-RC1</name>
+ <tag>TURBINE_2_3_1_RC1</tag>
+ </version>
+ <version>
+ <name>2.3.1-RC2</name>
+ <tag>TURBINE_2_3_1_RC2</tag>
+ </version>
+ <version>
+ <name>2.3.1</name>
+ <tag>TURBINE_2_3_1</tag>
+ </version>
+ <version>
+ <name>2.3.2-RC1</name>
+ <tag>TURBINE_2_3_2_RC1</tag>
+ </version>
+ <version>
+ <name>2.3.2-RC2</name>
+ <tag>TURBINE_2_3_2_RC2</tag>
+ </version>
+ <version>
+ <name>2.3.2</name>
+ <tag>TURBINE_2_3_2</tag>
+ </version>
</versions>
<mailingLists>
@@ -187,6 +216,16 @@
<organization>IT20one GmbH</organization>
</developer>
<developer>
+ <name>Thomas Vandahl</name>
+ <id>tv</id>
+ <email>tv@apache.org</email>
+ <organization>TeWiSoft GmbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
<name>Jürgen Hoffmann</name>
<id>hoffmann</id>
<email>jh@byteaction.de</email>
@@ -349,33 +388,89 @@
</contributor>
</contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<dependencies>
- <!-- Start of ECM dependencies -->
+ <!-- Start of Avalon dependencies -->
<dependency>
- <id>logkit</id>
- <version>1.2</version>
- <url>http://jakarta.apache.org/avalon/logkit/</url>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <url>http://excalibur.apache.org/framework/index.html</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>excalibur-component</id>
- <version>1.1</version>
- <url>http://jakarta.apache.org/avalon/</url>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ <url>http://excalibur.apache.org/framework/index.html</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>excalibur-instrument</id>
- <version>1.0</version>
- <url>http://jakarta.apache.org/avalon/</url>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ <url></url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <!-- End of Avalon dependencies -->
+
+ <!-- Start of ECM dependencies -->
+ <dependency>
+ <groupId>excalibur-component</groupId>
+ <artifactId>excalibur-component</artifactId>
+ <version>2.1</version>
+ <url>http://excalibur.apache.org/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-instrument</groupId>
+ <artifactId>excalibur-instrument-api</artifactId>
+ <version>2.1</version>
+ <url>http://excalibur.apache.org/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>excalibur-logger</id>
- <version>1.0.1</version>
- <url>http://jakarta.apache.org/avalon/</url>
+ <groupId>excalibur-logger</groupId>
+ <artifactId>excalibur-logger</artifactId>
+ <version>2.1</version>
+ <url>http://excalibur.apache.org/logger.html</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>excalibur-pool</id>
- <version>1.2</version>
- <url>http://jakarta.apache.org/avalon/</url>
+ <groupId>excalibur-pool</groupId>
+ <artifactId>excalibur-pool-api</artifactId>
+ <version>2.1</version>
+ <url>http://excalibur.apache.org/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<!-- End of ECM dependencies -->
@@ -386,7 +481,7 @@
<version>1.0.4</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-yaafi</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<!-- End of YAAFI dependencies -->
@@ -398,101 +493,163 @@
<url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <url>http://avalon.apache.org/framework/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
- <url>http://avalon.apache.org/framework/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.3.3</version>
+ <url>http://java.sun.com/products/javamail/</url>
+ <type>jar</type>
</dependency>
+
+ <!-- Jakarta Commons dependencies -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-codec</id>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
<version>1.3</version>
+ <url>http://jakarta.apache.org/commons/codec/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-collections</id>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-configuration</id>
- <version>1.2</version>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.3</version>
<url>http://jakarta.apache.org/commons/configuration/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-digester</id>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
<version>1.7</version>
<url>http://jakarta.apache.org/commons/digester/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-email</id>
+ <groupId>commons-email</groupId>
+ <artifactId>commons-email</artifactId>
<version>1.0</version>
- <url>http://jakarta.apache.org/commons/sandbox/email/</url>
+ <url>http://jakarta.apache.org/commons/email/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-fileupload</id>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/fileupload/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-io</id>
- <version>1.1</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
<url>http://jakarta.apache.org/commons/io/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-lang</id>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>2.1</version>
<url>http://jakarta.apache.org/commons/lang/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-logging</id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <url>http://jakarta.apache.org/commons/logging.html</url>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>commons-pool</id>
- <version>1.2</version>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
<url>http://jakarta.apache.org/commons/pool/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>cryptix</id>
+ <groupId>cryptix</groupId>
+ <artifactId>cryptix</artifactId>
<version>3.2.0</version>
<url>http://www.cryptix.org/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>dom4j</id>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
<version>1.6.1</version>
<url>http://www.dom4j.org/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>ecs</id>
+ <groupId>ecs</groupId>
+ <artifactId>ecs</artifactId>
<version>1.4.2</version>
<url>http://jakarta.apache.org/ecs/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
+
+ <!-- Fulcrum Components dependencies -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-cache</artifactId>
<version>1.0.5</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-cache</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -501,7 +658,7 @@
<version>1.0.5</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-crypto</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -510,7 +667,7 @@
<version>1.0.6-dev</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-localization</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -519,7 +676,7 @@
<version>1.0.4-dev</version>
<url>http://jakarta.apache.org/turbine/fulcrum/intake</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -528,7 +685,7 @@
<version>1.0.3</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-factory</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -537,7 +694,7 @@
<version>1.0.3</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-pool</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -546,7 +703,7 @@
<version>1.0.4</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-mimetype</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -555,7 +712,7 @@
<version>1.0.2-dev</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-parser</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
@@ -564,97 +721,153 @@
<version>1.0.3</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-upload</url>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.3.3</version>
- <url>http://java.sun.com/products/javamail/</url>
- <type>jar</type>
- </dependency>
- <dependency>
- <id>jdbc</id>
- <version>2.0</version>
- <url>http://java.sun.com/products/jdbc/</url>
- </dependency>
- <dependency>
- <id>jndi</id>
- <version>1.2.1</version>
- <url>http://java.sun.com/products/jndi/</url>
- </dependency>
- <dependency>
- <id>junit</id>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<version>3.8.1</version>
<url>http://www.junit.org/</url>
</dependency>
<!-- ORO must be loaded before Jython, as Jython includes some ORO -->
<!-- classes which cause the Maven JXR plug-in to fail. -->
- <dependency>
- <id>oro</id>
- <version>2.0.7</version>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
<url>http://jakarta.apache.org/oro/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
- <dependency>
- <id>jython</id>
+ <dependency>
+ <groupId>jython</groupId>
+ <artifactId>jython</artifactId>
<version>2.1</version>
<url>http://www.jython.org/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j/</url>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ <url>http://logging.apache.org/log4j/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>servletapi</id>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
<version>2.3</version>
<url>http://java.sun.com/products/servlet/</url>
+ <type>jar</type>
</dependency>
- <!--dependency>
- <id>torque</id>
- <version>3.1.1</version>
+
+ <!-- Torque dependencies -->
+ <!-- dependency>
+ <groupId>torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>3.2</version>
<url>http://db.apache.org/torque/</url>
- </dependency-->
- <!--
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
<dependency>
- <groupId>turbine</groupId>
- <artifactId>turbine-torque-impl</artifactId>
- <version>2.4-dev</version>
- <url>http://jakarta.apache.org/turbine/</url>
+ <groupId>village</groupId>
+ <artifactId>village</artifactId>
+ <version>2.0</version>
+ <url>http://www.softwareforge.de/projects/village/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency -->
+
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ <version>2.0</version>
+ <url>http://ws.apache.org/xmlrpc/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
- -->
+
<dependency>
- <id>velocity</id>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
<version>1.4</version>
<url>http://jakarta.apache.org/velocity/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
+
+<!--
+========================================================================
+== ==
+== uncomment these dependencies if you are using a 1.3 JDK ==
+== ==
+========================================================================
+-->
+
+<!-- REMOVE THIS LINE
<dependency>
- <id>village</id>
+ <groupId>javax.sql</groupId>
+ <artifactId>jdbc-stdext</artifactId>
<version>2.0</version>
- <url>http://share.whichever.com/index.php?SCREEN=village</url>
+ <url>http://java.sun.com/products/jdbc/</url>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.naming</groupId>
+ <artifactId>jndi</artifactId>
+ <version>1.2.1</version>
+ <url>http://java.sun.com/products/jndi/</url>
+ <type>jar</type>
</dependency>
<dependency>
- <id>xalan</id>
- <version>2.5.1</version>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
<url>http://xml.apache.org/xalan-j/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>xerces:xercesImpl</id>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
<version>2.4.0</version>
<url>http://xml.apache.org/xerces2-j/</url>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
- <id>xml-apis</id>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
<url>http://xml.apache.org/commons/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ <type>jar</type>
</dependency>
- <dependency>
- <id>xmlrpc</id>
- <version>1.2-b1</version>
- <url>http://xml.apache.org/xmlrpc/</url>
- </dependency>
+REMOVE THIS LINE -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -683,7 +896,7 @@
<dependency>
<groupId>torque</groupId>
<artifactId>maven-torque-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2</version>
<type>plugin</type>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org