From e048987b4f51368a25a1e0e2b4ed66ab3f6d3efe Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@apidesign.org>
Date: Fri, 27 Feb 2015 08:39:55 +0100
Subject: [PATCH] Using the HTML/Java name as the benchmark is generic and can
 also work on JavaFX

---
 teavm-samples/teavm-samples-benchmark/pom.xml               | 6 +++---
 .../benchmark/{bck2brwsr => htmljava}/BenchmarkFX.java      | 2 +-
 .../benchmark/{bck2brwsr => htmljava}/BenchmarkStarter.java | 2 +-
 .../teavm/samples/benchmark/{bck2brwsr => htmljava}/fx.html | 0
 .../teavm-samples-benchmark/src/main/webapp/bck2brwsr.html  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/{bck2brwsr => htmljava}/BenchmarkFX.java (95%)
 rename teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/{bck2brwsr => htmljava}/BenchmarkStarter.java (99%)
 rename teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/{bck2brwsr => htmljava}/fx.html (100%)

diff --git a/teavm-samples/teavm-samples-benchmark/pom.xml b/teavm-samples/teavm-samples-benchmark/pom.xml
index ffdbe10cd..1f302e97d 100644
--- a/teavm-samples/teavm-samples-benchmark/pom.xml
+++ b/teavm-samples/teavm-samples-benchmark/pom.xml
@@ -108,7 +108,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>org.teamvm.samples.benchmark.bck2brwsr.BenchmarkStarter</mainClass>
+                            <mainClass>org.teamvm.samples.benchmark.htmljava.BenchmarkStarter</mainClass>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
                             <useUniqueVersions>false</useUniqueVersions>
@@ -179,7 +179,7 @@
                 <mainJavaScript>${project.build.directory}/generated/js/b2b-benchmark.js</mainJavaScript>
                 <vm>${project.build.directory}/generated/js/bck2brwsr.js</vm>
                 <exports>
-                    <export>org.teavm.samples.benchmark.bck2brwsr.BenchmarkStarter</export>
+                    <export>org.teavm.samples.benchmark.htmljava.BenchmarkStarter</export>
                     <export>org/jbox2d/collision/shapes/</export>
                     <export>org/jbox2d/common/</export>
                     <export>org/jbox2d/dynamics/</export>
@@ -235,7 +235,7 @@
                       <artifactId>exec-maven-plugin</artifactId>
                       <version>1.3.2</version>
                       <configuration>
-                          <mainClass>org.teavm.samples.benchmark.bck2brwsr.BenchmarkFX</mainClass>
+                          <mainClass>org.teavm.samples.benchmark.htmljava.BenchmarkFX</mainClass>
                       </configuration>
                   </plugin>
               </plugins>
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkFX.java b/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
similarity index 95%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkFX.java
rename to teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
index 0a0336f4c..2349c1e61 100644
--- a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkFX.java
+++ b/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkFX.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.teavm.samples.benchmark.bck2brwsr;
+package org.teavm.samples.benchmark.htmljava;
 
 import net.java.html.boot.BrowserBuilder;
 
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkStarter.java b/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
similarity index 99%
rename from teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkStarter.java
rename to teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
index e0346b627..a0606f347 100644
--- a/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/bck2brwsr/BenchmarkStarter.java
+++ b/teavm-samples/teavm-samples-benchmark/src/main/java/org/teavm/samples/benchmark/htmljava/BenchmarkStarter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.teavm.samples.benchmark.bck2brwsr;
+package org.teavm.samples.benchmark.htmljava;
 
 import com.dukescript.api.canvas.GraphicsContext2D;
 import com.dukescript.api.canvas.Style;
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/bck2brwsr/fx.html b/teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html
similarity index 100%
rename from teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/bck2brwsr/fx.html
rename to teavm-samples/teavm-samples-benchmark/src/main/resources/org/teavm/samples/benchmark/htmljava/fx.html
diff --git a/teavm-samples/teavm-samples-benchmark/src/main/webapp/bck2brwsr.html b/teavm-samples/teavm-samples-benchmark/src/main/webapp/bck2brwsr.html
index b02c8c3c2..7aa17d72c 100644
--- a/teavm-samples/teavm-samples-benchmark/src/main/webapp/bck2brwsr.html
+++ b/teavm-samples/teavm-samples-benchmark/src/main/webapp/bck2brwsr.html
@@ -39,7 +39,7 @@
         <script type="text/javascript" src="bck2brwsr.js"></script>
         <script>
             var vm = bck2brwsr('b2b-benchmark.js');
-            var c = vm.loadClass('org.teavm.samples.benchmark.bck2brwsr.BenchmarkStarter');
+            var c = vm.loadClass('org.teavm.samples.benchmark.htmljava.BenchmarkStarter');
             c.invoke('main');
         </script>