diff options
Diffstat (limited to 'documentation/portal')
-rw-r--r-- | documentation/portal/portal-deployment.asciidoc | 6 | ||||
-rw-r--r-- | documentation/portal/portal-liferay-ipc.asciidoc | 2 | ||||
-rw-r--r-- | documentation/portal/portal-liferay.asciidoc | 4 | ||||
-rw-r--r-- | documentation/portal/portal-osgi.asciidoc | 2 | ||||
-rw-r--r-- | documentation/portal/portal-ui.asciidoc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/documentation/portal/portal-deployment.asciidoc b/documentation/portal/portal-deployment.asciidoc index fec0fd4793..8fcc848eb2 100644 --- a/documentation/portal/portal-deployment.asciidoc +++ b/documentation/portal/portal-deployment.asciidoc @@ -8,7 +8,7 @@ layout: page = Deploying to a Portal For OSGi portlets in Liferay 7, see -<<dummy/../../../framework/portal/portal-osgi#portal.osgi.portlet,"Publishing a Portlet With OSGi">>. +<<portal-osgi#portal.osgi.portlet,"Publishing a Portlet With OSGi">>. The text below applies mostly to non-OSGi portlets. To deploy a portlet WAR in a portal, you need to provide a @@ -262,7 +262,7 @@ bundled in Liferay 5.3 and later. If your portlets are contained in multiple WARs, which can happen quite typically, you need to install the widget set and theme portal-wide so that all the portlets can use them. See -<<dummy/../../../framework/portal/portal-liferay#portal.liferay,"Developing +<<portal-liferay#portal.liferay,"Developing Vaadin Portlets for Liferay">> on configuring the widget sets in the portal itself. @@ -275,7 +275,7 @@ deployment, you probably want to either use Maven or an Ant script to build the package. In Eclipse, you can right-click on the project and select "Export > WAR". Choose a name for the package and a target. If you have installed Vaadin in the portal as described in -<<dummy/../../../framework/portal/portal-liferay#portal.liferay,"Developing +<<portal-liferay#portal.liferay,"Developing Vaadin Portlets for Liferay">>, you should exclude all the Vaadin libraries, as well as widget set and themes from the WAR. diff --git a/documentation/portal/portal-liferay-ipc.asciidoc b/documentation/portal/portal-liferay-ipc.asciidoc index f60ff58bf5..c364c35cba 100644 --- a/documentation/portal/portal-liferay-ipc.asciidoc +++ b/documentation/portal/portal-liferay-ipc.asciidoc @@ -53,7 +53,7 @@ as from a Maven repository. To download the installation package or find out the Maven or Ivy dependency, see the link:https://vaadin.com/directory#addon/vaadin-ipc-for-liferay[add-on page at Vaadin Directory], and install the add-on as described in -<<dummy/../../../framework/addons/addons-overview.asciidoc#addons.overview,"Using +<<../addons/addons-overview.asciidoc#addons.overview,"Using Vaadin Add-ons">>. The contents of the installation package are as follows: diff --git a/documentation/portal/portal-liferay.asciidoc b/documentation/portal/portal-liferay.asciidoc index f3a32372c6..677a0458c3 100644 --- a/documentation/portal/portal-liferay.asciidoc +++ b/documentation/portal/portal-liferay.asciidoc @@ -13,7 +13,7 @@ globally in Liferay so that the resources are shared between all Vaadin portlets, as self-contained WARs where each portlet carries their own resources or as OSGi bundles in Liferay 7. -For Liferay 7 and OSGi portlets, see <<dummy/../../../framework/portal/portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. This is the recommended approach when using Vaadin 8.1 or later and Liferay 7. +For Liferay 7 and OSGi portlets, see <<portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. This is the recommended approach when using Vaadin 8.1 or later and Liferay 7. Currently, the latest Maven archetype supports the OSGi approach. The material below applies mostly to non-OSGi portlets. @@ -115,7 +115,7 @@ image::img/liferay-maven-profile.png[] == Creating a Portlet Project with Maven Creation of Vaadin a Maven project is described in -<<dummy/../../../framework/getting-started/getting-started-maven#getting-started.maven,"Using +<<../getting-started/getting-started-maven#getting-started.maven,"Using Vaadin with Maven">>. For a Liferay project, you should use the [literal]#++vaadin-archetype-liferay-portlet++#. diff --git a/documentation/portal/portal-osgi.asciidoc b/documentation/portal/portal-osgi.asciidoc index 67086d72e1..94ce99df50 100644 --- a/documentation/portal/portal-osgi.asciidoc +++ b/documentation/portal/portal-osgi.asciidoc @@ -13,7 +13,7 @@ using multiple different Vaadin versions in different portlets on a page. For general OSGi considerations with Vaadin Framework such as packaging and bundle manifests, and how to publish static resources such as themes and widget sets, see -<<dummy/../../../framework/advanced/advanced-osgi#advanced.osgi,"Vaadin OSGi Support">>. +<<../advanced/advanced-osgi#advanced.osgi,"Vaadin OSGi Support">>. [[portal.osgi.portlet]] diff --git a/documentation/portal/portal-ui.asciidoc b/documentation/portal/portal-ui.asciidoc index 78aff9b731..a5d4ce8c08 100644 --- a/documentation/portal/portal-ui.asciidoc +++ b/documentation/portal/portal-ui.asciidoc @@ -33,7 +33,7 @@ public class MyportletUI extends UI { ---- For OSGi portlets in Liferay 7, use additional annotations as described in -<<dummy/../../../framework/portal/portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. +<<portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. The portlet theme is defined with the [classname]#@Theme# annotation as usual. The theme for the UI must match a theme installed in the portal. You can use any @@ -67,7 +67,7 @@ can make testing it easier than deploying it to a portal. If you created the project as a Servlet 3.0 project, the generated UI stub includes a static servlet class annotated with [classname]#@WebServlet#, as described in -<<dummy/../../../framework/getting-started/getting-started-first-project#getting-started.first-project.exploring,"Exploring +<<../getting-started/getting-started-first-project#getting-started.first-project.exploring,"Exploring the Project">>. Otherwise, the following snippet can be used. |