# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1451116261 -3600
# Node ID 805b62b77f91ae65b6966a27e38473f4fc181b5f
# Parent  c78122e85b318d92ffa984c5329b5ad9d88d1cd0
Loading 'Class-Path' attributes of scripts relatively to location of the script that is referencing them

diff -r c78122e85b31 -r 805b62b77f91 javaquery/demo-calculator/pom.xml
--- a/javaquery/demo-calculator/pom.xml	Sat Dec 26 08:23:24 2015 +0100
+++ b/javaquery/demo-calculator/pom.xml	Sat Dec 26 08:51:01 2015 +0100
@@ -32,8 +32,14 @@
                     <execution>
                         <goals>
                             <goal>aot</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>show</id>
+                        <goals>
                             <goal>show</goal>
                         </goals>
+                        <phase>integration-test</phase>
                     </execution>
                 </executions>
                 <configuration>
diff -r c78122e85b31 -r 805b62b77f91 javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml
--- a/javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml	Sat Dec 26 08:23:24 2015 +0100
+++ b/javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml	Sat Dec 26 08:51:01 2015 +0100
@@ -30,7 +30,14 @@
   <fileSets>
       <fileSet>
           <directory>${project.build.directory}</directory>
-          <outputDirectory>/</outputDirectory>
+          <outputDirectory>/vm/</outputDirectory>
+          <includes>
+              <include>bck2brwsr.js</include>
+          </includes>
+      </fileSet>
+      <fileSet>
+          <directory>${project.build.directory}</directory>
+          <outputDirectory>/app/</outputDirectory>
           <includes>
               <include>bck2brwsr.js</include>
               <include>calculator.js</include>
diff -r c78122e85b31 -r 805b62b77f91 javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Sat Dec 26 08:23:24 2015 +0100
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Sat Dec 26 08:51:01 2015 +0100
@@ -89,9 +89,9 @@
         </ul>
         
         <div data-bind="text: displayPreview"></div>
-        <script src="bck2brwsr.js"></script>
+        <script src="vm/bck2brwsr.js"></script>
         <script>
-            var vm = bck2brwsr('calculator.js');
+            var vm = bck2brwsr('app/calculator.js');
             var c = vm.loadClass('org.apidesign.bck2brwsr.demo.calc.staticcompilation.Calc');
             c.invoke('main');
         </script>
diff -r c78122e85b31 -r 805b62b77f91 rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Sat Dec 26 08:23:24 2015 +0100
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Sat Dec 26 08:51:01 2015 +0100
@@ -655,10 +655,12 @@
                 + "      console.log('Will not register: ' + extension);\n"
                 + "      return false;\n"
                 + "    }\n"
+                + "    var cs = document['currentScript'];\n"
+                + "    var prefix = cs ? cs['src']['replace'](/\\/[^\\/]*$/,'/') : '';\n"
                 + "    extensions.push(extension);\n"
                 + "    var cp = config['classpath'];\n"
                 + "    if (cp) for (var i = 0; i < cp.length; i++) {\n"
-                + "      loadExtension(cp[i]);\n"
+                + "      loadExtension(prefix + cp[i]);\n"
                 + "    }\n"
                 + "    return null;\n"
                 + "  };\n");