diff options
| author | caustin | 2013-02-07 15:33:10 +0000 |
|---|---|---|
| committer | caustin | 2013-02-07 15:33:10 +0000 |
| commit | f42c283e7c63135271722e3da46a7aeb22af0efe (patch) | |
| tree | 80c2f9904c33f46988726638a47cdd3307115e23 | |
| parent | 7b293beeb999f49dd0a9d0b2da4ced4a18d0d0c4 (diff) | |
| parent | 7b699cde953cf1e2f5f2b8ab40b04c16e9c6d8ac (diff) | |
| download | eclipse.platform.ua-f42c283e7c63135271722e3da46a7aeb22af0efe.tar.gz eclipse.platform.ua-f42c283e7c63135271722e3da46a7aeb22af0efe.tar.xz eclipse.platform.ua-f42c283e7c63135271722e3da46a7aeb22af0efe.zip | |
Merge branch 'master' of ssh://caustin@git.eclipse.org/gitroot/platform/eclipse.platform.ua.gitv20130207-153310
| -rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties | 4 | ||||
| -rw-r--r-- | org.eclipse.help.webapp/pom.xml | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties index 0d25ced53..8d5ddd316 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2013 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -146,7 +146,7 @@ HelpPreferencePage_openInEditor=In the editor area HelpPreferencePage_openInBrowser=In a browser HelpPreferencePage_wlabel=Open &window context help HelpPreferencePage_view=In the dynamic help view -HelpPreferencePage_dlabel=Open &dialog context help +HelpPreferencePage_dlabel=Open d&ialog context help HelpPreferencePage_tray=In a dialog tray HelpPreferencePage_search=Search HelpPreferencePage_openContents=Open help &contents diff --git a/org.eclipse.help.webapp/pom.xml b/org.eclipse.help.webapp/pom.xml index 458a12c6b..9bbdc3453 100644 --- a/org.eclipse.help.webapp/pom.xml +++ b/org.eclipse.help.webapp/pom.xml @@ -22,4 +22,27 @@ <artifactId>org.eclipse.help.webapp</artifactId> <version>3.6.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>8.1.8.v20121106</version> + <executions> + <execution> + <id>jspc</id> + <goals> + <goal>jspc</goal> + </goals> + <configuration> + <packageRoot>org.eclipse.help.internal.webapp.jsp</packageRoot> + <webAppSourceDirectory>${basedir}</webAppSourceDirectory> + <useProvidedScope>true</useProvidedScope> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |