Author: tv
Date: Mon Nov 2 18:58:55 2009
New Revision: 832052
URL: http://svn.apache.org/viewvc?rev=832052&view=rev
Log:
- Fixed dependencies
- Updated documentation
- Removed Maven-1-stuff
- Added NOTICE
- Prepare release
Added:
turbine/fulcrum/trunk/intake/NOTICE.txt (with props)
turbine/fulcrum/trunk/intake/src/site/
turbine/fulcrum/trunk/intake/src/site/site.xml (with props)
Removed:
turbine/fulcrum/trunk/intake/maven.xml
turbine/fulcrum/trunk/intake/project.properties
turbine/fulcrum/trunk/intake/project.xml
turbine/fulcrum/trunk/intake/xdocs/navigation.xml
Modified:
turbine/fulcrum/trunk/intake/ (props changed)
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/intake/xdocs/changes.xml
turbine/fulcrum/trunk/intake/xdocs/index.xml
Propchange: turbine/fulcrum/trunk/intake/
------------------------------------------------------------------------------
(empty)
Added: turbine/fulcrum/trunk/intake/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/NOTICE.txt?rev=832052&view=auto
==============================================================================
--- turbine/fulcrum/trunk/intake/NOTICE.txt (added)
+++ turbine/fulcrum/trunk/intake/NOTICE.txt Mon Nov 2 18:58:55 2009
@@ -0,0 +1,5 @@
+Turbine Fulcrum Intake Component
+Copyright 2002-2009 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Propchange: turbine/fulcrum/trunk/intake/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=832052&r1=832051&r2=832052&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Mon Nov 2 18:58:55 2009
@@ -91,16 +91,6 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-factory</artifactId>
- <version>1.0.4</version>
- </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-parser</artifactId>
<version>1.0.2</version>
</dependency>
@@ -108,6 +98,7 @@
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
<version>1.0.4</version>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -165,5 +156,26 @@
</resource>
</resources>
</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>
Added: turbine/fulcrum/trunk/intake/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/site/site.xml?rev=832052&view=auto
==============================================================================
--- turbine/fulcrum/trunk/intake/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/intake/src/site/site.xml Mon Nov 2 18:58:55 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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
+ name="Fulcrum Intake"
+ href="http://turbine.apache.org/fulcrum/fulcrum-intake/";>
+
+ <body>
+ <menu name="Overview">
+ <item name="Main" href="/index.html"/>
+ <item name="Howto" href="/howto.html"/>
+ </menu>
+ </body>
+</project>
Propchange: turbine/fulcrum/trunk/intake/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: turbine/fulcrum/trunk/intake/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/xdocs/changes.xml?rev=832052&r1=832051&r2=832052&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/xdocs/changes.xml Mon Nov 2 18:58:55 2009
@@ -25,7 +25,12 @@
</properties>
<body>
- <release version="1.0.4-dev" date="in Subversion">
+ <release version="1.0.7-SNAPSHOT" date="in Subversion">
+ </release>
+ <release version="1.0.6" date="2009-11-02">
+ <action type="fix" dev="tv">
+ Catch only Exceptions that are actually thrown.
+ </action>
<action type="fix" dev="tv" issue="TRB-11" due-to="Evan Koffler">
Intake won't use interfaces for the mapTo() method.
</action>
Modified: turbine/fulcrum/trunk/intake/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/xdocs/index.xml?rev=832052&r1=832051&r2=832052&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/intake/xdocs/index.xml Mon Nov 2 18:58:55 2009
@@ -32,6 +32,26 @@
This service provides access to input processing objects based on an XML
specification.
</p>
+
+ <p>
+ It is written
+ for use in Turbine but it can be used in any container compatible
+ with Avalon's ECM container.
+ </p>
+
+ <p>
+ The component uses the following services from the Fulcrum Repository
+ <ul>
+ <li>
+ <a href="http://turbine.apache.org/fulcrum/fulcrum-parser/";>Fulcrum
Parser Service</a>
+ </li>
+ <li>
+ <a href="http://turbine.apache.org/fulcrum/fulcrum-upload/";>Fulcrum
Upload Service</a>
+ (optional)
+ </li>
+ </ul>
+ </p>
+
</section>
<section name="Configuration">
