Author: hlship
Date: Tue Nov 11 11:45:57 2008
New Revision: 713133
URL: http://svn.apache.org/viewvc?rev=713133&view=rev
Log:
Merge changes from 5.1-dev branch to trunk:
TAP5-215: Configuration interface should support contributing a class (which is
autobuilt) in addition to an instance
TAP5-217: Warnings related to service configuration validations should be
escalated to exceptions
TAP5-216: Many methods of the Page interface could be moved to PageResources
(which should be renamed to ComponentPageElementResources)
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/tapestry-project.ipr
Modified: tapestry/tapestry5/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=713133&r1=713132&r2=713133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Tue Nov 11 11:45:57 2008
@@ -4,11 +4,11 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
<packaging>pom</packaging>
- <version>5.0.16</version>
+ <version>5.1.0.0-SNAPSHOT</version>
<name>Tapestry 5 Project</name>
<description>Master project for the modules of Tapestry 5.</description>
<inceptionYear>2006</inceptionYear>
- <url>http://tapestry.apache.org/tapestry5/</url>
+ <url>http://tapestry.apache.org/tapestry5.1/</url>
<issueManagement>
<system>Jira</system>
<url>https://issues.apache.org/jira/browse/TAPESTRY</url>
Modified: tapestry/tapestry5/trunk/tapestry-project.ipr
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project.ipr?rev=713133&r1=713132&r2=713133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project.ipr (original)
+++ tapestry/tapestry5/trunk/tapestry-project.ipr Tue Nov 11 11:45:57 2008
@@ -571,6 +571,132 @@
</SvnBranchConfiguration>
</value>
</entry>
+ <entry key="$PROJECT_DIR$/tapestry-annotations">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-component-report">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-core">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-hibernate">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-ioc">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-spring">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-test">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-tutorial1">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/tapestry-upload">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tapestry5"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/branches"; />
+ <option
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/tags"; />
+ </list>
+ </option>
+ <option name="trunkUrl"
value="https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk"; />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
</map>
</option>
<option name="myVersion" value="123" />
