Support to serve static ressources

* more tests and cleanup
JetBrains · Mar 24, 2021 · 6fbab3c · 6fbab3c
1 parent fab5a12
commit 6fbab3c
Show file tree

Hide file tree

Showing 58 changed files with 13,846 additions and 7,702 deletions.
diff --git a/build/tests/mpsHttpSupport.xml b/build/tests/mpsHttpSupport.xml
@@ -92,6 +92,7 @@
     <jar destfile="${build.layout}/jetbrains.mps.ide.httpsupport.tests.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test" includes="icons/**, resources/**" />
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.ide.httpsupport.tests.jar" />
     </jar>
@@ -105,6 +106,12 @@
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
       <zipfileset file="${basedir}/testbench/testsolutions/httpsupport.test/jetbrains.mps.ide.httpsupport.tests.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/testbench-testsolutions-httpsupport.test-models" prefix="module/models" />
     </jar>
@@ -317,11 +324,13 @@
   <target name="module-tests" depends="assemble, test.http-support" />
 
   <target name="java.compile.jetbrains.mps.ide.httpsupport.tests" depends="fetchDependencies">
+    <mkdir dir="${basedir}/testbench/testsolutions/httpsupport.test/static" />
     <mkdir dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" />
     <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" fork="false" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
+        <path location="${basedir}/testbench/testsolutions/httpsupport.test/static" />
         <path location="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" />
         <pathelement path="${basedir}/testbench/testsolutions/httpsupport.test/test_gen/" />
       </src>
@@ -382,6 +391,7 @@
       </classpath>
     </javac2>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests">
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/test_gen/" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>

diff --git a/.../mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml b/.../mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
@@ -92,6 +92,7 @@
     <jar destfile="${build.layout}/jetbrains.mps.ide.httpsupport.tests.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test" includes="icons/**, resources/**" />
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.ide.httpsupport.tests.jar" />
     </jar>
@@ -105,6 +106,12 @@
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
       <zipfileset file="${basedir}/testbench/testsolutions/httpsupport.test/jetbrains.mps.ide.httpsupport.tests.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/testbench-testsolutions-httpsupport.test-models" prefix="module/models" />
     </jar>
@@ -317,11 +324,13 @@
   <target name="module-tests" depends="assemble, test.http-support" />
 
   <target name="java.compile.jetbrains.mps.ide.httpsupport.tests" depends="fetchDependencies">
+    <mkdir dir="${basedir}/testbench/testsolutions/httpsupport.test/static" />
     <mkdir dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" />
     <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests" fork="false" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
+        <path location="${basedir}/testbench/testsolutions/httpsupport.test/static" />
         <path location="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" />
         <pathelement path="${basedir}/testbench/testsolutions/httpsupport.test/test_gen/" />
       </src>
@@ -382,6 +391,7 @@
       </classpath>
     </javac2>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.ide.httpsupport.tests">
+      <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/static" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
       <fileset dir="${basedir}/testbench/testsolutions/httpsupport.test/test_gen/" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>

diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
@@ -77,7 +77,7 @@
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
     <file name="mpsHttpSupport.xml">
-      <unit id="6147098677962246363" at="1,0,546,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
+      <unit id="6147098677962246363" at="1,0,556,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">

diff --git a/...-httpsupport/language/generator/source_gen.caches/jetbrains/mps/ide/httpsupport/generated b/...-httpsupport/language/generator/source_gen.caches/jetbrains/mps/ide/httpsupport/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-4zvhr3eypqno7hwe0xzlsnub2gvcqa3">
+<product version="3" modelHash="3z3azro4dtd2572tq2qoxiu03sayf64">
   <files names="Generator.java" />
 </product>
 
diff --git a/...nerator/source_gen.caches/jetbrains/mps/ide/httpsupport/generator/template/main/generated b/...nerator/source_gen.caches/jetbrains/mps/ide/httpsupport/generator/template/main/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-cu4ricrei0i9z8t6krohyp37gdf6y0i">
+<product version="3" modelHash="bsqz23nc3xd8izhoaxyoxsuk764d4wb">
   <files names="QueriesGenerated.java" />
 </product>
 
