Prepare release
git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/parser@812793 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..2c44dd1
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,6 @@
+Turbine Fulcrum Parser Component
+Copyright 2005-2009 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/pom.xml b/pom.xml
index 14eb328..9fb65c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -107,17 +108,14 @@
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
<version>1.0.4</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pool</artifactId>
<version>1.0.4</version>
</dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-factory</artifactId>
- <version>1.0.4</version>
- </dependency>
+
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -137,5 +135,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.2</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+ <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
+ </properties>
</project>
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 2456923..0000000
--- a/project.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
diff --git a/project.xml b/project.xml
deleted file mode 100644
index 2a4999e..0000000
--- a/project.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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>
- <extend>${basedir}/../project.xml</extend>
- <id>fulcrum-parser</id>
- <name>Fulcrum Parser Component</name>
- <currentVersion>1.0.2-dev</currentVersion>
-
- <dependencies>
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-upload</artifactId>
- <version>1.0.4-dev</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
- <url>http://commons.apache.org/fileupload/</url>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.1</version>
- <url>http://commons.apache.org/io/</url>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <url>http://commons.apache.org/collections/</url>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <url>http://commons.apache.org/lang/</url>
- </dependency>
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-pool</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-factory</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
- <url>http://java.sun.com/products/servlet/</url>
- </dependency>
-
- <!-- Needed only for testing -->
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.5</version>
- </dependency>
-
- </dependencies>
-
-
-</project>
-
diff --git a/xdocs/navigation.xml b/src/site/site.xml
similarity index 91%
rename from xdocs/navigation.xml
rename to src/site/site.xml
index 0a29068..82f18b3 100644
--- a/xdocs/navigation.xml
+++ b/src/site/site.xml
@@ -17,19 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE project [
-<!ENTITY site-nav SYSTEM "../../incl_site_nav.xml">
-]>
-
<project
name="Fulcrum Parser"
href="http://turbine.apache.org/fulcrum/fulcrum-parser/">
<body>
-
-&site-nav;
-
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 07ed706..93a7b0d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -1,77 +1,79 @@
-<?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 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
+ 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.
+ 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.
-->
<document>
- <properties>
- <title>Fulcrum Parser</title>
- <author email="epugh@opensourceconnections.com">Eric Pugh</author>
- </properties>
+ <properties>
+ <title>Fulcrum Parser</title>
+ <author email="epugh@opensourceconnections.com">Eric Pugh</author>
+ </properties>
- <body>
- <release version="1.0.2-dev" date="in SVN">
- <action type="update" dev="tv">
- Removed the dependency on commons-logging.
- </action>
- <action type="add" dev="tv">
- Added getBooleans() and getBooleanObjects() to the ValueParser to provide
- a "more orthogonal" interface.
- </action>
- <action type="update" dev="tv">
- Important change: The BaseValueParser now consistently returns null for
- all get-methods that return an Object, if the parameter name does not exist.
- This changes the behaviour of getBigDecimal which used to return 0 in this
- case.
- </action>
- <action type="add" dev="tv">
- Made ValueParser and BaseValueParser locale-aware. Note that the default
- locale used is always the default value of the JVM which is different from
- the previous behaviour where the locale used was sometimes Locale.US (for
- float, double and BigDecimal) and sometimes the JVM-default (for dates).
- </action>
- <action dev="tv" type="update" issue="TRB-39">
- Totally refactored the component to provide correctly initialized
- parser objects.
- </action>
- <action dev="tv" type="update" issue="TRB-32" due-to="Juergen Hofmann">
- Port parser fixes of Turbine 2.3.2 over to the component.
- </action>
- <action dev="epugh" type="add">
- Add javabean get/set for dependent upload service to DefaultParameterParser.
- </action>
- <action dev="epugh" type="add">
- Basic unit test verifying that the default parser starts up.
- </action>
- <action dev="epugh" type="add">
- Change to commons-logger to be more friendly to who ever
- uses this code.
- </action>
- <action dev="epugh" type="add">
- Removed use of old Log4j Category in favor of Logger.
- </action>
- <action dev="epugh" type="add">
- Make gump friendly.
- </action>
- <action dev="epugh" type="add">
- Initial conversion to Avalon component.
- </action>
- </release>
-
- </body>
+ <body>
+ <release version="1.0.3-SNAPSHOT" date="in SVN">
+ </release>
+ <release version="1.0.2" date="2009-09-09">
+ <action type="update" dev="tv">
+ Removed the dependency on commons-logging.
+ </action>
+ <action type="add" dev="tv">
+ Added getBooleans() and getBooleanObjects() to the ValueParser to provide
+ a "more orthogonal" interface.
+ </action>
+ <action type="update" dev="tv">
+ Important change: The BaseValueParser now consistently returns null for
+ all get-methods that return an Object, if the parameter name does not
+ exist.
+ This changes the behaviour of getBigDecimal which used to return 0 in
+ this case.
+ </action>
+ <action type="add" dev="tv">
+ Made ValueParser and BaseValueParser locale-aware. Note that the default
+ locale used is always the default value of the JVM which
+ is different from the previous behaviour where the locale used was sometimes
+ Locale.US (for float, double and BigDecimal) and sometimes the JVM-default
+ (for dates).
+ </action>
+ <action dev="tv" type="update" issue="TRB-39">
+ Totally refactored the component to provide correctly initialized
+ parser objects.
+ </action>
+ <action dev="tv" type="update" issue="TRB-32" due-to="Jürgen Hofmann">
+ Port parser fixes of Turbine 2.3.2 over to the component.
+ </action>
+ <action dev="epugh" type="add">
+ Add javabean get/set for dependent upload service to
+ DefaultParameterParser.
+ </action>
+ <action dev="epugh" type="add">
+ Basic unit test verifying that the default parser starts up.
+ </action>
+ <action dev="epugh" type="add">
+ Change to commons-logger to be more friendly to who ever
+ uses this code.
+ </action>
+ <action dev="epugh" type="add">
+ Removed use of old Log4j Category in favor of Logger.
+ </action>
+ <action dev="epugh" type="add">
+ Make gump friendly.
+ </action>
+ <action dev="epugh" type="add">
+ Initial conversion to Avalon component.
+ </action>
+ </release>
+ </body>
</document>
