aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-12-05 13:55:03 (EST)
committerPaul Webster2012-12-05 13:55:03 (EST)
commit24777320e7556898fee91f0429b43f3afa9b05f7 (patch)
tree2b67e828ed74d2b07d145ac3b8634e94c869d036
parentb7fffe88a8204184807510c3579e1e9bb09e3488 (diff)
downloadeclipse.platform.common-24777320e7556898fee91f0429b43f3afa9b05f7.zip
eclipse.platform.common-24777320e7556898fee91f0429b43f3afa9b05f7.tar.gz
eclipse.platform.common-24777320e7556898fee91f0429b43f3afa9b05f7.tar.bz2
Bug 395743 - Documentation missing org.eclipse.equinox.http.jetty
jetty in PDE is called differently than jetty src in the git repos.
-rw-r--r--bundles/org.eclipse.platform.doc.isv/buildDoc.xml1
-rw-r--r--bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties1
-rw-r--r--bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties1
-rw-r--r--bundles/org.eclipse.platform.doc.isv/platformOptions.txt2
4 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index 1d4a613..e47abb0 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -137,6 +137,7 @@
<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.examples@" value="${eclipse.platform.team.examples}" />
<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.examples@" value="${eclipse.platform.swt.examples}" />
<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.examples@" value="${eclipse.platform.ui.examples}" />
+ <replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.http.jetty@" value="${eclipse.equinox.http.jetty}" />
<!-- expand _* to actual version -->
<!-- prepare ${replaceFile} with all files and folders from workspace -->
diff --git a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
index 8e80a10..ad5b54b 100644
--- a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -22,3 +22,4 @@ eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
+eclipse.equinox.http.jetty=org.eclipse.equinox.http.jetty8
diff --git a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
index 4b93106..f2acfb3 100644
--- a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
@@ -22,3 +22,4 @@ eclipse.platform.swt.examples=..
eclipse.platform.ui.examples=..
eclipse.equinox.supplement=../org.eclipse.equinox.supplement
+eclipse.equinox.http.jetty=org.eclipse.equinox.http.jetty_*
diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index 42f159b..f79b91b 100644
--- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -44,7 +44,7 @@
;@rt.equinox.bundles.bundles@/org.eclipse.equinox.ds/src
;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/src
;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.jetty_*/src
+;@rt.equinox.bundles.bundles@/@eclipse.equinox.http.jetty@/src
;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.registry/src
;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.servlet/src
;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper.registry/src