diff --git a/...ps-httpsupport/language/generator/source_gen/jetbrains/mps/ide/httpsupport/Generator.java b/...ps-httpsupport/language/generator/source_gen/jetbrains/mps/ide/httpsupport/Generator.java
@@ -36,18 +36,20 @@ protected void fillTemplateModels(TemplateModuleInterpreted2.TemplateModels mode
 
   @Override
   public Collection<SLanguage> getTargetLanguages() {
-    SLanguage[] rv = new SLanguage[6];
+    SLanguage[] rv = new SLanguage[8];
     rv[0] = MetaAdapterFactory.getLanguage(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, "jetbrains.mps.baseLanguage");
-    rv[1] = MetaAdapterFactory.getLanguage(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, "jetbrains.mps.baseLanguage.collections");
-    rv[2] = MetaAdapterFactory.getLanguage(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, "jetbrains.mps.baseLanguage.lightweightdsl");
-    rv[3] = MetaAdapterFactory.getLanguage(0xdf345b11b8c74213L, 0xac6648d2a9b75d88L, "jetbrains.mps.baseLanguageInternal");
-    rv[4] = MetaAdapterFactory.getLanguage(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, "jetbrains.mps.lang.core");
-    rv[5] = MetaAdapterFactory.getLanguage(0xc0080a477e374558L, 0xbee99ae18e690549L, "jetbrains.mps.lang.extension");
+    rv[1] = MetaAdapterFactory.getLanguage(0xfd3920347849419dL, 0x907112563d152375L, "jetbrains.mps.baseLanguage.closures");
+    rv[2] = MetaAdapterFactory.getLanguage(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, "jetbrains.mps.baseLanguage.collections");
+    rv[3] = MetaAdapterFactory.getLanguage(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, "jetbrains.mps.baseLanguage.lightweightdsl");
+    rv[4] = MetaAdapterFactory.getLanguage(0xdf345b11b8c74213L, 0xac6648d2a9b75d88L, "jetbrains.mps.baseLanguageInternal");
+    rv[5] = MetaAdapterFactory.getLanguage(0x817e4e70961e4a95L, 0x98a115e9f32231f1L, "jetbrains.mps.ide.httpsupport");
+    rv[6] = MetaAdapterFactory.getLanguage(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, "jetbrains.mps.lang.core");
+    rv[7] = MetaAdapterFactory.getLanguage(0xc0080a477e374558L, 0xbee99ae18e690549L, "jetbrains.mps.lang.extension");
     return Arrays.asList(rv);
   }
 
   @Override
   public Collection<TemplateMappingPriorityRule> getPriorities() {
-    return TemplateUtil.asCollection(TemplateUtil.createStrictlyAfterRule(TemplateUtil.createRefExternal("69433612-0c08-4d65-8f7c-839ae8b13b0d(jetbrains.mps.ide.httpsupport#4517832885627178591)", TemplateUtil.createRefNormal("r:54a5f1cc-4056-4ebe-b91a-271cac338c49(jetbrains.mps.ide.httpsupport.generator.template.main@generator)", "4622937352056028158", "main_request")), TemplateUtil.createRefExternal("1d6e05d7-9de9-40a7-9dad-7b8444280942(jetbrains.mps.lang.plugin#1203080439937)", TemplateUtil.createRefNormal("r:00000000-0000-4000-0000-011c89590369(jetbrains.mps.lang.plugin.generator.baseLanguage.template.main@generator)", "1204478979997", "Actions"))));
+    return TemplateUtil.asCollection(TemplateUtil.createStrictlyAfterRule(TemplateUtil.createRefExternal("69433612-0c08-4d65-8f7c-839ae8b13b0d(jetbrains.mps.ide.httpsupport#4517832885627178591)", TemplateUtil.createRefNormal("r:54a5f1cc-4056-4ebe-b91a-271cac338c49(jetbrains.mps.ide.httpsupport.generator.template.main@generator)", "4622937352056028158", "main_request")), TemplateUtil.createRefExternal("1d6e05d7-9de9-40a7-9dad-7b8444280942(jetbrains.mps.lang.plugin#1203080439937)", TemplateUtil.createRefNormal("r:00000000-0000-4000-0000-011c89590369(jetbrains.mps.lang.plugin.generator.baseLanguage.template.main@generator)", "1204478979997", "Actions"))), TemplateUtil.createStrictlyBeforeRule(TemplateUtil.createRefExternal("69433612-0c08-4d65-8f7c-839ae8b13b0d(jetbrains.mps.ide.httpsupport#4517832885627178591)", TemplateUtil.createRefNormal("r:54a5f1cc-4056-4ebe-b91a-271cac338c49(jetbrains.mps.ide.httpsupport.generator.template.main@generator)", "2345521174008440735", "mappingRessourceHandler")), TemplateUtil.createRefExternal("69433612-0c08-4d65-8f7c-839ae8b13b0d(jetbrains.mps.ide.httpsupport#4517832885627178591)", TemplateUtil.createRefNormal("r:54a5f1cc-4056-4ebe-b91a-271cac338c49(jetbrains.mps.ide.httpsupport.generator.template.main@generator)", "5573986434797587359", "main"))));
   }
 }