summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMike Rennie2013-11-06 13:26:17 (EST)
committer Mike Rennie2013-11-06 13:26:17 (EST)
commitf8aa3e1d4ff692e7219d59adbffe8c25d2e75b9d (patch)
tree1c0f528ac39e6c0809f6c1c2852656993b0fa49c
parenteace97ae9cc756c4207ab25a61da66dcf7bbe28d (diff)
downloadorg.eclipse.orion.server-f8aa3e1d4ff692e7219d59adbffe8c25d2e75b9d.zip
org.eclipse.orion.server-f8aa3e1d4ff692e7219d59adbffe8c25d2e75b9d.tar.gz
org.eclipse.orion.server-f8aa3e1d4ff692e7219d59adbffe8c25d2e75b9d.tar.bz2
Bug 421176 - Add hooks for the new JavaScript plugin in the serverv20131106-1826refs/changes/50/18150/1
Change-Id: Ic17c8491729d2aeac4b3eb00b2344a29f7930366 Signed-off-by: Mike Rennie <Michael_Rennie@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.orion.server.configurator/plugin.xml7
-rw-r--r--releng/org.eclipse.orion.releng/builder/customTargets.xml2
2 files changed, 9 insertions, 0 deletions
diff --git a/bundles/org.eclipse.orion.server.configurator/plugin.xml b/bundles/org.eclipse.orion.server.configurator/plugin.xml
index 9561776..f251dd7 100644
--- a/bundles/org.eclipse.orion.server.configurator/plugin.xml
+++ b/bundles/org.eclipse.orion.server.configurator/plugin.xml
@@ -308,6 +308,13 @@
extension="webapp"
mime-type="application/x-web-app-manifest+json">
</mime-mapping>
+ </httpcontext>
+ <httpcontext
+ id="org.eclipse.orion.server.configurator.httpcontext.javascript">
+ <resource-mapping
+ bundle="org.eclipse.orion.client.javascript"
+ path="/web">
+ </resource-mapping>
</httpcontext>
</extension>
<extension
diff --git a/releng/org.eclipse.orion.releng/builder/customTargets.xml b/releng/org.eclipse.orion.releng/builder/customTargets.xml
index 1e15199..c3fc342 100644
--- a/releng/org.eclipse.orion.releng/builder/customTargets.xml
+++ b/releng/org.eclipse.orion.releng/builder/customTargets.xml
@@ -123,6 +123,7 @@ lastMapTag=${mapsTagTag}
<arg value="${buildDirectory}/plugins/org.eclipse.orion.client.ui/web/orion/" />
<arg value="${buildDirectory}/plugins/org.eclipse.orion.client.editor/web/orion/" />
<arg value="${buildDirectory}/plugins/org.eclipse.orion.client.git/web/orion/" />
+ <arg value="${buildDirectory}/plugins/org.eclipse.orion.client.javascript/web/orion/" />
<arg value="${buildDirectory}/plugins/org.eclipse.orion.client.users/web/orion/" />
</java>
</target>
@@ -251,6 +252,7 @@ lastMapTag=${mapsTagTag}
<fileset dir="${buildDirectory}/plugins/org.eclipse.orion.client.ui/web" includes="**"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.orion.client.editor/web" includes="**"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.orion.client.git/web" includes="**"/>
+ <fileset dir="${buildDirectory}/plugins/org.eclipse.orion.client.javascript/web" includes="**"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.orion.client.users/web" includes="**"/>
</copy>