You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2009/06/18 20:43:59 UTC
svn commit: r786198 - in /turbine/fulcrum/trunk/localization: pom.xml
xdocs/changes.xml xdocs/index.xml
Author: tv
Date: Thu Jun 18 18:43:58 2009
New Revision: 786198
URL: http://svn.apache.org/viewvc?rev=786198&view=rev
Log:
Prepare release
Modified:
turbine/fulcrum/trunk/localization/pom.xml
turbine/fulcrum/trunk/localization/xdocs/changes.xml
turbine/fulcrum/trunk/localization/xdocs/index.xml
Modified: turbine/fulcrum/trunk/localization/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=786198&r1=786197&r2=786198&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/pom.xml (original)
+++ turbine/fulcrum/trunk/localization/pom.xml Thu Jun 18 18:43:58 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -15,10 +15,7 @@
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">
+<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">
<parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
@@ -93,6 +90,8 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
+ <optional>true</optional>
+
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -107,6 +106,7 @@
<version>1.0.6</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
@@ -119,5 +119,26 @@
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
</build>
+
+ <profiles>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Fulcrum Release Candidate Staging Site</name>
+ <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+ <properties>
+ <!-- This bits are used for the staging directory -->
+ <fulcrum.release.version>1.0.6</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+ <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
+ </properties>
</project>
Modified: turbine/fulcrum/trunk/localization/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/xdocs/changes.xml?rev=786198&r1=786197&r2=786198&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/localization/xdocs/changes.xml Thu Jun 18 18:43:58 2009
@@ -24,7 +24,10 @@
</properties>
<body>
- <release version="1.0.6" date="">
+ <release version="1.0.6" date="2009-06-18">
+ <action dev="tv" type="add">
+ Added a Maven-2 build.
+ </action>
<action dev="tv" type="add">
Split the service into a simple one that does not depend on servlet-api
and an extended one that does. This allows to use the service in non-web
Modified: turbine/fulcrum/trunk/localization/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/xdocs/index.xml?rev=786198&r1=786197&r2=786198&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/localization/xdocs/index.xml Thu Jun 18 18:43:58 2009
@@ -207,12 +207,12 @@
<section name="Usage">
<source><![CDATA[
- TurbineServices.getInstance().getService(LocalizationService.LOCALIZATION)
+ TurbineServices.getInstance().getService(LocalizationService.ROLE)
.getString("DISPLAYPROJECTS_TITLE");
]]></source>
<p>
- Wow. That is a lot of typing. That could be easily shortened to this:
+ Wow. That is a lot of typing. In Turbine, that could be easily shortened to this:
</p>
<source><![CDATA[
@@ -249,7 +249,7 @@
]]></source>
<p>
- This actually doesn't look too nice, however the call using the LocalizationTool
+ This actually doesn't look too nice, however the call using the Turbine LocalizationTool
from a <a href="http://velocity.apache.org/">Velocity</a> template just deflates to
</p>
Re: svn commit: r786198 - in /turbine/fulcrum/trunk/localization:
pom.xml xdocs/changes.xml xdocs/index.xml
Posted by Thomas Vandahl <tv...@apache.org>.
Scott Eade wrote:
>> <groupId>javax.servlet</groupId>
>> <artifactId>servlet-api</artifactId>
>> <version>2.4</version>
>> + <optional>true</optional>
>> + </dependency>
>> <dependency>
>> <groupId>commons-lang</groupId>
>>
> Wouldn't it be more accurate to use:
> <scope>provided</scope>
I'm not exactly sure what "provided" means but setting optional to true
was intentional because you can use the SimpleLocalizationService
without the servlet-api. This was actually a use case for me.
Bye, Thomas.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
For additional commands, e-mail: dev-help@turbine.apache.org
Re: svn commit: r786198 - in /turbine/fulcrum/trunk/localization:
pom.xml xdocs/changes.xml xdocs/index.xml
Posted by Scott Eade <se...@backstagetech.com.au>.
tv@apache.org wrote:
> Modified: turbine/fulcrum/trunk/localization/pom.xml
> URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=786198&r1=786197&r2=786198&view=diff
> ==============================================================================
> --- turbine/fulcrum/trunk/localization/pom.xml (original)
> +++ turbine/fulcrum/trunk/localization/pom.xml Thu Jun 18 18:43:58 2009
> @@ -93,6 +90,8 @@
> <groupId>javax.servlet</groupId>
> <artifactId>servlet-api</artifactId>
> <version>2.4</version>
> + <optional>true</optional>
> +
> </dependency>
> <dependency>
> <groupId>commons-lang</groupId>
>
Wouldn't it be more accurate to use:
<scope>provided</scope>
No big deal though.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
For additional commands, e-mail: dev-help@turbine.apache.org