You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/09/30 21:27:45 UTC

svn commit: r580772 - in /tapestry/tapestry5/trunk: tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ tapestry-core/ tapestry-ioc/src/site/apt/ tapestry-test/src/site/apt/ tapestry-upload/

Author: hlship
Date: Sun Sep 30 12:27:44 2007
New Revision: 580772

URL: http://svn.apache.org/viewvc?rev=580772&view=rev
Log:
TAPESTRY-1790: Component Report generates bad links to apidocs when the apidocs are generated at the project level

Modified:
    tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
    tapestry/tapestry5/trunk/tapestry-core/pom.xml
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt
    tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt
    tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt
    tapestry/tapestry5/trunk/tapestry-upload/pom.xml

Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java Sun Sep 30 12:27:44 2007
@@ -95,6 +95,16 @@
      */
     private String workDirectory;
 
+    /**
+     * Relative path from the generated report to the API documentation (Javadoc). Defaults to
+     * "apidocs" but will often be changed to "../apidocs" when documentation is created at the
+     * project level.
+     * 
+     * @parameter default-value="apidocs"
+     * @required
+     */
+    private String apidocs;
+
     @Override
     protected String getOutputDirectory()
     {
@@ -213,7 +223,7 @@
 
         sink.paragraph();
 
-        String javadocURL = String.format("apidocs/%s.html", className.replace('.', '/'));
+        String javadocURL = String.format("%s/%s.html", apidocs, className.replace('.', '/'));
 
         sink.link(javadocURL);
         sink.text("[JavaDoc]");

Modified: tapestry/tapestry5/trunk/tapestry-core/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/pom.xml?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/pom.xml Sun Sep 30 12:27:44 2007
@@ -110,6 +110,7 @@
         <version>${project.version}</version>
         <configuration>
           <rootPackage>org.apache.tapestry.corelib</rootPackage>
+          <apidocs>../apidocs</apidocs>
         </configuration>
       </plugin>
     </plugins>

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt Sun Sep 30 12:27:44 2007
@@ -22,4 +22,4 @@
   Just case is ignored --
   other punctuation, as well as whitespace, must exactly match.
   
-  Under the covers, this is supported by the {{{apidocs/org/apache/tapestry/ioc/CaseInsensitiveMap.html}CaseInsensitiveMap}} class.
\ No newline at end of file
+  Under the covers, this is supported by the {{{../apidocs/org/apache/tapestry/ioc/CaseInsensitiveMap.html}CaseInsensitiveMap}} class.
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt Sun Sep 30 12:27:44 2007
@@ -12,9 +12,9 @@
   may also happen inside tapestry-ioc, such as when injecting a value, rather than a service, into a builder method.
   
   Like everything else in Tapestry, type coercions are extensible.  At the root is the
-  {{{apidocs/org/apache/tapestry/ioc/services/TypeCoercer.html}TypeCoercer}} service. Its configuration consists
+  {{{../apidocs/org/apache/tapestry/ioc/services/TypeCoercer.html}TypeCoercer}} service. Its configuration consists
   of a number of 
-  {{{apidocs/org/apache/tapestry/ioc/services/CoercionTuple.html}CoercionTuple}}s.  Each tuple defines how to coerce from one type to another.
+  {{{../apidocs/org/apache/tapestry/ioc/services/CoercionTuple.html}CoercionTuple}}s.  Each tuple defines how to coerce from one type to another.
   The initial set of coercions is focused primarily on coercions between different numeric types:
   
 [images/type-coercer.png] Default Type Coercions  

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt Sun Sep 30 12:27:44 2007
@@ -32,7 +32,7 @@
 
   Because this pattern is used so often inside Tapestry, a built-in service exists
   to create implementations of the pattern as needed.  The
-  {{{apidocs/org/apache/tapestry/ioc/services/ChainBuilder.html}ChainBuilder}}
+  {{{../apidocs/org/apache/tapestry/ioc/services/ChainBuilder.html}ChainBuilder}}
   service takes care of all the work:
   
 +----+

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt Sun Sep 30 12:27:44 2007
@@ -130,7 +130,7 @@
 Targetting Multiple Services
 
   By using the
-  {{{apidocs/org/apache/tapestry/ioc/annotations/Match.html}@Match annnotation}},
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/Match.html}@Match annnotation}},
   you may identify which services are to be decorated.
   
   The value specified in the Match annotation is one or more patterns. These patterns
