Build also a docs package that includes the HTML version of the Book and the Tutorial.

svn changeset:8906/svn branch:6.1

1 files changed, 25 insertions, 6 deletions

diff --git a/build/build.xml b/build/build.xml
index 329266d734..5950064c50 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1073,7 +1073,7 @@
     <!-- Manual: Build from external repository.                            -->
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
-    <target name="manual-init">
+    <target name="manual-init" depends="init">
 		<!-- Can run XEP only if license is available. -->
 		<available file="build/lib/XEP/license.xml" property="xep.license.available" />
 
@@ -1086,7 +1086,7 @@
     </target>
 
     <!-- Checkout doc repository. -->
-    <target name="manual-checkout" unless="docdir">
+    <target name="manual-checkout" depends="manual-init" unless="docdir">
         <mkdir dir="${checkout-path}"/>
 
         <exec executable="svn" dir="${checkout-path}">
@@ -1095,6 +1095,7 @@
             <arg value="docs"/>
         </exec>
 
+		<!-- Documentation source directory. -->
         <property name="docdir" value="${checkout-path}/docs"/>
     </target>
 
@@ -1104,24 +1105,42 @@
     </target>
 
     <!-- Build manual. -->
-    <target name="manual-build" depends="xep-license-copy">
+    <target name="manual-build" depends="manual-init, xep-license-copy">
       <ant dir="${docdir}" antfile="build/build.xml" inheritAll="false">
           <property name="version" value="${version}"/>
       </ant>
     </target>
 
     <!-- Copy the manual from sub Ant results to our output directory. -->
-    <target name="manual-copy" depends="init, manual-checkout">
+    <target name="manual-copy" depends="manual-init">
 		<copy todir="${output-dir}/WebContent/docs">
             <fileset dir="${docdir}/build/result/package/WebContent/docs">
 				<exclude name="**/.svn" />
 				<include name="book-of-vaadin.pdf" />
+				<include name="book/**" />
+				<include name="tutorial/**" />
+				<include name="vaadin-tutorial.pdf" />
             </fileset>
         </copy>
     </target>
 
-	<target name="manual" depends="init, manual-init, manual-checkout, manual-build, manual-copy">
-    </target>        
+	<target name="manual-package" depends="manual-init, manual-copy">
+		<tar destfile="${result-path}/${product-file}-docs-${version}.tar.gz" compression="gzip" longfile="gnu">
+			<tarfileset prefix="docs" dir="${result-path}/${product-file}-${version}/WebContent/docs">
+				<patternset>
+					<include name="api/**" />
+					<include name="book/**" />
+					<include name="book-of-vaadin.pdf" />
+					<include name="tutorial/**" />
+					<include name="vaadin-tutorial.pdf" />
+					<include name="example-source" />
+				</patternset>
+			</tarfileset>
+		</tar>
+	</target>
+
+	<target name="manual" depends="init, manual-init, manual-checkout, manual-build, manual-copy, manual-package">
+    </target>
 
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
     <!-- Documentation: Add Javadoc to doc                                  -->

path: root/lib/private/Http/WellKnown/RequestManager.php

<?php

declare(strict_types=1);

/**
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
namespace OC\Http\WellKnown;

use OC\AppFramework\Bootstrap\Coordinator;
use OC\AppFramework\Bootstrap\ServiceRegistration;
use OCP\AppFramework\QueryException;
use OCP\Http\WellKnown\IHandler;
use OCP\Http\WellKnown\IRequestContext;
use OCP\Http\WellKnown\IResponse;
use OCP\Http\WellKnown\JrdResponse;
use OCP\IRequest;
use OCP\IServerContainer;
use Psr\Log\LoggerInterface;
use RuntimeException;
use function array_reduce;

class RequestManager {
	/** @var Coordinator */
	private $coordinator;

	/** @var IServerContainer */
	private $container;

	/** @var LoggerInterface */
	private $logger;

	public function __construct(Coordinator $coordinator,
		IServerContainer $container,
		LoggerInterface $logger) {
		$this->coordinator = $coordinator;
		$this->container = $container;
		$this->logger = $logger;
	}

	public function process(string $service, IRequest $request): ?IResponse {
		$handlers = $this->loadHandlers();
		$context = new class($request) implements IRequestContext {
			/** @var IRequest */
			private $request;

			public function __construct(IRequest $request) {
				$this->request = $request;
			}

			public function getHttpRequest(): IRequest {
				return $this->request;
			}
		};

		$subject = $request->getParam('resource');
		$initialResponse = new JrdResponse($subject ?? '');
		$finalResponse = array_reduce($handlers, function (?IResponse $previousResponse, IHandler $handler) use ($context, $service) {
			return $handler->handle($service, $context, $previousResponse);
		}, $initialResponse);

		if ($finalResponse instanceof JrdResponse && $finalResponse->isEmpty()) {
			return null;
		}

		return $finalResponse;
	}

	/**
	 * @return IHandler[]
	 */
	private function loadHandlers(): array {
		$context = $this->coordinator->getRegistrationContext();

		if ($context === null) {
			throw new RuntimeException('Well known handlers requested before the apps had been fully registered');
		}

		$registrations = $context->getWellKnownHandlers();
		$this->logger->debug(count($registrations) . ' well known handlers registered');

		return array_filter(
			array_map(function (ServiceRegistration $registration) {
				/** @var ServiceRegistration<IHandler> $registration */
				$class = $registration->getService();

				try {
					$handler = $this->container->get($class);

					if (!($handler) instanceof IHandler) {
						$this->logger->error("Well known handler $class is invalid");

						return null;
					}

					return $handler;
				} catch (QueryException $e) {
					$this->logger->error("Could not load well known handler $class", [
						'exception' => $e,
						'app' => $registration->getAppId(),
					]);

					return null;
				}
			}, $registrations)
		);
	}
}