@@ -175,7 +175,7 @@
 
    In cases where multiple decorators will apply to a single service, you can control
    the order in which decorators are applied using  an additional annotation:
-   {{{apidocs/org/apache/tapestry/ioc/annotations/Order.html}@Order}}.
+   {{{../apidocs/org/apache/tapestry/ioc/annotations/Order.html}@Order}}.
    
    This annotation allows any number of {{{order.html}ordering constraints}}
    to be specified for the decorator, to order it relative to

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt Sun Sep 30 12:27:44 2007
@@ -134,7 +134,7 @@
       
   * {{{http://www.slf4j.org/api/org/slf4j/Logger.html}org.slf5j.Logger}}: logger for the module (derived from the module's class name)
    
-  * {{{apidocs/org/apache/tapestry/ioc/ObjectLocator.html}ObjectLocator}}:  access to other services
+  * {{{../apidocs/org/apache/tapestry/ioc/ObjectLocator.html}ObjectLocator}}:  access to other services
   
   []
   
@@ -211,7 +211,7 @@
   or packages).
   
   A better alternative is the 
-  {{{apidocs/org/apache/tapestry/ioc/annotations/SubModule.html}@SubModule annotation}}.
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/SubModule.html}@SubModule annotation}}.
   
   The value for this annotation is a list of <additional> classes to be treated as module builder classes,
   exactly as if they were identified in the manifest.  For example:

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt Sun Sep 30 12:27:44 2007
@@ -27,7 +27,7 @@
   control what other objects must come before a contribution, or come after.
   
   The constraints are specified using the
-  {{{apidocs/org/apache/tapestry/ioc/annotations/Order.html}Order}} annotation (for
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/Order.html}Order}} annotation (for
   service decorator methods), or as variable arguments at the end of the add() method
   for ordered configurations.
   

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt Sun Sep 30 12:27:44 2007
@@ -59,7 +59,7 @@
 +-----+  
 
   The
-  {{{apidocs/org/apache/tapestry/ioc/services/PipelineBuilder.html}PipelineBuilder}}
+  {{{../apidocs/org/apache/tapestry/ioc/services/PipelineBuilder.html}PipelineBuilder}}
   service is useful for constructing pipelines. The service is often injected
   into a service builder method, along with an ordered configuration of services.
   

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt Sun Sep 30 12:27:44 2007
@@ -6,7 +6,7 @@
 
  Primarily, you will use the IoC Registry as part of a Tapestry application.
  In those situations, the 
- {{{apidocs/org/apache/tapestry/TapestryFilter.html}TapestryFilter}} will
+ {{{../apidocs/org/apache/tapestry/TapestryFilter.html}TapestryFilter}} will
  be responsible for starting and stopping the registry.
  
  However, you may want to do some integration testing using the Registry
@@ -16,7 +16,7 @@
 Building the Registry
 
   The class
-  {{{apidocs/org/apache/tapestry/ioc/RegistryBuilder.html}RegistryBuilder}}
+  {{{../apidocs/org/apache/tapestry/ioc/RegistryBuilder.html}RegistryBuilder}}
   is used to create a Registry.
   
 +---+
@@ -34,17 +34,17 @@
   
   Using this approach, you will form a Registry containing
   the builtin services from the
-  {{{apidocs/org/apache/tapestry/ioc/services/TapestryIoCModule.html}Tapestry IoC module}}, plus
+  {{{../apidocs/org/apache/tapestry/ioc/services/TapestryIoCModule.html}Tapestry IoC module}}, plus
   the modules you explicitly list.
   
   The call to eagerLoadServices() is necessary to ensure that any services marked with the
-  {{{apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation are, in fact,
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation are, in fact,
   loaded.
   
 Building the Default Registry
 
   The default registry is available by invoking the static method
-  {{{apidocs/org/apache/tapestry/ioc/IOCUtilities.html#buildDefaultRegistry()}ICCUtilities.buildDefaultRegistry()}}.
+  {{{../apidocs/org/apache/tapestry/ioc/IOCUtilities.html#buildDefaultRegistry()}ICCUtilities.buildDefaultRegistry()}}.
   This method builds a Registry using
   {{{module.html#Autoloading modules}autoloading logic}}, where modules to load
   are identified via a JAR Manifest entry.
@@ -52,7 +52,7 @@
 Shutting down the Registry
 
   The method
-  {{{apidocs/org/apache/tapestry/ioc/Registry.html#shutdown()}Registry.shutdown()}}
+  {{{../apidocs/org/apache/tapestry/ioc/Registry.html#shutdown()}Registry.shutdown()}}
   will shutdown the Registry. This immediately invalidates all service proxies.
   Some services may have chosen to register for shutdown notification (for example,
   to do cleanup work such as closing a database connection).

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt Sun Sep 30 12:27:44 2007
@@ -47,7 +47,7 @@
   with the container.
   
   Every module may have an optional, static bind() method which is passed a
-  {{{apidocs/org/apache/tapestry/ioc/ServiceBinder.html}ServiceBinder}}.  Services may be registered with
+  {{{../apidocs/org/apache/tapestry/ioc/ServiceBinder.html}ServiceBinder}}.  Services may be registered with
   the container by "binding" a service interface to a service implementation:
   
 +------+
@@ -235,7 +235,7 @@
   more can be added.
   
   Service lifecycle is specified using the 
-  {{{apidocs/org/apache/tapestry/ioc/annotations/Scope.html}@Scope annotation}},
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/Scope.html}@Scope annotation}},
   which is attached to a builder method.  When this annotation is not present, the
   default scope, "singleton" is used.
     
@@ -245,7 +245,7 @@
   is created when the service is first referenced.  By reference, we mean any situation in which
   the service is requested by name, such as using the @InjectService annotation on a
   service builder method, or by using the
-  {{{apidocs/org/apache/tapestry/ioc/Registry.html}Registry}} API from outside the
+  {{{../apidocs/org/apache/tapestry/ioc/Registry.html}Registry}} API from outside the
   container.
   
   In any case, the service proxy will only create the service implementation when a method
@@ -309,7 +309,7 @@
   Services are normally created only as needed (per the scope discussion above).
   
   This can be tweaked slightly; by adding the 
-  {{{apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation to
+  {{{../apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation to
   the service builder method, Tapestry will instantiate the service when the Registry is first created.
   
   This will cause the service builder method to be invoked, as well as any service decorator methods.
@@ -350,7 +350,7 @@
   
   * java.lang.Class: service interface implemented by the service to be constructed
   
-  * {{{apidocs/org/apache/tapestry/ioc/ServiceResources.html}ServiceResources}}:  access to other services
+  * {{{../apidocs/org/apache/tapestry/ioc/ServiceResources.html}ServiceResources}}:  access to other services
   
   []
   
@@ -452,18 +452,18 @@
   A few services within the Tapestry IOC Module are "builtin"; there is no 
   service builder method
   in the
-  {{{apidocs/org/apache/tapestry/ioc/services/TapestryIOCModule.html}TapestryIOCModule}} class.
+  {{{../apidocs/org/apache/tapestry/ioc/services/TapestryIOCModule.html}TapestryIOCModule}} class.
   
 *---------------------+-----------------------------------------------------------------------------------------+
 | <<Service Id>>      | <<Service Interface>>                                                                   |
 *---------------------+-----------------------------------------------------------------------------------------+
-| ClassFactory        | {{{apidocs/org/apache/tapestry/ioc/services/ClassFactory.html}ClassFactory}}            |
+| ClassFactory        | {{{../apidocs/org/apache/tapestry/ioc/services/ClassFactory.html}ClassFactory}}            |
 *---------------------+-----------------------------------------------------------------------------------------+
-| LogSource           | {{{apidocs/org/apache/tapestry/ioc/LogSource.html}LogSource}}                           |
+| LogSource           | {{{../apidocs/org/apache/tapestry/ioc/LogSource.html}LogSource}}                           |
 *---------------------+-----------------------------------------------------------------------------------------+
-| RegistryShutdownHub | {{{apidocs/org/apache/tapestry/ioc/RegistryShutdownHub.html}RegistryShutdownHub}}       |
+| RegistryShutdownHub | {{{../apidocs/org/apache/tapestry/ioc/RegistryShutdownHub.html}RegistryShutdownHub}}       |
 *---------------------+-----------------------------------------------------------------------------------------+
-| ThreadCleanupHub    | {{{apidocs/org/apache/tapestry/ioc/services/ThreadCleanupHub.html}ThreadCleanupHub}}    |
+| ThreadCleanupHub    | {{{../apidocs/org/apache/tapestry/ioc/services/ThreadCleanupHub.html}ThreadCleanupHub}}    |
 *---------------------+-----------------------------------------------------------------------------------------+
 
   Consult the JavaDoc for each of these services to identify under what circumstances you'll need to use them.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt Sun Sep 30 12:27:44 2007
@@ -5,7 +5,7 @@
 Shadow Services
 
   The 
-  {{{apidocs/org/apache/tapestry/ioc/services/PropertyShadowBuilder.html}PropertyShadowBuilder}}
+  {{{../apidocs/org/apache/tapestry/ioc/services/PropertyShadowBuilder.html}PropertyShadowBuilder}}
   service is used to build a special, delegating kind of service implementation.
   
   Effectively, it is used to allow a property of another service to be exposed as its own service.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt Sun Sep 30 12:27:44 2007
@@ -7,7 +7,7 @@
   Another of the Gang Of Four patterns, the strategy pattern as implemented in Tapestry IoC is a kind of late binding.
   
   The idea is that <adapters> for objects are accessed based on the <actual type> of an object.  These adapters supply additional functionality.  The adapters
-  are located using an {{{apidocs/org/apache/tapestry/util/StrategyRegistry.html}StrategyRegistry}}.
+  are located using an {{{../apidocs/org/apache/tapestry/util/StrategyRegistry.html}StrategyRegistry}}.
   
   The lookup of adapters is based on an inheritance search; thus providing an adapter for type java.util.Map will match any object that implements the Map interface.
   The inheritance search works its way up the class hierarchy looking for a matching registration. If nothing is found, then all the interfaces directly or indirectly
@@ -17,7 +17,7 @@
   
   As a special case, the value null is search for as if it was an instance of the class void.
     
-  The {{{apidocs/org/apache/tapestry/ioc/services/StrategyBuilder.html}StrategyBuilder}} service creates a service implementation around a strategy registry.
+  The {{{../apidocs/org/apache/tapestry/ioc/services/StrategyBuilder.html}StrategyBuilder}} service creates a service implementation around a strategy registry.
   
 +---+
 public interface StrategyBuilder

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt Sun Sep 30 12:27:44 2007
@@ -11,8 +11,8 @@
   name is segmented with periods.
   
   These symbols are used inside the 
-  {{{apidocs/org/apache/tapestry/ioc/annoations/Value.html}Value}} and
-  {{{apidocs/org/apache/tapestry/ioc/annoations/InjectService.html}InjectService}}
+  {{{../apidocs/org/apache/tapestry/ioc/annoations/Value.html}Value}} and
+  {{{../apidocs/org/apache/tapestry/ioc/annoations/InjectService.html}InjectService}}
   annotations.
   
   For example:
@@ -34,9 +34,9 @@
 Symbol Resolution
 
   Symbols are resolved by the
-  {{{apidocs/org/apache/tapestry/ioc/services/SymbolSource.html}SymbolSource}} service.  The SymbolSource
+  {{{../apidocs/org/apache/tapestry/ioc/services/SymbolSource.html}SymbolSource}} service.  The SymbolSource
   checks against an ordered list of
-  {{{apidocs/org/apache/tapestry/ioc/services/SymbolProvider.html}SymbolProvider}} objects.
+  {{{../apidocs/org/apache/tapestry/ioc/services/SymbolProvider.html}SymbolProvider}} objects.
 
   Additional symbol providers may be employed by contributing to the tapestry.ioc.SymbolSource service configuration,
   which is an ordered list of SymbolProviders.

Modified: tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt Sun Sep 30 12:27:44 2007
@@ -18,7 +18,7 @@
 Usage and Configuration
 
   The core part of this library is a base class for you to extend your tests cases from: 
-  {{{apidocs/org/apache/tapestry/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
+  {{{../apidocs/org/apache/tapestry/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
   
   This class is responsible for starting an instance of Jetty to server your web application, as well
   as a copy of Selenium Server. It also implements the

Modified: tapestry/tapestry5/trunk/tapestry-upload/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/pom.xml?rev=580772&r1=580771&r2=580772&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/pom.xml Sun Sep 30 12:27:44 2007
@@ -125,6 +125,7 @@
         <version>${project.version}</version>
         <configuration>
           <rootPackage>org.apache.tapestry.upload</rootPackage>
+          <apidocs>../apidocs</apidocs>
         </configuration>
       </plugin>
     </plugins>