diff --git a/App/app/src/androidTest/java/com/gazeboindustries/sextafeiramobile/ExampleInstrumentedTest.java b/App/app/src/androidTest/java/com/gazeboindustries/friday/ExampleInstrumentedTest.java
similarity index 93%
rename from App/app/src/androidTest/java/com/gazeboindustries/sextafeiramobile/ExampleInstrumentedTest.java
rename to App/app/src/androidTest/java/com/gazeboindustries/friday/ExampleInstrumentedTest.java
index 128ecc1..f74ef87 100644
--- a/App/app/src/androidTest/java/com/gazeboindustries/sextafeiramobile/ExampleInstrumentedTest.java
+++ b/App/app/src/androidTest/java/com/gazeboindustries/friday/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.content.Context;
 
diff --git a/App/app/src/main/AndroidManifest.xml b/App/app/src/main/AndroidManifest.xml
index b403e10..036cbd8 100644
--- a/App/app/src/main/AndroidManifest.xml
+++ b/App/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gazeboindustries.sextafeiramobile">
+    package="com.gazeboindustries.friday">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application
@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name="com.gazeboindustries.friday.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/ConfigurationsFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/ConfigurationsFragment.java
similarity index 70%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/ConfigurationsFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/ConfigurationsFragment.java
index bea331d..4a41940 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/ConfigurationsFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/ConfigurationsFragment.java
@@ -1,17 +1,15 @@
-package com.gazeboindustries.sextafeiramobile.Fragments;
+package com.gazeboindustries.friday.Fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.R;
+import com.gazeboindustries.friday.R;
 
 public class ConfigurationsFragment extends Fragment {
     @Nullable
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/AddDeviceFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/AddDeviceFragment.java
similarity index 90%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/AddDeviceFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/AddDeviceFragment.java
index 3740946..c493eca 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/AddDeviceFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/AddDeviceFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddDeviceFragment extends Fragment {
     private Button btnAddDevice;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/DevicesFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/DevicesFragment.java
similarity index 85%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/DevicesFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/DevicesFragment.java
index 0f2a288..5286d14 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/DevicesFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/DevicesFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,11 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments.AddInteractionFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ViewProjectsFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/ViewDevicesFragment.java
similarity index 97%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/ViewDevicesFragment.java
index 4f49353..e8e2531 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/DevicesFragments/ViewDevicesFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,15 +17,12 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-
 public class ViewDevicesFragment extends Fragment {
     private Intent intent;
     private EditText txtDevice;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/HomeFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/HomeFragment.java
similarity index 85%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/HomeFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/HomeFragment.java
index ed4766b..b7eb8c7 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/HomeFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/HomeFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments;
+package com.gazeboindustries.friday.Fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,8 +10,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class HomeFragment extends Fragment {
     private Button startFriday;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/AddInteractionFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/AddInteractionFragment.java
similarity index 92%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/AddInteractionFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/AddInteractionFragment.java
index 3d1e0ff..b65c9c0 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/AddInteractionFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/AddInteractionFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddInteractionFragment extends Fragment {
     private ServerConnection connection;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/InteractionFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/InteractionFragment.java
similarity index 89%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/InteractionFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/InteractionFragment.java
index b56546c..7c22357 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/InteractionFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/InteractionFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,16 +14,14 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.ViewHomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static java.lang.Thread.sleep;
 
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/ViewInteractionFragment.java
similarity index 95%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/ViewInteractionFragment.java
index e463138..a718e45 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/InteractionsFragments/ViewInteractionFragment.java
@@ -1,13 +1,10 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,14 +13,12 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
-import com.google.android.material.drawable.DrawableUtils;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class ViewInteractionFragment extends Fragment {
     private Intent intent;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java
similarity index 92%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java
index 7ec3e94..0b1ebb5 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java
similarity index 83%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java
index d076790..b365d41 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/HomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,12 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ViewProjectsFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java
similarity index 97%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java
index 8c47197..84cc04a 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,8 +17,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java
similarity index 89%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java
index 04a61d5..1b06c24 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/AddProjectFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddProjectFragment extends Fragment {
     private Button btnAddProject;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java
similarity index 90%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java
index 1272f65..2e6fc1f 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ProjectFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,9 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java
similarity index 96%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java
index 54febc4..665991c 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,8 +17,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class ViewProjectsFragment extends Fragment {
     private Intent intent;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/SkillsFragment.java b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/SkillsFragment.java
similarity index 68%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/SkillsFragment.java
rename to App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/SkillsFragment.java
index 48f37a2..ffa6d0b 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/SkillsFragment.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/Fragments/SkillsFragments/SkillsFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,12 +10,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments.AddDeviceFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.AddHomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.HomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
-import com.gazeboindustries.sextafeiramobile.R;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments.HomeWorkFragment;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
+import com.gazeboindustries.friday.R;
 
 public class SkillsFragment extends Fragment {
     @Nullable
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ListItemRow.java b/App/app/src/main/java/com/gazeboindustries/friday/ListItemRow.java
similarity index 97%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ListItemRow.java
rename to App/app/src/main/java/com/gazeboindustries/friday/ListItemRow.java
index 8d484db..7a5e90b 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ListItemRow.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/ListItemRow.java
@@ -1,6 +1,5 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/MainActivity.java b/App/app/src/main/java/com/gazeboindustries/friday/MainActivity.java
similarity index 81%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/MainActivity.java
rename to App/app/src/main/java/com/gazeboindustries/friday/MainActivity.java
index c26fa1d..032df09 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/MainActivity.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/MainActivity.java
@@ -1,12 +1,12 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.os.Bundle;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.ConfigurationsFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments.DevicesFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.HomeFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments.InteractionFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.SkillsFragment;
+import com.gazeboindustries.friday.Fragments.ConfigurationsFragment;
+import com.gazeboindustries.friday.Fragments.DevicesFragments.DevicesFragment;
+import com.gazeboindustries.friday.Fragments.HomeFragment;
+import com.gazeboindustries.friday.Fragments.InteractionsFragments.InteractionFragment;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.SkillsFragment;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import androidx.appcompat.app.AppCompatActivity;
diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java b/App/app/src/main/java/com/gazeboindustries/friday/ServerConnection.java
similarity index 99%
rename from App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java
rename to App/app/src/main/java/com/gazeboindustries/friday/ServerConnection.java
index 0bc63b7..e445bb0 100644
--- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java
+++ b/App/app/src/main/java/com/gazeboindustries/friday/ServerConnection.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.os.AsyncTask;
 
diff --git a/App/app/src/test/java/com/gazeboindustries/sextafeiramobile/ExampleUnitTest.java b/App/app/src/test/java/com/gazeboindustries/friday/ExampleUnitTest.java
similarity index 88%
rename from App/app/src/test/java/com/gazeboindustries/sextafeiramobile/ExampleUnitTest.java
rename to App/app/src/test/java/com/gazeboindustries/friday/ExampleUnitTest.java
index e81e0dd..5ea5bfa 100644
--- a/App/app/src/test/java/com/gazeboindustries/sextafeiramobile/ExampleUnitTest.java
+++ b/App/app/src/test/java/com/gazeboindustries/friday/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import org.junit.Test;
 
diff --git a/Configurations.json b/Configurations.json
index 00759ba..c5d52f8 100644
--- a/Configurations.json
+++ b/Configurations.json
@@ -1,17 +1,12 @@
 {
     "FridayConfigs": {
         "ID": "Sexta-Feira",
-        "ServerHost": "192.168.0.5",
+        "ServerHost": "192.168.0.4",
         "Port": 5000
     },
     "ServerConfigs": {
         "ID": "Server",
-        "Host": "192.168.0.5",
-        "Port": 5000
-    },
-    "InterfaceConfigs": {
-        "ID": "Interface",
-        "ServerHost": "192.168.0.5",
+        "Host": "192.168.0.4",
         "Port": 5000
     }
 }
\ No newline at end of file
diff --git a/Interface/SextaFeiraInterface/src/main/resources/styles/BackgroundFriday.jpg b/Images/BackgroundFriday.jpg
similarity index 100%
rename from Interface/SextaFeiraInterface/src/main/resources/styles/BackgroundFriday.jpg
rename to Images/BackgroundFriday.jpg
diff --git a/Images/BackgroundFriday.png b/Images/BackgroundFriday.png
deleted file mode 100644
index e54aee0..0000000
Binary files a/Images/BackgroundFriday.png and /dev/null differ
diff --git a/Interface/SextaFeiraInterface/nb-configuration.xml b/Interface/SextaFeiraInterface/nb-configuration.xml
deleted file mode 100644
index ec4540c..0000000
--- a/Interface/SextaFeiraInterface/nb-configuration.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
-    </properties>
-</project-shared-configuration>
diff --git a/Interface/SextaFeiraInterface/nbactions.xml b/Interface/SextaFeiraInterface/nbactions.xml
deleted file mode 100644
index 9c9ee62..0000000
--- a/Interface/SextaFeiraInterface/nbactions.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>run</actionName>
-            <goals>
-                <goal>clean</goal>
-                <goal>package</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <runfx.args>-jar "${project.build.directory}/${project.build.finalName}.jar"</runfx.args>
-            </properties>
-        </action>
-        <action>
-            <actionName>debug</actionName>
-            <goals>
-                <goal>clean</goal>
-                <goal>package</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <runfx.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Dglass.disableGrab=true -jar "${project.build.directory}/${project.build.finalName}.jar"</runfx.args>
-                <jpda.listen>true</jpda.listen>
-            </properties>
-        </action>        
-    </actions>
diff --git a/Interface/SextaFeiraInterface/pom.xml b/Interface/SextaFeiraInterface/pom.xml
deleted file mode 100644
index 0fa4503..0000000
--- a/Interface/SextaFeiraInterface/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>Interface</groupId>
-    <artifactId>SextaFeiraInterface</artifactId>
-    <version>6.0</version>
-    <packaging>jar</packaging>
-
-    <name>SextaFeiraInterface</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mainClass>Interface.MainApp</mainClass>
-    </properties>
-
-    <organization>
-        <!-- Used as the 'Vendor' for JNLP generation -->
-        <name>Your Organisation</name>
-    </organization>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>unpack-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <excludeScope>system</excludeScope>
-                            <excludeGroupIds>junit,org.mockito,org.hamcrest</excludeGroupIds>
-                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>unpack-dependencies</id>
-                        
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>${java.home}/../bin/javafxpackager</executable>
-                            <arguments>
-                                <argument>-createjar</argument>
-                                <argument>-nocss2bin</argument>
-                                <argument>-appclass</argument>
-                                <argument>${mainClass}</argument>
-                                <argument>-srcdir</argument>
-                                <argument>${project.build.directory}/classes</argument>
-                                <argument>-outdir</argument>
-                                <argument>${project.build.directory}</argument>
-                                <argument>-outfile</argument>
-                                <argument>${project.build.finalName}.jar</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-cli</id>
-                        <goals>
-                            <goal>exec</goal>                            
-                        </goals>
-                        <configuration>
-                            <executable>${java.home}/bin/java</executable>
-                            <commandlineArgs>${runfx.args}</commandlineArgs>
-                        </configuration>
-                    </execution>
-                </executions>  
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <compilerArguments>
-                        <bootclasspath>${sun.boot.class.path}${path.separator}${java.home}/lib/jfxrt.jar</bootclasspath>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
-                <configuration>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>${java.home}/lib/jfxrt.jar</additionalClasspathElement>
-                    </additionalClasspathElements>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/Interface/SextaFeiraInterface/src/main/FridayComunication.json b/Interface/SextaFeiraInterface/src/main/FridayComunication.json
deleted file mode 100644
index 757b33f..0000000
--- a/Interface/SextaFeiraInterface/src/main/FridayComunication.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "action": 1,
-    "content":{
-
-    },
-    "url": ".com"
-}
\ No newline at end of file
diff --git a/Interface/SextaFeiraInterface/src/main/java/Interface/Configurations.java b/Interface/SextaFeiraInterface/src/main/java/Interface/Configurations.java
deleted file mode 100644
index 9c7b204..0000000
--- a/Interface/SextaFeiraInterface/src/main/java/Interface/Configurations.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package Interface;
-
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-public class Configurations {
-    private static JSONObject jsonObject;
-    private static JSONObject jsonInterfaceObject;
-    private static JSONParser parser;
-
-    public static String getConfig(String Config) {
-        jsonInterfaceObject = readJsonFile();
-        return jsonInterfaceObject.get(Config).toString();
-    }
-
-    private static JSONObject readJsonFile() {
-        parser = new JSONParser();
-
-        try {
-            jsonObject = (JSONObject) parser.parse(new FileReader("E:\\Sexta-Feira-Mark_6\\Configurations.json"));
-            jsonInterfaceObject = (JSONObject) jsonObject.get("InterfaceConfigs");
-        } catch (ParseException | IOException e) {
-            e.printStackTrace();
-        }
-
-        return jsonInterfaceObject;
-    }
-}
\ No newline at end of file
diff --git a/Server/DevicesStatus.json b/Server/DevicesStatus.json
index 139f56d..983de54 100644
--- a/Server/DevicesStatus.json
+++ b/Server/DevicesStatus.json
@@ -1,10 +1,12 @@
 {
     "Friday": {
         "action": 0,
+        "content": {},
         "url": ".com"
     },
     "Interface": {
-        "action": 1,
+        "action": 2,
+        "content": {},
         "url": ".com"
     }
 }
\ No newline at end of file
diff --git a/Server/Server.py b/Server/Server.py
index 90bebf2..d25c518 100644
--- a/Server/Server.py
+++ b/Server/Server.py
@@ -44,7 +44,6 @@ def setDevicesStatus(receiverID, action, url):
 
     newJson[receiverID]['action'] = action
     newJson[receiverID]['url'] = url
-    newJson.update()
 
     writeFile = open('E:/Sexta-Feira-Mark_6/Server/DevicesStatus.json', 'w')
     json.dump(newJson, writeFile, indent=4)
@@ -234,8 +233,6 @@ def handle(self):
                             clientRequest['command'])
 
                             self.request.send(json.dumps({'requestStatus': True}).encode())
-
-                  
                 else:
                     break
 
diff --git a/Sexta-Feira(A.I.)/Commands.py b/Sexta-Feira(A.I.)/Commands.py
index 5006d5b..49d4241 100644
--- a/Sexta-Feira(A.I.)/Commands.py
+++ b/Sexta-Feira(A.I.)/Commands.py
@@ -19,32 +19,36 @@ def updateFriday(speech, connection):
     os.system('git reset --hard origin/master')
 
 def sendCloseToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 0, '.com'))
-
+    Functions.setFridayComunication(0, None, ".com")
+    
 def sendInteractionsToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 1, '.com'))
+    response = connection.send(Functions.setRequestJson('getInteractions', 'Interface', 1, '.com'))
+    Functions.setFridayComunication(1, response, ".com")
 
 def sendHomeWorksToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 2, '.com'))
+    response = connection.send(Functions.setRequestJson('getHomeWorks', 'Interface', 2, '.com'))
+    Functions.setFridayComunication(2, response, ".com")
 
 def sendProjectsToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 3, '.com'))
+    response = connection.send(Functions.setRequestJson('getProjects', 'Interface', 3, '.com'))
+    Functions.setFridayComunication(3, response, ".com")
 
 def sendDevicesToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 4, '.com'))
+    response = connection.send(Functions.setRequestJson('getDevice', 'Interface', 4, '.com'))
+    Functions.setFridayComunication(4, response, ".com")
 
 def sendPeriodicTableToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 5, 'E:\\Sexta-Feira-Mark_6\\Images\\TabelaPeriodica.jpg'))
+    Functions.setFridayComunication(5, response, 'E:\\Sexta-Feira-Mark_6\\Images\\TabelaPeriodica.jpg')
 
 def sendPoliticalBrazilToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 5, 'E:\\Sexta-Feira-Mark_6\\Images\\Brasil Político.jpg'))
+    Functions.setFridayComunication(5, response, 'E:\\Sexta-Feira-Mark_6\\Images\\Brasil Político.jpg')
 
 def sendEletronicDestToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 5, 'E:\\Sexta-Feira-Mark_6\\Images\\diagrama-de-pauling.jpg'))
+    Functions.setFridayComunication(5, response, 'E:\\Sexta-Feira-Mark_6\\Images\\diagrama-de-pauling.jpg')
 
 def sendAnglesTableToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 5, 'E:\\Sexta-Feira-Mark_6\\Images\\TabelaSenoCossenoTangente.png'))
+    Functions.setFridayComunication(5, response, 'E:\\Sexta-Feira-Mark_6\\Images\\TabelaSenoCossenoTangente.png')
 
 def sendFisicEquationsToInterface(speech, connection):
-    connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 5, 'E:\\Sexta-Feira-Mark_6\\Images\\Equações Dinamica.png'))
+    Functions.setFridayComunication(5, response, 'E:\\Sexta-Feira-Mark_6\\Images\\Equações Dinamica.png')
 
diff --git a/Sexta-Feira(A.I.)/Functions.py b/Sexta-Feira(A.I.)/Functions.py
index 00df714..2642001 100644
--- a/Sexta-Feira(A.I.)/Functions.py
+++ b/Sexta-Feira(A.I.)/Functions.py
@@ -69,6 +69,8 @@ def setRequestJson(request, receiverID, action, url):
     return requestJson
 
 def setup():
+    setFridayComunication(0, None, ".com")
+
     server = ServerConnection()
 
     interactions = list(server.send(setRequestJson('getInteractions', 'server', 1, ".com")).items())
@@ -81,8 +83,6 @@ def setup():
     else:
         speak('Boa noite chefe!')
 
-    devicesStatus =  devicesStatusThread()
-    devicesStatus.start()
 
     return [server, interactions]
 
@@ -111,10 +111,22 @@ def run(self):
         while True:
             response = server.send(setRequestJson('getDevicesStatus', 'server', 1, ".com"))
 
-            writeFile = open('E:/Sexta-Feira-Mark_6/Interface/Interface/FridayComunication.json', 'w')
+            writeFile = open('E:/Sexta-Feira-Mark_6/Sexta-FeiraInterface/src/com/friday/FridayComunication.json', 'w')
             json.dump(response['Interface'], writeFile, indent=4)
 
+def setFridayComunication(action, content, url):
+    filePath = 'E:/Sexta-Feira-Mark_6/Sexta-FeiraInterface/src/com/friday/FridayComunication.json'
+    readFile = open(filePath)
+    newJson = json.load(readFile)
+
+    print(newJson)
+
+    newJson['action'] = action
+    newJson['content'] = content
+    newJson['url'] = url
 
+    writeFile = open(filePath, 'w')
+    json.dump(newJson, writeFile, indent=4)
 
 
 
diff --git a/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc b/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc
index a5a6a06..c661b22 100644
Binary files a/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc and b/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc differ
diff --git a/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc b/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc
index 6b6434d..6da6608 100644
Binary files a/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc and b/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc differ
diff --git a/Sexta-FeiraInterface/build.xml b/Sexta-FeiraInterface/build.xml
new file mode 100644
index 0000000..941caee
--- /dev/null
+++ b/Sexta-FeiraInterface/build.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- You may freely edit this file. See commented blocks below for --><!-- some examples of how to customize the build. --><!-- (If you delete it and reopen the project it will be recreated.) --><!-- By default, only the Clean and Build commands use this build script. --><project name="Sexta-FeiraInterface" default="default" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
+    <description>Builds, tests, and runs the project Sexta-FeiraInterface.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. Those of them relevant for JavaFX project are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-jfx-jar:              called before FX SDK specific <fx:jar> task
+      -post-jfx-jar:             called after FX SDK specific <fx:jar> task
+      -pre-jfx-deploy:           called before FX SDK specific <fx:deploy> task
+      -post-jfx-deploy:          called after FX SDK specific <fx:deploy> task
+      -pre-jfx-native:           called just after -pre-jfx-deploy if <fx:deploy> runs in native packaging mode
+      -post-jfx-native:          called just after -post-jfx-deploy if <fx:deploy> runs in native packaging mode
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting a HTML postprocessor after javaFX SDK deployment:
+
+        <target name="-post-jfx-deploy">
+            <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+            <property name="jfx.deployment.html" location="${jfx.deployment.dir}${file.separator}${jfx.deployment.base}.html"/>
+            <custompostprocess>
+                <fileset dir="${jfx.deployment.html}"/>
+            </custompostprocess>
+        </target>
+
+    Example of calling an Ant task from JavaFX SDK. Note that access to JavaFX SDK Ant tasks must be
+    initialized; to ensure this is done add the dependence on -check-jfx-sdk-version target:
+
+        <target name="-post-jfx-jar" depends="-check-jfx-sdk-version">
+            <echo message="Calling jar task from JavaFX SDK"/>
+            <fx:jar ...>
+                ...
+            </fx:jar>
+        </target>
+
+    For more details about JavaFX SDK Ant tasks go to
+    http://docs.oracle.com/javafx/2/deployment/jfxpub-deployment.htm
+
+    For list of available properties check the files
+    nbproject/build-impl.xml and nbproject/jfx-impl.xml.
+
+    -->
+</project>
diff --git a/Sexta-FeiraInterface/build/built-jar.properties b/Sexta-FeiraInterface/build/built-jar.properties
new file mode 100644
index 0000000..843e266
--- /dev/null
+++ b/Sexta-FeiraInterface/build/built-jar.properties
@@ -0,0 +1,4 @@
+#Tue, 28 Jul 2020 20:12:56 -0300
+
+
+E\:\\Sexta-Feira-Mark_6\\Sexta-FeiraInterface=
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.class b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.class
new file mode 100644
index 0000000..d7afe37
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json
new file mode 100644
index 0000000..407630c
--- /dev/null
+++ b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json
@@ -0,0 +1,5 @@
+{
+    "action": 0,
+    "content": null,
+    "url": ".com"
+}
\ No newline at end of file
diff --git a/Interface/SextaFeiraInterface/src/main/resources/fxml/Scene.fxml b/Sexta-FeiraInterface/build/classes/com/friday/Scene.fxml
similarity index 97%
rename from Interface/SextaFeiraInterface/src/main/resources/fxml/Scene.fxml
rename to Sexta-FeiraInterface/build/classes/com/friday/Scene.fxml
index d128a93..efd5b80 100644
--- a/Interface/SextaFeiraInterface/src/main/resources/fxml/Scene.fxml
+++ b/Sexta-FeiraInterface/build/classes/com/friday/Scene.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="720.0" prefWidth="1280.0" styleClass="bodybg" stylesheets="@../styles/Styles.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Interface.FXMLController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="720.0" prefWidth="1280.0" styleClass="bodybg" stylesheets="@../styles/Styles.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.friday.SceneController">
    <children>
       <Label fx:id="lblTime" layoutX="120.0" layoutY="41.0" prefHeight="112.0" prefWidth="187.0" text="12:20" textFill="#ff6600" AnchorPane.leftAnchor="120.0" AnchorPane.topAnchor="41.0">
          <font>
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$1.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$1.class
new file mode 100644
index 0000000..c8a8a3c
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$1.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$10.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$10.class
new file mode 100644
index 0000000..4ae4be3
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$10.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$11.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$11.class
new file mode 100644
index 0000000..876da8a
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$11.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$12.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$12.class
new file mode 100644
index 0000000..f9e8e2d
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$12.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$13.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$13.class
new file mode 100644
index 0000000..fdfc7cc
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$13.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$14.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$14.class
new file mode 100644
index 0000000..bdc7854
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$14.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$15.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$15.class
new file mode 100644
index 0000000..b4d5537
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$15.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$16.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$16.class
new file mode 100644
index 0000000..d9ca0d7
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$16.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$17.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$17.class
new file mode 100644
index 0000000..05a492e
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$17.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$18.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$18.class
new file mode 100644
index 0000000..8859f04
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$18.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$19.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$19.class
new file mode 100644
index 0000000..49e93fd
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$19.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$2.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$2.class
new file mode 100644
index 0000000..a42768a
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$2.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$20.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$20.class
new file mode 100644
index 0000000..48bbdc0
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$20.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$21.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$21.class
new file mode 100644
index 0000000..5aa586e
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$21.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$22.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$22.class
new file mode 100644
index 0000000..922533d
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$22.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$3.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$3.class
new file mode 100644
index 0000000..83087d2
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$3.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$4.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$4.class
new file mode 100644
index 0000000..ca05f6e
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$4.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$5.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$5.class
new file mode 100644
index 0000000..221786d
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$5.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$6.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$6.class
new file mode 100644
index 0000000..e79f17e
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$6.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$7.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$7.class
new file mode 100644
index 0000000..0ddc501
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$7.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$8.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$8.class
new file mode 100644
index 0000000..e0c33aa
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$8.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController$9.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$9.class
new file mode 100644
index 0000000..270ad5c
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController$9.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SceneController.class b/Sexta-FeiraInterface/build/classes/com/friday/SceneController.class
new file mode 100644
index 0000000..fdb5fa5
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SceneController.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class b/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class
new file mode 100644
index 0000000..6b3d795
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class differ
diff --git a/Sexta-FeiraInterface/build/classes/com/styles/BackgroundFriday.jpg b/Sexta-FeiraInterface/build/classes/com/styles/BackgroundFriday.jpg
new file mode 100644
index 0000000..07d16fc
Binary files /dev/null and b/Sexta-FeiraInterface/build/classes/com/styles/BackgroundFriday.jpg differ
diff --git a/Interface/SextaFeiraInterface/src/main/resources/styles/Styles.css b/Sexta-FeiraInterface/build/classes/com/styles/Styles.css
similarity index 100%
rename from Interface/SextaFeiraInterface/src/main/resources/styles/Styles.css
rename to Sexta-FeiraInterface/build/classes/com/styles/Styles.css
diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html
new file mode 100644
index 0000000..bf79758
--- /dev/null
+++ b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html
@@ -0,0 +1,45 @@
+<html><head>
+  <SCRIPT src="./web-files/dtjava.js"></SCRIPT>
+<script>
+    function launchApplication(jnlpfile) {
+        dtjava.launch(            {
+                url : 'Sexta-FeiraInterface.jnlp',
+                jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA3MDk2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
+            },
+            {
+                javafx : '8.0+'
+            },
+            {}
+        );
+        return false;
+    }
+</script>
+
+<script>
+    function javafxEmbedcom.friday() {
+        dtjava.embed(
+            {
+                id : 'com.friday',
+                url : 'Sexta-FeiraInterface.jnlp',
+                placeholder : 'javafx-app-placeholder',
+                width : '800',
+                height : '600',
+                jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA3MDk2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
+            },
+            {
+                javafx : '8.0+'
+            },
+            {}
+        );
+    }
+    <!-- Embed FX application into web page once page is loaded -->
+    dtjava.addOnloadCallback(javafxEmbedcom.friday);
+</script>
+
+</head><body>
+<h2>Test page for <b>Sexta-FeiraInterface</b></h2>
+  <b>Webstart:</b> <a href='Sexta-FeiraInterface.jnlp' onclick="return launchApplication('Sexta-FeiraInterface.jnlp');">click to launch this app as webstart</a><br><hr><br>
+
+  <!-- Applet will be inserted here -->
+  <div id='javafx-app-placeholder'></div>
+</body></html>
diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar
new file mode 100644
index 0000000..74180ac
Binary files /dev/null and b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar differ
diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp
new file mode 100644
index 0000000..d690e0f
--- /dev/null
+++ b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" xmlns:jfx="http://javafx.com" href="Sexta-FeiraInterface.jnlp">
+  <information>
+    <title>Sexta-FeiraInterface</title>
+    <vendor>Gazebo</vendor>
+    <description>null</description>
+    <offline-allowed/>
+  </information>
+  <resources>
+    <j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
+    <jar href="Sexta-FeiraInterface.jar" size="107096" download="eager" />
+    <jar href="lib\json-simple-1.1.jar" size="16046" download="eager" />
+  </resources>
+  <applet-desc  width="800" height="600" main-class="com.javafx.main.NoJavaFXFallback"  name="Sexta-FeiraInterface" >
+    <param name="requiredFXVersion" value="8.0+"/>
+  </applet-desc>
+  <jfx:javafx-desc  width="800" height="600" main-class="com.friday.SextaFeiraInterface"  name="Sexta-FeiraInterface" />
+  <update check="always"/>
+</jnlp>
diff --git a/Sexta-FeiraInterface/dist/lib/json-simple-1.1.jar b/Sexta-FeiraInterface/dist/lib/json-simple-1.1.jar
new file mode 100644
index 0000000..f395f41
Binary files /dev/null and b/Sexta-FeiraInterface/dist/lib/json-simple-1.1.jar differ
diff --git a/Sexta-FeiraInterface/dist/web-files/dtjava.js b/Sexta-FeiraInterface/dist/web-files/dtjava.js
new file mode 100644
index 0000000..b77ecd7
--- /dev/null
+++ b/Sexta-FeiraInterface/dist/web-files/dtjava.js
@@ -0,0 +1,3958 @@
+/*
+ * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+
+/**
+  The Java Deployment Toolkit is a utility to deploy Java content in
+  the browser as applets or applications using the right version of Java.
+  If needed it can initiate an upgrade of user's system to install required
+  components of Java platform.
+  <p>
+  Note that some of the Deployment Toolkit methods may not be fully operational if
+  used before web page body is loaded (because DT native plugins could not be instantiated).
+  If you intend to use it before web page DOM tree is ready then dtjava.js
+  needs to be loaded inside the body element of the page and before use of other DT APIs.
+
+  @module java/deployment_toolkit
+*/
+var dtjava = function() {
+    function notNull(o) {
+        return (o != undefined && o != null);
+    }
+
+    function isDef(fn) {
+        return (fn != null && typeof fn != "undefined");
+    }
+
+    //return true if any of patterns from query list is found in the given string
+    function containsAny(lst, str) {
+        for (var q = 0; q < lst.length; q++) {
+            if (str.indexOf(lst[q]) != -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /* Location of static web content - images, javascript files. */
+    var jscodebase =  (function () {
+        // <script> elements are added to the DOM and run synchronously,
+        // the currently running script will also be the last element in the array
+        var scripts = document.getElementsByTagName("script");
+        var src = scripts[scripts.length - 1].getAttribute("src");
+        return src ? src.substring(0, src.lastIndexOf('/') + 1) : "";
+    })();
+
+    //set to true to disable FX auto install (before release)
+    var noFXAutoInstall = false;
+
+    // page has no body yet, postpone plugin installation
+    postponeNativePluginInstallation = false;
+
+    // JRE version we start to have JRE and FX true co-bundle
+    var minJRECobundleVersion = "1.7.0_06";
+
+    //aliases
+    var d = document;
+    var w = window;
+
+    var cbDone = false;  //done with onload callbacks
+    var domInternalCb = []; //list of internal callbacks
+    var domCb = [];      //list of callbacks
+    var ua = null;
+
+
+    // Add internal function to be called on DOM ready event.
+    // These functions will be called before functions added by addOnDomReady().
+    // Used to do internal initialization (installing native plug-in) to avoid
+    // race condition with user requests.
+    function addOnDomReadyInternal(fn) {
+        if (cbDone) {
+            fn();
+        } else {
+            domInternalCb[domInternalCb.length] = fn;
+        }
+    }
+
+    // add function to be called on DOM ready event
+    function addOnDomReady(fn) {
+        if (cbDone) {
+            fn();
+        } else {
+            domCb[domCb.length] = fn;
+        }
+    }
+
+    //invoke pending onload callbacks
+    function invokeCallbacks() {
+        if (!cbDone) {
+            //swfoject.js tests whether DOM is actually ready first
+            //  in order to not fire too early. Use same heuristic
+            try {
+                var t = d.getElementsByTagName("body")[0].appendChild(
+                    d.createElement("div"));
+                t.parentNode.removeChild(t);
+            } catch (e) {
+                return;
+            }
+            cbDone = true;
+            for (var i = 0; i < domInternalCb.length; i++) {
+                domInternalCb[i]();
+            }
+            for (var i = 0; i < domCb.length; i++) {
+                domCb[i]();
+            }
+        }
+    }
+
+    //cross browser onload support.
+    //Derived from swfobject.js
+    function addOnload(fn) {
+        if (isDef(w.addEventListener)) {
+            w.addEventListener("load", fn, false);
+        } else if (isDef(d.addEventListener)) {
+            d.addEventListener("load", fn, false);
+        } else if (isDef(w.attachEvent)) {
+            w.attachEvent("onload", fn);
+            //TODO: swfobject also keeps references to the listeners to detach them on onload
+            // to avoid memory leaks ...
+        } else if (typeof w.onload == "function") {
+            var fnOld = w.onload;
+            w.onload = function() {
+                fnOld();
+                fn();
+            };
+        } else {
+            w.onload = fn;
+        }
+    }
+
+    function detectEnv() {
+        var dom = isDef(d.getElementById) && isDef(d.getElementsByTagName) && isDef(d.createElement);
+        var u = navigator.userAgent.toLowerCase(),
+            p = navigator.platform.toLowerCase();
+
+        //NB: may need to be refined as some user agent may contain strings related to other browsers
+        //   (e.g. Chrome has both Safari and mozilla, Safari also has mozilla
+        var windows = p ? /win/.test(p) : /win/.test(u),
+            mac = p ? /mac/.test(p) : /mac/.test(u),
+            linux = p ? /linux/.test(p) : /linux/.test(u),
+            chrome = /chrome/.test(u),
+            // get webkit version or false if not webkit
+            webkit = !chrome && /webkit/.test(u) ?
+                parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false,
+            opera = /opera/.test(u),
+            cputype = null,
+            osVersion = null;
+
+        var ie = false;
+        try {
+            //Used to be using trick from
+            //  http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
+            //ie = !+"\v1",
+            //but it does not work with IE9 in standards mode
+            //Reverting to alternative - use execScript
+            ie = isDef(window.execScript);
+            // IE 11 does not support execScript any more and no exception is thrown, so lets use more naive test.
+            // http://msdn.microsoft.com/en-us/library/ie/bg182625(v=vs.85).aspx
+            if (!ie) { // We do not want to overwrite if ie was detected above.
+                ie = (navigator.userAgent.match(/Trident/i) != null);
+            }
+        } catch (ee) {
+            //if javafx app is in the iframe and content of main window is coming from other domain
+            //  then some browsers may restrict access to outer window properties,
+            //  e.g. FF can throw exception for top.execScript (see RT-17885)
+            //We could revert to more naive test, e.g. test user agent for "MSIE " string
+            // but so far IE does not seem to throw exception => if we get here it is not IE anyways
+            ie = false;
+        }
+
+        var edge = false;
+        var noActiveX = false;
+        edge = (navigator.userAgent.match(/Edge/i) != null);
+
+        // If IE and Windows 8 or Windows 8.1 then check for Metro mode
+        if(ie && navigator.userAgent.match(/Windows NT 6\.[23]/i) != null) {
+            try {
+                // try to create a known ActiveX object
+                new ActiveXObject("htmlfile");
+            } catch(e) {
+		// ActiveX is disabled or not supported.
+                noActiveX = true;
+            }
+        }
+
+        if(edge || noActiveX) {
+            ie = false;
+	}
+
+
+        //we are not required to detect everything and can leave values null as
+        // long as we later treat them accordingly.
+        //We use "cputype" to detect if given hardware is supported,
+        // e.g. we do not support PPC or iPhone/iPad despite they are running Mac OS
+        //We use "osVersion" to detect if Java/JavaFX can be installed on this OS
+        // e.g. Oracle Java for Mac requires 10.7.3
+        if (mac) {
+            if ((p && /intel/.test(p)) || /intel/.test(u)) {
+                cputype = "intel";
+            }
+            //looking for things like 10_7, 10_6_8, 10.4 in the user agent
+            var t = u.match(/mac os x (10[0-9_\.]+)/);
+            //normalize to "." separators
+            osVersion = notNull(t) ? t[0].replace("mac os x ","").replace(/_/g, ".") : null;
+        }
+
+        // trim() is not supported by IE10 and before
+        if(typeof String.prototype.trim !== 'function') {
+           String.prototype.trim = function() {
+               return this.replace(/^\s+|\s+$/g, '');
+           }
+        }
+
+        // startsWith() is not supported by IE
+        if(typeof String.prototype.startsWith !== 'function') {
+           String.prototype.startsWith = function(searchString, position) {
+               position = position || 0;
+               return this.indexOf(searchString, position) === position;
+           }
+        }
+
+
+        // Check mime types. Works with netscape family browsers and checks latest installed plugin only
+        var mm = navigator.mimeTypes;
+        var jre = null;
+        var deploy = null;
+        var fx = null;
+        var override = false;
+
+        if (typeof __dtjavaTestHook__ !== 'undefined' &&
+            __dtjavaTestHook__ != null &&
+            __dtjavaTestHook__.jre != null &&
+            __dtjavaTestHook__.jfx != null &&
+            __dtjavaTestHook__.deploy != null) {
+            jre = __dtjavaTestHook__.jre;
+            deploy = __dtjavaTestHook__.deploy;
+            fx = __dtjavaTestHook__.jfx;
+            override = true;
+        }
+        else {
+            //Cache configuration from plugin mimetypes
+            //It is only available for NPAPI browsers
+            for (var t = 0; t < mm.length; t++) {
+                // The jpi-version is the JRE version.
+                var m = navigator.mimeTypes[t].type;
+                if (m.indexOf("application/x-java-applet;version") != -1 && m.indexOf('=') != -1) {
+                    var v = m.substring(m.indexOf('=') + 1);
+                    // Use the existing version comparison mechanism to ensure that
+                    // the latest JRE is selected ( "versionA"<="VersionB" equals to
+                    // versionCheck("versionA+","versionB") returns "true")
+                    if(jre == null || versionCheck(jre + "+", v)){
+			jre = v;
+	            }
+                }
+                //Supported for 7u6 or later
+                if (m.indexOf("application/x-java-applet;deploy") != -1 && m.indexOf('=') != -1) {
+                    deploy = m.substring(m.indexOf('=') + 1);
+                }
+                //javafx version for cobundled javafx (7u6+)
+                if (m.indexOf("application/x-java-applet;javafx") != -1 && m.indexOf('=') != -1) {
+                    fx = m.substring(m.indexOf('=') + 1);
+                }
+            }
+        }
+
+       var firefox = (navigator.userAgent.match(/Firefox/i) != null);
+
+       var noPluginWebBrowser = edge || chrome || noActiveX || (firefox && (jre == null));
+
+
+        return {haveDom:dom, wk:webkit, ie:ie, win:windows,
+                linux:linux, mac:mac, op: opera, chrome:chrome, edge:edge,
+                jre:jre, deploy:deploy, fx:fx, noPluginWebBrowser:noPluginWebBrowser,
+                cputype: cputype, osVersion: osVersion, override: override};
+    }
+
+   function showMessageBox() {
+        var message = 'Java Plug-in is not supported by this browser. <a href="https://java.com/dt-redirect">More info</a>';
+        var mbStyle = 'background-color: #ffffce;text-align: left;border: solid 1px #f0c000; padding: 1.65em 1.65em .75em 0.5em; font-family: Helvetica, Arial, sans-serif; font-size: 75%; bottom:0; left:0; right:0; position:fixed; margin:auto; opacity:0.9; width:400px;';
+        var messageStyle = "border: .85px; margin:-2.2em 0 0.55em 2.5em;";
+        var closeButtonStyle = "margin-left:10px;font-weight:bold;float:right;font-size:22px;line-height:20px;cursor:pointer;color:red;"
+        var messageBox = '<span style="'+ closeButtonStyle +'" onclick="this.parentElement.style.display=\'none\';">&times;</span><img src="https://java.com/js/alert_16.png"><div style="'+ messageStyle +'"><p>'+ message + '</p>';
+
+
+        var divTag = document.createElement("div");
+        divTag.id = "messagebox";
+        divTag.setAttribute('style', mbStyle);
+        divTag.innerHTML = messageBox;
+        document.body.appendChild(divTag);
+
+    }
+    //partially derived from swfobject.js
+    var initDone = false;
+
+    function init() {
+        if (typeof __dtjavaTestHook__ !== 'undefined') {
+          jre = null;
+          jfx = null;
+          deploy = null;
+
+          if ((__dtjavaTestHook__ != null) && (__dtjavaTestHook__.args != null)) {
+              jre = __dtjavaTestHook__.args.jre;
+              jfx = __dtjavaTestHook__.args.jfx;
+              deploy = __dtjavaTestHook__.args.deploy;
+          }
+
+          if ((window.location.href.indexOf('http://localhost') == 0) ||
+             (window.location.href.indexOf('file:///') == 0)) {
+             __dtjavaTestHook__ = {
+                detectEnv: detectEnv,
+                Version: Version,
+                checkFXSupport: checkFXSupport,
+                versionCheck: versionCheck,
+                versionCheckFX: versionCheckFX,
+                jre: jre,
+                jfx: jfx,
+                deploy: deploy
+             };
+          }
+        }
+
+        if (initDone) return;
+
+        ua = detectEnv();
+        if (!ua.haveDom) {
+            return;
+        }
+
+        //NB: dtjava.js can be added dynamically and init() can be called after
+        //    document onload event is fired
+        if (( isDef(d.readyState) && d.readyState == "complete") ||
+            (!isDef(d.readyState) &&
+                (d.getElementsByTagName("body")[0] || d.body))) {
+            invokeCallbacks();
+        }
+
+        if (!cbDone) {
+            if (isDef(d.addEventListener)) {
+                d.addEventListener("DOMContentLoaded",
+                    invokeCallbacks, false);
+            }
+            if (ua.ie && ua.win) {
+                // http://msdn.microsoft.com/en-us/library/ie/ms536343(v=vs.85).aspx
+                // attachEvent is not supported by IE 11.
+                if (isDef(d.addEventListener)) {
+                    d.addEventListener("onreadystatechange", function() {
+                        if (d.readyState == "complete") {
+                            d.removeEventListener("onreadystatechange", arguments.callee, false);
+                            invokeCallbacks();
+                        }
+                    }, false);
+                } else {
+                    d.attachEvent("onreadystatechange", function() {
+                        if (d.readyState == "complete") {
+                            d.detachEvent("onreadystatechange", arguments.callee);
+                            invokeCallbacks();
+                        }
+                    });
+                }
+                if (w == top) { // if not inside an iframe
+                    (function() {
+                        if (cbDone) {
+                            return;
+                        }
+                        //AI: what for??
+                        try {
+                            d.documentElement.doScroll("left");
+                        } catch(e) {
+                            setTimeout(arguments.callee, 0);
+                            return;
+                        }
+                        invokeCallbacks();
+                    })();
+                }
+            }
+            if (ua.wk) {
+                (function() {
+                    if (cbDone) {
+                        return;
+                    }
+                    if (!/loaded|complete/.test(d.readyState)) {
+                        setTimeout(arguments.callee, 0);
+                        return;
+                    }
+                    invokeCallbacks();
+                })();
+            }
+            addOnload(invokeCallbacks);
+        }
+        //only try to install native plugin if we do not have DTLite
+        //Practically this means we are running NPAPI browser on Windows
+        //(Chrome or FF) and recent JRE (7u4+?)
+        if (!haveDTLite()) {
+            installNativePlugin();
+        }
+    }
+
+   function getAbsoluteUrl(jnlp){
+        var absoluteUrl;
+        if(isAbsoluteUrl(jnlp)) {
+            absoluteUrl = jnlp;
+        } else {
+            var location = window.location.href;
+            var pos = location.lastIndexOf('/');
+            var docbase =  pos > -1 ? location.substring(0, pos + 1) : location + '/';
+	    absoluteUrl = docbase + jnlp;
+        }
+        return absoluteUrl;
+    }
+
+    function launchWithJnlpProtocol(jnlp) {
+        document.location="jnlp:"+ getAbsoluteUrl(jnlp);
+    }
+
+
+    function isAbsoluteUrl(url){
+       var protocols = ["http://", "https://", "file://"];
+       for (var i=0; i < protocols.length; i++){
+         if(url.toLowerCase().startsWith(protocols[i])){
+         	return true;;
+	 }
+       }
+       return false;
+     }
+
+
+    /**
+     This class provides details on why current platform does not meet
+     application platform requirements. Note that severe problems are
+     reported immediately and therefore full check may be not performed and
+     some (unrelated to fatal problem)
+     methods may provide false positive answers.
+     <p>
+     If multiple components do not match then worst status is reported.
+     Application need to repeat checks on each individual component
+     if it want to find out all details.
+
+     @class PlatformMismatchEvent
+     @for   dtjava
+     */
+    function PlatformMismatchEvent(a) {
+
+        //expect to get all parameters needed
+        for (var p in a) {
+            this[p] = a[p];
+        }
+
+        /**
+         * @method toString
+         * @return {string}
+         *    Returns string replesentation of event. Useful for debugging.
+         */
+        this.toString = function() {
+            return "MISMATCH [os=" + this.os + ", browser=" + this.browser
+                + ", jre=" + this.jre + ", fx=" + this.fx
+                + ", relaunch=" + this.relaunch + ", platform="
+                + this.platform + "]";
+        };
+
+        /**
+         @method isUnsupportedPlatform
+         @return {boolean}
+         Returns true if this platform (OS/hardware) is not supported in a way
+         to satisfy all platfrom requirements.
+         (E.g. page is viewed on iPhone or JavaFX 2.0 application on Solaris.)
+         <p>
+         Note that this does not include browser match data.
+         If platform is unsupported then application can not be
+         launched and user need to use another platform to view it.
+         */
+
+        this.isUnsupportedPlatform = function() {
+            return this.os;
+        };
+
+        /**
+         @method isUnsupportedBrowser
+         @return {boolean}
+         Returns true if error is because current browser is not supported.
+         <p>
+         If true is returned and isRelaunchNeeded() returns true too then
+         there are known supported browsers browsers for this platform.
+         (but they are not necessary installed on end user system)
+         */
+        this.isUnsupportedBrowser = function() {
+            return this.browser;
+        };
+
+        /**
+         @method jreStatus
+         @return {string}
+
+         Returns "ok" if error was not due to missing JRE.
+         Otherwise return error code characterizing the problem:
+         <ul>
+         <li> none - no JRE were detected on the system
+         <li> old - some version of JRE was detected but it does not match platform requirements
+         <li> oldplugin - matching JRE found but it is configured to use deprecated Java plugin that
+         does not support Java applets
+         <ul>
+         <p>
+         canAutoInstall() and isRelaunchNeeded() can be used to
+         get more details on how seamless user' install experience will be.
+         */
+        this.jreStatus = function() {
+            return this.jre;
+        };
+
+        /**
+         * @method jreInstallerURL
+         * @param {string} locale (optional) Locale to be used for installation web page
+         * @return {string}
+         *
+         * Return URL of page to visit to install required version of Java.
+         * If matching java runtime is already installed or not officially supported
+         * then return value is null.
+         */
+        this.jreInstallerURL = function(locale) {
+            if (!this.os && (this.jre == "old" || this.jre == "none")) {
+                return getJreUrl(locale);
+            }
+            return null;
+        };
+
+        /**
+         @method javafxStatus
+         @return {string}
+
+         Returns "ok" if error was not due to missing JavaFX.
+         Otherwise return error code characterizing the problem:
+         <ul>
+         <li> none - no JavaFX runtime is detected on the system
+         <li> old - some version of JavaFX runtime iss detected but it does not match platform requirements
+         <li> disabled - matching JavaFX is detected but it is disabled
+         <li> unsupported - JavaFX is not supported on this platform
+         <ul>
+         <p>
+         canAutoInstall() and isRelaunchNeeded() can be used to
+         get more details on how seamless user' install experience will be.
+         */
+        this.javafxStatus = function() {
+            return this.fx;
+        };
+
+        /**
+         * @method javafxInstallerURL
+         * @param {string} locale (optional) Locale to be used for installation web page
+         * @return {string}
+         *
+         * Return URL of page to visit to install required version of JavaFX.
+         * If matching JavaFX runtime is already installed or not officially supported
+         * then return value is null.
+         */
+        this.javafxInstallerURL = function(locale) {
+            if (!this.os && (this.fx == "old" || this.fx == "none")) {
+                return getFxUrl(locale);
+            }
+            return null;
+        };
+
+        /**
+         @method canAutoInstall
+         @return {boolean}
+         Returns true if installation of missing components can be
+         triggered automatically. In particular, ture is returned
+         if there are no missing components too.
+         <p>
+         If any of missing components need to be installed manually
+         (i.e. click through additional web pages) then false is returned.
+         */
+        this.canAutoInstall = function() {
+            return isAutoInstallEnabled(this.platform, this.jre, this.fx);
+        };
+
+        /**
+         @method isRelaunchNeeded
+         @return {boolean}
+
+         Returns true if browser relaunch is needed before application can be loaded.
+         This often is true in conjuction with need to perform installation.
+         <p>
+         Other typical case - use of unsupported browser when
+         it is known that there are supported browser for this pltaform.
+         Then both isUnsupportedBrowser() and isRelaunchNeeded() return true.
+         */
+        this.isRelaunchNeeded = function() {
+            return this.relaunch;
+        };
+    }
+
+    //returns version of instaled JavaFX runtime matching requested version
+    //or null otherwise
+    function getInstalledFXVersion(requestedVersion) {
+        //NPAPI browser and JRE with cobundle
+        if (ua.fx != null && versionCheckFX(requestedVersion, ua.fx)) {
+            return ua.fx;
+        }
+        //try to use DT
+        var p = getPlugin();
+        if (notNull(p)) {
+            try {
+                return p.getInstalledFXVersion(requestedVersion);
+            } catch(e) {}
+        }
+        return null;
+    }
+
+    //concatenate list with space as separator
+    function listToString(lst) {
+      if (lst != null) {
+          return lst.join(" ");
+      } else {
+          return null;
+      }
+    }
+
+    function addArgToList(lst, arg) {
+        if (notNull(lst)) {
+           lst.push(arg);
+           return lst;
+        } else {
+            var res = [arg];
+            return res;
+        }
+    }
+
+    function doLaunch(ld, platform, cb) {
+        var app = normalizeApp(ld, true);
+        if(ua.noPluginWebBrowser){
+            launchWithJnlpProtocol(app.url);
+            return;
+	}
+
+        //required argument is missing
+        if (!(notNull(app) && notNull(app.url))) {
+            throw "Required attribute missing! (application url need to be specified)";
+        }
+
+        //if we got array we need to copy over!
+        platform = new dtjava.Platform(platform);
+
+        //normalize handlers
+        cb = new dtjava.Callbacks(cb);
+
+        var launchFunc = function() {
+            //prepare jvm arguments
+            var jvmArgs = notNull(platform.jvmargs) ? platform.jvmargs : null;
+            if (notNull(platform.javafx)) {
+                //if FX is needed we know it is available or
+                // we will not get here
+                var v = getInstalledFXVersion(platform.javafx);
+                //add hint that we need FX toolkit to avoid relaunch
+                // if JNLP is not embedded
+                jvmArgs = addArgToList(jvmArgs, " -Djnlp.fx=" + v);
+                //for swing applications embedding FX we do not want this property as it will
+                // trigger FX toolkit and lead to app failure!
+                //But for JavaFX application it saves us relaunch as otherwise we wil launch with AWT toolkit ...
+                if (!notNull(ld.toolkit) || ld.toolkit == "fx") {
+                    jvmArgs = addArgToList(jvmArgs, " -Djnlp.tk=jfx");
+                }
+
+            }
+
+
+            //if we on 7u6+ we can use DTLite plugin in the NPAPI browsers
+            //Caveat: as of 7u6 it does not work with Chrome on Linux because Chrome expects
+            //   DTLite plugin to implement xembed (or claim to support xembed)
+            if (haveDTLite() && !(ua.linux && ua.chrome)) {
+                if (doLaunchUsingDTLite(app, jvmArgs, cb)) {
+                    return;
+                }
+            }
+
+            //Did not launch yet? Try DT plugin (7u2+)
+            var p =  getPlugin();
+            if (notNull(p)) {
+                try {
+                    try {
+                        //check if new DT APIs are available
+                        if (versionCheck("10.6+", ua.deploy, false)) {
+                            //    obj.launchApp({"url" : "http://somewhere/my.jnlp",
+                            //                   "jnlp_content" : "... BASE 64 ...",
+                            //                   "vmargs" : [ "-ea -Djnlp.foo=bar"
+                            //                   "appargs" : [ "first arg,  second arg" ]
+                            //                   "params" : {"p1" : "aaa", "p2" : "bbb"}});
+                            var callArgs = {"url":app.url};
+                            if (notNull(jvmArgs)) {
+                                callArgs["vmargs"] = jvmArgs;
+                            }
+                            //Only use HTML parameters, they are supposed to overwrite values in the JNLP
+                            //In the future we want to pass arguments too but this needs also be exposed for
+                            // embedded deployment
+                            if (notNull(app.params)) {
+                                //copy over and ensure all values are strings
+                                // (native code will ignore them otherwise)
+                                var ptmp = {};
+                                for (var k in app.params) {
+                                    ptmp[k] = String(app.params[k]);
+                                }
+                                callArgs["params"] = ptmp;
+                            }
+                            if (notNull(app.jnlp_content)) {
+                                callArgs["jnlp_content"] = app.jnlp_content;
+                            }
+                            var err = p.launchApp(callArgs);
+                            if (err == 0) { //0 - error
+                                if (isDef(cb.onRuntimeError)) {
+                                    cb.onRuntimeError(app.id);
+                                }
+                            }
+                        } else { //revert to old DT APIs
+                            //older DT APIs expects vmargs as a single string
+                            if (!p.launchApp(app.url, app.jnlp_content, listToString(jvmArgs))) {
+                                if (isDef(cb.onRuntimeError)) {
+                                    cb.onRuntimeError(app.id);
+                                }
+                            }
+                        }
+                        return;
+                    } catch (ee) { //temp  support for older build of DT
+                        if (!p.launchApp(app.url, app.jnlp_content)) {
+                           if (isDef(cb.onRuntimeError)) {
+                              cb.onRuntimeError(app.id);
+                           }
+                        }
+                        return;
+                    }
+                } catch (e) {
+                    //old DT
+                }
+            } //old Java (pre DTLite)? not Windows? or old DT
+
+            //use old way to launch it using java plugin
+            var o = getWebstartObject(app.url);
+            if (notNull(d.body)) {
+                d.body.appendChild(o);
+            } else {
+                //should never happen
+                d.write(o.innerHTML);
+            }
+        }
+
+        var r = doValidateRelaxed(platform);
+        //can not launch, try to fix
+        if (r != null) {
+            resolveAndLaunch(app, platform, r, cb, launchFunc);
+        } else {
+            launchFunc();
+        }
+    }
+
+    //process unhandled platform error - convert to code and call callback
+    function reportPlatformError(app, r, cb) {
+        if (isDef(cb.onDeployError)) {
+            cb.onDeployError(app, r);
+        }
+    }
+
+    function isDTInitialized(p) {
+        //if plugin is blocked then p.version will be undefined
+        return p != null && isDef(p.version);
+    }
+
+    //Wait until DT plugin is initialized and then run the code
+    //Currently we only use it for embeded apps and Chrome on Windows
+    function runUsingDT(label, f) {
+        //  Possible situations:
+        //   a) plugin is live and we can simply run code
+        //        - just run the code
+        //   b) plugin is in the DOM tree but it is not initialized yet (e.g. Chrome blocking)
+        //      and there is live timer (pendingCount > 0)
+        //        - there could be another request. We will APPEND to it
+        //        (this is different from dtlite as in this case we can not have multiple clicks)
+        //        - renew timer life counter (do not want new timer)
+        //   c) plugin is in the DOM tree and it is not fully initialized yet but timer is stopped
+        //        - overwrite old request
+        //        - restart timer
+        //
+        // Problem we are solving:
+        //    when plugin is ready to serve request? How do we schedule call to happen when plugin is initialized?
+        // Caveat:
+        //    Chrome can popup dialog asking user to grant permissions to load the plugin.
+        //    There is no API to detect dialog is shown and when user grants or declines permissions
+        //
+        // Note:
+        //    If we set property on plugin object before it is unblocked then they seem to be lost
+        //   and are not propagated to the final object once it is instantiated.
+        //
+        // Workaround we use:
+        //    Once plugin is added we will be checking if it is initialized and once we detect it we will execute code.
+        //  We will stop checking after some time.
+        var p = getPlugin();
+        if (p == null) {
+            return; //NO DT
+        }
+
+        if (isDTInitialized(p)) {
+            f(p);
+        } else {
+            // see if we need new timer
+            var waitAndUse = null;
+            if (!isDef(dtjava.dtPendingCnt) || dtjava.dtPendingCnt == 0) {
+                waitAndUse = function () {
+                    if (isDTInitialized(p)) {
+                        if (notNull(dtjava.dtPending)) {
+                            for (var i in dtjava.dtPending) {
+                                dtjava.dtPending[i]();
+                            }
+                        }
+                        return;
+                    }
+                    if (dtjava.dtPendingCnt > 0) {
+                        dtjava.dtPendingCnt--;
+                        setTimeout(waitAndUse, 500);
+                    }
+                }
+            }
+            //add new task in queue
+            if (!notNull(dtjava.dtPending) || dtjava.dtPendingCnt == 0) {
+                dtjava.dtPending = {};
+            }
+            dtjava.dtPending[label] = f; //use map to ensure repitative actions are not queued (e.g. multiple click to launch webstart)
+            //reset the timer counter
+            dtjava.dtPendingCnt = 1000; //timer is gone after 500s
+            //start timer if needed
+            if (waitAndUse != null) waitAndUse();
+        }
+    }
+
+    //returns same mismatch event if not resolved, null if resolved
+    function resolveAndLaunch(app, platform, v, cb, launchFunction) {
+        var p = getPlugin();
+        if( p == null && ua.noPluginWebBrowser){
+            var readyStateCheck = setInterval(function() {
+                    if(document.readyState  == "complete"){
+                        clearInterval(readyStateCheck);
+                        showMessageBox();
+                    }
+                }, 15);
+            return;
+        }
+        //Special case: Chrome/Windows
+        // (Note: IE may also block activeX control but then it will block attempts to use it too)
+        if (ua.chrome && ua.win && p != null && !isDTInitialized(p)) {
+            //this likely means DT plugin is blocked by Chrome
+            //tell user to grant permissions and retry
+            var actionLabel;
+            if (notNull(app.placeholder)) {
+                var onClickFunc = function() {w.open("https://www.java.com/en/download/faq/chrome.xml"); return false;};
+                var msg1 = "Please give Java permission to run on this browser web page.";
+                var msg2 = "Click for more information.";
+                var altText = "";
+                doShowMessageInTheArea(app, msg1, msg2, altText, "javafx-chrome.png", onClickFunc);
+                actionLabel = app.id + "-embed";
+            } else {
+                v.jre = "blocked";
+                reportPlatformError(app, v, cb);
+                actionLabel = "launch"; //we only queue ONE webstart launch.
+                                        //Do not want to try to queue different apps - bad UE
+                                        // (once user enable multiple things can spawn)
+                                        //Note: what if multiple webstart apps are set to launch on page load (suer do not need to click)?
+                                        //      Guess do not worry for now
+                                        //Note: app.id may be null in case of webstart app.
+            }
+
+            //now we need to start waiter. Once DT is initialized we can proceeed
+            var retryFunc = function() {
+                var vnew = doValidateRelaxed(platform);
+                if (vnew == null) { //no problems with env
+                    launchFunction();
+                } else {
+                    resolveAndLaunch(app, platform, vnew, cb, launchFunction);
+                }
+            };
+            runUsingDT(actionLabel, retryFunc);
+
+            return;
+        }
+
+        if (!v.isUnsupportedPlatform() && !v.isUnsupportedBrowser()) { //otherwise fatal, at least until restart of browser
+            if (isMissingComponent(v) && isDef(cb.onInstallNeeded)) {
+                var resolveFunc= function() {
+                    //once install is over we need to revalidate
+                    var vnew = doValidateRelaxed(platform);
+                    if (vnew == null) { //if no problems found - can launch
+                        launchFunction();
+                    } else { //TODO: what happens if we installed everything but relaunch is needed??
+                        //We can not get here if component install was not offered for any or missing componens
+                        //(if auto install was possible, see doInstall() implementation)
+                        //Hence, it is safe to assume we failed to meet requirements
+                        reportPlatformError(app, vnew, cb);
+
+                        //TODO: may be should call itself again but
+                        // then it easy can become infinite loop
+
+                        //e.g. user installs but we fail to detect it because DT
+                        // is not FX aware and retry, etc.
+                        //TODO: think it through
+                    }
+                };
+
+                cb.onInstallNeeded(app, platform, cb,
+                            v.canAutoInstall(), v.isRelaunchNeeded(), resolveFunc);
+                return;
+            }
+        }
+        reportPlatformError(app, v, cb);
+    }
+
+    function haveDTLite() {
+        // IE does not support DTLite
+        if (ua.deploy != null && !ua.ie) {
+            return versionCheck("10.6+", ua.deploy, false);
+        }
+        return false;
+    }
+
+    function isDTLiteInitialized(p) {
+        //if plugin is blocked then p.version will be undefined
+        return p != null && isDef(p.version);
+    }
+
+    function getDTLitePlugin() {
+        return document.getElementById("dtlite");
+    }
+
+    function doInjectDTLite() {
+        //do not want more than one plugin
+        if (getDTLitePlugin() != null) return;
+
+        var p = document.createElement('embed');
+        p.width = '10px';
+        p.height = '10px';
+        p.id = "dtlite";
+        p.type = "application/x-java-applet";  //means we get latest
+
+        var div = document.createElement("div");
+        div.style.position = "relative";
+        div.style.left = "-10000px";
+        div.appendChild(p);
+
+        var e = document.getElementsByTagName("body");
+        e[0].appendChild(div);
+    }
+
+    function runUsingDTLite(f) {
+        //  Possible situations:
+        //   a) first request, plugin is not in the DOM tree yet
+        //        - add plugin
+        //        - setup wait mechanism and run f() once plugin is ready
+        //   b) plugin is live and we can simply run code
+        //        - just run the code
+        //   c) plugin is in the DOM tree but it is not initialized yet (e.g. Chrome blocking)
+        //      and there is live timer (pendingCount > 0)
+        //        - there could be another request. We will override it (e.g. user clicked multiple times)
+        //        - renew timer life counter (do not want new timer)
+        //   d) plugin is in the DOM tree and it is not fully initialized yet but timer is stopped
+        //        - overwrite old request
+        //        - restart timer
+        //
+        // Problem:
+        //    when plugin is ready to serve request? How do we schedule call to happen when plugin is initialized?
+        // Caveat:
+        //    Chrome can popup dialog asking user to grant permissions to load the plugin.
+        //    There is no API to detect dialog is shown and when user grants or declines permissions
+        //
+        // Note:
+        //    If we set property on plugin object before it is unblocked then they seem to be lost
+        //   and are not propagated to the final object once it is instantiated.
+        //
+        // Workaround we use:
+        //    Once plugin is added we will be checking if it is initialized and once we detect it we will execute code.
+        //  We will stop checking after some time.
+        var p = getDTLitePlugin();
+        if (p == null) {
+            doInjectDTLite();
+            p = getDTLitePlugin();
+        }
+
+        if (isDTLiteInitialized(p)) {
+            f(p);
+        } else {
+            // see if we need new timer
+            var waitAndUse = null;
+            if (!isDef(dtjava.dtlitePendingCnt) || dtjava.dtlitePendingCnt == 0) {
+                waitAndUse = function () {
+                    if (isDef(p.version)) {
+                        if (dtjava.pendingLaunch != null) {
+                            dtjava.pendingLaunch(p);
+                        }
+                        dtjava.pendingLaunch = null;
+                        return;
+                    }
+                    if (dtjava.dtlitePendingCnt > 0) {
+                        dtjava.dtlitePendingCnt--;
+                        setTimeout(waitAndUse, 500);
+                    }
+                }
+            }
+            //add new task in queue
+            dtjava.pendingLaunch = f;
+            //reset the timer counter
+            dtjava.dtlitePendingCnt = 1000; //timer is gone after 500s
+            //start timer if needed
+            if (waitAndUse != null) {
+                waitAndUse();
+            }
+        }
+    }
+
+    function doLaunchUsingDTLite(app, jvmargs, cb) {
+        var launchIt = function() {
+            var pp = getDTLitePlugin();
+            if (pp == null) {
+                //should not be possible as we guard before enter this function
+                if (isDef(cb.onRuntimeError)) {
+                    cb.onRuntimeError(app.id);
+                }
+            }
+
+            //DTLite only support new invocation API
+            //    obj.launchApp({"url" : "http://somewhere/my.jnlp",
+            //                   "jnlp_content" : "... BASE 64 ...",
+            //                   "vmargs" : [ "-ea -Djnlp.foo=bar"
+            //                   "appargs" : [ "first arg,  second arg" ]
+            //                   "params" : {"p1" : "aaa", "p2" : "bbb"}});
+            var callArgs = {"url" : app.url};
+            if (notNull(jvmargs)) {
+               callArgs["vmargs"] = jvmargs;
+            }
+            //Only use HTML parameters, they are supposed to overwrite values in the JNLP
+            //In the future we want to pass arguments too but this needs also be exposed for
+            // embedded deployment
+            if (notNull(app.params)) {
+                //copy over and ensure all values are stings
+                // (native code will ignore them otherwise)
+                var ptmp = {};
+                for (var k in app.params) {
+                    ptmp[k] = String(app.params[k]);
+                }
+                callArgs["params"] = ptmp;
+            }
+            if (notNull(app.jnlp_content)) {
+               callArgs["jnlp_content"] = app.jnlp_content;
+            }
+            var err = pp.launchApp(callArgs);
+            if (err == 0) { //0 - error
+                if (isDef(cb.onRuntimeError)) {
+                    cb.onRuntimeError(app.id);
+                }
+            }
+        };
+
+        if (versionCheck("10.4+", ua.deploy, false)) { //only for NPAPI browsers
+            runUsingDTLite(launchIt);
+            return true;
+        }
+        return false;
+    }
+
+    function getWebstartObject(jnlp) {
+        var wo = null;
+        if (ua.ie) { //TODO: attempt to use object in FF 3.6 lead to hang. Revert to embed for now
+                     //TODO: Should Chrome use object?
+            //object tag itself
+            wo = d.createElement('object');
+            wo.width = '1px'; //zero size reports invalid argument in IE!
+            wo.height = '1px'; //TODO: make it less distruptive to page layout? hide div?
+            var p = d.createElement('param');
+            p.name = 'launchjnlp';
+            p.value = jnlp;
+            wo.appendChild(p);
+            p = d.createElement('param');
+            p.name = 'docbase';
+            p.value = notNull(d.documentURI) ? d.documentURI : d.URL;
+            wo.appendChild(p);
+
+            if (!ua.ie) {
+                //NB:do not need to use exact version in mime type as generic should be mapped to latest?
+                wo.type = "application/x-java-applet;version=1.7";
+            } else {
+                wo.classid = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
+            }
+        } else { //TODO: else part should go away once we figure out what is going on with FF
+            wo = d.createElement('embed');
+            wo.width = '0px';
+            wo.height = '0px';
+            //NB: dot notation did not work for custom attributes??? revert to setAttribute
+            wo.setAttribute('launchjnlp', jnlp);
+            wo.setAttribute('docbase', (notNull(d.documentURI) ? d.documentURI : d.URL));
+            //NB:do not need to use exact version in mime type as generic should be mapped to latest?
+            wo.type = "application/x-java-applet;version=1.7";
+        }
+
+        var div = d.createElement("div");
+        div.style.position = "relative";
+        div.style.left = "-10000px";
+        div.appendChild(wo);
+        return div;
+    }
+
+    // Version class. The argument VersionString is a valid version string and
+    // UpgradeFromOldJavaVersion is optional true/false.
+    var Match = {
+        Exact: {value: 0},  // exact version
+        Family: {value: 1}, // Example: 1.7* only matches 1.7.X family
+        Above: {value: 2}   // Example: 1.7+ matches 1.7 and above
+    };
+
+    var Token = {
+        Uninitialized: {value: -2},
+        Unknown: {value: -1},
+        Identifier: {value: 0},
+        Alpha: {value: 1},
+        Digits: {value: 2},
+        Plus: {value: 3},
+        Minus: {value: 4},
+        Underbar: {value: 5},
+        Star: {value: 6},
+        Dot: {value: 7},
+        End: {value: 8}
+    };
+
+    var Version = function(VersionString, UpgradeFromOldJavaVersion) {
+        if (typeof UpgradeFromOldJavaVersion === 'undefined') {
+            var UpgradeFromOldJavaVersion = true;
+        }
+
+        // Constants
+        var MAX_DIGITS = 4;
+
+        // Private
+        var FVersionString = null;
+        var FOld = false;
+        var FVersion = null;
+        var FBuild = null;
+        var FPre = null;
+        var FMatch = null;
+        var FMajor = null;
+        var FMinor = null;
+        var FSecurity = null;
+        var FPatch = null;
+
+        // Class constructor
+        if (!VersionString) {
+            return null;
+        }
+        else {
+            FVersionString = VersionString;
+            var v = parseAndSplitVersionString(VersionString, UpgradeFromOldJavaVersion)
+            FOld = v.old;
+            FVersion = v.version;
+            FBuild = v.build;
+            FMatch = v.match;
+            FPre = v.pre;
+
+            var parts = splitVersion(v.version);
+            FMajor = parts.major;
+            FMinor = parts.minor;
+            FSecurity = parts.security;
+            FPatch = parts.patch;
+        }
+
+        // Public
+        return {
+            VersionString: VersionString,
+            old: FOld,
+            major: FMajor,
+            minor: FMinor,
+            security: FSecurity,
+            patch: FPatch,
+            version: FVersion,
+            build: FBuild,
+            pre: FPre,
+            match: FMatch,
+
+            check: function(query) {
+                return check(query, this);
+            },
+
+            equals: function(query) {
+                return equals(query, this);
+            }
+        };
+
+        // Private
+        function splitVersion(version) {
+            var lmajor = null;
+            var lminor = null;
+            var lsecurity = null;
+            var lpatch = null;
+
+            if (version.length >= 1) {
+                lmajor = version[0];
+            }
+
+            if (version.length >= 2) {
+                lminor = version[1];
+            }
+
+            if (version.length >= 3) {
+                lsecurity = version[2];
+            }
+
+            if (version.length >= 4) {
+                lpatch = version[3];
+            }
+
+            return {
+                major: lmajor,
+                minor: lminor,
+                security: lsecurity,
+                patch: lpatch
+          };
+        }
+
+        function VersionStringTokenizer(versionString) {
+            // Convert the version string to lower case and strip all whitespace
+            // from the beginning and end of the string.
+
+            var FVersionString = versionString.toLowerCase().trim();
+            var FIndex;
+            var FCurrentToken = null;
+            var FStack = Array();
+
+            function isDigit(c) {
+                var result = false;
+
+                switch(c) {
+                    case '0':
+                    case '1':
+                    case '2':
+                    case '3':
+                    case '4':
+                    case '5':
+                    case '6':
+                    case '7':
+                    case '8':
+                    case '9':
+                        result = true;
+                        break;
+                }
+
+                return result;
+            }
+
+            function isLetter(c) {
+                //return c.match("^[a-zA-Z]");
+                var result = false;
+                var lowerBoundLower = "a".charCodeAt(0);
+                var upperBoundLower = "z".charCodeAt(0);
+                var bound = c.charCodeAt(0);
+
+                if (lowerBoundLower <= bound && bound <= upperBoundLower) {
+                    result = true;
+                }
+
+                return result;
+            }
+
+            function start() {
+                FIndex = 0;
+            }
+
+            function currentToken() {
+                return FCurrentToken;
+            }
+
+            function pushToken(Token) {
+                if (FCurrentToken != null) {
+                    FStack.unshift(FCurrentToken);
+                }
+
+                FCurrentToken = Token;
+            }
+
+            function nextToken() {
+                var tokenID = Token.Uninitialized;
+                var token = '';
+
+                if (FStack.length > 0) {
+                    tokenID = FStack[0].tokenID;
+                    token = FStack[0].token;
+                    FStack.shift();
+                }
+                else {
+                    if (FIndex >= FVersionString.length) {
+                        tokenID = Token.End;
+                    }
+                    else {
+                        while (FIndex < FVersionString.length) {
+                            var c = FVersionString.charAt(FIndex);
+
+                            if ((tokenID == Token.Uninitialized || tokenID == Token.Alpha) &&
+                                isLetter(c) == true) {
+                                tokenID = Token.Alpha;
+                                FIndex++;
+                                token += c;
+                            }
+                            else if ((tokenID == Token.Uninitialized || tokenID == Token.Digits) &&
+                                     isDigit(c) == true) {
+                                if (parseInt(c) == 0 && parseInt(token) == 0) {
+                                    tokenID = Token.Unknown;
+                                    token += c;
+                                    FIndex++;
+                                    break;
+                                }
+                                else {
+                                    tokenID = Token.Digits;
+                                    token += c;
+                                    FIndex++;
+                                }
+                            }
+                            else if ((tokenID == Token.Alpha || tokenID == Token.Identifier) &&
+                                     isDigit(c) == true &&
+                                     isLetter(c) == false) {
+                                tokenID = Token.Identifier;
+                                FIndex++;
+                                token += c;
+                            }
+                            else if (tokenID == Token.Uninitialized) {
+                                switch(c) {
+                                    case '-':
+                                      tokenID = Token.Minus;
+                                      FIndex++;
+                                      token = c;
+                                      break;
+                                    case '+':
+                                      tokenID = Token.Plus;
+                                      FIndex++;
+                                      token = c;
+                                      break;
+                                    case '*':
+                                      tokenID = Token.Star;
+                                      FIndex++;
+                                      token = c;
+                                      break;
+                                    case '.':
+                                      tokenID = Token.Dot;
+                                      FIndex++;
+                                      token = c;
+                                      break;
+                                    case '_':
+                                      tokenID = Token.Underbar;
+                                      FIndex++;
+                                      token = c;
+                                      break;
+                                    default:
+                                        tokenID = Token.Unknown;
+                                        FIndex++;
+                                        break;
+                                }
+
+                                break;
+                            }
+                            else {
+                              break;
+                            }
+                        }
+                    }
+                }
+
+                FCurrentToken = {
+                    token: token,
+                    tokenID: tokenID
+                }
+
+                return FCurrentToken;
+            }
+
+            return {
+                start: start,
+                nextToken: nextToken,
+                pushToken: pushToken,
+                currentToken: currentToken,
+                isDigit: isDigit,
+                isLetter: isLetter
+            }
+        }
+
+        function VersionStringParser() {
+            function readDigits(Tokenizer) {
+                var result = new Array();
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Digits) {
+                    result.push(parseInt(token.token));
+                    token = Tokenizer.nextToken();
+
+                    // Read up to 3 more digits.
+                    for (var index = 0; index < (MAX_DIGITS - 1); index++) {
+                        if (token.tokenID == Token.Dot) {
+                            token = Tokenizer.nextToken();
+
+                            if (token.tokenID == Token.Digits) {
+                                result.push(parseInt(token.token));
+                                token = Tokenizer.nextToken();
+                            }
+                            else if (token.tokenID == Token.Star ||
+                                     token.tokenID == Token.Plus) {
+                                break;
+                            }
+                            else {
+                                result = null;
+                                break;
+                            }
+                        }
+                        else if (token.tokenID == Token.Star ||
+                                 token.tokenID == Token.Plus ||
+                                 token.tokenID == Token.End ||
+                                 token.tokenID == Token.Minus ||
+                                 token.tokenID == Token.Underbar ||
+                                 token.tokenID == Token.Identifier ||
+                                 (token.tokenID == Token.Alpha && token.token == 'u')) {
+                            break;
+                        }
+                        else {
+                            result = null;
+                            break;
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            function readMatch(Tokenizer, Old) {
+                var result = Match.Exact;
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Dot) {
+                    token = Tokenizer.nextToken();
+
+                    if (token.tokenID == Token.Star) {
+                        result = Match.Family;
+                        Tokenizer.nextToken();
+                    }
+                    else if (token.tokenID == Token.Plus) {
+                        result = Match.Above;
+                        Tokenizer.nextToken();
+                    }
+                }
+                else if (token.tokenID == Token.Star) {
+                    result = Match.Family;
+                    Tokenizer.nextToken();
+                }
+                else if (token.tokenID == Token.Plus) {
+                    result = Match.Above;
+                    Tokenizer.nextToken();
+                }
+
+                return result;
+            }
+
+            function readPre(Tokenizer) {
+                var result = null;
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Minus) {
+                    var savedToken = token;
+                    var token = Tokenizer.nextToken();
+
+                    if (token.tokenID == Token.Alpha) {
+                        result = token.token;
+                        Tokenizer.nextToken();
+                    }
+                    else {
+                        Tokenizer.pushToken(savedToken);
+                    }
+                }
+
+                return result;
+            }
+
+            function readBuild(Tokenizer, Old) {
+                var result = null;
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Plus) {
+                    // The new version spec has build number prepended with a "+":
+                    // RegEx: +([1-9][0-9]*)
+                    var savedToken = token;
+                    var token = Tokenizer.nextToken();
+
+                    if (token.tokenID == Token.Digits) {
+                        result = parseInt(token.token);
+                        Tokenizer.nextToken();
+                    }
+                    else {
+                        Tokenizer.pushToken(savedToken);
+                    }
+                }
+                else if (Old == true) {
+                    // The old version spec has build number prepended with a "-b"
+                    // RegEx: -b([1-9][0-9]*)
+                    if (token.tokenID == Token.Minus || token.tokenID == Token.Underbar) {
+                        var savedToken = token;
+                        token = Tokenizer.nextToken();
+
+                        if (token.tokenID == Token.Identifier && token.token[0] == 'b') {
+                            var builderNumber = parseInt(token.token.substr(1));
+
+                            if (builderNumber != null && isNaN(builderNumber) == false) {
+                                Tokenizer.nextToken();
+                                result = builderNumber;
+                            }
+                        }
+                        else {
+                            Tokenizer.pushToken(savedToken);
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            // isOldUpdate determines if the version string is in the old
+            // short format. For Example: 8u60
+            function isOldUpdate(version, token) {
+                var result = false;
+
+                if (version.length == 1 &&
+                    parseInt(version[0]) <= 8 &&
+                    token.tokenID == Token.Identifier &&
+                    token.token.length > 0 &&
+                    token.token.charAt(0) == "u") {
+                    result = true;
+                }
+
+                return result;
+            }
+
+            // Only call this function if isOldUpdate() returns true.
+            function readOldUpdate(Tokenizer) {
+                var result = null;
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Identifier) {
+                    result = parseInt(token.token.substr(1));
+                    Tokenizer.nextToken();
+                }
+                else if (token.tokenID == Token.Star) {
+                    lmatch = Match.Family;
+                    Tokenizer.nextToken();
+                }
+                else if (token.tokenID == Token.Plus) {
+                    lmatch = Match.Above;
+                    Tokenizer.nextToken();
+                }
+
+                return result;
+            }
+
+            function readOpt(Tokenizer) {
+                var result = null;
+                var token = Tokenizer.currentToken();
+
+                if (token.tokenID == Token.Alpha) {
+                    result = token.token;
+                    Tokenizer.nextToken();
+                }
+
+                return result;
+            }
+
+            function parse(Tokenizer) {
+                var result = null;
+                var success = false;
+
+                var lold = false;
+                var lversion = null;
+                var lbuild = null;
+                var lmatch = Match.Exact;
+                var lpre = false;
+                var lopt = null;
+
+                Tokenizer.start();
+                var token = Tokenizer.nextToken();
+
+                if (token.tokenID == Token.Digits) {
+                    lversion = readDigits(Tokenizer);
+
+                    if (lversion != null && lversion.length > 0) {
+                        token = Tokenizer.currentToken();
+
+                        if (lversion[0] == 1) {
+                            if (lversion.length >= 2 && lversion[1] == 9) {
+                                return null;
+                            }
+
+                            lold = true;
+                        }
+                        else if (token.token == "u") {
+                            // Special case. For Example: 8u*
+                            token = Tokenizer.nextToken();
+                        }
+
+                        if (isOldUpdate(lversion, token) == true) {
+                            lold = true;
+                            var value = readOldUpdate(Tokenizer);
+
+                            if (value != null) {
+                                token = Tokenizer.currentToken();
+                                lversion.push(parseInt(value));
+                                lold = true;
+
+                                if (token.tokenID == Token.End) {
+                                    success = true;
+                                }
+                                else {
+                                    lmatch = readMatch(Tokenizer);
+                                    token = Tokenizer.currentToken();
+
+                                    if (token.tokenID == Token.End) {
+                                        success = true;
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            token = Tokenizer.currentToken();
+
+                            if (lold == true && token.tokenID == Token.Underbar) {
+                                token = Tokenizer.nextToken();
+
+                                if (token.tokenID == Token.Digits && lversion.length < MAX_DIGITS) {
+                                    lversion.push(parseInt(token.token));
+                                    Tokenizer.nextToken();
+                                }
+                            }
+
+                            lpre = readPre(Tokenizer);
+                            token = Tokenizer.currentToken();
+
+                            lbuild = readBuild(Tokenizer, lold);
+                            lopt = readOpt(Tokenizer);
+                            lmatch = readMatch(Tokenizer, lold);
+                            token = Tokenizer.currentToken();
+
+                            if (token.tokenID == Token.End) {
+                                success = true;
+                            }
+                        }
+
+                        if (success == true) {
+                            result = {
+                                old: lold,
+                                version: lversion,
+                                build: lbuild,
+                                match: lmatch,
+                                pre: lpre,
+                                opt: lopt
+                            };
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            return {
+                parse: parse
+            }
+        }
+
+        function parseAndSplitVersionString(versionString, UpgradeFromOldJavaVersion) {
+            var lold = false;
+            var lversion = new Array;
+            var lbuild = null;
+            var lmatch = null;
+            var lpre = false;
+            var lopt = null;
+
+            // Corner case inputs.
+            if (versionString == null || versionString.length == 0) {
+                lversion = [0, 0, 0, 0];
+            }
+            else {
+                var tokenizer = VersionStringTokenizer(versionString);
+                var parser = VersionStringParser();
+                var result = parser.parse(tokenizer);
+
+                if (result != null) {
+                    if (UpgradeFromOldJavaVersion == true &&
+                        result.old == true) {
+                        if (result.version.length > 0 &&
+                            result.version[0] == 1) {
+                            lversion = result.version.splice(1, result.version.length - 1);
+                        }
+                        else {
+                            lversion = result.version;
+                        }
+
+                        lold = true;
+                    }
+                    else {
+                        lversion = result.version;
+                    }
+
+                    lbuild = result.build;
+                    lmatch = result.match;
+                    lpre = result.pre;
+                }
+            }
+
+            return {
+                old: lold,
+                version: lversion,
+                build: lbuild,
+                match: lmatch,
+                pre: lpre,
+                opt: lopt
+            };
+        }
+
+        function sameVersion(query, version) {
+            var result = false;
+            var lquery = query;
+
+            if (lquery == null)
+                lquery = 0;
+
+            if (parseInt(lquery) == parseInt(version)) {
+                result = true;
+            }
+
+            return result;
+        }
+
+        // compareVersionExact comparison returns true only if query and version are
+        // exact matches.
+        function compareVersionExact(query, version) {
+            var result = false;
+
+            if ((query.major != null) &&
+                (version.major != null) &&
+                sameVersion(query.major, version.major) &&
+                sameVersion(query.minor, version.minor) &&
+                sameVersion(query.security, version.security) &&
+                sameVersion(query.patch, version.patch) &&
+                (query.old == version.old) &&
+                (query.pre == version.pre) &&
+                ((parseInt(query.build) == parseInt(version.build)) || (query.build == null && version.build == null))) {
+                result = true;
+            }
+
+            return result;
+        }
+
+        // compareVersionFamily comparison is for the * wild card for the current query
+        // version and anything above within the current version. For Example:
+        // 1.7* will match 1.7.8.9 but not 1.8.
+        function compareVersionFamily(query, version) {
+            var result = false;
+
+            // There is a subtle corner case comparison when comparing:
+            //  1.* to 1.8 (success)
+            //  1.* to 9.0 (fail)
+            // In this case, if both strings are old that means we have a 1s, so
+            // since the query string is all 0s, or empty, we have a match.
+            if (query.old == true && query.version.length == 0 && version.old == true) {
+                result = true;
+            }
+            else {
+                // All elements must match on the query version array.
+                for (index = 0 ;index < query.version.length && index < version.version.length;
+                     index++) {
+                    var q = query.version[index];
+                    var v = version.version[index];
+
+                    if (parseInt(q) == parseInt(v)) {
+                        result = true;
+                    }
+                    else {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        // compareVersionAbove comparison is for the + wild card for the current query
+        // version and anything above returning true.
+        function compareVersionAbove(query, version) {
+            var result = false;
+
+            if (query.old == true && query.version.length == 0) {
+                result = true;
+            }
+            else if (query.old == true && version.old == false) {
+                result = true;
+            }
+            else if (query.major == 0) {
+                result = true;
+            }
+            else if ((query.major != null) &&
+                (version.major != null) &&
+                ((parseInt(query.build) == parseInt(version.build)) || (query.build == null && version.build == null))) {
+
+                for (var index = 0; index < query.version.length; index++) {
+                    var q = query.version[index];
+                    var v = version.version[index];
+
+                    if (parseInt(q) == parseInt(v)) {
+                        result = true;
+                    }
+                    else if (parseInt(q) < parseInt(v)) {
+                        if ((query.old == true && version.old == true) ||
+                            (query.old == false && version.old == false)) {
+                            result = true;
+                        }
+
+                        break;
+                    }
+                    else {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        // cloneAndCompleteVersionInfo is an internal method. It makes a copy of the
+        // version structure and completes the version array to contain four elements.
+        function cloneAndCompleteVersionInfo(version) {
+            var clone_version = version.version.slice(0);
+
+            // The source version string must be a complete version string (four digits).
+            // Example: 9.0.0.0
+            for (var index = clone_version.length; index < 4 ; index++) {
+                clone_version.push(0);
+            }
+
+            var parts = splitVersion(clone_version);
+
+            return {
+                old: version.old,
+                major: parts.major,
+                minor: parts.minor,
+                security: parts.security,
+                patch: parts.patch,
+                version: clone_version,
+                build: version.build,
+                pre: version.pre
+            };
+        }
+
+        // Check performs a deploy pattern match comparison and returns
+        // true if the comparing version matches false if not.
+        function check(query, version) {
+            var result = false;
+
+            if (query.VersionString == null || query.VersionString.length == 0) {
+                result = true;
+            }
+            else {
+                if (query.build == null && version.build == null) {
+                    var lversion = cloneAndCompleteVersionInfo(version);
+
+                    if (query.match == Match.Exact) {
+                        result = compareVersionExact(query, lversion);
+                    }
+                    else if (query.match == Match.Family) {
+                        result = compareVersionFamily(query, lversion);
+                    }
+                    else if (query.match == Match.Above) {
+                        result = compareVersionAbove(query, lversion);
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        // Performs a comparison on the two version string arguments and returns
+        // true if the comparing version matches false if not.
+        function equals(value, version) {
+            var result = false;
+
+            if (query.VersionString == null || query.VersionString.length == 0) {
+                result = true;
+            }
+            else {
+                var lversion = cloneAndCompleteVersionInfo(version);
+                var lquery = cloneAndCompleteVersionInfo(query);
+                result = compareVersionExact(lquery, lversion);
+            }
+
+            return result;
+        }
+    };
+
+    // Compares two version strings: query and version, matching query against version. query
+    // is allowed to have wild cards + and * version is not. The argument UpgradeFromOldJavaVersion
+    // is optional. This will remove the 1 prefix if present and mark the old field in the structure
+    // that is passed around.
+    function versionCheck(query, version, UpgradeFromOldJavaVersion) {
+        var q = new Version(query, UpgradeFromOldJavaVersion);
+        var v = new Version(version, UpgradeFromOldJavaVersion);
+        return v.check(q);
+    }
+
+    // This is similar to version check rules except there is a range
+    // over versions (3-7) that are not valid.
+    //
+    // JavaFX version requirements are always treated as "not earlier than this update".
+    // I.e. we expect
+    //     2.2.0 to match 2.2*, 2.2+, 2.1+, 2.1*, 2.0 and 1+
+    //           but not match 2.2.1+, 2.2.1*, 2.3*, 2.3+ or 1*
+    function versionCheckFX(query, version) {
+        var q = new Version(query, false);
+
+        if (parseInt(q.major) >= 3 && parseInt(q.major) <= 7 && query.substr(-1) !== "+") {
+            return false;
+        }
+
+        if (q.match == Match.Exact) {
+            q = new Version(query + "+", false);
+        }
+
+        var v = new Version(version, false);
+
+        return v.check(q);
+    }
+
+    //as JavaFX comes with own plugin binaries then check based on mime types, etc.
+    // may be false positive as it only checks for plugin version, not real JRE
+    //Here we check that DT plugin is aware of JRE installations
+    //Note that:
+    //  - if DT is not available we will return false but we only do this i
+    //    ready to launch => DT must be found
+    //  - we do not want to check in jreCheck() as we want to avoid loading
+    //    DT plugin if we can (as old DT may make it not possible to autostart)
+    function doublecheckJrePresence() {
+        if (!haveDTLite()) { //basically IE on windows or Old JRE on windows
+          if (postponeNativePluginInstallation && notNull(d.body)) {
+              // Native Plugin installation was postponed, as the page didn't have
+              // body at that time. Try to install the plugin now.
+              installNativePlugin();
+              postponeNativePluginInstallation = false;
+          }
+          var p = getPlugin();
+          if (p != null) {
+            return true;
+            //WORKAROUND: bug in native DT!!! TODO: What version? bypass for it only
+            //return (p.jvms.getLength() > 0);
+          }
+
+          return false;
+        }
+
+        //if we are not using native DT plugin (i.e. using DTLite) then no way we can do sanity check
+        //   => assume first check is accurate
+        return true;
+    }
+
+    function jreCheck(jre) {
+        // Check if latest JRE is exposed in mimetype and if it is good enough (only for NPAPI browsers)
+        if (ua.jre != null) {
+            if (versionCheck(jre, ua.jre)) {
+               return "ok";
+            }
+            //Note: if we have JRE but it is not match that means we may need an upgrade message
+            // but we still could be able to get more accurate answer with native DT plugin
+        }
+
+        //try to use DT plugin
+        var p = getPlugin();
+        if (p != null) {
+            var VMs = p.jvms;
+            for (var i = 0; VMs != null && i < VMs.getLength(); i++) {
+                if (versionCheck(jre, VMs.get(i).version)) {
+                    if (!ua.ie && notNull(navigator.mimeTypes)) {
+                        //if mime types are available but plugin is not there =>
+                        //  it is disabled
+                        if (!notNull(navigator.mimeTypes["application/x-java-applet"])) {
+                            return "disabled";
+                        }
+                    }
+                    return "ok";
+                }
+            }
+            //do not need to try other ways if used DT
+            return "none";
+        }
+
+        //No full DT => On Windows we can not launch FX anyways
+        //   but may have old JRE
+        //And we might be able to launch on Mac/Linux
+
+
+        //This is only IE on Windows. This gives no update version. only e.g. 1.6.0
+        //and also cause java plugin to be loaded => browser will need to be restarted
+        //if new JRE is installed.
+        //However, if we got here than DT is not available and autoinstall is not possible
+        if (ua.ie) {
+            var lst = ["1.8.0", "1.7.0", "1.6.0", "1.5.0"];
+            for (var v = 0; v < lst.length; v++) {
+                if (versionCheck(jre, lst[v])) {
+                    try {
+                        //TODO: FIXME: This does not seem to work in my testing in IE7?
+                        var axo = new ActiveXObject("JavaWebStart.isInstalled." + lst[v] + ".0");
+                        // This is not hit if the above throws an exception.
+                        return "ok";
+                    } catch (ignored) {
+                    }
+                }
+            }
+        }
+
+
+        return "none";
+    }
+
+    function checkJRESupport() {
+        //Negative test. New platforms will not be rejected
+        var osProblem = ['iPhone', 'iPod'];
+        var os = containsAny(osProblem, navigator.userAgent);
+
+        //Do not support Chrome/Mac as Chrome is 32 bit only
+        var browser = (ua.mac && ua.chrome && ua.cputype == "intel");
+
+        //autoinstall possible if native plugin is detected or OS is fine
+        auto = os || (getPlugin() != null);
+
+        //false is no problem found
+        return {os: os, browser: browser, auto: auto};
+    }
+
+    //it is not clear if we can work in IE6
+    // but it is hard to test and JRE7 does not even support it
+    // mark as unsupported for now
+    function isUnsupportedVersionOfIE() {
+        if (ua.ie) {
+            try {
+              //these functions are defined in IE only
+              var v = 10*ScriptEngineMajorVersion() + ScriptEngineMinorVersion();
+              if (v < 57) return true; //IE7 will have 57
+            } catch (err) {
+                //really old IE?
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function checkFXSupport() {
+        var browser;
+        if (ua.win) {
+            //do not support Opera and Safari
+            // (not really tested, may be it works but known to have problems with DT detection)
+            browser = ua.op || ua.wk || isUnsupportedVersionOfIE();
+
+            //false is no problem found
+            return {os: false, browser: browser};
+        } else if (ua.mac && ua.cputype == "intel") { //do not support PPC/iphone/ipad ...
+            var os = !versionCheck("10.7.3+", ua.osVersion, false); //10.7.3 or later!
+            browser = ua.op ||
+                (ua.mac && ua.chrome); //Opera is not supported
+            //Chrome on Mac is 32 bit => plugin only work in 64 bit ...
+            //TODO: How do we detect FF running in 32 bit mode?
+
+            //false is no problem found
+            return {os: os, browser: browser};
+        } else if (ua.linux) {
+            browser = ua.op; //Opera unsupported
+
+            //false is no problem found
+            return {os: false, browser: browser};
+        } else {
+            //unknown unsupported OS
+            return {os: true, browser: false};
+        }
+    }
+
+    function relaxVersion(v) {
+        if (notNull(v) && v.length > 0) {
+            var c = v.charAt(v.length - 1);
+            if (c == '*') {
+              v = v.substring(0, v.length - 1)+"+";
+            } else if (c != '+') { //exact version (e.g. 1.6)
+                v = v + "+";
+            }
+        }
+        return v;
+    }
+
+    //we relax validation rules where we try to embed or launch app
+    // in order to deal with requests for OLDER jres at the java level
+    //Basically we convert request for version in JRE family to request for any future JRE
+    //We do NOT do same for JavaFX right now. There is no real need before 3.0 and it is not clear if it is good thing
+    //
+    //Note we keep validation strict for install and validate-only scenarios.
+    // This allows to query accurate details from javascript
+    function doValidateRelaxed(platform) {
+        var p = new dtjava.Platform(platform);
+
+        p.jvm = relaxVersion(p.jvm);
+        //p.javafx = relaxVersion(p.javafx);
+
+        return doValidate(p);
+    }
+
+    function doValidate(platform, noPluginWebBrowser) {
+        //ensure some platform is set (we could get array too!)
+        platform = new dtjava.Platform(platform);
+
+        //problem markers
+        var fx = "ok", jre = "ok", restart = false, os = false, browser = false,
+            p, details;
+
+        //check JRE
+        if (notNull(platform.jvm) && jreCheck(platform.jvm) != "ok") { //matching JRE not found
+            var res = jreCheck("1+");
+            if (res == "ok") {
+                jre = "old";
+            } else {
+                jre = res; //"none" or "disabled"
+            }
+
+            details = checkJRESupport();
+            if (details.os) {
+                jre = "unsupported";
+                os = true;
+            } else if(noPluginWebBrowser) {
+		jre = "ok";
+	    } else {
+                browser = details.browser;
+            }
+        }
+
+        //check FX
+        if (notNull(platform.javafx)) {
+            details = checkFXSupport();
+            if (details.os) { //FX is not supported,
+                              //do not even try
+                fx = "unsupported";
+                os = os || details.os;
+            } else if(noPluginWebBrowser) {
+                fx = "ok";
+	    } else if( details.browser) {
+                browser = browser || details.browser;
+            } else {
+                //on non windows platforms automated install is not possible
+                // (if it is needed on windows and possible we will set it to false later)
+
+                if (ua.fx != null) {
+                  //found cobundled JavaFX on 7u6+ (and it is NPAPI-based browser)
+                  if (versionCheckFX(platform.javafx, ua.fx)) {
+                        fx = "ok";
+                  } else if (versionCheckFX("2.0+", ua.fx)) {
+                        fx = "old";
+                  }
+                } else if (ua.win) { //could be 7u6(cobundle)/IE or JRE6/FX
+                  try {
+                    p = getPlugin();
+                    //typeof did not work in IE
+                    var v = p.getInstalledFXVersion(platform.javafx);
+                    // If not found then try for the latest family (e.g. if the requested FX version is "2.2" and "8.0.5" is installed
+                    // we should not report that FX is old or does not exist. Instead we should continue with "8.0.5" and than either relaunch
+                    // with the requested JRE or offer the user to launch the app using the latest JRE installed).
+                    if (v == "" || v == null) {
+                        v = p.getInstalledFXVersion(platform.javafx + '+');
+                    }
+                    //if found we should get version string, otherwise empty string or null. If found then fx=false!
+                    if (v == "" || v == null) {
+                        v = p.getInstalledFXVersion("2.0+"); //check for any FX version
+                        if (v == null || v == "") {
+                            fx = "none";
+                        } else {
+                            fx = "old";
+                        }
+                    }
+                  } catch(err) {
+                    //If we got here then environment is supported but
+                    //this is non FX aware JRE => no FX and can only offer manual install
+                    // (restart needed as toolkit is already loaded)
+                    fx = "none";
+                  }
+                } else if (ua.mac || ua.linux) {
+                    fx = "none";
+                }
+            }
+        }
+
+        //recommend relaunch if OS is ok but browser is not supported
+        restart = restart || (!os && browser);
+
+        //TODO: need a way to find out if java plugin is loaded => will need to relaunch
+
+        //we need to return null if everything is ok. Check for problems.
+        if (fx != "ok" || jre != "ok" || restart || os || browser) {
+            return new PlatformMismatchEvent(
+                {fx: fx, jre: jre, relaunch: restart, os: os, browser: browser,
+                    platform: platform});
+        } else {
+            //if all looks good check JRE again, it could be false positive
+            if (ua.override == false && !noPluginWebBrowser && !doublecheckJrePresence()) {
+               return new PlatformMismatchEvent(
+                 {fx: fx, jre: "none", relaunch: restart, os: os,
+                     browser: browser, platform: platform});
+            }
+        }
+
+        return null;
+    }
+
+    //TODO: does it make sense to have a way to explicitly request locale?
+    function guessLocale() {
+        var loc = null;
+
+        loc = navigator.userLanguage;
+        if (loc == null)
+            loc = navigator.systemLanguage;
+        if (loc == null)
+            loc = navigator.language;
+
+        if (loc != null) {
+            loc = loc.replace("-", "_")
+        }
+        return loc;
+    }
+
+    function getJreUrl(loc) {
+        if (!notNull(loc)) {
+            loc = guessLocale();
+        }
+        return 'https://java.com/dt-redirect?' +
+            ((notNull(window.location) && notNull(window.location.href)) ?
+                ('&returnPage=' + window.location.href) : '') +
+            (notNull(loc) ? ('&locale=' + loc) : '');
+        //NB: brand parameter is not supported for now
+    }
+
+    function getFxUrl(locale) {
+        return "http://www.oracle.com/technetwork/java/javafx/downloads/index.html";
+    }
+
+    //return true if mismatch event suggest to perform installation
+    function isMissingComponent(v) {
+        if (v != null) {
+            var jre = v.jreStatus();
+            var fx = v.javafxStatus();
+            //if anything is disabled then this need to be resolved before any further installs
+            return (jre == "none" || fx == "none" || jre == "old" || fx == "old")
+               && (fx != "disabled" && jre != "disabled");
+        }
+        return false;
+    }
+
+    function showClickToInstall(ld, isJRE, isUpgrade, isAutoinstall, isRelaunchNeeded, actionFunc) {
+        //what product?
+        var productName, productLabel;
+        if (isJRE) {
+            productName = "Java";
+            productLabel = "java";
+        } else {
+            productName = "JavaFX";
+            productLabel = "javafx";
+        }
+
+        var msg1, msg2, imgName;
+        if (isUpgrade) {
+            msg1 = "A newer version of " + productName + "is required to view the content on this page.";
+            msg2 = "Please click here to update " + productName;
+            imgName = "upgrade_"+productLabel+".png";
+        } else {
+            msg1 = "View the content on this page.";
+            msg2 = "Please click here to install " + productName;
+            imgName = "get_"+productLabel+".png";
+        }
+        var altText = "Click to install "+productName;
+
+        doShowMessageInTheArea(ld, msg1, msg2, altText, imgName, actionFunc);
+    }
+
+    function doShowMessageInTheArea(ld, msg1, msg2, altText, imgName, actionFunc) {
+        //if image will fit (size 238x155)
+        var r = d.createElement("div");
+        r.width = normalizeDimension(ld.width);
+        r.height = normalizeDimension(ld.height);
+
+        var lnk = d.createElement("a");
+        lnk.href="";
+        lnk.onclick = function() {actionFunc(); return false;};
+        if (ld.width < 250 || ld.height < 160) { //if relative size this will fail =>
+                                                 // will choose image
+            r.appendChild(
+               d.createElement("p").appendChild(
+                  d.createTextNode(msg1)));
+            lnk.appendChild(d.createTextNode(msg2));
+            r.appendChild(lnk);
+        } else {
+            var img = d.createElement("img");
+            img.src = jscodebase + imgName;
+            img.alt = altText;
+            img.style.borderWidth="0px";
+            img.style.borderStyle="none";
+//FIXME: centering image does not work (in a way it also work with relative dimensions ...)
+//            lnk.style.top="50%";
+//            lnk.style.left="50%";
+//            lnk.style.marginTop = -119; // 238/2
+//            lnk.style.marginLeft = -77; //155/2
+            lnk.appendChild(img);
+            r.appendChild(lnk);
+        }
+        wipe(ld.placeholder);
+        ld.placeholder.appendChild(r);
+    }
+
+    function canJavaFXCoBundleSatisfy(platform) {
+        // check if latest co-bundle can satisfy
+        if (versionCheck(platform.jvm, minJRECobundleVersion, false) &&
+            versionCheckFX(platform.javafx, "2.2.0")) {
+            return true;
+        }
+        return false;
+    }
+
+    function defaultInstallHandler(app, platform, cb,
+                                   isAutoinstall, needRelaunch, launchFunc) {
+        var installFunc = function() {
+            doInstall(app, platform, cb, launchFunc);
+        };
+
+        var s = doValidate(platform);
+        if (!notNull(s)) { //platform match => nothing to install
+            if (notNull(launchFunc)) {
+                launchFunc();
+            }
+        }
+
+        var isUpgrade = notNull(s) && (s.javafxStatus() == "old" || s.jreStatus() == "old");
+        if (notNull(app.placeholder)) { //embedded
+            if (canJavaFXCoBundleSatisfy(platform)) { //if both JRE and FX are missing we will start install from JRE
+                //it is only JRE that needs to be updated
+               showClickToInstall(app, true, isUpgrade, isAutoinstall, needRelaunch, installFunc);
+            } else {
+               showClickToInstall(app, (s.jreStatus() != "ok"), isUpgrade, isAutoinstall, needRelaunch, installFunc);
+            }
+        } else { //webstart
+          var r = isAutoinstall;
+          var msg = null;
+          if (!r) {
+             if (canJavaFXCoBundleSatisfy(platform)) { //if both JRE and FX are missing we will start install from JRE
+                 //it is only JRE that needs to be updated
+                 if (isUpgrade) {
+                     msg = "A newer version of Java is required to view the content on this page. Please click here to update Java.";
+                 } else {
+                     msg = "To view the content on this page, please click here to install Java.";
+                 }
+                 r = confirm(msg);
+             } else {
+                 if (isUpgrade) {
+                     msg = "A newer version of JavaFX is required to view the content on this page. Please click here to update JavaFX.";
+                 } else {
+                     msg = "To view the content on this page, please click here to install JavaFX.";
+                 }
+                 r = confirm(msg);
+             }
+          }
+          if (r)
+             installFunc();
+        }
+    }
+
+    /**
+     * returns true if we can enable DT plugin auto-install without chance of
+     * deadlock on cert mismatch dialog
+     *
+     * requestedJREVersion param is optional - if null, it will be
+     * treated as installing any JRE version
+     *
+     * DT plugin for 6uX only knows about JRE installer signed by SUN cert.
+     * If it encounter Oracle signed JRE installer, it will have chance of
+     * deadlock when running with IE.  This function is to guard against this.
+     */
+    function enableWithoutCertMisMatchWorkaround(requestedJREVersion) {
+
+       // Non-IE browser are okay
+       if (!ua.ie) return true;
+
+       // if DT plugin is 10.0.0 or above, return true
+       // This is because they are aware of both SUN and Oracle signature and
+       // will not show cert mismatch dialog that might cause deadlock
+       if (versionCheck("10.0.0+", getPlugin().version, false)) {
+          return true;
+       }
+
+       // If we got there, DT plugin is 6uX
+
+       if (requestedJREVersion  == null) {
+          // if requestedJREVersion is not defined - it means ANY.
+          // can not guarantee it is safe to install ANY version because 6uX
+          // DT does not know about Oracle certificates and may deadlock
+          return false;
+       }
+
+       // 6u32 or earlier JRE installer used Sun certificate
+       // 6u33+ uses Oracle's certificate
+       // DT in JRE6 does not know about Oracle certificate => can only
+       // install 6u32 or earlier without risk of deadlock
+       return !versionCheck("1.6.0_33+", requestedJREVersion);
+    }
+
+    // return true if we can auto-install to satisfy the platform requirement
+    // return false otherwise
+    //
+    // We can auto-install if all below is true:
+    //   - windows platform
+    //   - native DT plugin available
+    //   - if JRE install is required, JRE exe is signed by compatible
+    //       certificate
+    //   - if FX install is required, JRE co-bundle can satisfy the
+    //       requirement or DT plugin supports FX auto-install
+    function isAutoInstallEnabled(platform, jre, fx) {
+       // auto-install is windows only
+       if (!ua.win) return false;
+
+       // if no DT plugin, return false
+       // if DT plugin is there but not operational (e.g. blocked)
+       //  then pretend there is no autoinstall
+       var p = getPlugin();
+       if (p == null || !isDef(p.version)) return false;
+
+       if (jre != "ok") {
+           // need JRE install
+           if (!enableWithoutCertMisMatchWorkaround(platform.jvm)) {
+               return false;
+           }
+       }
+
+       if (fx != "ok") {
+            if (!canJavaFXCoBundleSatisfy(platform)) {
+                // no cobundle, check if there is standalone FX auto-install
+                // DT from Java 7 or later should be ok
+                if (!versionCheck("10.0.0+", getPlugin().version, false)) {
+                    return false;
+                }
+            } else {
+                // we are going to install co-bundle JRE - check if we can do
+                // that
+                if (!enableWithoutCertMisMatchWorkaround(minJRECobundleVersion)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    function doInstall(app, platform, cb, postInstallFunc) {
+        var s = doValidate(platform);
+
+        cb = new dtjava.Callbacks(cb);
+
+        if (notNull(s) && s.isUnsupportedPlatform()) {
+            reportPlatformError(app, s, cb);
+            return false; //no install
+        }
+
+        var placeholder = (app != null) ? app.placeholder : null;
+
+        var codes, status;
+        if (isMissingComponent(s)) { //otherwise nothing to install
+            if (s.jre != "ok") {
+                if (isDef(cb.onInstallStarted)) {
+                    cb.onInstallStarted(placeholder, "Java",
+                                        false, getPlugin() != null);
+                }
+                startManualJREInstall();
+            } else { //what it could be??
+              reportPlatformError(app, s, cb);
+            }
+        } else {
+            //nothing to install
+            if (postInstallFunc != null) {
+                postInstallFunc();
+            }
+            return true;
+        }
+        //no install initiated
+        return false;
+    }
+
+    //just open download URL in new window
+    function startManualJREInstall() {
+        w.open(getJreUrl());
+    }
+
+    //just open download URL in new window
+    function startManualFXInstall() {
+        w.open(javafxURL);
+    }
+
+    function defaultGetSplashHandler(ld) {
+        if (ld.placeholder != null) {
+            var _w = ld.width, _h = ld.height;
+            //prepare image
+            //if width and height are relative then comparison with int will be false
+            //  and we will end up using large image. This is on purpose
+            //  as it is unlikely that relative dimensions are used for tiny applet areas
+            var isBig = !(_w < 100 && _h < 100);
+            var iU = isBig ? 'javafx-loading-100x100.gif' : 'javafx-loading-25x25.gif';
+            var iW = isBig ? 80 : 25;
+            var iH = isBig ? 80 : 25;
+
+            var img = d.createElement("img");
+            img.src = jscodebase + iU;
+            img.alt = "";
+            //position in the center of the container
+            img.style.position = "relative";
+            img.style.top = "50%";
+            img.style.left = "50%";
+            img.style.marginTop =  normalizeDimension(-iH/2);
+            img.style.marginLeft = normalizeDimension(-iW/2);
+
+            return img;
+        } else {
+            //webstart or install case
+            //TODO: show some html splash for webstart? how to hide it?
+            return null;
+        }
+    }
+
+    function defaultGetNoPluginMessageHandler(app) {
+        if (app.placeholder != null) {
+            var p = d.createElement("p");
+            p.appendChild(d.createTextNode("FIXME - add real message!"));
+            return p;
+        } //no op if not embedded content
+        return null;
+    }
+
+    //remove all child elements for given node
+    function wipe(c) {
+        while(c.hasChildNodes()) c.removeChild(c.firstChild);
+    }
+
+    function defaultInstallStartedHandler(placeholder, component, isAuto, restartNeeded) {
+        if (placeholder != null) {
+            var code = null;
+            if (isAuto) {
+                code = (component == "JavaFX") ?
+                    "install:inprogress:javafx": "install:inprogress:jre";
+            } else {
+                code = (component == "JavaFX") ?
+                    "install:inprogress:javafx:manual" : "install:inprogress:jre:manual";
+            }
+
+            appletInfoMsg(code);
+        }
+    }
+
+    function defaultInstallFinishedHandler(placeholder, component, status, relaunch) {
+        var t;
+        if (status != "success") {
+            var msg = null;
+            if (component == "javafx") {
+                if (!doublecheckJrePresence()) { //guess if we failed due to no JRE
+                    //need to request to install JRE first
+                    msg = "install:fx:error:nojre";
+                } else {
+                    msg = "install:fx:"+status;
+                }
+            } else { //must be JRE error
+                msg = "install:jre:"+status;
+            }
+            if (placeholder != null) {
+                t = appletErrorMsg(msg, null);
+
+                //Instead of hiding splash and applet we simply clear the container
+                //We are not going to show neither splash nor applet anyways ...
+                wipe(placeholder);
+                placeholder.appendChild(t);
+            } else {
+                w.alert(webstartErrorMsg(msg));
+            }
+        } else { //success
+            if (relaunch) {
+                t = appletInfoMsg("install:fx:restart");
+
+                //Instead of hiding splash and applet we simply clear the container
+                //We are not going to show neither splash nor applet anyways ...
+                wipe(placeholder);
+                placeholder.appendChild(t);
+            }
+        }
+    }
+
+    function defaultDeployErrorHandler(app, r) {
+        if (r == null) {
+            code = "success";
+        } else if (r.isUnsupportedBrowser()) {
+            code = "browser";
+        } else if (r.jreStatus() != "ok") {
+            code = "jre:" + r.jreStatus();
+        } else if (r.javafxStatus() != "ok") {
+            code = "javafx:" + r.javafxStatus();
+        } else if (r.isRelaunchNeeded()) {
+            code = "relaunch";
+        } else {
+            code = "unknown " + r.toString();
+        }
+
+        if (app.placeholder != null) {//embedded app
+            showAppletError(app.id, code, null);
+        } else { //webstart or install case
+            w.alert(webstartErrorMsg(code));
+        }
+    }
+
+    function defaultRuntimeErrorHandler(id) {
+        var el_applet = findAppletDiv(id);
+
+        if (getErrorDiv(id) != null) {
+            showAppletError(id, "launch:fx:generic:embedded",
+                function() {showHideApplet(findAppletDiv(id), false); return false;});
+        } else {
+            w.alert(webstartErrorMsg("launch:fx:generic"));
+        }
+    }
+
+    //TODO: Does availability of object mean initialization is completed (or even started?)
+    //Can we expect that any subsequent call to this object will actually work?
+    //Perhaps it is false alarm
+    function getPlugin() {
+        var result = null;
+
+        if (ua.override == false) {
+            navigator.plugins.refresh(false);
+            result = document.getElementById('dtjavaPlugin');
+        }
+
+        return result;
+    }
+
+    function installNativePlugin() {
+        //already installed?
+        if (getPlugin() != null) return;
+
+        //can not install plugin now as page has no body yet, postpone
+        //NB: use cbDone here to avoid infinite recursion (corner case)
+        if (!notNull(d.body) && !cbDone) {
+            addOnDomReadyInternal(function() {
+                installNativePlugin();
+            });
+            postponeNativePluginInstallation = true;
+            return;
+        }
+
+        var p = null;
+        if (ua.ie) {
+            p = d.createElement('object');
+            //TODO: zero size does not work?? How we can make it less intrusive for layout?
+            p.width  = '1px';
+            p.height = '1px';
+            //new CLSID, one with 0000-0000 had been kill bit
+            p.classid = 'clsid:CAFEEFAC-DEC7-0000-0001-ABCDEFFEDCBA';
+        } else {
+            // Safari and Opera browsers find the plugin but it
+            // doesn't work, so until we can get it to work - don't use it.
+            if (!ua.wk && !ua.op && navigator.mimeTypes != null) {
+                // mime-type of the DeployToolkit plugin object
+                // (do not care about old DT plugin anymore)
+                var mimeType = 'application/java-deployment-toolkit';
+                var newDT = false;
+                for (var i = 0; i < navigator.mimeTypes.length; i++) {
+                    var mt = navigator.mimeTypes[i];
+                    newDT = newDT || ((mt.type == mimeType) && mt.enabledPlugin);
+                }
+                if (newDT) {
+                    p = d.createElement('embed');
+                    p.setAttribute('type', newDT ? mimeType : oldMimeType);
+                    p.setAttribute('hidden', 'true');
+                }
+            }
+        }
+        if (p != null) {
+            p.setAttribute('id', 'dtjavaPlugin');
+            d.body.appendChild(p);
+
+            // Update internal versions from plug-in if needed
+            if (ua.deploy == null && isDef(p.version)) {
+                ua.deploy = p.version;
+            }
+        }
+    }
+
+    var appletCounter = 0;
+
+    function prepareAppletID(ld) {
+        if (notNull(ld.id)) {
+            return ld.id;
+        } else {
+            appletCounter++;
+            return ("dtjava-app-" + appletCounter);
+        }
+    }
+
+    //returns object that represents an applet/object tag
+    function getAppletSnippet(ld, platform, cb) {
+        //we use wrapper div here as changing style on applet tag
+        // cause liveconnect to be initialized and slows down startup
+        var wrapper = d.createElement("div");
+        wrapper.width = normalizeDimension(ld.width);
+        wrapper.height = normalizeDimension(ld.height);
+        wrapper.id = ld.id + "-app";
+        //without this it splash will not work in Chrome
+        wrapper.style.position = "relative";
+
+        var r = d.createElement("applet"); //TODO: use object!
+
+        r.code = "dummy.class";
+        r.id = ld.id;
+        r.width = normalizeDimension(ld.width);
+        r.height = normalizeDimension(ld.height);
+
+        //things added unconditionally
+        var sparams = {"jnlp_href" : ld.url,
+            "java_status_events" : true,
+            "type" : "application/x-java-applet"};
+
+        if (notNull(ld.jnlp_content)) {
+            sparams['jnlp_embedded'] = ld.jnlp_content;
+        }
+        if (notNull(platform.javafx)) {
+            //for swing applications embedding FX we do not want this property as it will
+            // trigger FX toolkit and lead to app failure!
+            if (!notNull(ld.toolkit) || ld.toolkit == "fx") {
+               sparams["javafx_version"] = ((platform.javafx == "*") ? "2.0+" : platform.javafx);
+            }
+            //FX requires new VM per applet, do it unconditionally
+            sparams["separate_jvm"] = true;
+            sparams["javafx_applet_id"] = r.id;
+            //enable scripting for FX unconditionally for now
+            sparams["scriptable"] = true;
+        } else {
+            if (ld.scriptable) {
+                sparams["scriptable"] = true;
+            }
+            if (ld.sharedjvm) {
+                sparams["separate_jvm"] = true;
+            }
+        }
+        if (notNull(platform.jvmargs)) {
+            sparams["java_arguments"] = listToString(platform.jvmargs);
+        }
+
+        //prepare parameters first
+        var key, p;
+        for (key in ld.params) {
+            //do not let to override system parameters
+            if (!notNull(sparams[key])) {
+                p = d.createElement("param");
+                p.name = key;
+                p.value = ld.params[key];
+                r.appendChild(p);
+            }
+        }
+        for (key in sparams) {
+            p = d.createElement("param");
+            p.name = key;
+            p.value = sparams[key];
+            r.appendChild(p);
+        }
+
+        if (isDef(cb.onGetNoPluginMessage)) {
+            p = d.createElement("noapplet");
+            var t = cb.onGetNoPluginMessage(ld);
+            p.appendChild(t);
+            //TODO: FIXME: following line fails for me in IE7??
+            //r.appendChild(p);
+        }
+
+        wrapper.appendChild(r);
+        return wrapper;
+    }
+
+    function findAppletDiv(id) {
+        //TODO: FIXME: in static deployment scenario this seem to cause restart of plugin (in FF)
+        //Weird but similar code works in the deployJava.js ...
+        //TODO: reinvestigate
+        var el = d.getElementById(id + "-app");
+        if (el == null) { //wrapping div for applet is not required
+            el = d.getElementById(id);
+        }
+        return el;
+    }
+
+    //IMPORTANT: whilst we can update style on the applet element itself
+    //  this is not best idea as this may also cause wait till liveconnect
+    //  is initialized and slow startup.
+    function showHideApplet(div, hide) {
+        if (!notNull(div)) return;
+        if (hide) {
+            div.style.left = -10000;
+        } else {
+            div.style.left = "0px";
+        }
+    }
+
+    function showHideDiv(div, hide) {
+        if (!notNull(div)) return;
+        if (hide) {
+            div.style.visibility = "hidden";
+        } else {
+            div.style.visibility = "visible";
+        }
+    }
+
+    function doHideSplash(id) {
+        try {
+            var errPane = getErrorDiv(id);
+            if (errPane != null && errPane.style != null && errPane.style.visibility == "visible") {
+                //if we have error pane shown then ignore this request
+                // (could be race condition and applet is asking to hide splash to show error too)
+                return;
+            }
+
+            var el = findAppletDiv(id);
+            showHideApplet(el, false);
+
+            //show applet first and then hide splash to avoid blinking
+            showHideDiv(d.getElementById(id + "-splash"), true);
+        } catch(err) {}
+    }
+
+    var javafxURL = "https://java.com/javafx";
+
+    //TODO: validate ALL messages are shown as expected and when expected (for applet/webstart/install)
+    var errorMessages = {
+        "launch:fx:generic" : ["JavaFX application could not launch due to system configuration.",
+            " See ", "a", "https://java.com/javafx", "java.com/javafx",
+            " for troubleshooting information."],
+        "launch:fx:generic:embedded" : ["JavaFX application could not launch due to system configuration ",
+            "(", "onclick", "show error details", ").",
+            " See ", "a", "https://java.com/javafx", "java.com/javafx",
+            " for troubleshooting information."],
+        "install:fx:restart" : ["Restart your browser to complete the JavaFX installation,",
+            " then return to this page."],
+        "install:fx:error:generic" : ["JavaFX install not completed.",
+            " See ", "a", "https://java.com/javafx", "java.com/javafx",
+            " for troubleshooting information."],
+        "install:fx:error:download" : ["JavaFX install could not start because of a download error.",
+            " See ", "a", "https://java.com/javafx", "java.com/javafx",
+            " for troubleshooting information."],
+        "install:fx:error:cancelled" : ["JavaFX install was cancelled.",
+            " Reload the page and click on the download button to try again."],
+        "install:jre:error:cancelled" : ["Java install was cancelled.",
+            " Reload the page and click on the download button to try again."],
+        "install:jre:error:generic" : ["Java install not completed.",
+            " See ", "a", "https://java.com/", "java.com",
+            " for troubleshooting information."],
+        "install:jre:error:download" : ["Java install could not start because of a download error.",
+            " See ", "a", "https://java.com/", "java.com/",
+            " for troubleshooting information."],
+        "install:inprogress:jre" : ["Java install in progress."],
+        "install:inprogress:javafx" : ["JavaFX install in progress."],
+        "install:inprogress:javafx:manual" : ["Please download and run JavaFX Setup from ",
+            "a", getFxUrl(null), "java.com/javafx",
+            ". When complete, restart your browser to finish the installation,",
+            " then return to this page."],
+        "install:inprogress:jre:manual" : ["Please download and run Java Setup from ",
+            "a", getJreUrl(), "java.com/download",
+            ". When complete, reload the page."],
+        "install:fx:error:nojre" : ["b", "Installation failed.", "br",
+            "Java Runtime is required to install JavaFX and view this content. ",
+            "a", getJreUrl(), "Download Java Runtime",
+            " and run the installer. Then reload the page to install JavaFX."],
+        "browser":    [ 'Content can not be displayed using your Web browser. Please open this page using another browser.'],
+        "jre:none":    [ 'JavaFX application requires a recent Java runtime. Please download and install the latest JRE from ',
+            'a', 'https://java.com', "java.com", '.'],
+        "jre:old" :    [ 'JavaFX application requires a recent Java runtime. Please download and install the latest JRE from ',
+            'a', 'https://java.com', "java.com", '.'],
+        "jre:plugin":  ['b', "A Java plugin is required to view this content.", 'br',
+            "Make sure that ", "a", 'https://java.com', "a recent Java runtime",
+            " is installed, and the Java plugin is enabled."],
+        "jre:blocked": ["Please give Java permission to run. This will allow Java to present content provided on this page."],
+        "jre:unsupported": ["b", "Java is required to view this content but Java is currently unsupported on this platform.",
+            "br", "Please consult ", "a", "https://java.com", "the Java documentation",
+            " for list of supported platforms."],
+        "jre:browser" : ["b", "Java plugin is required to view this content but Java plugin is currently unsupported in this browser.",
+            "br", "Please try to launch this application using other browser. Please consult ",
+            "a", "https://java.com", "the Java documentation",
+            " for list of supported browsers for your OS."],
+        "javafx:unsupported" : ["b", "JavaFX 2.0 is required to view this content but JavaFX is currently unsupported on this platform.",
+            "br", "Please consult ", "a", javafxURL, "the JavaFX documentation",
+            " for list of supported platforms."],
+        "javafx:old" :    [ 'This application requires newer version of JavaFX runtime. ',
+            'Please download and install the latest JavaFX Runtime from ',
+            'a', javafxURL, "java.com/javafx", '.'],
+        "javafx:none" : ["b", "JavaFX 2.0 is required to view this content.",
+            "br", "a", javafxURL, "Get the JavaFX runtime from java.com/javafx",
+            " and run the installer. Then restart the browser."],
+        "javafx:disabled" : ["JavaFX is disabled. Please open Java Control Panel, switch to Advanced tab and enable it. ",
+            "Then restart the browser."],
+        "jre:oldplugin" : ["New generation Java plugin is required to view this content." +
+                " Please open Java Control Panel and enable New Generation Java Plugin."],
+        "jre:disabled" : ["Java plugin appear to be disabled in your browser. ",
+                " Please enable Java in the browser options."]
+    };
+
+    //assume we get list of (tag, param, text) where both param and tag are optional
+    // Supported tags:
+    //  ("a", href value, link text)
+    //  ("b", text)
+    //  ("br")
+    //  (text) //text can not be the same as any of tag names
+    function msgAsDOM(lst, extra, onClickFunc) {
+        var i = 0;
+        var root = d.createElement("p");
+
+        if (extra != null) {
+            root.appendChild(extra);
+        }
+        var el;
+        while (i < lst.length) {
+            switch (lst[i]) {
+                case "a":
+                    el = d.createElement(lst[i]);
+                    el.href = lst[i + 1];
+                    el.appendChild(d.createTextNode(lst[i + 2]));
+                    i = i + 2;
+                    break;
+                case "br":
+                    el = d.createElement(lst[i]);
+                    break;
+                case "b":
+                    el = d.createElement(lst[i]);
+                    el.appendChild(d.createTextNode(lst[i + 1]));
+                    i++;
+                    break;
+                case "onclick":
+                    el = d.createElement("a");
+                    el.href = "";
+                    if (onClickFunc == null) {
+                       onClickFunc = function() {return false;}
+                    }
+                    el.onclick = onClickFunc;
+                    el.appendChild(d.createTextNode(lst[i + 1]));
+                    i = i + 1;
+                    break;
+                default:
+                    el = d.createTextNode(lst[i]);
+                    break;
+            }
+            root.appendChild(el);
+            i++;
+        }
+        return root;
+    }
+
+    function webstartErrorMsg(code) {
+        var m = "";
+        var lst = errorMessages[code];
+        var i = 0;
+        if (notNull(lst)) {
+          while (i < lst.length) {
+              if (lst[i] != 'a' && lst[i] != 'br' && lst[i] != 'b') {
+                  m += lst[i];
+              } else if (lst[i] == 'a') { //next element is link => skip it
+                  i++;
+              }
+              i++;
+          }
+        } else {
+            m = "Unknown error: ["+code+"]";
+        }
+        return m;
+    }
+
+    function getErrorDiv(id) {
+        return d.getElementById(id + "-error");
+    }
+
+    function showAppletError(id, code, onclickFunc) {
+        var pane = getErrorDiv(id);
+
+        if (!notNull(pane)) { //should not be possible, we add error pane right a way and then add it again before we add splash/app
+            return;
+        }
+
+        //remove old content in the ERROR PANE only (if any)
+        wipe(pane);
+
+        //populate and show pane
+        pane.appendChild(appletErrorMsg(code, onclickFunc));
+        pane.style.visibility = "visible";
+
+        //hide splash and applet
+        showHideDiv(d.getElementById(id+"-splash"), true);
+        showHideApplet(findAppletDiv(id), true);
+    }
+
+    //returns DOM subtree
+    function appletErrorMsg(code, onclickFunc) {
+        var out = d.createElement("div");
+        var img = d.createElement("img");
+        img.src = jscodebase + 'error.png';
+        img.width = '16px';
+        img.height = '16px';
+        img.alt = "";
+        img.style.cssFloat = "left";
+        img.style.styleFloat = "left"; //IE way
+        img.style.margin = "0px 10px 60px 10px";
+        img.style.verticalAlign="text-top";
+
+        var m = errorMessages[code];
+        //error message is missing => show code as fallback
+        if (!notNull(m)) {
+            m = [code];
+        }
+
+        var hideFunc = null;
+
+        if (isDef(onclickFunc)) {
+            hideFunc = function() {
+                if (notNull(out.parentNode)) {
+                  out.parentNode.removeChild(out);
+                }
+                try {
+                    onclickFunc();
+                } catch (e) {}
+                return false;
+            }
+        }
+
+        out.appendChild(msgAsDOM(m, img, hideFunc));
+        return out;
+    }
+
+    //returns DOM subtree
+    function appletInfoMsg(code) {
+        var out = d.createElement("div");
+
+        var m = errorMessages[code];
+        //error message is missing => show code as fallback
+        if (!notNull(m)) {
+            m = [code];
+        }
+
+        out.appendChild(msgAsDOM(m, null, null));
+        return out;
+    }
+
+    function normalizeApp(ld, acceptString) {
+        var app = null;
+        //normalize launch descriptor
+        if (notNull(ld)) {
+            //could be either url or set of parameters
+            if (acceptString && typeof ld === 'string') {
+                app = new dtjava.App(ld, null);
+            } else if (ld instanceof dtjava.App) {
+                app = ld;
+            } else {
+                app = new dtjava.App(ld.url, ld);
+            }
+        }
+        return app;
+    }
+
+    function setupAppletCallbacks(platform, callbacks) {
+        //set default callbacks
+        var cb = new dtjava.Callbacks(callbacks);
+
+        //disable splash if it is was not requested explicitly and
+        // it is not JavaFX app
+        if (platform.javafx == null && cb.onGetSplash === defaultGetSplashHandler) {
+            cb.onGetSplash = null;
+        }
+        return cb;
+    }
+
+    //width and height in styles need to have unit type explicitly referenced
+    // or they will not conform to strict doctypes
+    //On other hand we can have relative dimensions, e.g. 100% and these are fine without units
+    //
+    //This method will add unit type to numeric dimension specifications. E.g.
+    //   400 => 400px
+    //   -10 => -10px
+    //   50% => 50%
+    function normalizeDimension(v) {
+        if (isFinite(v)) {
+            return v + 'px';
+        } else {
+            return v;
+        }
+    }
+
+    //wrap given node s in the div
+    function wrapInDiv(ld, s, suffix) {
+        var sid = ld.id + "-" + suffix;
+        var div = d.createElement("div");
+        div.id = sid;
+        div.style.width = normalizeDimension(ld.width);
+        //this does not work well for different browsers
+        //if height is relative ...
+        //For firefox it becomes better if 100% is hardcode
+        // but then image is off in Chrome and it does not work in IE too ...
+        div.style.height = normalizeDimension(ld.height);
+        div.style.position = "absolute";
+        //TODO: provide way to specify bgcolor
+        // Perhaps app.style.bgcolor, app.style.splash-image, ... ?
+        // What was the param name supported by regular applet?
+        div.style.backgroundColor = "white";
+        if (s != null) {
+            div.appendChild(s);
+        }
+        return div;
+    }
+
+    var pendingCallbacks = {};
+
+    function doInstallCallbacks(id, cb) {
+        if (cb == null) {
+            cb = pendingCallbacks[id];
+            if (notNull(cb)) {
+              pendingCallbacks[id] = null;
+            } else {
+                return;
+            }
+        }
+        var a = document.getElementById(id);
+        if (!notNull(a)) return;
+
+        if (isDef(cb.onJavascriptReady)) {
+            var onReady = cb.onJavascriptReady;
+            if (a.status < 2) { //not READY yet
+              a.onLoad = function() {
+                  onReady(id);
+                  a.onLoad = null; //workaround bug in plugin for IE in JRE7
+              }
+            }
+        }
+
+        if (isDef(cb.onRuntimeError)) {
+            if (a.status < 3) { //not ERROR or READY yet
+               a.onError = function() {
+                  cb.onRuntimeError(id);
+                  //This used to be added as
+                  //  "workaround bug in plugin for IE in JRE7"
+                  //I do not have recollection what the bug was
+                  // and can not reproduce it now
+                  //(perhaps multiple calls into callback?)
+                  //With FX 2.0 it cause restart of the applet in IE
+                  // for reason that is not completely clear
+                  //Disable it for now
+                  /*   a.onError = null; */
+              }
+            } else if (a.status == 3) { //already failed, call handler in place
+               cb.onRuntimeError(id);
+            }
+        }
+    }
+
+
+    //we can not install applet callbacks until applet is instantiated as
+    //hook entry points are not defined and we do not control when applet is
+    //instantiated as developer may not add it to the DOM tree for a while.
+    //
+    //Therefore what we do is we insert <script> element AFTER applet tag
+    //to initiate install after applet tag is parsed
+    //
+    //However, we can not
+    //
+    function getSnippetToInstallCallbacks(id, cb) {
+        if (!notNull(cb) || !(isDef(cb.onDeployError) || isDef(cb.onJavascriptReady))) {
+            return null;
+        }
+
+        var s = d.createElement("script");
+        pendingCallbacks[id] = cb;
+        s.text = "dtjava.installCallbacks('"+id+"')";
+        return s;
+    }
+
+    function getErrorPaneSnippet(app) {
+        var paneDiv = wrapInDiv(app, null, "error");
+        paneDiv.style.visibility = "hidden";
+        return paneDiv;
+    }
+
+    function doEmbed(ld, platform, callbacks) {
+        var app = normalizeApp(ld, false);
+        //required argument is missing
+        if (!(notNull(app) && notNull(app.url) &&
+              notNull(app.width) && notNull(app.height) && notNull(app.placeholder))) {
+            //deployment error, not runtime => exception is ok
+            throw "Required attributes are missing! (url, width, height and placeholder are required)";
+        }
+
+        app.id = prepareAppletID(app);
+
+        //if placeholder is passed as id => find DOM node
+        if ((typeof app.placeholder == "string")) {
+           var p = d.getElementById(app.placeholder);
+           if (p == null) {
+               throw "Application placeholder [id="+app.placeholder+"] not found.";
+           }
+            app.placeholder = p;
+        }
+
+        //we may fail before we even try to add splash. E.g. because it is unsupported platform
+        //make sure we have error pane in place to show error
+        app.placeholder.appendChild(getErrorPaneSnippet(app));
+
+        //if we got array we need to copy over!
+        platform = new dtjava.Platform(platform);
+
+        var cb = setupAppletCallbacks(platform, callbacks);
+
+        //allow family match to match next family
+        //Once we get to java layer we will deal with it there
+        var v = doValidateRelaxed(platform);
+        var launchFunction = function() {
+            var appSnippet = getAppletSnippet(app, platform, cb);
+            var splashSnippet = (cb.onGetSplash == null) ? null : cb.onGetSplash(ld);
+
+            //what we try to do:
+            // placeholder need to have relative positioning (then splash will pe position relative to it)
+            // if splash is present it needs to have position "absolute", then it will not occupy space
+            //  and can be placed on top of applet
+            app.placeholder.style.position = "relative";
+            if (splashSnippet != null) {
+                //position splash on top of applet area and hide applet temporarily
+                var ss = wrapInDiv(app, splashSnippet, "splash");
+                showHideDiv(ss, false);
+                showHideApplet(appSnippet, true);
+
+                wipe(app.placeholder);
+                app.placeholder.appendChild(getErrorPaneSnippet(app));
+                app.placeholder.appendChild(ss);
+                app.placeholder.appendChild(appSnippet);
+            } else {
+                wipe(app.placeholder);
+                app.placeholder.appendChild(getErrorPaneSnippet(app));
+                app.placeholder.appendChild(appSnippet);
+            }
+            //Note: this is not needed as we use setTimeout for the same
+            //var cbSnippet = getSnippetToInstallCallbacks(app.id, cb);
+            //if (cbSnippet != null) {
+            //    app.placeholder.appendChild(cbSnippet);
+            //}
+            setTimeout(function() {doInstallCallbacks(app.id, cb)}, 0);
+        };
+
+        //can not launch yet
+        if (v != null) {
+            resolveAndLaunch(app, platform, v, cb, launchFunction);
+        } else {
+            launchFunction();
+        }
+    }
+
+    function extractApp(e) {
+        if (notNull(e)) {
+            var w = e.width;    //TODO: do we need to extract number? e.g. if it was 400px? or 100%?
+            var h = e.height;
+            var jnlp = "dummy"; //Can find it from list of parameters but it is not really needed in
+                                //static deployment scenario
+            return new dtjava.App(jnlp, {
+                id: e.id,
+                width: w,
+                height: h,
+                placeholder: e.parentNode
+            });
+        } else {
+            throw "Can not find applet with null id";
+        }
+    }
+
+    function processStaticObject(id, platform, callbacks) {
+        var a = d.getElementById(id); //TODO: use findAppletDiv??
+        var app = extractApp(a);
+
+        var cb = setupAppletCallbacks(platform, callbacks);
+        //Ensure some platform is set
+        platform = new dtjava.Platform(platform);
+
+        var launchFunc = function() {
+            //add error pane
+            app.placeholder.insertBefore(getErrorPaneSnippet(app), a);
+
+            if (cb.onGetSplash != null) {
+                //TODO: show splash if it was not hidden yet!
+                var splashSnippet = cb.onGetSplash(app);
+                if (notNull(splashSnippet)) {
+                    var ss = wrapInDiv(app, splashSnippet, "splash");
+                    if (notNull(ss)) {
+                        app.placeholder.style.position = "relative";
+                        app.placeholder.insertBefore(ss, a);
+                        showHideApplet(a, true);
+                    }
+                }
+            }
+
+            //TODO: install applet callbacks if they are provided
+            //Note - in theory we need to check if callbacks are supported too
+            // but if detection was not possible then it is hard to do
+            //they always wotk for FX or jre 7+ but how validate this?
+            //otherwise attempt to set them will block js and then trigger exception ...
+        }
+
+        var v = doValidateRelaxed(platform);
+        if (v != null) {
+            //TODO: Problem
+            //  if FX missing and static deployment
+            // then JRE will try to autoinstall itself - this will cause popup
+            // Then DT will detect problem and also initiate install too
+            //   a) double install
+            //   b) if popup is canceled then we still offer to install again but it will not help applet to launch
+            //   c) popup is unconditional and really ugly ...
+            //But popup comes from JRE7 - can not fix it, on other hand 6 will go manual install route
+
+            resolveAndLaunch(app, platform, v, cb, launchFunc);
+        } else {
+            launchFunc();
+        }
+    }
+
+    function doRegister(id, platform, cb) {
+        //we will record static object and process it once onload is done
+        addOnDomReady(function() {
+            processStaticObject(id, platform, cb);
+        });
+    }
+
+    //perform basic (lightweight) initialization
+    init();
+
+    /**
+     The Java Deployment Toolkit is utility to deploy Java content in
+     the browser as applets or applications using right version of Java.
+     If needed it can initiate upgrade of user's system to install required
+     components of Java platform.
+     <p>
+     Note that some of Deployment Toolkit methods may not be fully operational if
+     used before web page body is loaded (because DT native plugins could not be instantiated).
+     If you intend to use it before web page DOM tree is ready then dtjava.js needs to be loaded inside the
+     body element of the page and before use of other DT APIs.
+
+     @class dtjava
+     @static */
+    return {
+        /**
+         Version of Javascript part of Deployment Toolkit.
+         Increasing date lexicographically.
+
+         @property version
+         @type string
+         */
+        version: "20150817",
+
+        /**
+         Validate that platform requirements are met.
+
+         @param platform {Platform}
+         (Optional) set of platform requirements.
+         <p>
+
+         Default settings are
+         <ul>
+         <li>platform.jvm : "1.6+"
+         <li>platform.javafx : null
+         <li>platform.plugin : "*"
+         </ul>
+
+         @return {PlatformMismatchEvent}
+         Returns null if all requirements are met.
+         Return PlatformMismatchEvent describing the problem otherwise.
+         */
+        validate: function(platform) {
+            return doValidate(platform, ua.noPluginWebBrowser);
+        },
+
+        /**
+         Perform install of missing components based on given
+         platform requirements. By default if automated install is
+         not possible then manual install will be offered.
+
+         @method install
+         @param platform {Platform}
+         Description of platform requirements.
+         @param callbacks {Callbacks}
+         Optional set of callbacks to customize install experience.
+         @return {boolean}
+         Returns true if install was initiated.
+
+         */
+        install: function(platform, callbacks) {
+            return doInstall(null, platform, callbacks, null);
+        },
+
+        //              (TODO: AI: what are limitations on "connect back to origin host?"
+        //                   can someone provide us fake JNLP url to get access to other host?
+        //                   Perhaps we should support this for relative URLs only?)
+        /**
+         Launch application (not embedded into browser) based on given
+         application descriptor. If launch requirements are not met
+         then autoinstall may be initiated if requested and supported.
+         By default autoinstall is disabled.
+
+         @method launch
+         @param ld {App | string | array}
+         Application launch descriptor. Could be defined as one of following:
+         <ul>
+         <li>instance of App object,
+         <li>string with URL of application JNLP file
+         <li>or array (where URL attribute is required)
+         </ul>
+         At least link to JNLP file must be provided (could be full URL or relative to
+         document location).
+         <p>
+         Note that passing parameters through the Apps object is not supported by this method.
+         Any parameters specified will be ignored.
+
+         @param platform {Platform}
+         Optional platform requirements (such as JRE and JavaFX versions).
+
+         @param callbacks {Callbacks | array}
+         Optional set of callbacks. See Callbacks for details.
+         */
+            //this will not use jvargs either but we do not necessary need to document it
+        launch: function(ld, platform, callbacks) {
+            return doLaunch(ld, platform, callbacks);
+        },
+
+        /**
+         Embeds application into browser based on given application descriptor
+         (required elements: url of JNLP file, width and height, id or reference to placeholder node).
+         <p>
+         If JRE or JavaFX installation is required then default handler is to return "click to install" html snippet.
+         To enable autoinstall custom onDeployError handler need to be used.
+         <p>
+         If applet can not be launched because platform requirements are not met
+         (e.g. DT plugin is not available or mandatory parameters are missing)
+         return value will be null.
+         <p>
+         Set applet identifier in the launch descriptor if you want to name your
+         applet in the DOM tree (e.g. to use it from javascript later).
+
+         @method embed
+         @param ld {App | string | array}
+         Application launch descriptor. Could be defined as one of following:
+         <ul>
+         <li>instance of App object,
+         <li>array (where attribute names are same as in App object)
+         </ul>
+         At least link to JNLP file, width and height must be provided.
+         @param platform {Platform}
+         Optional platform requirements (such as JRE and JavaFX versions).
+         @param cb {Callbacks | array}
+         Optional set of callbacks. See Callbacks for details.
+         @return {void}
+         */
+        embed: function(ld, platform, cb) {
+            return doEmbed(ld, platform, cb);
+        },
+
+        /**
+         Registers statically deployed Java applet to customize loading experience
+         if Javascript is enabled.
+         <p>
+         Note that launch of statically deployed applet will be initiated
+         before this this function will get control. Hence platform
+         requirements listed here will NOT be validated prior to launch
+         and will be used if applet launch can not be initiated otherwise.
+
+         @method register
+         @param id
+         Identifier of application.
+         @param platform {Platform}
+         Optional platform requirements (such as JRE and JavaFX versions).
+         @param cb {Callbacks | array}
+         Optional set of callbacks. See Callbacks for details.
+         */
+        register: function(id, platform, callbacks) {
+            return doRegister(id, platform, callbacks);
+        },
+
+
+        /**
+         * Hides html splash panel for applet with given id.
+         * If splash panel does not exist this method has no effect.
+         * For JavaFX applications this method will be called automatically once application is ready.
+         * For Swing/AWT applets application code need to call into this method explicitly if they were deployed
+         * with custom splash handler.
+         *
+         * @method hideSplash
+         * @param id    Identifier of applet whose splash panel need to be hidden
+         */
+        hideSplash: function(id) {
+            return doHideSplash(id);
+        },
+
+        /**
+         Helper function: cross-browser onLoad support
+         <p>
+         This will call fn() once document is loaded.
+         If page is already loaded when this method is
+         called then fn() is called immediately.
+         <p>
+         If strictMode is true then fn() is called once page
+         and all its assets are loaded (i.e. when document
+         ready state will be 'complete').
+         Otherwise fn() is called after DOM tree is fully created
+         (but some assets may not yet be loaded).
+         <p>
+         It is ok to call this function multiple times. It will append
+         to existing chain of events (and do not replace them).
+
+         @method addOnloadCallback
+
+         @param {function} fn
+         (required) function to call
+
+         @param strictMode {boolean} Flag indicating whether page assets need to
+         be loaded before launch (default is false).
+         */
+        addOnloadCallback: function(fn, strictMode) {
+            //WORKAROUND for RT-21574
+            // avoid using onDomReady because it leads to deadlocks
+            if (strictMode || (ua.chrome && !ua.win)) {
+                addOnload(fn);
+            } else {
+                addOnDomReady(fn);
+            }
+        },
+
+        /**
+         * Add onJavascriptReady and onDeployError callbacks
+         * to the existing Java applet or JavaFX application.
+         * Application need to be alive in the browser DOM tree for this to work
+         *
+         * @param id {string} applet id
+         * @param cb {array}  Set of callbacks. If null then pending callbacks are installed (if any for this applet).
+         * @private
+         */
+        installCallbacks: function(id, cb) {
+            doInstallCallbacks(id, cb);
+        },
+
+        /** Platform requirements for application launch.
+
+         <p><br>
+         The version pattern strings are of the form #[.#[.#[_#]]][+|*],
+         which includes strings such as "1.6", * "2.0*", and "1.6.0_18+".
+         <p>
+
+         A star (*) means "any version within this family" where family is defined
+         by prefix and a plus (+) means "any version greater or equal to the specified version".
+         For example "1.6.0*" matches 1.6.0_25 but not 1.7.0_01,
+         whereas "1.6.0+" or "1.*" match both.
+         <p>
+         If the version pattern does not include all four version components
+         but does not end with a star or plus, it will be treated as if it
+         ended with a star.  "2.0" is exactly equivalent to "2.0*", and will
+         match any version number beginning with "2.0".
+         <p>
+         Null version string is treated as "there is no requirement to have it installed".
+         Validation will pass whether this component is installed or not.
+         <p>
+         Both "+" and "*" will match any installed version of component. However if component is not
+         installed then validation will fail.
+
+         @class Platform
+         @for dtjava
+         @constructor
+         @param r {array}
+         Array describing platform requirements. Element names should match
+         Platform properties.
+         */
+        Platform: function(r) {
+            //init with defaults
+
+            /**
+             JRE/JVM version.
+             @property jvm
+             @type version pattern string
+             @default "1.6+"
+             */
+            this.jvm = "1.6+";
+            /**
+             Minimum JavaFX version.
+             @property javafx
+             @type version pattern string
+             @default null
+             */
+            this.javafx = null;
+            /**
+             Java Plugin version.
+             If set to null then browser plugin support for embedded content is not validated.
+             @property plugin
+             @type version pattern string
+             @default "*"
+             */
+            this.plugin = "*";
+            /**
+             List of requested JVM arguments.
+             @property jvmargs
+             @type string
+             @default null
+             */
+            this.jvmargs = null;
+
+            //copy over
+            for (var v in r) {
+                this[v] = r[v];
+                //we expect jvmargs to come as array. if not - convert to array
+                if (this["jvmargs"] != null && typeof this.jvmargs == "string") {
+                    this["jvmargs"] = this["jvmargs"].split(" ");
+                }
+            }
+
+           /**
+             * @method toString
+             * @return {string}
+             *    Returns string replesentation of platform spec. Useful for debugging.
+             */
+            this.toString = function() {
+                return "Platform [jvm=" + this.jvm + ", javafx=" + this.javafx
+                + ", plugin=" + this.plugin + ", jvmargs=" + this.jvmargs + "]";
+            };
+        },
+
+        /**
+         Application launch descriptor.
+
+         @class App
+         @for dtjava
+         @constructor
+         @param url {string}
+         (Required) location of JNLP file. Could be full URL or partial
+         relative to document base.
+         @param details {array}
+         (Optional) set of values for other object properties.
+         Name should match documented object properties.
+         */
+        App: function(url, details) {
+            /**
+             Location of application's JNLP file.  Can not be null or undefined.
+             @property url
+             @type string
+             */
+            this.url = url;
+
+            //default behavior
+            this.scriptable = true;
+            this.sharedjvm = true;
+
+            if (details != undefined && details != null) {
+                /**
+                 Identifier of this App. Expected to be unique on this page.
+                 If null then it is autogenerated.
+                 @property id
+                 @type string
+                 */
+                this.id = details.id;
+                /**
+                 Base64 encoded content of JNLP file.
+                 @property jnlp_content
+                 @type string
+                 */
+                this.jnlp_content = details.jnlp_content;
+                /**
+                 Applet width. Could be absolute or relative (e.g. 50 or 50%)
+                 @property width
+                 @type string
+                 */
+                this.width = details.width;
+                /**
+                 Applet height. Could be absolute or relative (e.g. 50 or 50%)
+                 @property height
+                 @type int
+                 */
+                this.height = details.height;
+
+                /**
+                 Set of named parameters to pass to application.
+                 @property params
+                 @type array
+                 */
+                this.params = details.params;
+
+                /**
+                 If set to true then Javascript to Java bridge will be initialized.
+                 Note that some platform requirements imply Javascript bridge is initialized anyways.
+                 If set to false the Java to Javascript calls are still possible.
+
+                 //TODO: AI: will it affect applet callbacks?
+
+                 @property scriptable
+                 @type boolean
+                 @default true
+                 */
+                this.scriptable = details.scriptable;
+
+                /**
+                 True if application does not need JVM instance to be dedicated to this application.
+                 Some of platform requirements may imply exclusive use of JVM.
+                 <p>
+                 Note that even if sharing is enabled java plugin may choose to run applets in different JVM
+                 instances. There is no way to force java plugin to reuse same JVM.
+
+                 @property sharedjvm
+                 @type boolean
+                 @default true
+                 */
+                this.sharedjvm = details.sharedjvm;
+
+                /**
+                 Reference to DOM node to embed application into.
+                 If not provided by the user and application is embedded then will be allocated dynamically.
+                 <p>
+                 Note that element may be not inserted into the DOM tree yet.
+                 <p>
+                 User may also provide identifier of the existing DOM node to be used as placeholder.
+                 @property placeholder
+                 @type {DOM node | DOM node id}
+                 @default null
+                 */
+                this.placeholder = details.placeholder;
+
+                /**
+                  Tookit used by the application.
+                  By default it is "fx" (and null is treated as JavaFX too).
+                  Swing applications embedding JavaFX components need to pass "swing"
+                */
+                this.toolkit = details.toolkit;
+            }
+
+            /**
+             * Returns string representation of this object.
+             *
+             * @return {string}
+             */
+            this.toString = function() {
+                var pstr = "null";
+                var first = true;
+                if (notNull(this.params)) {
+                    pstr = "{";
+                    for (p in this.params) {
+                        pstr += ((first) ? "" : ", ") + p + " => " + this.params[p];
+                        first = false;
+                    }
+                    pstr += "}";
+                }
+                return "dtjava.App: [url=" + this.url + ", id=" + this.id + ", dimensions=(" + this.width + "," + this.height + ")"
+                    + ", toolkit=" + this.toolkit
+                    + ", embedded_jnlp=" + (notNull(this.jnlp_content) ? (this.jnlp_content.length + " bytes") : "NO")
+                    + ", params=" + pstr + "]";
+            }
+        },
+
+
+        /**
+         Set of callbacks to be used to customize user experience.
+
+         @class Callbacks
+         @for dtjava
+         @constructor
+         @param cb {list of callbacks}
+         set of callbacks to set
+         */
+        Callbacks: function(cb) {
+            /**
+             Callback to be called to obtain content of the splash panel. Gets application
+             launch descriptor as an input. If null is returned then splash is disabled.
+             Non-null return value is expected to be html snippet to be added into splash overlay.
+             Only applicable to embed().
+             <p>
+             Note that autohiding splash is not supported by all platforms. Splash will be hidden by default
+             for JavaFX application but not for Swing/AWT applets. In later case if use of splash is desirable
+             then app need to call dtjava.hideSplash() explicitly to initiate hiding splash.
+
+             @property onGetSplash
+             @type function(app)
+             @default Default splash panel for JavaFX applications embedded into web page, null otherwise.
+             */
+            this.onGetSplash = defaultGetSplashHandler;
+
+            /**
+             Called if embedding or launching application need
+             additional components to be installed. This callback is
+             responsible for handling such situation, e.g. reporting
+             need to install something to the user,
+             initiating installation using install() and
+             hiding splash panel for embedded apps (if needed).
+             After installation is complete callback implementation may
+             retry attempt to launch application using provided launch function.
+             <p>
+             This method is NOT called if platform requirement could not be met
+             (e.g. if platfrom is not supported or if installation
+             is not possible).
+             <p>Default handler provides "click to install" solution for
+             embedded application and attempt to perform installation without
+             additional questions for apps started using launch().
+             <p>
+             If handler is null then it is treated as no op handler.
+             <p>
+             Parameters:
+             <ul>
+             <li> <b>app</b> - application launch descriptor.
+                 For embedded applications app.placeholder will refer to
+                 the root of the applet area in the DOM tree (to be used for
+                 visual feedback)
+             <li> <b>platform</b> - application platform requirements
+             <li> <b>cb</b> - set of callbacks to be used during
+                   installation process
+             <li> <b>isAutoinstall</b> - true if install can be launched
+                 automatically
+             <li> <b>needRestart</b> - true if browser restart will be required
+                 once installation is complete
+             <li> <b>launchFunction</b> - function to be executed to
+                 retry launching the application once installation is finished
+             </ul>
+
+             @property onInstallNeeded
+             @type function(app, platform, cb, isAutoinstall, needRelaunch, launchFunc)
+             @default Default implementation shows "click to install" banner
+               for embedded applications or initiates installation immediately
+               for applications launched from web page.
+             */
+            this.onInstallNeeded = defaultInstallHandler;
+
+            /**
+             Called before installation of required component is triggered.
+             For manual install scenario it is called before installation
+             page is opened.
+             <p>
+             This method can be used to provide visual feedback to the user
+             during the installation. Placeholder
+             points to the area that can be used for visualization,
+             for embedded applications it will be applet area.
+             If null then callee need to find place for visualization on its own.
+             <p>
+             In case of automatic launch of installation onInstallFinished will be called
+             once installation is complete (succesfully or not).
+             <p>
+             If handler is null then it is treated as no-op handler.
+
+             Parameters:
+             <ul>
+             <li> <b>placeholder</b> - DOM element to insert visual feedback into.
+                  If null then callee need to add visual feedback to the document on its own
+                  (e.g. placeholder will be null if installation is not happening in context of embedding application into
+                  web page).
+             <li> <b>component</b> - String "Java", "JavaFX" or "Java bundle"
+             <li> <b>isAutoInstall</b> - true if installer will be launched
+                  automatically
+             <li> <b>restartNeeded</b> - boolean to specify whether browser restart will be required
+             </ul>
+
+             @property onInstallStarted
+             @type function(placeholder, component, isAuto, restartNeeded)
+             @default No-op
+             */
+            this.onInstallStarted = defaultInstallStartedHandler;
+
+            /**
+             Called once installation of required component
+             is completed. This method will NOT be called if installation is
+             performed in manual mode.
+
+             Parameters:
+             <ul>
+             <li> <b>placeholder</b> - DOM element that was passed to
+                 onInstallStarted to insert visual feedback into.
+             <li> <b>component</b> - String "jre" or "javafx"
+             <li> <b>status</b> - status code is string categorizing the status of install.
+             ("success", "error:generic", "error:download" or "error:canceled")
+             <li> <b>relaunchNeeded</b> - boolean to specify
+             whether browser restart is required to complete the installation
+             </ul>
+
+             @property onInstallFinished
+             @type function(placeholder, component, status, relaunchNeeded)
+             @default no op
+             */
+            this.onInstallFinished = defaultInstallFinishedHandler;
+
+            /**
+             This function is called if application can not be deployed because
+             current platform does not match given platform requirements.
+             It is also called if request to install missing components can not be
+             completed due to platform.
+             <p>
+             Problem can be fatal error or transient issue (e.g. relaunch needed). Further
+             details can be extracted from provided mismatchEvent. Here are some typical combinations:
+
+             <ul>
+             <li><em>Current browser is not supported by Java</em> - (r.isUnsupportedBrowser())
+             <li><em>Browser need to be restarted before application can be launched</em> - (r.isRelaunchNeeded())
+             <li>JRE specific codes
+             <ul>
+             <li><em>JRE is not supported on this platform</em> - (r.jreStatus() == "unsupported")
+             <li><em>JRE is not detected and need to be installed</em> - (r.jreStatus() == "none")
+             <li><em>Installed version of JRE does not match requirements</em> - (r.jreStatus() == "old")
+             <li><em>Matching JRE is detected but deprecated Java plugin is used and
+                     it does not support JNLP applets</em> - (r.jreStatus() == "oldplugin")
+             </ul>
+             <li> JavaFX specific codes
+             <ul>
+             <li><em>JavaFX is not supported on this platform</em> - (r.javafxStatus() == "unsupported")
+             <li><em>JavaFX Runtime is missing and need to be installed manually</em> - (r.javafxStatus() == "none")
+             <li><em>Installed version of JavaFX Runtime does not match requirements</em> - (r.javafxStatus() == "old")
+             <li><em>JavaFX Runtime is installed but currently disabled</em> - (r.javafxStatus() == "disabled")
+             </ul>
+             </ul>
+
+             Default error handler handles both application launch errors and embedded content.
+
+             @property onDeployError
+             @type function(app, mismatchEvent)
+             */
+            this.onDeployError = defaultDeployErrorHandler;
+
+            /**
+             * Called to get content to be shown in the applet area if Java plugin is not installed
+             * and none of callbacks helped to resolve this.
+             *
+             * @property onGetNoPluginMessage
+             * @type function(app)
+             * @return DOM Element object representing content to be shown in the applet area if
+             *         java plugin is not detected by browser.
+             */
+            this.onGetNoPluginMessage = defaultGetNoPluginMessageHandler;
+
+            /**
+             Called once applet is ready to accept Javascript calls.
+             Only supported for plugin version 10.0.0 or later
+             @property onJavascriptReady
+             @type function(id)
+             @default null
+             */
+            this.onJavascriptReady = null;
+
+            /**
+             Called if application failed to launch.
+             Only supported for plugin version 10.0.0 or later.
+
+             @property onRuntimeError
+             @type function(id)
+             @default no op
+             */
+            this.onRuntimeError = defaultRuntimeErrorHandler;
+
+            //overwrite with provided parameters
+            for (c in cb) {
+                this[c] = cb[c];
+            }
+        }
+    };
+}();
diff --git a/Sexta-FeiraInterface/dist/web-files/error.png b/Sexta-FeiraInterface/dist/web-files/error.png
new file mode 100644
index 0000000..8eb6617
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/error.png differ
diff --git a/Sexta-FeiraInterface/dist/web-files/get_java.png b/Sexta-FeiraInterface/dist/web-files/get_java.png
new file mode 100644
index 0000000..d1c8e8c
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/get_java.png differ
diff --git a/Sexta-FeiraInterface/dist/web-files/get_javafx.png b/Sexta-FeiraInterface/dist/web-files/get_javafx.png
new file mode 100644
index 0000000..12b3b65
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/get_javafx.png differ
diff --git a/Sexta-FeiraInterface/dist/web-files/javafx-chrome.png b/Sexta-FeiraInterface/dist/web-files/javafx-chrome.png
new file mode 100644
index 0000000..3ba304b
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/javafx-chrome.png differ
diff --git a/Sexta-FeiraInterface/dist/web-files/javafx-loading-100x100.gif b/Sexta-FeiraInterface/dist/web-files/javafx-loading-100x100.gif
new file mode 100644
index 0000000..9683db3
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/javafx-loading-100x100.gif differ
diff --git a/Sexta-FeiraInterface/dist/web-files/javafx-loading-25x25.gif b/Sexta-FeiraInterface/dist/web-files/javafx-loading-25x25.gif
new file mode 100644
index 0000000..d7b9afe
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/javafx-loading-25x25.gif differ
diff --git a/Sexta-FeiraInterface/dist/web-files/upgrade_java.png b/Sexta-FeiraInterface/dist/web-files/upgrade_java.png
new file mode 100644
index 0000000..5c40a93
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/upgrade_java.png differ
diff --git a/Sexta-FeiraInterface/dist/web-files/upgrade_javafx.png b/Sexta-FeiraInterface/dist/web-files/upgrade_javafx.png
new file mode 100644
index 0000000..91bf092
Binary files /dev/null and b/Sexta-FeiraInterface/dist/web-files/upgrade_javafx.png differ
diff --git a/Sexta-FeiraInterface/manifest.mf b/Sexta-FeiraInterface/manifest.mf
new file mode 100644
index 0000000..328e8e5
--- /dev/null
+++ b/Sexta-FeiraInterface/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/Sexta-FeiraInterface/nbproject/build-impl.xml b/Sexta-FeiraInterface/nbproject/build-impl.xml
new file mode 100644
index 0000000..1c323a9
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/build-impl.xml
@@ -0,0 +1,1421 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - test compilation
+  - test execution
+  - test debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Sexta-FeiraInterface-impl">
+    <import file="jfx-impl.xml"/>
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.6"/>
+        <property name="default.javac.target" value="1.6"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <property name="platform.java" value="${java.home}/bin/java"/>
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="profile.available">
+            <and>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+profile.available">
+            <and>
+                <isset property="profile.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <property name="manifest.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="javac.fork">
+            <or>
+                <istrue value="${jdkBug6558476}"/>
+                <istrue value="${javac.external.vm}"/>
+            </or>
+        </condition>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+        <condition property="junit.available">
+            <or>
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+            </or>
+        </condition>
+        <condition property="testng.available">
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+        </condition>
+        <condition property="junit+testng.available">
+            <and>
+                <istrue value="${junit.available}"/>
+                <istrue value="${testng.available}"/>
+            </and>
+        </condition>
+        <condition else="testng" property="testng.mode" value="mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <condition else="" property="testng.debug.mode" value="-mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <property name="java.failonerror" value="true"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-init">
+        <condition else="false" property="nb.junit.batch" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <not>
+                    <isset property="test.method"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="nb.junit.single" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <isset property="test.method"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-init-test-properties">
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
+        <property name="test.binarytestincludes" value=""/>
+        <property name="test.binaryexcludes" value=""/>
+    </target>
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+    <target if="${testng.available}" name="-init-macrodef-testng">
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                    <isset property="test.method"/>
+                </condition>
+                <union id="test.set">
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                </union>
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Sexta-FeiraInterface" testname="TestNG tests" workingDir="${work.dir}">
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                    <propertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </propertyset>
+                    <customize/>
+                </testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-test-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <echo>No tests executed.</echo>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <sequential>
+                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element name="customize2" optional="true"/>
+            <sequential>
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                    <isset property="test.method"/>
+                </condition>
+                <condition else="-suitename Sexta-FeiraInterface -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                    <matches pattern=".*\.xml" string="@{testClass}"/>
+                </condition>
+                <delete dir="${build.test.results.dir}" quiet="true"/>
+                <mkdir dir="${build.test.results.dir}"/>
+                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
+                    <customize>
+                        <customize2/>
+                        <jvmarg value="-ea"/>
+                        <arg line="${testng.debug.mode}"/>
+                        <arg line="-d ${build.test.results.dir}"/>
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                        <arg line="${testng.cmd.args}"/>
+                    </customize>
+                </j2seproject3:debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element implicit="true" name="customize2" optional="true"/>
+            <sequential>
+                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2/>
+                </j2seproject3:testng-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                        </syspropertyset>
+                    </customize2>
+                </j2seproject3:testng-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <!--
+                end of pre NB7.2 profiling section
+            -->
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <filtermapper>
+                            <replacestring from=" " to="%20"/>
+                        </filtermapper>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: Sexta-FeiraInterface was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
+    <target depends="-jfx-copylibs,-rebase-libs,jfx-deployment" name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile,jar" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee,jar" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <!--
+                pre NB7.2 profiler integration
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                end of pre NB72 profiling section
+            -->
+    <target if="netbeans.home" name="-profile-check">
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    <target depends="-profile-check,-profile-pre72,jar" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="run"/>
+    </target>
+    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcall target="run-single"/>
+    </target>
+    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
+    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <startprofiler/>
+        <antcall target="test-single"/>
+    </target>
+    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcall target="run-test-with-main"/>
+    </target>
+    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <startprofiler/>
+        <antcall target="run-applet"/>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+            <and>
+                <isset property="endorsed.classpath.cmd.line.arg"/>
+                <not>
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                TEST COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                TEST EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <!--
+                =======================
+                TEST DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: Sexta-FeiraInterface was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <and>
+                <not>
+                    <isset property="already.built.${call.subproject}"/>
+                </not>
+                <available file="${call.script}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/Sexta-FeiraInterface/nbproject/configs/Executar_como_WebStart.properties b/Sexta-FeiraInterface/nbproject/configs/Executar_como_WebStart.properties
new file mode 100644
index 0000000..32e4ea9
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/configs/Executar_como_WebStart.properties
@@ -0,0 +1,2 @@
+# Do not modify this property in this configuration. It can be re-generated.
+$label=Executar como WebStart
diff --git a/Sexta-FeiraInterface/nbproject/configs/Executar_no_Browser.properties b/Sexta-FeiraInterface/nbproject/configs/Executar_no_Browser.properties
new file mode 100644
index 0000000..f3a07e3
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/configs/Executar_no_Browser.properties
@@ -0,0 +1,2 @@
+# Do not modify this property in this configuration. It can be re-generated.
+$label=Executar no Browser
diff --git a/Sexta-FeiraInterface/nbproject/genfiles.properties b/Sexta-FeiraInterface/nbproject/genfiles.properties
new file mode 100644
index 0000000..303c8e2
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=3ec07fb5
+build.xml.script.CRC32=4e830620
+build.xml.stylesheet.CRC32=8064a381@1.80.1.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=3ec07fb5
+nbproject/build-impl.xml.script.CRC32=072b6bde
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/Sexta-FeiraInterface/nbproject/jfx-impl.xml b/Sexta-FeiraInterface/nbproject/jfx-impl.xml
new file mode 100644
index 0000000..575cf06
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/jfx-impl.xml
@@ -0,0 +1,4049 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM TEMPLATE - DO NOT EDIT ***
+***       EDIT ../build.xml INSTEAD       ***
+-->
+
+<project name="jfx-impl" default="jfx-deployment" basedir=".." xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" 
+         xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:fx="javafx:com.sun.javafx.tools.ant">
+    <description>JavaFX-specific Ant calls</description>
+
+
+    <!-- Empty placeholders for easier customization in ../build.xml -->
+    
+    <target name="-pre-jfx-jar">
+        <!-- Called right before <fx:jar> task. You can override this target in the ../build.xml file. -->
+    </target>
+
+    <target name="-post-jfx-jar">
+        <!-- Called right after <fx:jar> task. You can override this target in the ../build.xml file. -->
+    </target>
+
+    <target name="-pre-jfx-deploy">
+        <!-- Called right before <fx:deploy> task. You can override this target in the ../build.xml file. -->
+    </target>
+
+    <target name="-post-jfx-deploy">
+        <!-- Called right after <fx:deploy> task. You can override this target in the ../build.xml file. -->
+    </target>
+    
+    <target name="-pre-jfx-native">
+        <!-- Called right before the call to native packager (just after -pre-jfx-deploy). You can override this target in the ../build.xml file. -->
+    </target>
+
+    <target name="-post-jfx-native">
+        <!-- Called right after the call to native packager (just after -post-jfx-deploy). You can override this target in the ../build.xml file. -->
+    </target>
+    
+    
+    <!-- Check system and JDK version -->
+
+    <target name="-check-operating-system">
+        <condition property="running.on.mac">
+            <os family="mac"/>
+        </condition>
+        <condition property="running.on.unix">
+            <os family="unix"/>
+        </condition>
+        <condition property="running.on.windows">
+            <os family="windows"/>
+        </condition>
+        <echo message="running.on.mac = ${running.on.mac}" level="verbose"/>
+        <echo message="running.on.unix = ${running.on.unix}" level="verbose"/>
+        <echo message="running.on.windows = ${running.on.windows}" level="verbose"/>
+    </target>
+
+    <target name="-check-platform-home-fxsdk-java" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.platform.home.fxsdk.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${javafx.sdk}${file.separator}bin${file.separator}java"/>
+                    <available file="${javafx.sdk}${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-fxsdk-java" depends="-check-platform-home-fxsdk-java" if="do.set.platform.home.fxsdk.java">
+        <property name="active.platform.home.java.executable" value="${javafx.sdk}${file.separator}bin${file.separator}java"/>
+    </target>
+    <target name="-check-platform-home-java" if="platform.home">
+        <condition property="do.set.platform.home.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${platform.home}${file.separator}bin${file.separator}java"/>
+                    <available file="${platform.home}${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-java" depends="-set-platform-home-fxsdk-java,-check-platform-home-java" if="do.set.platform.home.java">
+        <property name="active.platform.home.java.executable" value="${platform.home}${file.separator}bin${file.separator}java"/>
+    </target>
+    <target name="-check-platform-home-probjdk-java" unless="active.platform.home.java.executable">
+        <condition property="do.set.platform.home.probjdk.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${java.home}${file.separator}..${file.separator}bin${file.separator}java"/>
+                    <available file="${java.home}${file.separator}..${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-probjdk-java" depends="-set-platform-home-java,-check-platform-home-probjdk-java" if="do.set.platform.home.probjdk.java">
+        <property name="active.platform.home.java.executable" value="${java.home}${file.separator}..${file.separator}bin${file.separator}java"/>
+    </target>
+    <target name="-check-platform-home-envjdk-java" unless="active.platform.home.java.executable">
+        <property environment="env"/>
+        <condition property="do.set.platform.home.envjdk.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${env.JAVA_HOME}${file.separator}bin${file.separator}java"/>
+                    <available file="${env.JAVA_HOME}${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-envjdk-java" depends="-set-platform-home-probjdk-java,-check-platform-home-envjdk-java" if="do.set.platform.home.envjdk.java">
+        <property environment="env"/>
+        <property name="active.platform.home.java.executable" value="${env.JAVA_HOME}${file.separator}bin${file.separator}java"/>
+    </target>
+    <target name="-check-platform-home-fxrt-java" depends="-check-property-javafx.runtime" if="javafx.runtime.defined">
+        <condition property="do.set.platform.home.fxrt.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${javafx.runtime}${file.separator}bin${file.separator}java"/>
+                    <available file="${javafx.runtime}${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-fxrt-java" depends="-set-platform-home-envjdk-java,-check-platform-home-fxrt-java" if="do.set.platform.home.fxrt.java">
+        <property name="active.platform.home.java.executable" value="${javafx.runtime}${file.separator}bin${file.separator}java"/>
+        <echo message="Warning: java executable not found in JDK, evaluating java executable in RT instead." level="info"/>
+    </target>
+    <target name="-check-platform-home-jre-java" unless="active.platform.home.java.executable">
+        <condition property="do.set.platform.home.jre.java">
+            <and>
+                <not><isset property="active.platform.home.java.executable"/></not>
+                <or>
+                    <available file="${java.home}${file.separator}bin${file.separator}java"/>
+                    <available file="${java.home}${file.separator}bin${file.separator}java.exe"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-platform-home-jre-java" depends="-set-platform-home-fxrt-java,-check-platform-home-jre-java" if="do.set.platform.home.jre.java">
+        <property name="active.platform.home.java.executable" value="${java.home}${file.separator}bin${file.separator}java"/>
+        <echo message="Warning: java executable not found in JDK, evaluating java executable in RT instead." level="info"/>
+    </target>
+    <target name="-check-platform-home" depends="-set-platform-home-jre-java">
+        <echo message="active.platform.home.java.executable = ${active.platform.home.java.executable}" level="verbose"/>
+        <fail message="Error:${line.separator}java executable not found !" unless="active.platform.home.java.executable"/>
+    </target>
+        
+    <target name="-check-jdk-version" depends="-do-init,-check-platform-home" unless="jdk-version-checked-in-jfximpl">
+        <local name="version-output"/>
+        <exec executable="${active.platform.home.java.executable}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
+        <echo message="version-output:${line.separator}${version-output}" level="verbose"/>
+        <condition property="have-jdk-older-than-1.6">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+                <contains string="${version-output}" substring="java version &quot;1.4"/>
+                <contains string="${version-output}" substring="java version &quot;1.5"/>
+            </or>
+        </condition>
+        <fail message="Error:${line.separator}JavaFX 2.0+ projects require JDK version 1.6+ !" if="have-jdk-older-than-1.6"/>
+        <condition property="have-jdk-7u4or5-mac">
+            <and>
+                <or>
+                    <contains string="${version-output}" substring="java version &quot;1.7.0_04"/>
+                    <contains string="${version-output}" substring="java version &quot;1.7.0_05"/>
+                </or>
+                <os family="mac"/>
+            </and>
+        </condition>
+        <condition property="have-jdk-pre7u6">
+            <or>
+                <isset property="have-jdk-older-than-1.6"/>
+                <contains string="${version-output}" substring="java version &quot;1.6"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0&quot;"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_01"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_02"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_03"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_04"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_05"/>
+            </or>
+        </condition>
+        <condition property="have-jdk-pre7u14">
+            <or>
+                <isset property="have-jdk-pre7u6"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_06"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_07"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_08"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_09"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_10"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_11"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_12"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_13"/>
+            </or>
+        </condition>
+        <property name="jdk-version-checked-in-jfximpl" value="true"/>
+        <echo message="have-jdk-7u4or5-mac = ${have-jdk-7u4or5-mac}" level="verbose"/>
+        <echo message="have-jdk-pre7u6 = ${have-jdk-pre7u6}" level="verbose"/>
+        <echo message="have-jdk-pre7u14 = ${have-jdk-pre7u14}" level="verbose"/>
+    </target>
+        
+    <target name="-check-ant-jre-version" unless="ant-jre-version-checked-in-jfximpl">
+        <local name="version-output"/>
+        <exec executable="${java.home}${file.separator}bin${file.separator}java" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
+        <echo message="version-output:${line.separator}${version-output}" level="verbose"/>
+        <condition property="have-ant-jre-pre7u6">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+                <contains string="${version-output}" substring="java version &quot;1.4"/>
+                <contains string="${version-output}" substring="java version &quot;1.5"/>
+                <contains string="${version-output}" substring="java version &quot;1.6"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0&quot;"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_01"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_02"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_03"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_04"/>
+                <contains string="${version-output}" substring="java version &quot;1.7.0_05"/>
+            </or>
+        </condition>
+        <condition property="have-jdk7-css2bin-bug">
+            <!-- as of NB7.4 release date the external css-to-bss converter is unreliable in all JDK7 versions before 7u40 (with exception of 7u14)-->
+            <and>
+                <contains string="${version-output}" substring="java version &quot;1.7"/>
+                <not><matches string="${version-output}" pattern="\bjava version &quot;1\.7\.0_(14|[4-9].)"/></not>
+            </and>
+        </condition>
+        <property name="ant-jre-version-checked-in-jfximpl" value="true"/>
+        <echo message="have-ant-jre-pre7u6 = ${have-ant-jre-pre7u6}" level="verbose"/>
+        <echo message="have-jdk7-css2bin-bug = ${have-jdk7-css2bin-bug}" level="verbose"/>
+    </target>
+
+    <target name="-check-jdk-7u4or5-mac" depends="-check-jdk-version" if="have-jdk-7u4or5-mac">
+        <fail message="Error:${line.separator}JDK 7u4 Mac and 7u5 Mac do not support WebStart and JavaFX 2.0+ browser plugin technologies.${line.separator}Please upgrade to JDK 7u6 or later."/>
+    </target>
+
+    
+    <!-- Check availability of JavaFX SDK deployment support (ant-javafx.jar) -->
+
+    <target name="-check-endorsed-javafx-ant-classpath">
+        <condition property="endorsed-javafx-ant-classpath-available">
+            <and>
+                <isset property="endorsed.javafx.ant.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.javafx.ant.classpath}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <echo message="endorsed-javafx-ant-classpath-available = ${endorsed-javafx-ant-classpath-available}" level="verbose"/>
+    </target>
+
+    <target name="-check-property-javafx.sdk">
+        <echo message="javafx.sdk = ${javafx.sdk}" level="verbose"/>
+        <condition property="javafx.sdk.defined">
+            <and>
+                <isset property="javafx.sdk"/>
+                <not><contains string="${javafx.sdk}" substring="$${platform" casesensitive="false"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.sdk.missing+default">
+            <and>
+                <equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/>
+                <not><isset property="javafx.sdk.defined"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.sdk.missing-default">
+            <and>
+                <not><equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/></not>
+                <not><isset property="javafx.sdk.defined"/></not>
+            </and>
+        </condition>
+        <echo message="javafx.sdk.defined = ${javafx.sdk.defined}" level="verbose"/>
+        <echo message="javafx.sdk.missing+default = ${javafx.sdk.missing+default}" level="verbose"/>
+        <echo message="javafx.sdk.missing-default = ${javafx.sdk.missing-default}" level="verbose"/>
+    </target>
+
+    <target name="-check-ant-javafx-in-fxsdk-lib" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.ant-javafx.in.fxsdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-fxsdk-lib" depends="-check-ant-javafx-in-fxsdk-lib" if="do.set.ant-javafx.in.fxsdk.lib">
+        <property name="ant-javafx.jar.location" value="${javafx.sdk}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-fxsdk-tools" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.ant-javafx.in.fxsdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-fxsdk-tools" depends="-set-ant-javafx-in-fxsdk-lib,-check-ant-javafx-in-fxsdk-tools" if="do.set.ant-javafx.in.fxsdk.tools">
+        <property name="ant-javafx.jar.location" value="${javafx.sdk}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-platform-home-lib" if="platform.home">
+        <condition property="do.set.ant-javafx.in.platform.home.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${platform.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-platform-home-lib" depends="-set-ant-javafx-in-fxsdk-tools,-check-ant-javafx-in-platform-home-lib" if="do.set.ant-javafx.in.platform.home.lib">
+        <property name="ant-javafx.jar.location" value="${platform.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-platform-home-tools" if="platform.home">
+        <condition property="do.set.ant-javafx.in.platform.home.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-platform-home-tools" depends="-set-ant-javafx-in-platform-home-lib,-check-ant-javafx-in-platform-home-tools" if="do.set.ant-javafx.in.platform.home.tools">
+        <property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.lib.has_jre">
+            <available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.lib.no_jre">
+            <available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <or>
+                    <isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-probjdk-lib" depends="-set-ant-javafx-in-platform-home-tools,-check-ant-javafx-in-probjdk-lib" if="do.set.ant-javafx.in.probjdk.lib">
+        <condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar" else="${java.home}${file.separator}lib${file.separator}ant-javafx.jar">
+            <isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
+        </condition>
+    </target>
+    <target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.probjdk.tools.has_jre">
+            <available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.tools.no_jre">
+            <available file="${java.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
+        </condition>
+        <condition property="do.set.ant-javafx.in.probjdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <or>
+                    <isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-probjdk-tools" depends="-set-ant-javafx-in-probjdk-lib,-check-ant-javafx-in-probjdk-tools" if="do.set.ant-javafx.in.probjdk.tools">
+        <condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar" else="${java.home}${file.separator}tools${file.separator}ant-javafx.jar">
+            <isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
+        </condition>
+    </target>
+    <target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
+        <condition property="do.set.ant-javafx.in.macjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-macjdk-lib" depends="-set-ant-javafx-in-probjdk-tools,-check-ant-javafx-in-macjdk-lib" if="do.set.ant-javafx.in.macjdk.lib">
+        <property name="ant-javafx.jar.location" value="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-envjdk-lib" unless="ant-javafx.jar.location">
+        <property environment="env"/>
+        <condition property="do.set.ant-javafx.in.envjdk.lib">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}lib${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-envjdk-lib" depends="-set-ant-javafx-in-macjdk-lib,-check-ant-javafx-in-envjdk-lib" if="do.set.ant-javafx.in.envjdk.lib">
+        <property name="ant-javafx.jar.location" value="${env.JAVA_HOME}${file.separator}lib${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-check-ant-javafx-in-envjdk-tools" unless="ant-javafx.jar.location">
+        <property environment="env"/>
+        <condition property="do.set.ant-javafx.in.envjdk.tools">
+            <and>
+                <not><isset property="ant-javafx.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}tools${file.separator}ant-javafx.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-ant-javafx-in-envjdk-tools" depends="-set-ant-javafx-in-envjdk-lib,-check-ant-javafx-in-envjdk-tools" if="do.set.ant-javafx.in.envjdk.tools">
+        <property name="ant-javafx.jar.location" value="${env.JAVA_HOME}${file.separator}tools${file.separator}ant-javafx.jar"/>
+    </target>
+    <target name="-pre-check-ant-javafx-version" depends="-set-ant-javafx-in-envjdk-tools" unless="ant-javafx-version-already-checked-in-jfximpl">
+        <condition property="do.check.ant-javafx.version">
+            <and>
+                <isset property="ant-javafx.jar.location"/>
+                <not><isset property="ant-javafx-version-already-checked-in-jfximpl"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-endorsed-javafx-ant-classpath" depends="-check-endorsed-javafx-ant-classpath,-pre-check-ant-javafx-version" if="endorsed-javafx-ant-classpath-available">
+        <property name="javafx.ant.classpath" value="${endorsed.javafx.ant.classpath}:${ant-javafx.jar.location}"/>
+    </target>
+    <target name="-set-javafx-ant-classpath" depends="-check-endorsed-javafx-ant-classpath,-pre-check-ant-javafx-version" unless="endorsed-javafx-ant-classpath-available">
+        <property name="javafx.ant.classpath" value="${ant-javafx.jar.location}"/>
+    </target>
+    <target name="-check-ant-javafx-version" depends="-pre-check-ant-javafx-version,
+            -set-endorsed-javafx-ant-classpath,-set-javafx-ant-classpath" if="do.check.ant-javafx.version">
+        <echo message="ant-javafx.jar.location = ${ant-javafx.jar.location}" level="verbose"/>
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
+            uri="javafx:com.sun.javafx.tools.ant"
+            classpath="${javafx.ant.classpath}"/>
+        <condition property="have-fx-ant-init">
+            <typefound name="javafx:com.sun.javafx.tools.ant:init-ant"/>
+        </condition>
+        <property name="ant-javafx-version-already-checked-in-jfximpl" value="true"/>
+        <echo message="have-fx-ant-init = ${have-fx-ant-init}" level="verbose"/>
+    </target>
+    <target name="-check-jfx-sdk-version-old" depends="-check-ant-javafx-version" unless="have-fx-ant-init">
+        <property name="javafx.ant.version" value="1.0"/>
+    </target>
+    <target name="-check-jfx-sdk-version-new" depends="-check-ant-javafx-version" if="have-fx-ant-init">
+        <fx:init-ant/>
+        <condition property="have-fx-ant-api-1.1">
+            <!-- new features from JavaFX 2.0.2 are available in API version 1.1 or later -->
+            <matches pattern="1.[1-9]" string="${javafx.ant.version}"/>
+        </condition>
+        <condition property="have-fx-ant-api-1.2">
+            <!-- new features from JavaFX 2.2 are available in API version 1.2 or later -->
+            <matches pattern="1.[2-9]" string="${javafx.ant.version}"/>
+        </condition>
+    </target>
+    <target name="-check-jfx-sdk-version" depends="-check-jfx-sdk-version-old, -check-jfx-sdk-version-new" unless="jfx.sdk.version.checked">
+        <echo message="Detected JavaFX Ant API version ${javafx.ant.version}" level="info"/>
+        <echo message="have-fx-ant-api-1.1 = ${have-fx-ant-api-1.1}" level="verbose"/>
+        <echo message="have-fx-ant-api-1.2 = ${have-fx-ant-api-1.2}" level="verbose"/>
+        <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+        <property name="jfx.sdk.version.checked" value="true"/>
+    </target>
+
+    <target name="-check-jfx-deployment" depends="-check-jdk-version,-check-jfx-sdk-version">
+        <condition property="jfx-deployment-available">
+            <and>
+                <or>
+                    <isset property="do.set.ant-javafx.in.fxsdk.lib"/>
+                    <isset property="do.set.ant-javafx.in.fxsdk.tools"/>
+                    <isset property="do.set.ant-javafx.in.platform.home.lib"/>
+                    <isset property="do.set.ant-javafx.in.platform.home.tools"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.lib"/>
+                    <isset property="do.set.ant-javafx.in.probjdk.tools"/>
+                    <isset property="do.set.ant-javafx.in.envjdk.lib"/>
+                    <isset property="do.set.ant-javafx.in.envjdk.tools"/>
+                </or>
+                <isset property="ant-javafx.jar.location"/>
+            </and>
+        </condition>
+        <condition property="jfx-deployment-missing+jdk7u6">
+            <and>
+                <not><isset property="jfx-deployment-available"/></not>
+                <not><isset property="have-jdk-pre7u6"/></not>
+            </and>
+        </condition>
+        <condition property="jfx-deployment-missing+javafx.sdk.missing+default">
+            <and>
+                <not><isset property="jfx-deployment-available"/></not>
+                <isset property="have-jdk-pre7u6"/>
+                <isset property="javafx.sdk.missing+default"/>
+            </and>
+        </condition>
+        <condition property="jfx-deployment-missing+javafx.sdk.missing-default">
+            <and>
+                <not><isset property="jfx-deployment-available"/></not>
+                <isset property="have-jdk-pre7u6"/>
+                <isset property="javafx.sdk.missing-default"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}JavaFX deployment library not found in active JDK.${line.separator}Please check that the JDK is correctly installed and its version is at least 7u4 on Mac or 7u6 on other systems." if="jfx-deployment-missing+jdk7u6"/>
+        <fail message="Error:${line.separator}JavaFX deployment library not found.${line.separator}JavaFX SDK path undefined. Check the definition of ${platform.active} in Java Platform Manager${line.separator}(or directly the properties platform.active and javafx.sdk in project.properties file).${line.separator}Note: If missing, the default JavaFX-enabled platform gets created automatically when creating a new JavaFX Project." if="jfx-deployment-missing+javafx.sdk.missing+default"/>
+        <fail message="Error:${line.separator}JavaFX deployment library not found.${line.separator}JavaFX SDK path undefined. Check the definition of ${platform.active} in Java Platform Manager${line.separator}(or directly the properties platform.active and javafx.sdk in project.properties file)." if="jfx-deployment-missing+javafx.sdk.missing-default"/>
+        <fail message="Error:${line.separator}JavaFX deployment library not found." unless="jfx-deployment-available"/>
+        <echo message="jfx-deployment-available = ${jfx-deployment-available}" level="verbose"/>
+    </target>
+    
+    
+    <!-- Check availability of main JavaFX runtime jar (jfxrt.jar) -->
+
+    <target name="-check-property-javafx.runtime">
+        <echo message="javafx.runtime = ${javafx.runtime}" level="verbose"/>
+        <condition property="javafx.runtime.defined">
+            <and>
+                <isset property="javafx.runtime"/>
+                <not><contains string="${javafx.runtime}" substring="$${platform" casesensitive="false"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.runtime.missing+default">
+            <and>
+                <equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/>
+                <not><isset property="javafx.runtime.defined"/></not>
+            </and>
+        </condition>
+        <condition property="javafx.runtime.missing-default">
+            <and>
+                <not><equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/></not>
+                <not><isset property="javafx.runtime.defined"/></not>
+            </and>
+        </condition>
+        <echo message="javafx.runtime.defined = ${javafx.runtime.defined}" level="verbose"/>
+        <echo message="javafx.runtime.missing+default = ${javafx.runtime.missing+default}" level="verbose"/>
+        <echo message="javafx.runtime.missing-default = ${javafx.runtime.missing-default}" level="verbose"/>
+    </target>
+
+    <target name="-check-jfxrt-in-fxrt" depends="-check-property-javafx.runtime" if="javafx.runtime.defined">
+        <condition property="do.set.jfxrt.in.fxrt.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.runtime}${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.fxrt.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.fxrt.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.runtime}${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-fxrt-old" depends="-check-jfxrt-in-fxrt" if="do.set.jfxrt.in.fxrt.old">
+        <property name="jfxrt.jar.location" value="${javafx.runtime}${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-fxrt-new" depends="-set-jfxrt-in-fxrt-old,-check-jfxrt-in-fxrt" if="do.set.jfxrt.in.fxrt.new">
+        <property name="jfxrt.jar.location" value="${javafx.runtime}${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-fxsdk-jre" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.jfxrt.in.fxsdk.jre.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.fxsdk.jre.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.fxsdk.jre.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-fxsdk-jre-old" depends="-set-jfxrt-in-fxrt-new,-check-jfxrt-in-fxsdk-jre" if="do.set.jfxrt.in.fxsdk.jre.old">
+        <property name="jfxrt.jar.location" value="${javafx.sdk}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-fxsdk-jre-new" depends="-set-jfxrt-in-fxsdk-jre-old,-check-jfxrt-in-fxsdk-jre" if="do.set.jfxrt.in.fxsdk.jre.new">
+        <property name="jfxrt.jar.location" value="${javafx.sdk}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-fxsdk-rt" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.jfxrt.in.fxsdk.rt.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}rt${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.fxsdk.rt.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.fxsdk.rt.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${javafx.sdk}${file.separator}rt${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-fxsdk-rt-old" depends="-set-jfxrt-in-fxsdk-jre-new,-check-jfxrt-in-fxsdk-rt" if="do.set.jfxrt.in.fxsdk.rt.old">
+        <property name="jfxrt.jar.location" value="${javafx.sdk}${file.separator}rt${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-fxsdk-rt-new" depends="-set-jfxrt-in-fxsdk-rt-old,-check-jfxrt-in-fxsdk-rt" if="do.set.jfxrt.in.fxsdk.rt.new">
+        <property name="jfxrt.jar.location" value="${javafx.sdk}${file.separator}rt${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-platform-home-jre" if="platform.home">
+        <condition property="do.set.jfxrt.in.platform.home.jre.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${platform.home}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.platform.home.jre.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.platform.home.jre.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${platform.home}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-platform-home-jre-old" depends="-set-jfxrt-in-fxsdk-rt-new,-check-jfxrt-in-platform-home-jre" if="do.set.jfxrt.in.platform.home.jre.old">
+        <property name="jfxrt.jar.location" value="${platform.home}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-platform-home-jre-new" depends="-set-jfxrt-in-platform-home-jre-old,-check-jfxrt-in-platform-home-jre" if="do.set.jfxrt.in.platform.home.jre.new">
+        <property name="jfxrt.jar.location" value="${platform.home}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-platform-home-rt" if="platform.home">
+        <condition property="do.set.jfxrt.in.platform.home.rt.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${platform.home}${file.separator}rt${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.platform.home.rt.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.platform.home.rt.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${platform.home}${file.separator}rt${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-platform-home-rt-old" depends="-set-jfxrt-in-platform-home-jre-new,-check-jfxrt-in-platform-home-rt" if="do.set.jfxrt.in.platform.home.rt.old">
+        <property name="jfxrt.jar.location" value="${platform.home}${file.separator}rt${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-platform-home-rt-new" depends="-set-jfxrt-in-platform-home-rt-old,-check-jfxrt-in-platform-home-rt" if="do.set.jfxrt.in.platform.home.rt.new">
+        <property name="jfxrt.jar.location" value="${platform.home}${file.separator}rt${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-jre" unless="jfxrt.jar.location">
+        <condition property="do.set.jfxrt.in.jre.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${java.home}${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.jre.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.jre.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${java.home}${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-jre-old" depends="-set-jfxrt-in-platform-home-rt-new,-check-jfxrt-in-jre" if="do.set.jfxrt.in.jre.old">
+        <property name="jfxrt.jar.location" value="${java.home}${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-jre-new" depends="-set-jfxrt-in-jre-old,-check-jfxrt-in-jre" if="do.set.jfxrt.in.jre.new">
+        <property name="jfxrt.jar.location" value="${java.home}${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-check-jfxrt-in-envjdk-jre" unless="jfxrt.jar.location">
+        <property environment="env"/>
+        <condition property="do.set.jfxrt.in.envjdk.jre.old">
+            <and>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+        <condition property="do.set.jfxrt.in.envjdk.jre.new">
+            <and>
+                <not><isset property="do.set.jfxrt.in.envjdk.jre.old"/></not>
+                <not><isset property="jfxrt.jar.location"/></not>
+                <available file="${env.JAVA_HOME}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-jfxrt-in-envjdk-jre-old" depends="-set-jfxrt-in-jre-new,-check-jfxrt-in-envjdk-jre" if="do.set.jfxrt.in.envjdk.jre.old">
+        <property name="jfxrt.jar.location" value="${env.JAVA_HOME}${file.separator}jre${file.separator}lib${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-set-jfxrt-in-envjdk-jre-new" depends="-set-jfxrt-in-envjdk-jre-old,-check-jfxrt-in-envjdk-jre" if="do.set.jfxrt.in.envjdk.jre.new">
+        <property name="jfxrt.jar.location" value="${env.JAVA_HOME}${file.separator}jre${file.separator}lib${file.separator}ext${file.separator}jfxrt.jar"/>
+    </target>
+    <target name="-pre-check-jfx-runtime" depends="-set-jfxrt-in-envjdk-jre-new">
+        <echo message="jfxrt.jar.location = ${jfxrt.jar.location}" level="verbose"/>
+    </target>
+
+    <target name="-check-jfx-runtime" depends="-check-jdk-version, -pre-check-jfx-runtime">
+        <condition property="jfx-runtime-available">
+            <and>
+                <or>
+                    <isset property="do.set.jfxrt.in.fxrt.old"/>
+                    <isset property="do.set.jfxrt.in.fxrt.new"/>
+                    <isset property="do.set.jfxrt.in.fxsdk.jre.old"/>
+                    <isset property="do.set.jfxrt.in.fxsdk.jre.new"/>
+                    <isset property="do.set.jfxrt.in.fxsdk.rt.old"/>
+                    <isset property="do.set.jfxrt.in.fxsdk.rt.new"/>
+                    <isset property="do.set.jfxrt.in.platform.home.jre.old"/>
+                    <isset property="do.set.jfxrt.in.platform.home.jre.new"/>
+                    <isset property="do.set.jfxrt.in.platform.home.rt.old"/>
+                    <isset property="do.set.jfxrt.in.platform.home.rt.new"/>
+                    <isset property="do.set.jfxrt.in.jre.old"/>
+                    <isset property="do.set.jfxrt.in.jre.new"/>
+                    <isset property="do.set.jfxrt.in.envjdk.jre.old"/>
+                    <isset property="do.set.jfxrt.in.envjdk.jre.new"/>
+                </or>
+                <isset property="jfxrt.jar.location"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}JavaFX runtime JAR not found." unless="jfx-runtime-available"/>
+        <echo message="jfx-runtime-available = ${jfx-runtime-available}" level="verbose"/>
+    </target>
+
+
+    <!-- Check availability of WebStart executable -->
+
+    <target name="-check-webstart-in-fxrt" depends="-check-property-javafx.runtime" if="javafx.runtime.defined">
+        <condition property="do.set.webstart.in.fxrt">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <isset property="javafx.runtime.defined"/>
+                <or>
+                    <available file="${javafx.runtime}${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${javafx.runtime}${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-fxrt" depends="-check-webstart-in-fxrt" if="do.set.webstart.in.fxrt">
+        <property name="active.webstart.executable" value="${javafx.runtime}${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-fxsdk-jre" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.webstart.in.fxsdk.jre">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <isset property="javafx.sdk.defined"/>
+                <or>
+                    <available file="${javafx.sdk}${file.separator}jre${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${javafx.sdk}${file.separator}jre${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-fxsdk-jre" depends="-set-webstart-in-fxrt,-check-webstart-in-fxsdk-jre" if="do.set.webstart.in.fxsdk.jre">
+        <property name="active.webstart.executable" value="${javafx.sdk}${file.separator}jre${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-fxsdk" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
+        <condition property="do.set.webstart.in.fxsdk">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <isset property="javafx.sdk.defined"/>
+                <or>
+                    <available file="${javafx.sdk}${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${javafx.sdk}${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-fxsdk" depends="-set-webstart-in-fxsdk-jre,-check-webstart-in-fxsdk" if="do.set.webstart.in.fxsdk">
+        <property name="active.webstart.executable" value="${javafx.sdk}${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-platform-home-jre" if="platform.home">
+        <condition property="do.set.webstart.in.platform.home.jre">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <or>
+                    <available file="${platform.home}${file.separator}jre${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${platform.home}${file.separator}jre${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-platform-home-jre" depends="-set-webstart-in-fxsdk,-check-webstart-in-platform-home-jre" if="do.set.webstart.in.platform.home.jre">
+        <property name="active.webstart.executable" value="${platform.home}${file.separator}jre${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-platform-home" if="platform.home">
+        <condition property="do.set.webstart.in.platform.home">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <or>
+                    <available file="${platform.home}${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${platform.home}${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-platform-home" depends="-set-webstart-in-platform-home-jre,-check-webstart-in-platform-home" if="do.set.webstart.in.platform.home">
+        <property name="active.webstart.executable" value="${platform.home}${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-jre" unless="active.webstart.executable">
+        <condition property="do.set.webstart.in.jre">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <or>
+                    <available file="${java.home}${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${java.home}${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-jre" depends="-set-webstart-in-platform-home,-check-webstart-in-jre" if="do.set.webstart.in.jre">
+        <property name="active.webstart.executable" value="${java.home}${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-probjdk" unless="active.webstart.executable">
+        <condition property="do.set.webstart.in.probjdk">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <or>
+                    <available file="${java.home}${file.separator}..${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${java.home}${file.separator}..${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-probjdk" depends="-set-webstart-in-jre,-check-webstart-in-probjdk" if="do.set.webstart.in.probjdk">
+        <property name="active.webstart.executable" value="${java.home}${file.separator}..${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-check-webstart-in-envjdk" unless="active.webstart.executable">
+        <property environment="env"/>
+        <condition property="do.set.webstart.in.envjdk">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <or>
+                    <available file="${env.JAVA_HOME}${file.separator}bin${file.separator}javaws.exe"/>
+                    <available file="${env.JAVA_HOME}${file.separator}bin${file.separator}javaws"/>
+                </or>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-webstart-in-envjdk" depends="-set-webstart-in-probjdk,-check-webstart-in-envjdk" if="do.set.webstart.in.envjdk">
+        <property name="active.webstart.executable" value="${env.JAVA_HOME}${file.separator}bin${file.separator}javaws"/>
+    </target>
+    <target name="-pre-check-webstart-in-unix" depends="-check-operating-system,-set-webstart-in-envjdk" unless="active.webstart.executable">
+        <condition property="running.on.unix-active.webstart.executable">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <isset property="running.on.unix"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-check-webstart-in-unix" depends="-pre-check-webstart-in-unix" if="running.on.unix-active.webstart.executable">
+        <local name="exec.which.javaws.result"/>
+        <exec executable="command" failifexecutionfails="false" failonerror="false" resultproperty="exec.which.javaws.result" outputproperty="exec.which.javaws.output">
+            <arg line="-v javaws"/>
+        </exec>
+        <condition property="do.set.webstart.in.unix">
+            <and>
+                <not><isset property="active.webstart.executable"/></not>
+                <isset property="exec.which.javaws.result"/>
+                <equals arg1="${exec.which.javaws.result}" arg2="0"/>
+                <isset property="exec.which.javaws.output"/>
+                <not><equals arg1="${exec.which.javaws.output}" arg2=""/></not>
+            </and>
+        </condition>
+        <echo message="do.set.webstart.in.unix = ${do.set.webstart.in.unix}" level="verbose"/>
+    </target>
+    <target name="-set-webstart-in-unix" depends="-set-webstart-in-envjdk,-check-webstart-in-unix" if="do.set.webstart.in.unix">
+        <property name="active.webstart.executable" value="${exec.which.javaws.output}"/>
+    </target>
+    <target name="-pre-check-jfx-webstart" depends="-set-webstart-in-unix">
+        <echo message="active.webstart.executable = ${active.webstart.executable}" level="verbose"/>
+    </target>
+
+    <target name="-check-jfx-webstart" depends="-pre-check-jfx-webstart">
+        <condition property="jfx-webstart-available">
+            <and>
+                <or>
+                    <isset property="do.set.webstart.in.fxrt"/>
+                    <isset property="do.set.webstart.in.fxsdk.jre"/>
+                    <isset property="do.set.webstart.in.fxsdk"/>
+                    <isset property="do.set.webstart.in.platform.home.jre"/>
+                    <isset property="do.set.webstart.in.platform.home"/>
+                    <isset property="do.set.webstart.in.jre"/>
+                    <isset property="do.set.webstart.in.probjdk"/>
+                    <isset property="do.set.webstart.in.envjdk"/>
+                    <isset property="do.set.webstart.in.unix"/>
+                </or>
+                <isset property="active.webstart.executable"/>
+            </and>
+        </condition>
+        <condition property="jfx-webstart-missing+jdk7u6">
+            <and>
+                <not><isset property="jfx-webstart-available"/></not>
+                <not><isset property="have-jdk-pre7u6"/></not>
+            </and>
+        </condition>
+        <condition property="jfx-webstart-missing+javafx.runtime.missing+default">
+            <and>
+                <not><isset property="jfx-webstart-available"/></not>
+                <isset property="have-jdk-pre7u6"/>
+                <isset property="javafx.runtime.missing+default"/>
+            </and>
+        </condition>
+        <condition property="jfx-webstart-missing+javafx.runtime.missing-default">
+            <and>
+                <not><isset property="jfx-webstart-available"/></not>
+                <isset property="have-jdk-pre7u6"/>
+                <isset property="javafx.runtime.missing-default"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}WebStart executable could not be found in active JDK.${line.separator}Please check that the JDK is correctly installed and its version is at least 7u6." if="jfx-webstart-missing+jdk7u6"/>
+        <fail message="Error:${line.separator}WebStart executable could not be found.${line.separator}JavaFX RT path undefined. Check the definition of ${platform.active} in Java Platform Manager${line.separator}(or directly the properties platform.active and javafx.runtime in project.properties file).${line.separator}Note: If missing, the default JavaFX-enabled platform gets created automatically when creating a new JavaFX Project." if="jfx-webstart-missing+javafx.runtime.missing+default"/>
+        <fail message="Error:${line.separator}WebStart executable could not be found.${line.separator}JavaFX RT path undefined. Check the definition of ${platform.active} in Java Platform Manager${line.separator}(or directly the properties platform.active and javafx.runtime in project.properties file)." if="jfx-webstart-missing+javafx.runtime.missing-default"/>
+        <fail message="Error:${line.separator}WebStart executable could not be found." unless="jfx-webstart-available"/>
+        <echo message="jfx-webstart-available = ${jfx-webstart-available}" level="verbose"/>
+    </target>
+
+    
+    <!-- Legacy targets kept for compatibility with older build-impl.xml scripts -->
+
+    <!-- Note: target "-check-javafx" is not necessary any more but is referenced from NB 7.1 build-impl.xml -->
+    <target name="-check-javafx"/>
+    <!-- Note: target "-javafx-check-error" is not necessary any more but is referenced from NB 7.1 build-impl.xml -->
+    <target name="-javafx-check-error"/>    
+    <!-- Note: target "-init-javafx" is not necessary any more but is referenced from NB 7.1 build-impl.xml -->
+    <target name="-init-javafx"/>
+
+    
+    <!-- Check project properties -->
+    
+    <target name="-check-default-run-config" unless="config">
+        <property name="config" value="&lt;default config&gt;"/>
+    </target>
+    
+    <target name="-check-project">
+        <condition property="main-class-available">
+            <isset property="javafx.main.class"/>
+        </condition>
+        <condition property="vmargs-available">
+            <and>
+                <isset property="run.jvmargs"/>
+                <not><equals arg1="${run.jvmargs}" arg2=""/></not>
+            </and>
+        </condition>
+        <condition property="preloader-available">
+            <and>
+                <isset property="javafx.preloader.enabled"/>
+                <equals arg1="${javafx.preloader.enabled}" arg2="true"/>
+                <isset property="javafx.preloader.class"/>
+                <not><equals arg1="${javafx.preloader.class}" arg2=""/></not>
+                <isset property="javafx.preloader.jar.filename"/>
+                <not><equals arg1="${javafx.preloader.jar.filename}" arg2=""/></not>
+            </and>
+        </condition>
+        <condition property="app-with-preloader">
+            <and>
+                <istrue value="${preloader-available}"/>
+                <istrue value="${main-class-available}"/>
+            </and>
+        </condition>
+        <condition property="app-with-external-preloader-jar">
+            <and>
+                <isset property="app-with-preloader"/>
+                <isset property="javafx.preloader.type"/>
+                <equals arg1="${javafx.preloader.type}" arg2="jar" trim="true"/>
+            </and>
+        </condition>
+        <condition property="app-without-preloader">
+            <and>
+                <not>
+                    <istrue value="${preloader-available}"/>
+                </not>
+                <istrue value="${main-class-available}"/>
+            </and>
+        </condition>
+        <condition property="preloader-app">
+            <and>
+                <isset property="javafx.preloader"/>
+                <equals arg1="${javafx.preloader}" arg2="true"/>
+            </and>
+        </condition>
+        <condition property="fx-in-swing-app">
+            <and>
+                <isset property="javafx.swing"/>
+                <equals arg1="${javafx.swing}" arg2="true"/>
+            </and>
+        </condition>
+        <condition property="fx-in-swing-workaround-app">
+            <and>
+                <istrue value="${fx-in-swing-app}"/>
+                <istrue value="${preloader-app}"/>
+            </and>
+        </condition>
+        <condition property="preloader-app-no-workaround">
+            <and>
+                <istrue value="${preloader-app}"/>
+                <not><istrue value="${fx-in-swing-app}"/></not>
+            </and>
+        </condition>
+        <condition property="html-template-available">
+            <and>
+                <isset property="javafx.run.htmltemplate"/>
+                <not>
+                    <equals arg1="${javafx.run.htmltemplate}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <condition property="icon-available">
+            <and>
+                <isset property="javafx.deploy.icon"/>
+                <not>
+                    <equals arg1="${javafx.deploy.icon}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <condition property="dimensions-available">
+            <and>
+                <isset property="javafx.run.width"/>
+                <isset property="javafx.run.height"/>
+                <not><equals arg1="${javafx.run.width}" arg2=""/></not>
+                <not><equals arg1="${javafx.run.height}" arg2=""/></not>
+            </and>
+        </condition>
+        <condition property="update-mode-background">
+            <and>
+                <isset property="javafx.deploy.backgroundupdate"/>
+                <equals arg1="${javafx.deploy.backgroundupdate}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="offline-allowed">
+            <and>
+                <isset property="javafx.deploy.allowoffline"/>
+                <equals arg1="${javafx.deploy.allowoffline}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="permissions-elevated">
+            <and>
+                <isset property="javafx.deploy.permissionselevated"/>
+                <equals arg1="${javafx.deploy.permissionselevated}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="binary-encode-css">
+            <and>
+                <isset property="javafx.binarycss"/>
+                <equals arg1="${javafx.binarycss}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="rebase-lib-jars">
+            <and>
+                <isset property="javafx.rebase.libs"/>
+                <equals arg1="${javafx.rebase.libs}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="use-blob-signing">
+            <and>
+                <isset property="javafx.signing.blob"/>
+                <equals arg1="${javafx.signing.blob}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <echo message="main-class-available = ${main-class-available}" level="verbose"/>
+        <echo message="vmargs-available = ${vmargs-available}" level="verbose"/>
+        <echo message="preloader-available = ${preloader-available}" level="verbose"/>
+        <echo message="app-with-preloader = ${app-with-preloader}" level="verbose"/>
+        <echo message="app-with-preloader-without-project = ${app-with-preloader-without-project}" level="verbose"/>
+        <echo message="app-without-preloader = ${app-without-preloader}" level="verbose"/>
+        <echo message="preloader-app = ${preloader-app}" level="verbose"/>
+        <echo message="fx-in-swing-app = ${fx-in-swing-app}" level="verbose"/>
+        <echo message="fx-in-swing-workaround-app = ${fx-in-swing-workaround-app}" level="verbose"/>
+        <echo message="preloader-app-no-workaround = ${preloader-app-no-workaround}" level="verbose"/>
+        <echo message="html-template-available = ${html-template-available}" level="verbose"/>
+        <echo message="icon-available = ${icon-available}" level="verbose"/>
+        <echo message="dimensions-available = ${dimensions-available}" level="verbose"/>
+        <echo message="update-mode-background = ${update-mode-background}" level="verbose"/>
+        <echo message="offline-allowed = ${offline-allowed}" level="verbose"/>
+        <echo message="permissions-elevated = ${permissions-elevated}" level="verbose"/>
+        <echo message="binary-encode-css = ${binary-encode-css}" level="verbose"/>
+        <echo message="rebase-lib-jars = ${rebase-lib-jars}" level="verbose"/>
+        <echo message="use-blob-signing = ${use-blob-signing}" level="verbose"/>
+    </target>
+
+    <target name="-swing-api-check" depends="-check-project,-check-jfx-deployment" if="fx-in-swing-app">
+        <condition property="fx-in-swing-app-workaround">
+            <and>
+                <isset property="fx-in-swing-app"/>
+                <not><isset property="have-fx-ant-api-1.2"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-swing-api-warning" depends="-swing-api-check" if="fx-in-swing-app-workaround">
+        <echo message="Info: No support for FX-in-Swing deployment detected in current JavaFX SDK. Using workaround instead."/>
+    </target>
+
+    <target name="-icon-deployment-check" depends="-check-project,-check-jfx-deployment" if="icon-available">
+        <condition property="icon-deployment-may-not-be-supported">
+            <and>
+                <isset property="icon-available"/>
+                <not><isset property="have-fx-ant-api-1.1"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-icon-warning" depends="-icon-deployment-check" if="icon-deployment-may-not-be-supported">
+        <echo message="Warning: Note that due to a bug in early JavaFX 2.0 SDK distributions the icon may not be properly set in deployment files."/>
+    </target>
+
+    <target name="-set-dimensions" depends="-check-project" if="dimensions-available">
+        <property name="javafx.width" value="${javafx.run.width}"/>
+        <property name="javafx.height" value="${javafx.run.height}"/>
+    </target>
+    <target name="-reset-dimensions" depends="-check-project" unless="dimensions-available">
+        <property name="javafx.width" value="800"/>
+        <property name="javafx.height" value="600"/>
+    </target>
+
+    <target name="-set-update-mode-background" depends="-check-project" if="update-mode-background">
+        <property name="update-mode" value="background"/>
+    </target>
+    <target name="-set-update-mode-eager" depends="-check-project" unless="update-mode-background">
+        <property name="update-mode" value="eager"/>
+    </target>
+
+    <target name="-set-permissions-elevated" depends="-check-project" if="permissions-elevated">
+        <property name="permissions.elevated" value="true"/>
+    </target>
+    <target name="-reset-permissions-elevated" depends="-check-project" unless="permissions-elevated">
+        <property name="permissions.elevated" value="false"/>
+    </target>
+
+    <target name="-set-binary-css" depends="-check-project,-init-css-conversion" if="do.copy.binary.css">
+        <property name="css-include-ext" value="bss"/>
+        <property name="css-exclude-ext" value="css"/>
+    </target>
+    <target name="-unset-binary-css" depends="-check-project,-init-css-conversion" unless="do.copy.binary.css">
+        <property name="css-include-ext" value="css"/>
+        <property name="css-exclude-ext" value="bss"/>
+    </target>
+    <target name="-copy-binary-css" depends="-init-css-conversion,-set-binary-css,-unset-binary-css,-copy-binary-css-bypass,-copy-binary-css-impl"/>
+    <target name="-init-css-conversion" depends="-check-project,-check-ant-jre-version">
+        <fileset id="cssfiles" dir="${basedir}${file.separator}${build.classes.dir}">
+            <include name="**${file.separator}*.css"/>
+        </fileset>
+        <pathconvert refid="cssfiles" property="cssfileset.notempty" setonempty="false"/>
+        <condition property="do.copy.binary.css">
+            <and>
+                <isset property="binary-encode-css"/>
+                <isset property="cssfileset.notempty"/>
+                <not><isset property="have-jdk7-css2bin-bug"/></not>
+            </and>
+        </condition>
+        <condition property="do.bypass.binary.css">
+            <and>
+                <isset property="binary-encode-css"/>
+                <isset property="cssfileset.notempty"/>
+                <isset property="have-jdk7-css2bin-bug"/>
+            </and>
+        </condition>
+        <echo message="do.copy.binary.css = ${do.copy.binary.css}" level="verbose"/>
+        <echo message="do.bypass.binary.css = ${do.bypass.binary.css}" level="verbose"/>
+    </target>
+    <target name="-copy-binary-css-bypass" depends="-init-css-conversion" if="do.bypass.binary.css">
+        <echo message="Warning: Bypassing FX CSS to BSS conversion due to a bug in &lt;fx:csstobin&gt; task in current JDK platform" level="warning"/>
+    </target>
+    <target name="-copy-binary-css-impl" depends="-init-css-conversion" if="do.copy.binary.css">
+        <property name="cssfileslist" refid="cssfiles"/>
+        <echo message="css files to binary convert: " level="verbose">${cssfileslist}</echo>
+        <fx:csstobin outdir="${basedir}${file.separator}${build.classes.dir}">
+            <fileset refid="cssfiles"/>
+        </fx:csstobin>
+    </target>
+
+
+    <!-- Copy dependent libraries -->
+    
+    <!-- Note: target "-jfx-copylibs" is referenced from NB 7.1 build-impl.xml -->
+    <target name="-jfx-copylibs" depends="init,compile,-pre-pre-jar,-pre-jar,-jfx-copylibs-warning" unless="fallback.no.javascript">
+        <jfx-copylibs-js-impl/>
+    </target>
+    <target name="-jfx-copylibs-warning" if="fallback.no.javascript">
+        <echo message="Warning: Dependent Libraries copy (-jfx-copylibs) skipped in fallback build mode due to JDK missing JavaScript support."/>
+    </target>
+    <macrodef name="jfx-copylibs-js-impl">
+        <sequential>
+            <local name="run.classpath.without.build.classes.and.dist.dir"/>
+            <pathconvert property="run.classpath.without.build.classes.and.dist.dir">
+                <path path="${run.classpath}"/>
+                <map from="${basedir}${file.separator}${build.classes.dir}" to=""/>
+                <map from="${basedir}${file.separator}${dist.jar}" to=""/>
+                <scriptmapper language="javascript">
+                    self.addMappedName(
+                        (source.indexOf("jfxrt.jar") >= 0) ||
+                        (source.indexOf("deploy.jar") >= 0) ||
+                        (source.indexOf("javaws.jar") >= 0) ||
+                        (source.indexOf("plugin.jar") >= 0)
+                        ? "" : source
+                    );
+                </scriptmapper>
+            </pathconvert>
+            <!-- add possibly missing dependencies at distance 2 (build system logic thus provides transitive closure) -->
+            <local name="run.and.lib.classpath"/>
+            <echo message="JavaScript: -jfx-copylibs" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    function prefix(s, len) {
+                        if(s == null || len <= 0 || s.length == 0) {
+                            return new String("");
+                        }
+                        return new String(s.substr(0, len));
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    var pathConvert = project.createTask("pathconvert");
+                    pathConvert.setProperty("run.and.lib.classpath");
+                    var classPath = new String(project.getProperty("run.classpath.without.build.classes.and.dist.dir"));
+                    var fileSeparator = new String(project.getProperty("file.separator"));
+                    if(defined(classPath)) {
+                        var classPathCopy = pathConvert.createPath();
+                        classPathCopy.setPath(classPath);
+                        var pathArray;
+                        if(classPath.indexOf(";") != -1) {
+                            pathArray = classPath.split(";");
+                        } else {
+                            pathArray = classPath.split(":");
+                        }
+                        var added = new java.lang.StringBuilder();
+                        for (var i = 0; i < pathArray.length; i++) {
+                            var index = pathArray[i].lastIndexOf(fileSeparator);
+                            if (index >= 0) {
+                                var onePath = prefix(pathArray[i], index+1).concat("lib");
+                                var oneDir = new java.io.File(onePath);
+                                if(oneDir.exists()) {
+                                    var fs = project.createDataType( "fileset" );
+                                    fs.setDir( oneDir );
+                                    fs.setIncludes("*.jar");
+                                    var ds = fs.getDirectoryScanner(project);
+                                    var srcFiles = ds.getIncludedFiles();
+                                    for (var j = 0; j < srcFiles.length; j++) {
+                                        if(classPath.indexOf( srcFiles[j] ) == -1 && added.indexOf( srcFiles[j] ) == -1) {
+                                            var path = pathConvert.createPath();
+                                            path.setPath( onePath.concat(fileSeparator).concat(srcFiles[j]) );
+                                            added.append( srcFiles[j] );
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    pathConvert.perform();
+                ]]>
+            </script>
+            <echo message="run.and.lib.classpath = ${run.and.lib.classpath}" level="verbose"/>
+            <delete dir="${dist.dir}${file.separator}lib" includeEmptyDirs="true" quiet="true"/>
+            <copy todir="${dist.dir}${file.separator}lib" flatten="true" preservelastmodified="true" overwrite="true">
+                <path>
+                    <pathelement path="${run.and.lib.classpath}"/>
+                </path>
+            </copy>
+        </sequential>
+    </macrodef>
+    
+    <target name="-copy-external-preloader-jar" depends="-check-project" if="app-with-external-preloader-jar">
+        <copy file="${javafx.preloader.jar.path}" todir="${dist.dir}${file.separator}lib"/>
+    </target>
+
+
+    <!-- Optional classpath re-base of dependent JAR manifests after copy to lib/, required by GlassFish -->
+
+    <!-- Note: target "-rebase-libs" is referenced from NB 7.1 build-impl.xml -->
+    <target name="-rebase-libs" depends="-check-project, -jfx-copylibs, -check-rebase-libs, -rebase-libs-warning" if="do-rebase-lib-jars">
+        <rebase-libs-js-impl/>
+    </target>
+    <target name="-check-rebase-libs">
+        <condition property="do-rebase-lib-jars">
+            <and>
+                <isset property="rebase-lib-jars"/>
+                <not><isset property="fallback.no.javascript"/></not>
+            </and>
+        </condition>
+        <condition property="do-skip-rebase-libs">
+            <and>
+                <isset property="rebase-lib-jars"/>
+                <isset property="fallback.no.javascript"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-rebase-libs-warning" depends="-check-rebase-libs" if="do-skip-rebase-libs">
+        <echo message="Warning: Dependent Libraries JARs rebase (-rebase-libs) skipped in fallback build mode due to JDK missing JavaScript support."/>
+    </target>
+
+    <macrodef name="rebase-libs-js-impl">
+        <sequential>
+            <property name="pp_rebase_dir" value="${basedir}${file.separator}${dist.dir}${file.separator}lib"/>
+            <property name="pp_rebase_fs" value="*.jar"/>
+            <echo message="JavaScript: -rebase-libs-js-impl" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    var dir = new String(project.getProperty("pp_rebase_dir"));
+                    var fDir = new java.io.File(dir);
+                    if( fDir.exists() ) {
+                        var callTask = project.createTask("antcall");
+                        callTask.setTarget("-rebase-libs-macro-call");
+                        var param = callTask.createParam();
+                        param.setName("jar.file.to.rebase");
+                        var includes = new String(project.getProperty("pp_rebase_fs"));
+                        var fs = project.createDataType("fileset");
+                        fs.setDir( fDir );
+                        fs.setIncludes(includes);
+                        var ds = fs.getDirectoryScanner(project);
+                        var srcFiles = ds.getIncludedFiles();
+                        for (var i = 0; i < srcFiles.length; i++) {
+                            param.setValue(dir.concat("${file.separator}").concat(srcFiles[i]));
+                            callTask.perform();
+                        }
+                    }
+                ]]>
+            </script>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="rebase-lib">
+        <attribute name="jarfile"/>
+        <sequential>
+            <local name="tmpdir"/>
+            <property name="tmpdir" value="${java.io.tmpdir}${file.separator}${user.name}_${ant.project.name}_rebase" />
+            <echo message="tmpdir = ${tmpdir}" level="verbose"/>
+            <delete dir="${tmpdir}" quiet="true"/>
+            <mkdir dir="${tmpdir}"/>
+            <unzip src="@{jarfile}" dest="${tmpdir}">
+                <patternset>
+                    <include name="META-INF${file.separator}MANIFEST.MF"/>
+                </patternset>
+            </unzip>
+            <local name="manifest.file.temp"/>
+            <property name="manifest.file.temp" value="${tmpdir}${file.separator}META-INF${file.separator}MANIFEST.MF" />
+            <echo message="manifest.file.temp = ${manifest.file.temp}" level="verbose"/>
+            <!-- edited manifest file -->
+            <local name="manifest.file.temp.new"/>
+            <property name="manifest.file.temp.new" value="${manifest.file.temp}_new" />
+            <echo message="manifest.file.temp.new = ${manifest.file.temp.new}" level="verbose"/>
+            <echo message="JavaScript: rebase-lib" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    var UTF_8 = "UTF-8";
+                    var ATTR_CLASS_PATH = "Class-Path";
+                    var ATTR_CLASS_PATH_FX = "JavaFX-Class-Path";
+                    function endsWith(s, suffix) {
+                        var i = s.lastIndexOf(suffix);
+                        return  (i != -1) && (i == (s.length - suffix.length));
+                    }
+                    function isSigned(manifest) {        
+                        var sections = manifest.getSectionNames();
+                        while(sections.hasMoreElements()) {
+                            var sectionname = new String(sections.nextElement());
+                            var section = manifest.getSection(sectionname);
+                            if(section != null) {
+                                var sectionKeys = section.getAttributeKeys();
+                                while (sectionKeys.hasMoreElements()) {
+                                    var element = new String(sectionKeys.nextElement());
+                                    if (endsWith(element, "-Digest") || endsWith(element, "-digest")) {
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                        return false;
+                    }
+                    var src = new String(project.getProperty("manifest.file.temp"));
+                    var srf = new java.io.File(src);
+                    var manifest;
+                    try {
+                        var fis = new java.io.FileInputStream(srf);
+                        try {
+                            var isr = new java.io.InputStreamReader(fis, UTF_8);
+                            try {
+                                manifest = new org.apache.tools.ant.taskdefs.Manifest(isr);
+                            } finally {
+                                isr.close();
+                            }
+                        } finally {
+                            fis.close();
+                        }
+                    } catch(e) {
+                        manifest = null;
+                    }
+                    if(manifest != null) {
+                        if(isSigned(manifest)) {
+                            print("Warning: Signed JAR can not be rebased.");
+                        } else {
+                            var mainSection = manifest.getMainSection();
+                            var classPath = mainSection.getAttributeValue(ATTR_CLASS_PATH);
+                            var classPathAttr = null;
+                            if (classPath != null) {
+                                classPathAttr = ATTR_CLASS_PATH;
+                            } else {
+                                classPath = mainSection.getAttributeValue(ATTR_CLASS_PATH_FX);
+                                if(classPath != null) {
+                                    classPathAttr = ATTR_CLASS_PATH_FX;
+                                }
+                            }
+                            if(classPath != null) {
+                                var result = new java.lang.StringBuilder();
+                                var changed = false;
+                                var pathArray = classPath.split(" ");
+                                for (var i = 0; i < pathArray.length; i++) {
+                                    if (result.length() > 0) {
+                                        result.append(' ');
+                                    }
+                                    var index = pathArray[i].lastIndexOf('/');
+                                    if (index >= 0 && index < pathArray[i].length - 1) {
+                                        pathArray[i] = pathArray[i].substring(index+1);
+                                        changed = true;
+                                    }
+                                    result.append(pathArray[i]);
+                                }
+                                mainSection.removeAttribute(classPathAttr);
+                                mainSection.addAttributeAndCheck(new org.apache.tools.ant.taskdefs.Manifest.Attribute(classPathAttr, result.toString()));
+                                var tgt = new String(project.getProperty("manifest.file.temp.new"));
+                                var tgf = new java.io.File(tgt);
+                                try {
+                                    var fos = new java.io.FileOutputStream(tgf);
+                                    try {
+                                        var osw = new java.io.OutputStreamWriter(fos, UTF_8);
+                                        try {
+                                            var manifestOut = new java.io.PrintWriter(osw);
+                                            manifest.write(manifestOut);
+                                            manifestOut.close();
+                                        } finally {
+                                            osw.close();
+                                        }
+                                    } finally {
+                                        fos.close();
+                                    }
+                                } catch(e) {
+                                    print("Warning: problem storing rebased manifest file.");
+                                }
+                            }
+                        }
+                    }
+                ]]>
+            </script>
+            <antcall target="-move-new-manifest-if-exists">
+                <param name="move.file.from" value="${manifest.file.temp.new}"/>
+                <param name="move.file.to" value="${manifest.file.temp}"/>
+            </antcall>
+            <zip destfile="@{jarfile}" basedir="${tmpdir}" update="true"/>
+            <delete dir="${tmpdir}" quiet="true"/>
+        </sequential>
+    </macrodef>
+    
+    <target name="-new-temp-mainfest-existence">
+        <condition property="new-temp-manifest-exists">
+            <available file="${move.file.from}"/>
+        </condition>
+        <echo message="new-temp-manifest-exists = ${new-temp-manifest-exists}" level="verbose"/>
+    </target>
+    
+    <target name="-move-new-manifest-if-exists" depends="-new-temp-mainfest-existence" if="new-temp-manifest-exists">
+        <move file="${move.file.from}" tofile="${move.file.to}" failonerror="false"/>
+    </target>
+    
+    <target name="-rebase-libs-macro-call">
+        <echo message="Rebase jarfile = ${jar.file.to.rebase}" level="verbose"/>
+        <rebase-lib jarfile="${jar.file.to.rebase}"/>
+    </target>
+    
+
+    <!-- Main Deployment Target -->
+
+    <!-- Note: target "jfx-deployment" is referenced from NB 7.1+ build-impl.xml -->
+    <target name="jfx-deployment" depends="-check-jfx-deployment-launch,-do-jfx-deployment-script,-do-jfx-deployment-noscript" if="jfx-deployment-available"/>
+
+    <target name="-check-dist-lib-exists">
+        <deploy-defines/>
+        <available file="${jfx.deployment.dir}${file.separator}lib" type="dir" property="dist.lib.exists"/>
+    </target>
+    <target name="-check-jfx-deployment-jar-current-nolib" depends="-check-dist-lib-exists" unless="dist.lib.exists">
+        <uptodate property="jfx-deployment-jar-current" targetfile="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}" >
+            <srcfiles dir="${basedir}${file.separator}${build.classes.dir}" includes="**${file.separator}*"/>
+            <srcfiles dir="${basedir}${file.separator}nbproject" includes="**${file.separator}*"/>
+        </uptodate>
+    </target>
+    <target name="-check-jfx-deployment-jar-current-lib" depends="-check-dist-lib-exists" if="dist.lib.exists">
+        <uptodate property="jfx-deployment-jar-current" targetfile="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}" >
+            <srcfiles dir="${basedir}${file.separator}${build.classes.dir}" includes="**${file.separator}*"/>
+            <srcfiles dir="${jfx.deployment.dir}${file.separator}lib" includes="**${file.separator}*"/>
+            <srcfiles dir="${basedir}${file.separator}nbproject" includes="**${file.separator}*"/>
+        </uptodate>
+    </target>
+    <target name="-check-jfx-deployment-launch" depends="-check-jfx-deployment,-check-jfx-deployment-jar-current-nolib,-check-jfx-deployment-jar-current-lib">
+        <condition property="do-jfx-deployment-script">
+            <and>
+                <isset property="jfx-deployment-available"/>
+                <not><isset property="fallback.no.javascript"/></not>
+                <not><isset property="jfx-deployment-jar-current"/></not>
+            </and>
+        </condition>
+        <condition property="do-jfx-deployment-noscript">
+            <and>
+                <isset property="jfx-deployment-available"/>
+                <isset property="fallback.no.javascript"/>
+                <not><isset property="jfx-deployment-jar-current"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-do-jfx-deployment-script" depends="-check-jfx-deployment-launch" if="do-jfx-deployment-script">
+        <antcall target="jfx-deployment-script"/>
+    </target>
+    <target name="-do-jfx-deployment-noscript" depends="-check-jfx-deployment-launch" if="do-jfx-deployment-noscript">
+        <antcall target="jfx-deployment-noscript"/>
+    </target>
+
+    <target name="jfx-deployment-script" depends="-check-jfx-deployment,-check-project,
+        -swing-api-warning,-icon-warning,
+        -set-dimensions,-reset-dimensions,-set-update-mode-background,-set-update-mode-eager,
+        -set-permissions-elevated,-reset-permissions-elevated,
+        -copy-external-preloader-jar,-copy-binary-css,
+        -deploy-app-sign-nopreloader-notemplate,
+        -deploy-app-sign-preloader-notemplate,
+        -deploy-app-sign-nopreloader-template,
+        -deploy-app-sign-preloader-template,
+        -deploy-app-sign-nopreloader-notemplate-swing,
+        -deploy-app-sign-nopreloader-template-swing,
+        -deploy-app-sign-blob-nopreloader-notemplate,
+        -deploy-app-sign-blob-preloader-notemplate,
+        -deploy-app-sign-blob-nopreloader-template,
+        -deploy-app-sign-blob-preloader-template,
+        -deploy-app-sign-blob-nopreloader-notemplate-swing,
+        -deploy-app-sign-blob-nopreloader-template-swing,
+        -deploy-app-nosign-nopreloader-notemplate,
+        -deploy-app-nosign-preloader-notemplate,
+        -deploy-app-nosign-nopreloader-template,
+        -deploy-app-nosign-preloader-template,
+        -deploy-app-nosign-nopreloader-notemplate-swing,
+        -deploy-app-nosign-nopreloader-template-swing"
+        if="jfx-deployment-available">
+    </target>
+
+    <target name="jfx-deployment-noscript" depends="-check-jfx-deployment,-check-project,
+        -swing-api-warning,-icon-warning,
+        -set-dimensions,-reset-dimensions,-set-update-mode-background,-set-update-mode-eager,
+        -set-permissions-elevated,-reset-permissions-elevated,
+        -copy-external-preloader-jar,-copy-binary-css,
+        -fallback-deploy-app-sign-nopreloader-notemplate,
+        -fallback-deploy-app-sign-preloader-notemplate,
+        -fallback-deploy-app-sign-nopreloader-template,
+        -fallback-deploy-app-sign-preloader-template,
+        -fallback-deploy-app-sign-nopreloader-notemplate-swing,
+        -fallback-deploy-app-sign-nopreloader-template-swing,
+        -fallback-deploy-app-sign-blob-nopreloader-notemplate,
+        -fallback-deploy-app-sign-blob-preloader-notemplate,
+        -fallback-deploy-app-sign-blob-nopreloader-template,
+        -fallback-deploy-app-sign-blob-preloader-template,
+        -fallback-deploy-app-sign-blob-nopreloader-notemplate-swing,
+        -fallback-deploy-app-sign-blob-nopreloader-template-swing,
+        -fallback-deploy-app-nosign-nopreloader-notemplate,
+        -fallback-deploy-app-nosign-preloader-notemplate,
+        -fallback-deploy-app-nosign-nopreloader-template,
+        -fallback-deploy-app-nosign-preloader-template,
+        -fallback-deploy-app-nosign-nopreloader-notemplate-swing,
+        -fallback-deploy-app-nosign-nopreloader-template-swing"
+        if="jfx-deployment-available">
+    </target>
+
+
+    <!-- Security / Signing -->
+    
+    <target name="-unavailable-signjars-task" depends="-check-jfx-deployment" unless="jfx-deployment-available">
+        <echo message="Warning: Task required to sign JAR file is missing, check the availability of JavaFX 2.0 deployment tasks. JAR files will not be signed."/>
+    </target>
+
+    <target name="-security-props-check">
+        <condition property="javafx.signed.true">
+            <istrue value="${javafx.signing.enabled}"/>
+        </condition>
+    </target>
+
+    <target name="-check-signing-possible" depends="-security-props-check,-check-jfx-deployment,-unavailable-signjars-task">
+        <condition property="javafx.signed.true+signjars.task.available">
+            <and>
+                <isset property="javafx.signed.true"/>
+                <isset property="jfx-deployment-available"/>
+            </and>
+        </condition>
+    </target>
+    
+    <target name="-javafx-init-keystore" depends="-check-signing-possible,-javafx-init-signing,-javafx-init-keystore1,-javafx-init-keystore2,-check-keystore-exists" 
+            if="javafx.signed.true+signjars.task.available" unless="do.not.init.keystore">
+        <property name="javafx.signjar.vendor" value="CN=${application.vendor}"/>
+        <echo message="Going to create default keystore in ${javafx.signjar.keystore}"/>
+        <genkey dname="${javafx.signjar.vendor}" alias="${javafx.signjar.alias}" keystore="${javafx.signjar.keystore}"
+            storepass="${javafx.signjar.storepass}" keypass="${javafx.signjar.keypass}"/>
+    </target>
+    
+    <target name="-check-keystore-exists" depends="-security-props-check">
+        <available property="javafx.signjar.keystore.exists" file="${javafx.signjar.keystore}"/>
+        <condition property="do.not.init.keystore">
+            <or>
+                <not><isset property="javafx.signed.true"/></not>
+                <isset property="javafx.signjar.keystore.exists"/>
+            </or>
+        </condition>
+    </target>
+
+    <target name="-javafx-init-signing">
+        <condition property="generated.key.signing">
+            <equals arg1="${javafx.signing.type}" arg2="self" trim="true"/>
+        </condition>
+    </target>
+
+    <target name="-javafx-init-keystore1" depends="-javafx-init-signing" if="generated.key.signing">
+        <property name="javafx.signjar.keystore" value="${basedir}${file.separator}build${file.separator}nb-jfx.jks" />
+        <property name="javafx.signjar.storepass" value="storepass"/>
+        <property name="javafx.signjar.keypass" value="keypass"/>
+        <property name="javafx.signjar.alias" value="nb-jfx"/>
+    </target>
+
+    <target name="-javafx-init-keystore2" depends="-javafx-init-signing" unless="generated.key.signing">
+        <property name="javafx.signjar.keystore" value="${javafx.signing.keystore}" />
+        <property name="javafx.signjar.storepass" value="${javafx.signing.keystore.password}"/>
+        <property name="javafx.signjar.keypass" value="${javafx.signing.keyalias.password}"/>
+        <property name="javafx.signjar.alias" value="${javafx.signing.keyalias}"/>
+    </target>
+
+    <target name="-check-signing-security" depends="-security-props-check">
+        <condition property="is.signing.unsafe">
+            <or>
+                <not><isset property="javafx.signed.true"/></not>
+                <not><equals arg1="${javafx.signing.type}" arg2="key" casesensitive="false" trim="true"/></not>
+            </or>
+        </condition>
+    </target>
+
+    <target name="-warn-insufficient-signing" depends="-check-signing-security" if="is.signing.unsafe">
+        <echo message="Warning: Unsigned and self-signed WebStart Applications and Applets are deprecated from JDK7u21 onwards due to security reasons.${line.separator}         To ensure future correct functionality please sign WebStart Applications and Applets using trusted certificate."/>
+    </target>
+
+    
+    <!-- Project Deployment Macros -->
+
+    <macrodef name="deploy-defines">
+        <sequential>
+            <basename property="jfx.deployment.jar" file="${dist.jar}"/>
+            <property name="jfx.deployment.dir" location="${dist.dir}"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-preprocess">
+        <sequential>
+            <delete includeEmptyDirs="true" quiet="true">
+                <fileset dir="${jfx.deployment.dir}${file.separator}lib">
+                    <exclude name="**${file.separator}*.jar"/>
+                </fileset>
+            </delete>
+        </sequential>
+    </macrodef>
+
+    <!-- fx:jar scripted call enables passing of arbitrarily long list of params and fx-version dependent behavior -->
+    <macrodef name="deploy-jar">
+        <sequential>
+            <antcall target="-pre-jfx-jar"/>
+            <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+            <typedef name="fx_jar" classname="com.sun.javafx.tools.ant.FXJar" classpath="${javafx.ant.classpath}"/>
+            <echo message="Launching &lt;fx:jar&gt; task from ${ant-javafx.jar.location}" level="info"/>
+            <property name="pp_jar_destfile" value="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}"/>
+            <property name="pp_jar_buildclasses" value="${basedir}${file.separator}${build.classes.dir}"/>
+            <property name="pp_jar_cssbss" value="**${file.separator}*.${css-exclude-ext}"/>
+            <property name="pp_jar_dir" value="${jfx.deployment.dir}"/>
+            <property name="pp_jar_fs1" value="lib${file.separator}${javafx.preloader.jar.filename}"/>
+            <property name="pp_jar_fs2" value="lib${file.separator}*.jar"/>
+            <echo message="deploy_jar: pp_jar_destfile = ${pp_jar_destfile}" level="verbose"/>
+            <echo message="deploy_jar: pp_jar_buildclasses = ${pp_jar_buildclasses}" level="verbose"/>
+            <echo message="deploy_jar: pp_jar_cssbss = ${pp_jar_cssbss}" level="verbose"/>
+            <echo message="deploy_jar: pp_jar_dir = ${pp_jar_dir}" level="verbose"/>
+            <echo message="deploy_jar: pp_jar_fs1 = ${pp_jar_fs1}" level="verbose"/>
+            <echo message="deploy_jar: pp_jar_fs2 = ${pp_jar_fs2}" level="verbose"/>
+            <echo message="JavaScript: deploy-jar" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    function isTrue(prop) {
+                        return prop != null &&
+                           ( prop.toLowerCase() == "true" || prop.toLowerCase() == "yes" || prop.toLowerCase() == "on" );
+                    }                    
+                    function prefix(s, len) {
+                        if(s == null || len <= 0 || s.length == 0) {
+                            return new String("");
+                        }
+                        return new String(s.substr(0, len));
+                    }
+                    function replaceSuffix(s, os, ns) {
+                        return prefix(s, s.indexOf(os)).concat(ns);
+                    }
+                    function startsWith(s, prefix) {
+                        return (s != null) && (s.indexOf(prefix) == 0);
+                    }
+                    function endsWith(s, suffix) {
+                        var i = s.lastIndexOf(suffix);
+                        return  (i != -1) && (i == (s.length - suffix.length));
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    function contains(array, prop) {
+                        for (var i = 0; i < array.length; i++) {
+                            var s1 = new String(array[i]);
+                            var s2 = new String(prop);
+                            if( s1.toLowerCase() == s2.toLowerCase() ) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }
+                    var S = new String(java.io.File.separator);
+                    var JFXPAR = "javafx.param";
+                    var JFXMAN = "javafx.manifest.entry";
+                    var JFXPARN = "name";
+                    var JFXPARV = "value";
+                    var JFXPARH = "hidden";
+                    var JFXLAZY = "download.mode.lazy.jar";
+                    var withpreloader = new String(project.getProperty("app-with-preloader"));
+                    var fx_ant_api_1_1 = new String(project.getProperty("have-fx-ant-api-1.1"));
+                    var fx_ant_api_1_2 = new String(project.getProperty("have-fx-ant-api-1.2"));
+                    var fx_in_swing_app = new String(project.getProperty("fx-in-swing-app"));
+
+                    // get jars with lazy download mode property set
+                    function getLazyJars() {
+                        var jars = new Array();
+                        var keys = project.getProperties().keys();
+                        while(keys.hasMoreElements()) {
+                            var pn = new String(keys.nextElement());
+                            if(startsWith(pn, JFXLAZY)) {
+                                var fname = new String(pn.substring(JFXLAZY.length+1));
+                                jars.push(fname);
+                            }
+                        }
+                        return jars.length > 0 ? jars : null;
+                    }
+                    // set download mode of dependent libraries
+                    function setDownloadMode(fsEager, fsLazy, jars) {
+                        for(var i = 0; i < jars.length; i++) {
+                            fsEager.setExcludes("lib" + S + jars[i]);
+                            fsLazy.setIncludes("lib" + S + jars[i]);
+                        }
+                    }
+                    
+                    // fx:jar
+                    var jar = project.createTask("fx_jar");
+                    jar.setProject(project);
+                    var destfile = new String(project.getProperty("pp_jar_destfile"));
+                    jar.setDestfile(destfile);
+
+                    // fx:application
+                    var app = jar.createApplication();
+                    app.setProject(project);
+                    var title = new String(project.getProperty("application.title"));
+                    var mainclass;
+                    if(isTrue(fx_in_swing_app) && isTrue(fx_ant_api_1_2)) {
+                        mainclass = new String(project.getProperty("main.class"));
+                        app.setToolkit("swing");
+                    } else {
+                        mainclass = new String(project.getProperty("javafx.main.class"));
+                    }
+                    var fallback = new String(project.getProperty("javafx.fallback.class"));
+                    app.setName(title);
+                    app.setMainClass(mainclass);
+                    app.setFallbackClass(fallback);
+                    if(isTrue(withpreloader)) {
+                        preloaderclass = new String(project.getProperty("javafx.preloader.class"));
+                        app.setPreloaderClass(preloaderclass);
+                    }
+                    var appversion = new String(project.getProperty("javafx.application.implementation.version"));
+                    if(defined(appversion)) {
+                        app.setVersion(appversion);
+                    } else {
+                        app.setVersion("1.0");
+                    }
+                    // fx:param, fx:argument
+                    var searchHides = project.getProperties().keys();
+                    var hides = new Array();
+                    while(searchHides.hasMoreElements()) {
+                        // collect all hidden property names
+                        var pns = new String(searchHides.nextElement());
+                        if(startsWith(pns, JFXPAR) && endsWith(pns, JFXPARN)) {
+                            var propns = new String(project.getProperty(pns));
+                            var phs = replaceSuffix(pns, JFXPARN, JFXPARH);
+                            var proph = new String(project.getProperty(phs));
+                            if(isTrue(proph)) {
+                                hides.push(propns);
+                            }
+                         }
+                    }
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXPAR) && endsWith(pn, JFXPARN)) {
+                            var propn = new String(project.getProperty(pn));
+                            if(defined(propn) && !contains(hides, propn)) {
+                                var pv = replaceSuffix(pn, JFXPARN, JFXPARV);
+                                var propv = new String(project.getProperty(pv));
+                                if(defined(propv)) {
+                                    var par = app.createParam();
+                                    par.setName(propn);
+                                    par.setValue(propv);
+                                } else {
+                                    if(isTrue(fx_ant_api_1_1)) {
+                                        var arg = app.createArgument();
+                                        arg.addText(propn);
+                                    } else {
+                                        print("Warning: Unnamed parameters not supported by this version of JavaFX SDK deployment Ant tasks. Upgrade JavaFX to 2.0.2 or higher.");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                    // fx:resources
+                    var res = jar.createResources();
+                    res.setProject(project);
+                    var pdir = new String(project.getProperty("pp_jar_dir"));
+                    if(isTrue(withpreloader)) {
+                        var f1 = res.createFileSet();
+                        f1.setProject(project);
+                        f1.setDir(new java.io.File(pdir));
+                        var i1 = new String(project.getProperty("pp_jar_fs1"));
+                        f1.setIncludes(i1);
+                        f1.setRequiredFor("preloader");
+                        var f2 = res.createFileSet();
+                        f2.setProject(project);
+                        f2.setDir(new java.io.File(pdir));
+                        var i2b = new String(project.getProperty("pp_jar_fs2"));
+                        var e2c = new String(project.getProperty("pp_jar_fs1"));
+                        f2.setIncludes(i2b);
+                        f2.setExcludes(e2c);
+                        f2.setRequiredFor("startup");
+                        var lazyjars = getLazyJars();
+                        if(lazyjars != null) {
+                            var f3 = res.createFileSet();
+                            f3.setProject(project);
+                            f3.setDir(new java.io.File(pdir));
+                            f3.setRequiredFor("runtime");
+                            setDownloadMode(f2,f3,lazyjars);
+                        }
+                    } else {
+                        var fn = res.createFileSet();
+                        fn.setProject(project);
+                        fn.setDir(new java.io.File(pdir));
+                        var ib = new String(project.getProperty("pp_jar_fs2"));
+                        fn.setIncludes(ib);
+                        fn.setRequiredFor("startup");
+                        var lazyjars = getLazyJars();
+                        if(lazyjars != null) {
+                            var fn2 = res.createFileSet();
+                            fn2.setProject(project);
+                            fn2.setDir(new java.io.File(pdir));
+                            fn2.setRequiredFor("runtime");
+                            setDownloadMode(fn,fn2,lazyjars);
+                        }
+                    }
+                    
+                    // fileset to exclude *.css or *.bss
+                    var fs = jar.createFileSet();
+                    fs.setProject(project);
+                    var buildcls = new String(project.getProperty("pp_jar_buildclasses"));
+                    var exc = new String(project.getProperty("pp_jar_cssbss"));
+                    fs.setDir(new java.io.File(buildcls));
+                    fs.setExcludes(exc);
+                    
+                    // manifest
+                    var man = jar.createManifest();
+                    var userManifestPath = project.getProperty("manifest.file");
+                    if (userManifestPath) {
+                        var userManifestFile = project.resolveFile(userManifestPath);
+                        if (userManifestFile.isFile()) {
+                            var manifestEncoding = project.getProperty("manifest.encoding");
+                            var userManifestReader = manifestEncoding ?
+                                    new java.io.InputStreamReader(
+                                        new java.io.FileInputStream(userManifestFile),
+                                        manifestEncoding) :
+                                    new java.io.InputStreamReader(
+                                        new java.io.FileInputStream(userManifestFile));
+                            try {
+                                var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
+                                man.merge(userManifest);
+                            } finally {
+                                userManifestReader.close();
+                            }
+                        }
+                    }
+                    var a1val = new String(project.getProperty("application.vendor"));
+                    var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    a1.setName("Implementation-Vendor");
+                    a1.setValue(a1val);
+                    man.addConfiguredAttribute(a1);
+                    var a2val = new String(project.getProperty("application.title"));
+                    var a2 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    a2.setName("Implementation-Title");
+                    a2.setValue(a2val);
+                    man.addConfiguredAttribute(a2);
+                    if(defined(appversion)) {
+                        var a3 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                        a3.setName("Implementation-Version");
+                        a3.setValue(appversion);
+                        man.addConfiguredAttribute(a3);
+                    }
+                    var a4prop = new String(project.getProperty("javafx.deploy.disable.proxy"));
+                    if(isTrue(a4prop)) {
+                        var a4 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                        a4.setName("JavaFX-Feature-Proxy");
+                        a4.setValue("None");
+                        man.addConfiguredAttribute(a4);
+                    }
+                    // custom manifest entries
+                    var searchManifestHides = project.getProperties().keys();
+                    var manifestHides = new Array();
+                    while(searchManifestHides.hasMoreElements()) {
+                        // collect all hidden property names
+                        var pns = new String(searchManifestHides.nextElement());
+                        if(startsWith(pns, JFXMAN) && endsWith(pns, JFXPARN)) {
+                            var propns = new String(project.getProperty(pns));
+                            var phs = replaceSuffix(pns, JFXPARN, JFXPARH);
+                            var proph = new String(project.getProperty(phs));
+                            if(isTrue(proph)) {
+                                manifestHides.push(propns);
+                            }
+                         }
+                    }
+                    var manifestKeys = project.getProperties().keys();
+                    while(manifestKeys.hasMoreElements()) {
+                        var pn = new String(manifestKeys.nextElement());
+                        if(startsWith(pn, JFXMAN) && endsWith(pn, JFXPARN)) {
+                            var propn = new String(project.getProperty(pn));
+                            if(defined(propn) && !contains(manifestHides, propn)) {
+                                var propnr = propn.replace(/\s/g, "-");
+                                var entry = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                                entry.setName(propnr);
+                                var pv = replaceSuffix(pn, JFXPARN, JFXPARV);
+                                var propv = new String(project.getProperty(pv));
+                                if(defined(propv)) {
+                                    entry.setValue(propv);
+                                } else {
+                                    entry.setValue("");
+                                }
+                                man.addConfiguredAttribute(entry);
+                            }
+                        }
+                    }
+                    var profileAvailable = new String(project.getProperty("profile.available"));
+                    if (defined(profileAvailable)) {
+                        var profileAttribute = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                        profileAttribute.setName("Profile");
+                        profileAttribute.setValue(new String(project.getProperty("javac.profile")));
+                        man.addConfiguredAttribute(profileAttribute);
+                    }
+                    var perm_elev = new String(project.getProperty("permissions.elevated"));
+                    var cust_perm = new String(project.getProperty("manifest.custom.permissions"));
+                    var cust_cb = new String(project.getProperty("manifest.custom.codebase"));
+                    var sa1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    sa1.setName("Codebase");
+                    if(!defined(cust_cb) || cust_cb == "*") {
+                        sa1.setValue("*");
+                        print("Warning: From JDK7u25 the Codebase manifest attribute should be used to restrict JAR repurposing.");
+                        print("         Please set manifest.custom.codebase property to override the current default non-secure value '*'.");
+                    } else {
+                        sa1.setValue(cust_cb);
+                    }
+                    man.addConfiguredAttribute(sa1);
+                    var sa2 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
+                    sa2.setName("Permissions");
+                    if(!defined(cust_perm)) {
+                        if(isTrue(perm_elev)) {
+                            sa2.setValue("all-permissions");
+                        } else {
+                            sa2.setValue("sandbox");
+                        }
+                    } else {
+                        if(cust_perm == "all-permissions") {
+                            sa2.setValue("all-permissions");
+                        } else {
+                            sa2.setValue("sandbox");
+                        }
+                    }
+                    man.addConfiguredAttribute(sa2);
+                    // Note: see JavaFX Jira issue #RT-25003 if attribute names are created lowercase in manifest
+
+                    jar.perform();
+                ]]>
+            </script>
+            <antcall target="-post-jfx-jar"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-sign">
+        <sequential>
+            <echo message="keystore=${javafx.signjar.keystore}" level="verbose"/>
+            <echo message="storepass=${javafx.signjar.storepass}" level="verbose"/>
+            <echo message="alias=${javafx.signjar.alias}" level="verbose"/>
+            <echo message="keypass=${javafx.signjar.keypass}" level="verbose"/>
+            <signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                </fileset>
+            </signjar>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-sign-blob">
+        <sequential>
+            <echo message="keystore=${javafx.signjar.keystore}" level="verbose"/>
+            <echo message="storepass=${javafx.signjar.storepass}" level="verbose"/>
+            <echo message="alias=${javafx.signjar.alias}" level="verbose"/>
+            <echo message="keypass=${javafx.signjar.keypass}" level="verbose"/>
+            <echo message="Launching &lt;fx:signjar&gt; task from ${ant-javafx.jar.location}" level="info"/>
+            <fx:signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                </fileset>
+            </fx:signjar>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-sign-preloader">
+        <sequential>
+            <echo message="keystore=${javafx.signjar.keystore}" level="verbose"/>
+            <echo message="storepass=${javafx.signjar.storepass}" level="verbose"/>
+            <echo message="alias=${javafx.signjar.alias}" level="verbose"/>
+            <echo message="keypass=${javafx.signjar.keypass}" level="verbose"/>
+            <signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                </fileset>
+            </signjar>
+            <signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                    <exclude name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                </fileset>
+            </signjar>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-sign-blob-preloader">
+        <sequential>
+            <echo message="keystore=${javafx.signjar.keystore}" level="verbose"/>
+            <echo message="storepass=${javafx.signjar.storepass}" level="verbose"/>
+            <echo message="alias=${javafx.signjar.alias}" level="verbose"/>
+            <echo message="keypass=${javafx.signjar.keypass}" level="verbose"/>
+            <signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                </fileset>
+            </signjar>
+            <echo message="Launching &lt;fx:signjar&gt; task from ${ant-javafx.jar.location}" level="info"/>
+            <fx:signjar keystore="${javafx.signjar.keystore}"
+                storepass="${javafx.signjar.storepass}"
+                alias="${javafx.signjar.alias}"
+                keypass="${javafx.signjar.keypass}">
+                <fileset dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                    <exclude name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                </fileset>
+            </fx:signjar>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="deploy-process-template">
+        <sequential>
+            <echo message="javafx.run.htmltemplate = ${javafx.run.htmltemplate}" level="verbose"/>
+            <pathconvert property="javafx.run.htmltemplate.processed">
+                <path path="${javafx.run.htmltemplate}"/>
+                <mapper>
+                     <chainedmapper>
+                          <flattenmapper/>
+                          <globmapper from="*" to="${jfx.deployment.dir}${file.separator}*" casesensitive="no"/>
+                     </chainedmapper>
+                </mapper>
+            </pathconvert>
+            <echo message="javafx.run.htmltemplate.processed = ${javafx.run.htmltemplate.processed}" level="verbose"/>
+        </sequential>
+    </macrodef>
+
+    <!-- fx:deploy scripted call enables passing of arbitrarily long lists of params, vmoptions and callbacks and fx-version dependent behavior -->
+    <macrodef name="deploy-deploy">
+        <sequential>
+            <antcall target="-pre-jfx-deploy"/>
+            <antcall target="-call-pre-jfx-native"/>
+            <echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
+            <typedef name="fx_deploy" classname="com.sun.javafx.tools.ant.DeployFXTask" classpath="${javafx.ant.classpath}"/>
+            <echo message="Launching &lt;fx:deploy&gt; task from ${ant-javafx.jar.location}" level="info"/>
+            <property name="pp_deploy_dir" value="${jfx.deployment.dir}"/>
+            <property name="pp_deploy_fs1" value="lib${file.separator}${javafx.preloader.jar.filename}"/>
+            <property name="pp_deploy_fs2" value="lib${file.separator}*.jar"/>
+            <echo message="deploy_deploy: pp_deploy_dir = ${pp_deploy_dir}" level="verbose"/>
+            <echo message="deploy_deploy: pp_deploy_fs1 = ${pp_deploy_fs1}" level="verbose"/>
+            <echo message="deploy_deploy: pp_deploy_fs2 = ${pp_deploy_fs2}" level="verbose"/>
+            <echo message="JavaScript: deploy-deploy" level="verbose"/>
+            <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+            <script language="javascript">
+                <![CDATA[
+                    function isTrue(prop) {
+                        return prop != null && 
+                           (prop.toLowerCase()=="true" || prop.toLowerCase()=="yes" || prop.toLowerCase()=="on");
+                    }                    
+                    function prefix(s, len) {
+                        if(s == null || len <= 0 || s.length == 0) {
+                            return new String("");
+                        }
+                        return new String(s.substr(0, len));
+                    }
+                    function replaceSuffix(s, os, ns) {
+                        return prefix(s, s.indexOf(os)).concat(ns);
+                    }
+                    function startsWith(s, prefix) {
+                        return (s != null) && (s.indexOf(prefix) == 0);
+                    }
+                    function endsWith(s, suffix) {
+                        var i = s.lastIndexOf(suffix);
+                        return  (i != -1) && (i == (s.length - suffix.length));
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    function contains(array, prop) {
+                        for (var i = 0; i < array.length; i++) {
+                            var s1 = new String(array[i]);
+                            var s2 = new String(prop);
+                            if( s1.toLowerCase() == s2.toLowerCase() ) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }
+                    var S = java.io.File.separator;
+                    var JFXPAR = "javafx.param";
+                    var JFXPARN = "name";
+                    var JFXPARV = "value";
+                    var JFXPARH = "hidden";
+                    var JFXCALLB = "javafx.jscallback";
+                    var JFXLAZY = "download.mode.lazy.jar";
+                    var withpreloader = new String(project.getProperty("app-with-preloader"));
+                    var fx_ant_api_1_1 = new String(project.getProperty("have-fx-ant-api-1.1"));
+                    var fx_ant_api_1_2 = new String(project.getProperty("have-fx-ant-api-1.2"));
+                    var have_jdk_pre7u14 = new String(project.getProperty("have-jdk-pre7u14"));
+                    var fx_in_swing_app = new String(project.getProperty("fx-in-swing-app"));
+                    var debug_in_browser = new String(project.getProperty("project.state.debugging.in.browser"));
+
+                    // get jars with lazy download mode property set
+                    function getLazyJars() {
+                        var jars = new Array();
+                        var keys = project.getProperties().keys();
+                        while(keys.hasMoreElements()) {
+                            var pn = new String(keys.nextElement());
+                            if(startsWith(pn, JFXLAZY)) {
+                                var fname = pn.substring(JFXLAZY.length+1);
+                                jars.push(fname);
+                            }
+                        }
+                        return jars.length > 0 ? jars : null;
+                    }
+                    // set download mode of dependent libraries
+                    function setDownloadMode(fsEager, fsLazy, jars) {
+                        for(var i = 0; i < jars.length; i++) {
+                            fsEager.setExcludes("lib" + S + jars[i]);
+                            fsLazy.setIncludes("lib" + S + jars[i]);
+                        }
+                    }
+                    // convert path to absolute if relative
+                    function derelativizePath(path) {
+                        var f = new java.io.File(path);
+                        if(!f.exists()) {
+                            f = new java.io.File(new String(project.getBaseDir()) + S + path);
+                        }
+                        if(f.exists()) {
+                            try {
+                                return f.getCanonicalPath();
+                            } catch(err) {
+                                return path;
+                            }
+                        }
+                        return path;
+                    }
+                    
+                    // fx:deploy
+                    var deploy = project.createTask("fx_deploy");
+                    deploy.setProject(project);
+                    var width = new String(project.getProperty("javafx.width"));
+                    var height = new String(project.getProperty("javafx.height"));
+                    var outdir = new String(project.getProperty("jfx.deployment.dir"));
+                    var embedJNLP = new String(project.getProperty("javafx.deploy.embedJNLP"));
+                    var updatemode = new String(project.getProperty("update-mode"));
+                    var outfile = new String(project.getProperty("application.title"));
+                    var includeDT = new String(project.getProperty("javafx.deploy.includeDT"));
+                    var offline = new String(project.getProperty("javafx.deploy.allowoffline"));
+                    if (width.indexOf("%") != -1) {
+                        deploy.setEmbeddedWidth(width);
+                        deploy.setWidth(800);
+                    } else {
+                        deploy.setWidth(width);
+                    }
+                    if (height.indexOf("%") != -1) {
+                        deploy.setEmbeddedHeight(height);
+                        deploy.setHeight(600);
+                    } else {
+                        deploy.setHeight(height);
+                    }
+                    deploy.setOutdir(outdir);
+                    deploy.setEmbedJNLP(isTrue(embedJNLP));
+                    deploy.setUpdateMode(updatemode);
+                    deploy.setOutfile(outfile);
+                    deploy.setIncludeDT(isTrue(includeDT));
+                    if(defined(offline)) {
+                        if(isTrue(fx_ant_api_1_1)) {
+                            deploy.setOfflineAllowed(isTrue(offline));
+                        } else {
+                            print("Warning: offlineAllowed not supported by this version of JavaFX SDK deployment Ant task. Please upgrade JavaFX to 2.0.2 or higher.");
+                        }
+                    }
+                    // native packaging (time consuming, thus applied in explicit build only)
+                    var nativeEnabled = new String(project.getProperty("do.build.native.package"));
+                    var nativeType = new String(project.getProperty("javafx.native.bundling.type"));
+                    var projStateRun = new String(project.getProperty("project.state.running"));
+                    var projStateDbg = new String(project.getProperty("project.state.debugging"));
+                    var projStatePrf = new String(project.getProperty("project.state.profiling"));
+                    if(isTrue(nativeEnabled) && defined(nativeType) && nativeType != "none") {
+                        if(!isTrue(projStateRun) && !isTrue(projStateDbg) && !isTrue(projStatePrf)) {
+                            if(isTrue(fx_ant_api_1_2)) {
+                                deploy.setNativeBundles(nativeType);
+                                print("Note: To create native bundles the <fx:deploy> task may require external tools. See JavaFX 2.2+ documentation for details.");
+                                print("");
+                                print("Launching <fx:deploy> in native packager mode...");
+                            } else {
+                                print("Warning: Native packaging is not supported by this version of JavaFX SDK deployment Ant task. Please upgrade to JDK 7u6 or higher.");
+                            }
+                        }
+                    }
+
+                    // fx:application
+                    var app = deploy.createApplication();
+                    app.setProject(project);
+                    var title = new String(project.getProperty("application.title"));
+                    var mainclass;
+                    if(isTrue(fx_in_swing_app) && isTrue(fx_ant_api_1_2)) {
+                        mainclass = new String(project.getProperty("main.class"));
+                        app.setToolkit("swing");
+                    } else {
+                        mainclass = new String(project.getProperty("javafx.main.class"));
+                    }
+                    var fallback = new String(project.getProperty("javafx.fallback.class"));
+                    app.setName(title);
+                    app.setMainClass(mainclass);
+                    app.setFallbackClass(fallback);
+                    if(isTrue(withpreloader)) {
+                        preloaderclass = new String(project.getProperty("javafx.preloader.class"));
+                        app.setPreloaderClass(preloaderclass);
+                    }
+                    var appversion = new String(project.getProperty("javafx.application.implementation.version"));
+                    if(defined(appversion)) {
+                        app.setVersion(appversion);
+                    } else {
+                        app.setVersion("1.0");
+                    }
+                    // fx:param, fx:argument
+                    var searchHides = project.getProperties().keys();
+                    var hides = new Array();
+                    while(searchHides.hasMoreElements()) {
+                        // collect all hidden property names
+                        var pns = new String(searchHides.nextElement());
+                        if(startsWith(pns, JFXPAR) && endsWith(pns, JFXPARN)) {
+                            var propns = new String(project.getProperty(pns));
+                            var phs = replaceSuffix(pns, JFXPARN, JFXPARH);
+                            var proph = new String(project.getProperty(phs));
+                            if(isTrue(proph)) {
+                                hides.push(propns);
+                            }
+                         }
+                    }
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXPAR) && endsWith(pn, JFXPARN)) {
+                            var propn = new String(project.getProperty(pn));
+                            if(defined(propn) && !contains(hides, propn)) {
+                                var pv = replaceSuffix(pn, JFXPARN, JFXPARV);
+                                var propv = new String(project.getProperty(pv));
+                                if(defined(propv)) {
+                                    var par = app.createParam();
+                                    par.setName(propn);
+                                    par.setValue(propv);
+                                } else {
+                                    if(isTrue(fx_ant_api_1_1)) {
+                                        var arg = app.createArgument();
+                                        arg.addText(propn);
+                                    } else {
+                                        print("Warning: Unnamed parameters not supported by this version of JavaFX SDK deployment Ant tasks. Upgrade JavaFX to 2.0.2 or higher.");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                    // fx:resources
+                    var res = deploy.createResources();
+                    res.setProject(project);
+                    var deploydir = new String(project.getProperty("pp_deploy_dir"));
+                    if(isTrue(withpreloader)) {
+                        var f1 = res.createFileSet();
+                        f1.setProject(project);
+                        f1.setDir(new java.io.File(deploydir));
+                        var i1 = new String(project.getProperty("pp_deploy_fs1"));
+                        f1.setIncludes(i1);
+                        f1.setRequiredFor("preloader");
+                        var f2 = res.createFileSet();
+                        f2.setProject(project);
+                        f2.setDir(new java.io.File(deploydir));
+                        var i2a = new String(project.getProperty("jfx.deployment.jar"));
+                        var i2b = new String(project.getProperty("pp_deploy_fs2"));
+                        var e2c = new String(project.getProperty("pp_deploy_fs1"));
+                        f2.setIncludes(i2a);
+                        f2.setIncludes(i2b);
+                        f2.setExcludes(e2c);
+                        f2.setRequiredFor("startup");
+                        var lazyjars = getLazyJars();
+                        if(lazyjars != null) {
+                            var f3 = res.createFileSet();
+                            f3.setProject(project);
+                            f3.setDir(new java.io.File(deploydir));
+                            f3.setRequiredFor("runtime");
+                            setDownloadMode(f2,f3,lazyjars);
+                        }
+                    } else {
+                        var fn = res.createFileSet();
+                        fn.setProject(project);
+                        fn.setDir(new java.io.File(deploydir));
+                        var ia = new String(project.getProperty("jfx.deployment.jar"));
+                        var ib = new String(project.getProperty("pp_deploy_fs2"));
+                        fn.setIncludes(ia);
+                        fn.setIncludes(ib);
+                        fn.setRequiredFor("startup");
+                        var lazyjars = getLazyJars();
+                        if(lazyjars != null) {
+                            var fn2 = res.createFileSet();
+                            fn2.setProject(project);
+                            fn2.setDir(new java.io.File(deploydir));
+                            fn2.setRequiredFor("runtime");
+                            setDownloadMode(fn,fn2,lazyjars);
+                        }
+                    }
+                    
+                    // fx:info
+                    var info = deploy.createInfo();
+                    info.setProject(project);
+                    var vendor = new String(project.getProperty("application.vendor"));
+                    var description = new String(project.getProperty("application.desc"));
+                    info.setTitle(title); // title known from before
+                    info.setVendor(vendor);
+                    info.setDescription(description);
+                    var splash = new String(project.getProperty("javafx.deploy.splash"));
+                    if(defined(splash)) {
+                        if(isTrue(fx_ant_api_1_1)) {
+                            var sicon = info.createSplash();
+                            sicon.setHref(splash);
+                            sicon.setMode("any");
+                            print("Adding splash image reference: " + splash);
+                        } else {
+                            print("Warning: Splash Image not supported by this version of JavaFX SDK deployment Ant task. Please upgrade JavaFX to 2.0.2 or higher.");
+                        }
+                    }
+                    if(isTrue(nativeEnabled) && defined(nativeType) && nativeType != "none") {
+                        var icon = new String(project.getProperty("javafx.deploy.icon.native"));
+                        if(defined(icon)) {
+                            if(isTrue(fx_ant_api_1_2) && !isTrue(have_jdk_pre7u14)) {
+                                var dicon = derelativizePath(icon);
+                                // create temporary icon copy renamed to application name (required by native packager)
+                                var baseDir = new String(project.getProperty("basedir"));
+                                var buildDir = new String(project.getProperty("build.dir"));
+                                var deployBase = new String(project.getProperty("jfx.deployment.base"));
+                                var copyTask = project.createTask("copy");
+                                var source = new java.io.File(dicon);
+                                var sourceName = new String(source.getName());
+                                var lastDot = sourceName.lastIndexOf(".");
+                                var sourceExt;
+                                if(lastDot >=0) {
+                                    sourceExt = sourceName.substr(lastDot);
+                                } else {
+                                    sourceExt = new String("");
+                                }
+                                var target = new java.io.File(baseDir.concat(S).concat(buildDir).concat(S).concat("icon").concat(S).concat(deployBase).concat(sourceExt));
+                                copyTask.setFile(source);
+                                copyTask.setTofile(target);
+                                copyTask.setFlatten(true);
+                                copyTask.setFailOnError(false);
+                                copyTask.perform();
+                                var tempicon;
+                                if(target.exists()) {
+                                    try {
+                                        tempicon = target.getCanonicalPath();
+                                    } catch(err) {
+                                        tempicon = dicon;
+                                    }
+                                } else {
+                                    tempicon = dicon;
+                                }
+                                var nicon = info.createIcon();
+                                nicon.setHref(tempicon);
+                                print("Source native icon reference: " + dicon);
+                                print("Processed native icon reference: " + tempicon);
+                            } else {
+                                print("Warning: Native Package icon not supported by this version of JavaFX SDK deployment Ant task. Please upgrade to JDK7u14.");
+                            }
+                        }
+                    } else {
+                        var icon = new String(project.getProperty("javafx.deploy.icon"));
+                        if(defined(icon)) {
+                            if(isTrue(fx_ant_api_1_1)) {
+                                var iicon = info.createIcon();
+                                iicon.setHref(icon);
+                                print("Adding WebStart icon reference: " + icon);
+                            } else {
+                                print("Warning: WebStart Icon not supported by this version of JavaFX SDK deployment Ant task. Please upgrade JavaFX to 2.0.2 or higher.");
+                            }
+                        }
+                    }
+                    
+                    // fx:permissions
+                    var perm = deploy.createPermissions();
+                    perm.setProject(project);
+                    var elev = new String(project.getProperty("permissions.elevated"));
+                    perm.setElevated(isTrue(elev));
+                    
+                    // fx:preferences
+                    var pref = deploy.createPreferences();
+                    pref.setProject(project);
+                    var scut = new String(project.getProperty("javafx.deploy.adddesktopshortcut"));
+                    var instp = new String(project.getProperty("javafx.deploy.installpermanently"));
+                    var smenu = new String(project.getProperty("javafx.deploy.addstartmenushortcut"));
+                    pref.setShortcut(isTrue(scut));
+                    pref.setInstall(isTrue(instp));
+                    pref.setMenu(isTrue(smenu));
+
+                    // fx:template
+                    var templ = new String(project.getProperty("javafx.run.htmltemplate"));
+                    var templp = new String(project.getProperty("javafx.run.htmltemplate.processed"));
+                    if(defined(templ) && defined(templp)) {
+                        var temp = deploy.createTemplate();
+                        temp.setProject(project);
+                        temp.setFile(new java.io.File(templ));
+                        temp.setTofile(new java.io.File(templp));
+                    }
+
+                    // fx:platform
+                    var plat = deploy.createPlatform();
+                    plat.setProject(project);
+                    var requestRT = new String(project.getProperty("javafx.deploy.request.runtime"));
+                    if(defined(requestRT)) {
+                        plat.setJavafx(requestRT);
+                    }
+                    var jvmargs = new String(project.getProperty("run.jvmargs"));
+                    if(defined(jvmargs)) {
+                        var jvmargss = jvmargs.split(" ");
+                        for(var i = 0; i < jvmargss.length; i++) {
+                            if(defined(jvmargss[i])) {
+                                var vmarg = plat.createJvmarg();
+                                vmarg.setValue(jvmargss[i]);
+                            }
+                        }
+                    }
+                    if(isTrue(debug_in_browser)) {
+                        var vmarg = plat.createJvmarg();
+                        vmarg.setValue(new String("-ea:javafx.browserdebug"));
+                    }
+                    if(isTrue(nativeEnabled) && defined(nativeType) && nativeType != "none") {
+                        if(!isTrue(projStateRun) && !isTrue(projStateDbg) && !isTrue(projStatePrf)) {
+                            if(plat.setBasedir) {
+                                var sdkdir = new String(project.getProperty("javafx.sdk"));
+                                if(defined(sdkdir)) {
+                                    plat.setBasedir(sdkdir);
+                                }
+                            } else {
+                                print("Note: the current version of native packager Ant task can bundle the default JRE only.");
+                            }
+                        }
+                    }
+                    
+                    // fx:callbacks
+                    var callbs = deploy.createCallbacks();
+                    callbs.setProject(project);
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXCALLB)) {
+                            var prop = new String(project.getProperty(pn));
+                            if(defined(prop)) {
+                                var cname = pn.substring(JFXCALLB.length+1);
+                                var cb = callbs.createCallback();
+                                cb.setProject(project);
+                                cb.setName(cname);
+                                cb.addText(prop);
+                            }
+                        }
+                    }
+                    
+                    deploy.perform();
+                ]]>
+            </script>
+            <antcall target="-post-jfx-deploy"/>
+            <antcall target="-call-post-jfx-native"/>
+        </sequential>
+    </macrodef>
+
+    <!-- JavaFX SDK 2.0.x and 2.1.x deploy task can not generate pre-FX jnlp which is needed for FX-in-Swing projects-->
+    <macrodef name="deploy-deploy-swing">
+        <sequential>
+            <antcall target="-pre-jfx-deploy"/>
+            <local name="permissions-elevated-token"/>
+            <condition property="permissions-elevated-token" value="${line.separator}    &lt;security&gt;${line.separator}        &lt;all-permissions/&gt;${line.separator}    &lt;/security&gt;" else="">
+                <isset property="permissions-elevated"/>
+            </condition>
+            <local name="offline-allowed-token"/>
+            <condition property="offline-allowed-token" value="${line.separator}        &lt;offline-allowed/&gt;" else="">
+                <isset property="offline-allowed"/>
+            </condition>
+            <local name="update-mode-background-token"/>
+            <condition property="update-mode-background-token" value="background" else="always">
+                <isset property="update-mode-background"/>
+            </condition>
+            <local name="html-template-processed-available"/>
+            <condition property="html-template-processed-available">
+                <and>
+                    <isset property="javafx.run.htmltemplate.processed"/>
+                    <not>
+                        <equals arg1="${javafx.run.htmltemplate.processed}" arg2=""/>
+                    </not>
+                </and>
+            </condition>
+            <local name="javafx.deploy.icon.basename"/>
+            <basename property="javafx.deploy.icon.basename" file="${javafx.deploy.icon}"/>
+            <local name="local-icon-filename-available"/>
+            <condition property="local-icon-filename-available">
+                <and>
+                    <isset property="icon-available"/>
+                    <isset property="javafx.deploy.icon.basename"/>
+                    <not><equals arg1="${javafx.deploy.icon.basename}" arg2=""/></not>
+                    <not><contains string="${javafx.deploy.icon.basename}" substring="$${javafx" casesensitive="false"/></not>
+                    <not><contains string="${javafx.deploy.icon}" substring="http:" casesensitive="false"/></not>
+                </and>
+            </condition>
+            <local name="icon-token"/>
+            <condition property="icon-token" value="${line.separator}        &lt;icon href=&quot;${javafx.deploy.icon.basename}&quot; kind=&quot;default&quot;/&gt;">
+                <isset property="local-icon-filename-available"/>
+            </condition>
+            <condition property="icon-token" value="${line.separator}        &lt;icon href=&quot;${javafx.deploy.icon}&quot; kind=&quot;default&quot;/&gt;" else="">
+                <isset property="icon-available"/>
+            </condition>
+            <basename property="dist.filename" file="${dist.jar}" suffix=".jar"/>
+            <length file="${dist.jar}" property="dist.jar.size" />
+            <local name="vmargs-token"/>
+            <condition property="vmargs-token" value="java-vm-args=&quot;${run.jvmargs}&quot; " else="">
+                <isset property="vmargs-available"/>
+            </condition>
+            <local name="applet-params-token"/>
+            <local name="application-args-token"/>
+            <echo message="JavaScript: deploy-deploy-swing 1" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    function prefix(s, len) {
+                        if(s == null || len <= 0 || s.length == 0) {
+                            return new String("");
+                        }
+                        return new String(s.substr(0, len));
+                    }
+                    function replaceSuffix(s, os, ns) {
+                        return prefix(s, s.indexOf(os)).concat(ns);
+                    }
+                    function startsWith(s, prefix) {
+                        return (s != null) && (s.indexOf(prefix) == 0);
+                    }
+                    function endsWith(s, suffix) {
+                        var i = s.lastIndexOf(suffix);
+                        return  (i != -1) && (i == (s.length - suffix.length));
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    var JFXPAR = "javafx.param";
+                    var JFXPARN = "name";
+                    var JFXPARV = "value";
+
+                    var params = new java.lang.StringBuilder();
+                    var args = new java.lang.StringBuilder();
+                    var keys = project.getProperties().keys();
+                    while(keys.hasMoreElements()) {
+                        var pn = new String(keys.nextElement());
+                        if(startsWith(pn, JFXPAR) && endsWith(pn, JFXPARN)) {
+                            var propn = new String(project.getProperty(pn));
+                            if(defined(propn)) {
+                                var pv = replaceSuffix(pn, JFXPARN, JFXPARV);
+                                var propv = new String(project.getProperty(pv));
+                                if(defined(propv)) {
+                                    params.append("\n        <param name=\"");
+                                    params.append(propn);
+                                    params.append("\" value=\"");
+                                    params.append(propv);
+                                    params.append("\"/>");
+                                    args.append("\n        <argument>");
+                                    args.append(propn);
+                                    args.append("=");
+                                    args.append(propv);
+                                    args.append("</argument>");
+                                } else {
+                                    params.append("\n        <param name=\"");
+                                    params.append(propn);
+                                    params.append("\" value=\"\"/>");
+                                    args.append("\n        <argument>");
+                                    args.append(propn);
+                                    args.append("</argument>");
+                                }
+                            }
+                        }
+                    }
+                    project.setProperty("applet-params-token", new String(params.toString()));
+                    project.setProperty("application-args-token", new String(args.toString()));
+                ]]>
+            </script>
+            <local name="application.desc.processed"/>
+            <condition property="application.desc.processed" value="${application.desc}" else="Swing applet embedding JavaFX components.">
+                <isset property="application.desc"/>
+            </condition>
+            <filterchain id="jnlp.template.filter">
+                <replacetokens>
+                    <token key="NAME" value="${dist.filename}"/>
+                    <token key="MAINCLASS" value="${main.class}"/>
+                    <token key="FILESIZE" value="${dist.jar.size}"/>
+                    <token key="VENDOR" value="${application.vendor}"/>
+                    <token key="TITLE" value="${application.title}"/>
+                    <token key="DESCRIPTION" value="${application.desc.processed}"/>
+                    <token key="WIDTH" value="${javafx.run.width}"/>
+                    <token key="HEIGHT" value="${javafx.run.height}"/>
+                    <token key="PERMISSIONS" value="${permissions-elevated-token}"/>
+                    <token key="OFFLINE" value="${offline-allowed-token}"/>
+                    <token key="UPDATEMODE" value="${update-mode-background-token}"/>
+                    <token key="ICON" value="${icon-token}"/>
+                    <token key="VMARGS" value="${vmargs-token}"/>
+                    <token key="PARAMETERS" value="${applet-params-token}"/>
+                    <token key="ARGUMENTS" value="${application-args-token}"/>
+                </replacetokens>
+            </filterchain>
+            <copy file="${basedir}${file.separator}nbproject${file.separator}templates${file.separator}FXSwingTemplateApplication.jnlp" 
+                    tofile="${dist.dir}${file.separator}${dist.filename}_application.jnlp" >
+                    <filterchain refid="jnlp.template.filter"/>
+            </copy>        
+            <copy file="${basedir}${file.separator}nbproject${file.separator}templates${file.separator}FXSwingTemplateApplet.jnlp" 
+                    tofile="${dist.dir}${file.separator}${dist.filename}_applet.jnlp" >
+                    <filterchain refid="jnlp.template.filter"/>
+            </copy>        
+            <copy file="${basedir}${file.separator}nbproject${file.separator}templates${file.separator}FXSwingTemplate.html" 
+                    tofile="${dist.dir}${file.separator}${dist.filename}.html" >
+                    <filterchain refid="jnlp.template.filter"/>
+            </copy>
+            <echo message="JavaScript: deploy-deploy-swing 2" level="verbose"/>
+            <script language="javascript">
+                <![CDATA[
+                    function startsWith(s, prefix) {
+                        return (s != null) && (s.indexOf(prefix) == 0);
+                    }
+                    function defined(s) {
+                        return (s != null) && (s != "null") && (s.length > 0);
+                    }
+                    var PREF = "file:";
+                    var doCopyIcon = new String(project.getProperty("local-icon-filename-available"));
+                    if(defined(doCopyIcon)) {
+                        var iconProp = new String(project.getProperty("javafx.deploy.icon"));
+                        if(startsWith(iconProp, PREF)) {
+                            iconProp = iconProp.slice(PREF.length);
+                        }
+                        while(iconProp.charAt(0) == "/") {
+                            iconProp = iconProp.slice(1);
+                        }
+                        var S = java.io.File.separator;
+                        var baseDir = new String(project.getProperty("basedir"));
+                        var distDir = new String(project.getProperty("dist.dir"));
+                        var copyTask = new String(project.createTask("copy"));
+                        var source = new java.io.File(iconProp);
+                        var target = new java.io.File(baseDir.concat(S).concat(distDir));
+                        copyTask.setFile(source);
+                        copyTask.setTodir(target);
+                        copyTask.setFlatten(true);
+                        copyTask.setFailOnError(false);
+                        copyTask.perform();
+                    }
+                    var doCopyHTMLFrom = new String(project.getProperty("html-template-available"));
+                    var doCopyHTMLTo = new String(project.getProperty("html-template-processed-available"));
+                    if(defined(doCopyHTMLFrom) && defined(doCopyHTMLTo)) {
+                        var htmlFrom = new String(project.getProperty("javafx.run.htmltemplate"));
+                        if(startsWith(htmlFrom, PREF)) {
+                            htmlFrom = htmlFrom.slice(PREF.length);
+                        }
+                        while(startsWith(htmlFrom, "/")) {
+                            htmlFrom = htmlFrom.slice(1);
+                        }
+                        var htmlTo = new String(project.getProperty("javafx.run.htmltemplate.processed"));
+                        if(startsWith(htmlTo, PREF)) {
+                            htmlTo = htmlTo.slice(PREF.length);
+                        }
+                        while(startsWith(htmlTo, "/")) {
+                            htmlTo = htmlTo.slice(1);
+                        }
+                        var copyTask = project.createTask("copy");
+                        var source = new java.io.File(htmlFrom);
+                        var target = new java.io.File(htmlTo);
+                        copyTask.setFile(source);
+                        copyTask.setTofile(target);
+                        copyTask.setFailOnError(false);
+                        copyTask.perform();
+                    }
+                ]]>
+            </script>
+            <antcall target="-post-jfx-deploy"/>
+        </sequential>
+    </macrodef>
+
+
+    <!-- Fallback Project Deployment Macros To Support At Least Partially JDKs Without JavaScript Support -->
+    
+    <macrodef name="fallback-deploy-application-def">
+        <sequential>
+            <echo message="Warning: Parameters (if any) not passed to &lt;fx:application&gt; in fallback build mode due to JDK missing JavaScript support."/>
+            <fx:application id="fxApp"
+                name="${application.title}"
+                mainClass="${javafx.main.class}"
+                fallbackClass="${javafx.fallback.class}">
+                <!-- PARAMETERS NOT PASSED IN FALLBACK -->
+            </fx:application>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-application-def-preloader">
+        <sequential>
+            <echo message="Warning: Parameters (if any) not passed to &lt;fx:application&gt; in fallback build mode due to JDK missing JavaScript support."/>
+            <fx:application id="fxApp"
+                name="${application.title}"
+                mainClass="${javafx.main.class}"
+                preloaderClass="${javafx.preloader.class}"
+                fallbackClass="${javafx.fallback.class}">
+                <!-- PARAMETERS NOT PASSED IN FALLBACK -->
+            </fx:application>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-application-def-swing">
+        <sequential>
+            <echo message="Warning: Parameters (if any) not passed to &lt;fx:application&gt; in fallback build mode due to JDK missing JavaScript support."/>
+            <fx:application id="fxApp"
+                name="${application.title}"
+                mainClass="${main.class}"
+                fallbackClass="${javafx.fallback.class}"
+                toolkit="swing">
+                <!-- PARAMETERS NOT PASSED IN FALLBACK -->
+            </fx:application>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-resources">
+        <sequential>
+            <fx:resources id="appRes">
+                <fx:fileset requiredFor="startup" dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                    <exclude name="lib${file.separator}${jfx.deployment.jar}"/>
+                </fx:fileset>
+            </fx:resources>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-resources-preloader">
+        <sequential>
+            <fx:resources id="appRes">
+                <fx:fileset requiredFor="preloader" dir="${jfx.deployment.dir}">
+                    <include name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                </fx:fileset>
+                <fx:fileset requiredFor="startup" dir="${jfx.deployment.dir}">
+                    <include name="${jfx.deployment.jar}"/>
+                    <include name="lib${file.separator}*.jar"/>
+                    <exclude name="lib${file.separator}${javafx.preloader.jar.filename}"/>
+                    <exclude name="lib${file.separator}${jfx.deployment.jar}"/>
+                </fx:fileset>
+            </fx:resources>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-jar">
+        <sequential>
+            <antcall target="-pre-jfx-jar"/>
+            <fx:jar destfile="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}">
+                <fx:application refid="fxApp"/>
+                <fx:resources refid="appRes"/>
+                <fileset dir="${build.classes.dir}">
+                    <exclude name="**${file.separator}*.${css-exclude-ext}"/>
+                </fileset>
+                <manifest>
+                    <attribute name="Implementation-Vendor" value="${application.vendor}"/>
+                    <attribute name="Implementation-Title" value="${application.title}"/>
+                    <attribute name="Implementation-Version" value="1.0"/>
+                </manifest>
+            </fx:jar>
+            <antcall target="-post-jfx-jar"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-deploy">
+        <sequential>
+            <antcall target="-pre-jfx-deploy"/>
+            <echo message="Warning: JVM Arguments and Callbacks (if any) not passed to &lt;fx:deploy&gt; in fallback build mode due to JDK missing JavaScript support."/>
+            <fx:deploy width="${javafx.width}" height="${javafx.height}"
+                      outdir="${jfx.deployment.dir}" embedjnlp="true" updatemode="${update-mode}"
+                      outfile="${application.title}" includeDT="${javafx.deploy.includeDT}">
+                <fx:application refid="fxApp"/>
+                <fx:resources refid="appRes"/>
+                <fx:info title="${application.title}" vendor="${application.vendor}"/>
+                <fx:permissions elevated="${permissions.elevated}"/>
+                <fx:preferences shortcut="${javafx.deploy.adddesktopshortcut}" install="${javafx.deploy.installpermanently}" menu="${javafx.deploy.addstartmenushortcut}"/>
+                <!-- PLATFORM NOT PASSED IN FALLBACK -->
+                <!-- CALLBACKS NOT PASSED IN FALLBACK -->
+            </fx:deploy>
+            <antcall target="-post-jfx-deploy"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="fallback-deploy-deploy-template">
+        <sequential>
+            <antcall target="-pre-jfx-deploy"/>
+            <echo message="Warning: JVM Arguments and Callbacks (if any) not passed to &lt;fx:deploy&gt; in fallback build mode due to JDK missing JavaScript support."/>
+            <deploy-process-template/>
+            <fx:deploy width="${javafx.width}" height="${javafx.height}"
+                      outdir="${jfx.deployment.dir}" embedjnlp="true" updatemode="${update-mode}"
+                      outfile="${application.title}" includeDT="${javafx.deploy.includeDT}">
+                <fx:application refid="fxApp"/>
+                <fx:resources refid="appRes"/>
+                <fx:info title="${application.title}" vendor="${application.vendor}"/>
+                <fx:permissions elevated="${permissions.elevated}"/>
+                <fx:preferences shortcut="${javafx.deploy.adddesktopshortcut}" install="${javafx.deploy.installpermanently}" menu="${javafx.deploy.addstartmenushortcut}"/>
+                <fx:template file="${javafx.run.htmltemplate}" tofile="${javafx.run.htmltemplate.processed}"/>
+                <!-- PLATFORM NOT PASSED IN FALLBACK -->
+                <!-- CALLBACKS NOT PASSED IN FALLBACK -->
+            </fx:deploy>
+            <antcall target="-post-jfx-deploy"/>
+        </sequential>
+    </macrodef>
+
+
+    <!-- Project Deployment Targets -->
+
+    <target name="-check-sign" depends="-check-project,-javafx-init-keystore" if="javafx.signed.true+signjars.task.available">
+        <condition property="sign-nopreloader-notemplate">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-preloader-notemplate">
+            <and>
+                <isset property="app-with-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-nopreloader-template">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-preloader-template">
+            <and>
+                <isset property="app-with-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-nopreloader-notemplate-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <isset property="fx-in-swing-app-workaround"/>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-nopreloader-template-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <isset property="fx-in-swing-app-workaround"/>
+                <not><isset property="use-blob-signing"/></not>
+            </and>
+        </condition>
+        <condition property="sign-blob-nopreloader-notemplate">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+        <condition property="sign-blob-preloader-notemplate">
+            <and>
+                <isset property="app-with-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+        <condition property="sign-blob-nopreloader-template">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+        <condition property="sign-blob-preloader-template">
+            <and>
+                <isset property="app-with-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+        <condition property="sign-blob-nopreloader-notemplate-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <isset property="fx-in-swing-app-workaround"/>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+        <condition property="sign-blob-nopreloader-template-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <isset property="fx-in-swing-app-workaround"/>
+                <isset property="use-blob-signing"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-check-nosign" depends="-check-project">
+        <condition property="nosign-nopreloader-notemplate">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="javafx.signed.true"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+            </and>
+        </condition>
+        <condition property="nosign-preloader-notemplate">
+            <and>
+                <isset property="app-with-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="javafx.signed.true"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+            </and>
+        </condition>
+        <condition property="nosign-nopreloader-template">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="javafx.signed.true"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+            </and>
+        </condition>
+        <condition property="nosign-preloader-template">
+            <and>
+                <isset property="app-with-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="javafx.signed.true"/></not>
+                <not><isset property="fx-in-swing-app-workaround"/></not>
+            </and>
+        </condition>
+        <condition property="nosign-nopreloader-notemplate-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <not><isset property="html-template-available"/></not>
+                <not><isset property="javafx.signed.true"/></not>
+                <isset property="fx-in-swing-app-workaround"/>
+            </and>
+        </condition>
+        <condition property="nosign-nopreloader-template-swing">
+            <and>
+                <isset property="app-without-preloader"/>
+                <isset property="html-template-available"/>
+                <not><isset property="javafx.signed.true"/></not>
+                <isset property="fx-in-swing-app-workaround"/>
+            </and>
+        </condition>
+    </target>
+
+
+    <!-- WITH SIGNING -->
+
+    <!-- project without preloader -->
+    <!-- no html template -->
+    <target name="-deploy-app-sign-nopreloader-notemplate" depends="-check-sign" if="sign-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-sign-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign/>
+        <deploy-deploy/>
+    </target>
+    <target name="-deploy-app-sign-blob-nopreloader-notemplate" depends="-check-sign" if="sign-blob-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-sign-blob-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project with preloader -->
+    <!-- no html template -->
+    <target name="-deploy-app-sign-preloader-notemplate" depends="-check-sign" if="sign-preloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-sign-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-preloader/>
+        <deploy-deploy/>
+    </target>
+    <target name="-deploy-app-sign-blob-preloader-notemplate" depends="-check-sign" if="sign-blob-preloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-sign-blob-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob-preloader/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- html template -->
+    <target name="-deploy-app-sign-nopreloader-template" depends="-check-sign" if="sign-nopreloader-template" unless="preloader-app">
+        <echo message="-deploy-app-sign-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+    <target name="-deploy-app-sign-blob-nopreloader-template" depends="-check-sign" if="sign-blob-nopreloader-template" unless="preloader-app">
+        <echo message="-deploy-app-sign-blob-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project with preloader -->
+    <!-- html template -->
+    <target name="-deploy-app-sign-preloader-template" depends="-check-sign" if="sign-preloader-template" unless="preloader-app">
+        <echo message="-deploy-app-sign-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-preloader/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+    <target name="-deploy-app-sign-blob-preloader-template" depends="-check-sign" if="sign-blob-preloader-template" unless="preloader-app">
+        <echo message="-deploy-app-sign-blob-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob-preloader/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- no html template -->
+    <!-- FX in Swing app -->
+    <target name="-deploy-app-sign-nopreloader-notemplate-swing" depends="-check-sign" if="sign-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-sign-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign/>
+        <deploy-deploy-swing/>
+    </target>
+    <target name="-deploy-app-sign-blob-nopreloader-notemplate-swing" depends="-check-sign" if="sign-blob-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-sign-blob-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob/>
+        <deploy-deploy-swing/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- html template -->
+    <!-- FX in Swing app -->
+    <target name="-deploy-app-sign-nopreloader-template-swing" depends="-check-sign" if="sign-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-sign-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign/>
+        <deploy-process-template/>
+        <deploy-deploy-swing/>
+    </target>
+    <target name="-deploy-app-sign-blob-nopreloader-template-swing" depends="-check-sign" if="sign-blob-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-sign-blob-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-sign-blob/>
+        <deploy-process-template/>
+        <deploy-deploy-swing/>
+    </target>
+
+
+    <!-- NO SIGNING -->
+
+    <!-- project without preloader -->
+    <!-- no html template -->
+    <target name="-deploy-app-nosign-nopreloader-notemplate" depends="-check-nosign" if="nosign-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-nosign-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project with preloader -->
+    <!-- no html template -->
+    <target name="-deploy-app-nosign-preloader-notemplate" depends="-check-nosign" if="nosign-preloader-notemplate" unless="preloader-app">
+        <echo message="-deploy-app-nosign-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- html template -->
+    <target name="-deploy-app-nosign-nopreloader-template" depends="-check-nosign" if="nosign-nopreloader-template" unless="preloader-app">
+        <echo message="-deploy-app-nosign-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project with preloader -->
+    <!-- html template -->
+    <target name="-deploy-app-nosign-preloader-template" depends="-check-nosign" if="nosign-preloader-template" unless="preloader-app">
+        <echo message="-deploy-app-nosign-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-process-template/>
+        <deploy-deploy/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- no html template -->
+    <!-- FX in Swing app -->
+    <target name="-deploy-app-nosign-nopreloader-notemplate-swing" depends="-check-nosign" if="nosign-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-nosign-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-deploy-swing/>
+    </target>
+
+    <!-- project without preloader -->
+    <!-- html template -->
+    <!-- FX in Swing app -->
+    <target name="-deploy-app-nosign-nopreloader-template-swing" depends="-check-nosign" if="nosign-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-deploy-app-nosign-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <deploy-jar/>
+        <deploy-process-template/>
+        <deploy-deploy-swing/>
+    </target>
+
+
+    <!-- FALLBACK (NO JAVASCRIPT) TARGETS WITH SIGNING -->
+
+    <target name="-check-fallback-sign-deploy-swing-possible" depends="-check-sign">
+        <local name="fail-deploy-swing-possible"/>
+        <condition property="fail-deploy-swing-possible">
+            <and>
+                <or>
+                    <isset property="sign-nopreloader-notemplate-swing"/>
+                    <isset property="sign-nopreloader-template-swing"/>
+                </or>
+                <not><isset property="have-fx-ant-api-1.2"/></not>
+            </and>
+        </condition>
+        <fail message="Error: JavaFX SDK version 2.2 or newer is needed to deploy FX-in-Swing on JDK without JavaScript support." 
+              if="fail-deploy-swing-possible"/>
+    </target>
+    
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK no html template -->
+    <target name="-fallback-deploy-app-sign-nopreloader-notemplate" depends="-check-sign" if="sign-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign/>
+        <fallback-deploy-deploy/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-nopreloader-notemplate" depends="-check-sign" if="sign-blob-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-blob-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project with preloader -->
+    <!-- FALLBACK no html template -->
+    <target name="-fallback-deploy-app-sign-preloader-notemplate" depends="-check-sign" if="sign-preloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <deploy-sign-preloader/>
+        <fallback-deploy-deploy/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-preloader-notemplate" depends="-check-sign" if="sign-blob-preloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-blob-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob-preloader/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK html template -->
+    <target name="-fallback-deploy-app-sign-nopreloader-template" depends="-check-sign" if="sign-nopreloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign/>
+        <fallback-deploy-deploy-template/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-nopreloader-template" depends="-check-sign" if="sign-blob-nopreloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-blob-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+    <!-- FALLBACK project with preloader -->
+    <!-- FALLBACK html template -->
+    <target name="-fallback-deploy-app-sign-preloader-template" depends="-check-sign" if="sign-preloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <deploy-sign-preloader/>
+        <fallback-deploy-deploy-template/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-preloader-template" depends="-check-sign" if="sign-blob-preloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-sign-blob-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob-preloader/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK no html template -->
+    <!-- FALLBACK FX in Swing app -->
+    <target name="-fallback-deploy-app-sign-nopreloader-notemplate-swing" depends="-check-fallback-sign-deploy-swing-possible" if="sign-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-sign-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign/>
+        <fallback-deploy-deploy/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-nopreloader-notemplate-swing" depends="-check-fallback-sign-deploy-swing-possible" if="sign-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-sign-blob-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK html template -->
+    <!-- FALLBACK FX in Swing app -->
+    <target name="-fallback-deploy-app-sign-nopreloader-template-swing" depends="-check-fallback-sign-deploy-swing-possible" if="sign-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-sign-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign/>
+        <fallback-deploy-deploy-template/>
+    </target>
+    <target name="-fallback-deploy-app-sign-blob-nopreloader-template-swing" depends="-check-fallback-sign-deploy-swing-possible" if="sign-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-sign-blob-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <deploy-sign-blob/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+
+    <!-- FALLBACK (NO JAVASCRIPT) TARGETS NO SIGNING -->
+
+    <target name="-check-fallback-nosign-deploy-swing-possible" depends="-check-nosign">
+        <local name="fail-deploy-swing-possible"/>
+        <condition property="fail-deploy-swing-possible">
+            <and>
+                <or>
+                    <isset property="nosign-nopreloader-notemplate-swing"/>
+                    <isset property="nosign-nopreloader-template-swing"/>
+                </or>
+                <not><isset property="have-fx-ant-api-1.2"/></not>
+            </and>
+        </condition>
+        <fail message="Error: JavaFX SDK version 2.2 or newer is needed to deploy FX-in-Swing on JDK without JavaScript support." 
+              if="fail-deploy-swing-possible"/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK no html template -->
+    <target name="-fallback-deploy-app-nosign-nopreloader-notemplate" depends="-check-nosign" if="nosign-nopreloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-nosign-nopreloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project with preloader -->
+    <!-- FALLBACK no html template -->
+    <target name="-fallback-deploy-app-nosign-preloader-notemplate" depends="-check-nosign" if="nosign-preloader-notemplate" unless="preloader-app">
+        <echo message="-fallback-deploy-app-nosign-preloader-notemplate" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK html template -->
+    <target name="-fallback-deploy-app-nosign-nopreloader-template" depends="-check-nosign" if="nosign-nopreloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-nosign-nopreloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+    <!-- FALLBACK project with preloader -->
+    <!-- FALLBACK html template -->
+    <target name="-fallback-deploy-app-nosign-preloader-template" depends="-check-nosign" if="nosign-preloader-template" unless="preloader-app">
+        <echo message="-fallback-deploy-app-nosign-preloader-template" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-preloader/>
+        <fallback-deploy-resources-preloader/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK no html template -->
+    <!-- FALLBACK FX in Swing app -->
+    <target name="-fallback-deploy-app-nosign-nopreloader-notemplate-swing" depends="-check-fallback-nosign-deploy-swing-possible" if="nosign-nopreloader-notemplate-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-nosign-nopreloader-notemplate-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy/>
+    </target>
+
+    <!-- FALLBACK project without preloader -->
+    <!-- FALLBACK html template -->
+    <!-- FALLBACK FX in Swing app -->
+    <target name="-fallback-deploy-app-nosign-nopreloader-template-swing" depends="-check-fallback-nosign-deploy-swing-possible" if="nosign-nopreloader-template-swing" unless="preloader-app-no-workaround">
+        <echo message="-fallback-deploy-app-nosign-nopreloader-template-swing" level="verbose"/>
+        <deploy-defines/>
+        <deploy-preprocess/>
+        <fallback-deploy-application-def-swing/>
+        <fallback-deploy-resources/>
+        <fallback-deploy-jar/>
+        <fallback-deploy-deploy-template/>
+    </target>
+
+
+    <!-- Project Build Targets -->
+
+    <target name="jfx-build" depends="-jfx-do-compile, -jfx-do-jar, -jfx-do-post-jar"/>
+    <target name="jfx-build-noscript" depends="-set-fallback-no-javascript, -jfx-do-compile, -jfx-do-jar, -jfx-do-post-jar"/>
+    
+    <target name="jfx-rebuild" depends="clean, -jfx-do-compile, -jfx-do-jar, -jfx-do-post-jar"/>
+    <target name="jfx-rebuild-noscript" depends="-set-fallback-no-javascript, clean, -jfx-do-compile, -jfx-do-jar, -jfx-do-post-jar"/>
+
+    <target name="jfx-build-native" depends="-set-do-build-native-package, -check-ant-jre-supports-native-packaging, -check-native-packager-external-tools, jfx-rebuild"/>
+    <target name="jfx-build-native-noscript" depends="-set-do-build-native-package, -check-ant-jre-supports-native-packaging, -check-native-packager-external-tools, jfx-rebuild-noscript"/>
+
+    <target name="build-native">
+        <property name="javafx.native.bundling.type" value="${native.bundling.type}"/>
+        <antcall target="jfx-build-native"/>
+    </target>
+    <target name="build-native-noscript">
+        <property name="javafx.native.bundling.type" value="${native.bundling.type}"/>        
+        <antcall target="jfx-build-native-noscript"/>
+    </target>
+    
+    <target name="-check-do-jar">
+        <condition property="do-jar-false">
+            <and>
+                <isset property="do.jar"/>
+                <equals arg1="${do.jar}" arg2="false"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-set-fallback-no-javascript">
+        <property name="fallback.no.javascript" value="true"/>
+        <echo message="Warning: Using fallback build infrastructure due to default JDK missing JavaScript support."/>
+    </target>
+    <target name="-jfx-do-compile" depends="-check-do-jar" if="do-jar-false">
+        <antcall target="compile"/>
+    </target>
+    <target name="-jfx-do-jar" depends="-check-do-jar" unless="do-jar-false">
+        <antcall target="jar"/>
+    </target>
+    <target name="-jfx-do-post-jar" depends="-init-check,-check-project" if="preloader-app">
+        <!-- Preloaders are created using SE copylibs task that creates readme file relevant for SE only -->
+        <delete file="${basedir}${file.separator}${dist.dir}${file.separator}README.TXT"/>
+    </target>
+    
+    <target name="-set-do-build-native-package">
+        <property name="do.build.native.package" value="true"/>
+        <echo message="do.build.native.package = ${do.build.native.package}" level="verbose"/>
+    </target>
+    <target name="-check-ant-jre-supports-native-packaging" depends="-check-ant-jre-version">
+        <fail message="Error:${line.separator}JavaFX native packager requires NetBeans to run on JDK 1.7u6 or later !" if="have-ant-jre-pre7u6"/>
+    </target>
+    
+    <target name="-call-pre-jfx-native" if="do.build.native.package">
+        <antcall target="-pre-jfx-native"/>
+    </target>
+    <target name="-call-post-jfx-native" if="do.build.native.package">
+        <antcall target="-post-jfx-native"/>
+    </target>
+
+    <target name="-check-native-bundling-type" depends="-check-operating-system" if="do.build.native.package">
+        <condition property="need.Inno.presence">
+            <and>
+                <isset property="running.on.windows"/>
+                <isset property="javafx.native.bundling.type"/>
+                <or>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="all" casesensitive="false"/>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="installer" casesensitive="false"/>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="exe" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.WiX.presence">
+            <and>
+                <isset property="running.on.windows"/>
+                <isset property="javafx.native.bundling.type"/>
+                <or>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="all" casesensitive="false"/>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="installer" casesensitive="false"/>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="msi" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.dpkg.presence">
+            <and>
+                <isset property="running.on.unix"/>
+                <isset property="javafx.native.bundling.type"/>
+                <or>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="deb" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <condition property="need.rpmbuild.presence">
+            <and>
+                <isset property="running.on.unix"/>
+                <isset property="javafx.native.bundling.type"/>
+                <or>
+                    <equals arg1="${javafx.native.bundling.type}" arg2="rpm" casesensitive="false"/>
+                </or>
+            </and>
+        </condition>
+        <echo message="need.Inno.presence:${need.Inno.presence}" level="verbose"/>
+        <echo message="need.WiX.presence:${need.WiX.presence}" level="verbose"/>
+        <echo message="need.dpkg.presence:${need.dpkg.presence}" level="verbose"/>
+        <echo message="need.rpmbuild.presence:${need.rpmbuild.presence}" level="verbose"/>
+    </target>
+    <target name="-check-Inno-presence" depends="-check-native-bundling-type" if="need.Inno.presence">
+        <local name="exec-output"/>
+        <local name="exec-error"/>
+        <local name="exec-result"/>
+        <exec executable="iscc" outputproperty="exec-output" failifexecutionfails="false" errorproperty="exec-error" resultproperty="exec-result"/>
+        <echo message="exec-output:${exec-output}" level="verbose"/>
+        <echo message="exec-error:${exec-error}" level="verbose"/>
+        <echo message="exec-result:${exec-result}" level="verbose"/>
+        <condition property="missing.Inno">
+            <not><and>
+                <contains string="${exec-output}" substring="Inno Setup"/>
+                <not><contains string="${exec-output}" substring="Inno Setup 1"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 2"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 3"/></not>
+                <not><contains string="${exec-output}" substring="Inno Setup 4"/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-WiX-presence" depends="-check-native-bundling-type" if="need.WiX.presence">
+        <local name="exec-output"/>
+        <local name="exec-error"/>
+        <local name="exec-result"/>
+        <exec executable="candle" outputproperty="exec-output" failifexecutionfails="false" errorproperty="exec-error" resultproperty="exec-result">
+            <arg value="-?"/>
+        </exec>
+        <echo message="exec-output:${exec-output}" level="verbose"/>
+        <echo message="exec-error:${exec-error}" level="verbose"/>
+        <echo message="exec-result:${exec-result}" level="verbose"/>
+        <condition property="missing.WiX">
+            <not>
+                <matches string="${exec-output}" pattern="windows\s+installer\s+xml\s+(toolset\s+)?compiler\s+version\s+3.*" casesensitive="false"/>
+            </not>
+        </condition>
+    </target>
+    <target name="-check-dpkg-presence" depends="-check-native-bundling-type" if="need.dpkg.presence">
+        <local name="exec.which.dpkg.result"/>
+        <local name="exec.which.dpkg.output"/>
+        <exec executable="command" failifexecutionfails="false" failonerror="false" resultproperty="exec.which.dpkg.result" outputproperty="exec.which.dpkg.output">
+            <arg line="-v dpkg"/>
+        </exec>
+        <condition property="missing.dpkg">
+            <not><and>
+                <isset property="exec.which.dpkg.result"/>
+                <equals arg1="${exec.which.dpkg.result}" arg2="0"/>
+                <isset property="exec.which.dpkg.output"/>
+                <not><equals arg1="${exec.which.dpkg.output}" arg2=""/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-rpmbuild-presence" depends="-check-native-bundling-type" if="need.rpmbuild.presence">
+        <local name="exec.which.rpmbuild.result"/>
+        <local name="exec.which.rpmbuild.output"/>
+        <exec executable="command" failifexecutionfails="false" failonerror="false" resultproperty="exec.which.rpmbuild.result" outputproperty="exec.which.rpmbuild.output">
+            <arg line="-v rpmbuild"/>
+        </exec>
+        <condition property="missing.rpmbuild">
+            <not><and>
+                <isset property="exec.which.rpmbuild.result"/>
+                <equals arg1="${exec.which.rpmbuild.result}" arg2="0"/>
+                <isset property="exec.which.rpmbuild.output"/>
+                <not><equals arg1="${exec.which.rpmbuild.output}" arg2=""/></not>
+            </and></not>
+        </condition>
+    </target>
+    <target name="-check-native-packager-external-tools" depends="-check-Inno-presence, -check-WiX-presence, -check-dpkg-presence, -check-rpmbuild-presence">
+        <property name="missing.Inno.message" value="JavaFX native packager requires external Inno Setup 5+ tools installed and included on PATH to create EXE installer. See http://www.jrsoftware.org/"/>
+        <property name="missing.WiX.message" value="JavaFX native packager requires external WiX 3.0+ tools installed and included on PATH to create MSI installer. See http://wix.sourceforge.net/"/>
+        <property name="missing.dpkg.message" value="JavaFX native packager requires Debian Packager tools to create DEB package, but dpkg could not be found."/>
+        <property name="missing.rpmbuild.message" value="JavaFX native packager requires RPMBuild to create RPM package, but rpmbuild could not be found."/>
+        <condition property="missing.Inno.WiX">
+            <and>
+                <isset property="missing.Inno"/>
+                <isset property="missing.WiX"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}${missing.Inno.message}${line.separator}${missing.WiX.message}" if="missing.Inno.WiX"/>
+        <fail message="Error:${line.separator}${missing.Inno.message}" if="missing.Inno"/>
+        <fail message="Error:${line.separator}${missing.WiX.message}" if="missing.WiX"/>
+        <fail message="Error:${line.separator}${missing.dpkg.message}" if="missing.dpkg"/>
+        <fail message="Error:${line.separator}${missing.rpmbuild.message}" if="missing.rpmbuild"/>
+    </target>
+
+    <!-- Project Run Support -->
+
+    <target name="-warn-of-preloader" depends="-check-project" if="preloader-app-no-workaround">
+        <fail message="Error:${line.separator}JavaFX 2 Preloader Project can not be executed directly.${line.separator}Please execute instead a JavaFX Application that uses the Preloader."/>
+    </target>
+    
+    <target name="-mark-project-state-running">
+        <property name="project.state.running" value="true"/>
+        <echo message="project.state.running = ${project.state.running}" level="verbose"/>
+    </target>
+    <target name="-mark-project-state-debugging">
+        <property name="project.state.debugging" value="true"/>
+        <echo message="project.state.debugging = ${project.state.debugging}" level="verbose"/>
+    </target>
+    <target name="-mark-project-state-debugging-in-browser" depends="-mark-project-state-debugging">
+        <property name="project.state.debugging.in.browser" value="true"/>
+        <echo message="project.state.debugging.in.browser = ${project.state.debugging.in.browser}" level="verbose"/>
+    </target>
+    <target name="-mark-project-state-profiling">
+        <property name="project.state.profiling" value="true"/>
+        <echo message="project.state.profiling = ${project.state.profiling}" level="verbose"/>
+    </target>
+    <target name="-mark-project-needs-jnlp">
+        <property name="project.needs.jnlp" value="true"/>
+        <echo message="project.needs.jnlp = ${project.needs.jnlp}" level="verbose"/>
+    </target>
+    
+    <!-- set property javafx.disable.concurrent.runs=true to disable runs from temporary directory -->
+    <target name="-check-concurrent-runs">
+        <condition property="disable-concurrent-runs">
+            <and>
+                <isset property="javafx.disable.concurrent.runs"/>
+                <equals arg1="${javafx.disable.concurrent.runs}" arg2="true" trim="true"/>
+            </and>
+        </condition>
+        <condition property="temp.run.jar" value="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}">
+            <isset property="disable-concurrent-runs"/>
+        </condition>
+        <condition property="temp.run.jnlp" value="${jfx.deployment.jnlp}">
+            <isset property="disable-concurrent-runs"/>
+        </condition>
+        <condition property="temp.run.html" value="${jfx.deployment.html}">
+            <isset property="disable-concurrent-runs"/>
+        </condition>
+    </target>
+    <target name="-create-temp-run-dir" depends="-check-concurrent-runs" unless="disable-concurrent-runs">
+        <echo message="Creating temp run dir" level="verbose"/>
+        <tempfile property="temp.run.dir" destDir="${basedir}${file.separator}${dist.dir}${file.separator}" prefix="run"/>
+        <echo message="temp.run.dir = ${temp.run.dir}" level="verbose"/>
+        <copy todir="${temp.run.dir}" includeemptydirs="true" overwrite="true">
+            <fileset dir="${basedir}${file.separator}${dist.dir}">
+                <exclude name="**${file.separator}bundles${file.separator}**"/>
+                <exclude name="**${file.separator}run*${file.separator}**"/>
+            </fileset>
+        </copy>        
+        <property name="temp.run.jar" value="${temp.run.dir}${file.separator}${jfx.deployment.jar}"/>
+        <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+        <property name="temp.run.jnlp" value="${temp.run.dir}${file.separator}${jfx.deployment.base}.jnlp"/>
+        <property name="temp.run.html" value="${temp.run.dir}${file.separator}${jfx.deployment.base}.html"/>
+    </target>
+    <target name="-remove-temp-run-dir" if="temp.run.dir">
+        <echo message="Removing temp run dir" level="verbose"/>
+        <delete dir="${temp.run.dir}" quiet="true" failonerror="false"/>
+    </target>
+    <target depends="init,compile,jar,-create-temp-run-dir" description="Run JavaFX project standalone." name="jfx-project-run">
+        <echo message="Executing ${temp.run.jar} using platform ${platform.java}"/>
+        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>        
+        <java jar="${temp.run.jar}" dir="${work.dir}" fork="true" jvm="${platform.java}">
+            <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+            <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+            <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+            <jvmarg line="${run.jvmargs}"/>
+            <jvmarg line="${run.jvmargs.ide}"/>
+            <classpath>
+                <path path="${temp.run.jar}:${javac.classpath}"/>
+            </classpath>
+            <arg line="${application.args}"/>
+            <syspropertyset>
+                <propertyref prefix="run-sys-prop."/>
+                <mapper from="run-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+        </java>
+        <antcall target="-remove-temp-run-dir"/>
+    </target>
+    <target depends="init,compile,jar,-create-temp-run-dir,-debug-start-debugger" description="Debug JavaFX project standalone." name="jfx-project-debug">
+        <echo message="Executing ${temp.run.jar} using platform ${platform.java}"/>
+        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>        
+        <java jar="${temp.run.jar}" dir="${work.dir}" fork="true" jvm="${platform.java}">
+            <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+            <jvmarg line="${debug-args-line}"/>
+            <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+            <jvmarg value="-Dglass.disableGrab=true"/>
+            <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+            <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+            <jvmarg line="${run.jvmargs}"/>
+            <jvmarg line="${run.jvmargs.ide}"/>
+            <classpath>
+                <path path="${temp.run.jar}:${javac.classpath}"/>
+            </classpath>
+            <arg line="${application.args}"/>
+            <syspropertyset>
+                <propertyref prefix="run-sys-prop."/>
+                <mapper from="run-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+        </java>
+        <antcall target="-remove-temp-run-dir"/>
+    </target>
+
+
+    <!-- Running/Debugging/Profiling Standalone -->
+
+    <target name="jfxsa-run" depends="-mark-project-state-running,-clean-if-config-changed,-check-jfx-runtime,-warn-of-preloader,jfx-project-run"/>
+    <target name="jfxsa-run-noscript" depends="-set-fallback-no-javascript, jfxsa-run"/>
+
+    <target name="jfxsa-debug" depends="-mark-project-state-debugging,-clean-if-config-changed,jar,-check-jfx-runtime,-warn-of-preloader,jfx-project-debug"/>
+    <target name="jfxsa-debug-noscript" depends="-set-fallback-no-javascript, jfxsa-debug"/>
+    
+    <target name="jfxsa-profile" depends="-mark-project-state-profiling,-check-jfx-runtime,-warn-of-preloader,jfx-project-profile"/>
+    <target name="jfxsa-profile-noscript" depends="-set-fallback-no-javascript, jfxsa-profile"/>
+
+    <target name="-check-clean-if-config-changed" depends="-init-project">
+        <deploy-defines/>
+        <uptodate property="jfx.deployment.jar.newer.than.nbproject" targetfile="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}" >
+            <srcfiles dir="${basedir}${file.separator}nbproject" includes="**${file.separator}*"/>
+        </uptodate>
+        <echo message="jfx.deployment.jar.newer.than.nbproject = ${jfx.deployment.jar.newer.than.nbproject}" level="verbose"/>
+        <available file="${jfx.deployment.dir}${file.separator}${jfx.deployment.jar}" type="file" property="jfx.deployment.jar.exists"/>
+        <condition property="request.clean.due.to.config.change">
+            <and>
+                <isset property="jfx.deployment.jar.exists"/>
+                <not><isset property="jfx.deployment.jar.newer.than.nbproject"/></not>
+            </and>
+        </condition>
+    </target>
+    <target name="-clean-if-config-changed" depends="-check-clean-if-config-changed" if="request.clean.due.to.config.change">
+        <echo message="Config change detected. Invoking clean." level="verbose"/>
+        <antcall target="clean"/>
+    </target>
+    
+    <target depends="-profile-check-1,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="jfx-project-profile" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="jfxsa-run"/>
+    </target>
+
+    <!-- Shared Debugging init -->
+
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+
+
+    <!-- Running/Debugging/Profiling as WebStart -->
+
+    <target name="-check-jnlp-file-fx" depends="-swing-api-check" unless="fx-in-swing-app-workaround">
+        <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+        <property name="jfx.deployment.jnlp" location="${jfx.deployment.dir}${file.separator}${jfx.deployment.base}.jnlp"/>
+    </target>
+    <target name="-check-jnlp-file-swing" depends="-swing-api-check" if="fx-in-swing-app-workaround">
+        <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+        <property name="jfx.deployment.jnlp" location="${jfx.deployment.dir}${file.separator}${jfx.deployment.base}_application.jnlp"/>
+    </target>
+    <target name="-check-jnlp-file" depends="-check-jnlp-file-fx,-check-jnlp-file-swing">
+        <condition property="jnlp-file-exists">
+            <available file="${jfx.deployment.jnlp}"/>
+        </condition>
+        <condition property="jnlp-file-exists+netbeans.home">
+            <and>
+                <isset property="jnlp-file-exists"/>
+                <isset property="netbeans.home"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="-resolve-jnlp-file" depends="-check-jnlp-file" unless="jnlp-file-exists">
+        <antcall target="jfx-deployment"/>
+        <antcall target="-check-jnlp-file"/>
+    </target>
+
+    <!-- set property javafx.enable.concurrent.external.runs=true to enable multiple runs of the same WebStart or Run-in-Browser project -->
+    <target name="-check-concurrent-jnlp-runs" depends="-resolve-jnlp-file">
+        <condition property="disable-concurrent-runs">
+            <not>
+                <and>
+                    <isset property="javafx.enable.concurrent.external.runs"/>
+                    <equals arg1="${javafx.enable.concurrent.external.runs}" arg2="true" trim="true"/>
+                </and>
+            </not>
+        </condition>
+        <condition property="temp.run.jnlp" value="${jfx.deployment.jnlp}">
+            <isset property="disable-concurrent-runs"/>
+        </condition>
+    </target>
+    <target name="-warn-concurrent-jnlp-runs" unless="disable-concurrent-runs">
+        <echo message="Note: Concurrent Run as WebStart enabled.${line.separator}Temporary directory ${temp.run.dir}${line.separator}will remain unused when WebStart execution has finished. Use project Clean to delete unused directories."/>
+    </target>
+
+    <target name="jfxws-run" if="jnlp-file-exists" depends="-mark-project-state-running,-clean-if-config-changed,-mark-project-needs-jnlp,-check-jdk-7u4or5-mac,jar,
+            -check-jfx-webstart,-resolve-jnlp-file,-check-jfx-runtime,-check-concurrent-jnlp-runs,-create-temp-run-dir,-warn-insufficient-signing" 
+            description="Start JavaFX javaws execution">
+        <echo message="Executing ${temp.run.jnlp} using ${active.webstart.executable}"/>
+        <exec executable="${active.webstart.executable}">
+            <arg file="${temp.run.jnlp}"/>
+        </exec>
+        <antcall target="-warn-concurrent-jnlp-runs"/>
+    </target>
+    
+    <target name="jfxws-debug" if="jnlp-file-exists+netbeans.home" depends="-mark-project-state-debugging,-clean-if-config-changed,-mark-project-needs-jnlp,
+            -check-jdk-7u4or5-mac,jar,-check-jfx-webstart,-resolve-jnlp-file,-check-jfx-runtime,-warn-insufficient-signing,
+            -debug-start-debugger,-debug-javaws-debuggee" description="Debug JavaFX javaws project in IDE"/>
+        
+    <target name="-debug-javaws-debuggee" depends="-init-debug-args">
+        <echo message="Executing ${jfx.deployment.jnlp} in debug mode using ${active.webstart.executable}"/>
+        <exec executable="${active.webstart.executable}">
+            <env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address} -Dglass.disableGrab=true"/>
+            <arg value="-wait"/>
+            <arg file="${jfx.deployment.jnlp}"/>
+        </exec>
+    </target>
+    
+    <target name="-profile-check-1">
+        <property name="run.jvmargs.ide" value=""/>        
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    
+    <target if="jnlp-file-exists+netbeans.home" name="-profile-check-jnlp">
+        <antcall target="-profile-check-1"/>
+    </target>
+    
+    <target name="-do-jfxws-profile" depends="-mark-project-state-profiling,-mark-project-needs-jnlp,
+            -check-jdk-7u4or5-mac,jar,-check-jfx-webstart,-resolve-jnlp-file,-check-jfx-runtime,-warn-insufficient-signing">
+        <echo message="Executing ${jfx.deployment.jnlp} in profile mode using ${active.webstart.executable}"/>
+        <property name="run.jvmargs.ide" value=""/>        
+        <exec executable="${active.webstart.executable}">
+            <env key="JAVAWS_VM_ARGS" value="${run.jvmargs.ide}"/>
+            <arg value="-wait"/>
+            <arg file="${jfx.deployment.jnlp}"/>
+        </exec>
+    </target>
+    
+    <target name="jfxws-profile" if="profiler.configured" 
+        depends="-profile-check-1"
+        description="Profile JavaFX javaws project in IDE">
+        <startprofiler/>
+        <antcall target="-do-jfxws-profile"/>
+    </target>
+    
+    <target name="jfxws-run-noscript" depends="-set-fallback-no-javascript, jfxws-run"/>
+
+    <target name="jfxws-debug-noscript" depends="-set-fallback-no-javascript, jfxws-debug"/>
+
+    <target name="jfxws-profile-noscript" depends="-set-fallback-no-javascript, jfxws-profile"/>
+
+
+    <!-- Running/Debugging/Profiling in Browser -->
+
+    <target name="-check-selected-browser-path" depends="-check-default-run-config">
+        <condition property="javafx.run.inbrowser.undefined">
+            <or>
+                <and>
+                    <isset property="javafx.run.inbrowser"/>
+                    <equals arg1="${javafx.run.inbrowser}" arg2="undefined"/>
+                </and>
+                <and>
+                    <isset property="javafx.run.inbrowser.path"/>
+                    <equals arg1="${javafx.run.inbrowser.path}" arg2="undefined"/>
+                </and>
+            </or>
+        </condition>
+        <condition property="javafx.run.inbrowser.path-exists">
+            <and>
+                <isset property="javafx.run.inbrowser.path"/>
+                <available file="${javafx.run.inbrowser.path}"/>
+            </and>
+        </condition>
+        <fail message="Error:${line.separator}Browser selection not recognizable from ${config} run configuration.${line.separator}Please go to Project Properties dialog, category Run, to select a valid browser." unless="javafx.run.inbrowser.path"/>
+        <fail message="Error:${line.separator}No browser defined in ${config} run configuration.${line.separator}Please verify in Tools->Options dialog that NetBeans recognizes a valid browser, then go to Project Properties dialog, category Run, to select a valid browser." if="javafx.run.inbrowser.undefined"/>
+        <fail message="Error:${line.separator}Browser ${javafx.run.inbrowser.path} referred from ${config} run configuration can not be found.${line.separator}(This can happen, e.g, when the JavaFX Project is transferred to another system.)${line.separator}Please go to Project Properties dialog, category Run, to select a valid browser." unless="javafx.run.inbrowser.path-exists"/>
+    </target>
+
+    <target name="-substitute-template-processed-html-file" depends="-check-project" if="html-template-available">
+        <deploy-process-template/>
+    </target>
+    <target name="-check-template-processed-html-file" depends="-substitute-template-processed-html-file">
+        <condition property="html-file-exists">
+            <and>
+                <isset property="html-template-available"/>
+                <available file="${javafx.run.htmltemplate.processed}"/>
+            </and>
+        </condition>
+    </target>
+    
+    <target name="-set-template-processed-html-file" depends="-check-template-processed-html-file" if="html-file-exists">
+        <property name="jfx.deployment.html" location="${javafx.run.htmltemplate.processed}"/>
+    </target>
+    
+    <target name="-set-html-file" depends="-set-template-processed-html-file" unless="html-file-exists">
+        <basename property="jfx.deployment.base" file="${jfx.deployment.jar}" suffix=".jar"/>
+        <property name="jfx.deployment.html" location="${jfx.deployment.dir}${file.separator}${jfx.deployment.base}.html"/>
+        <condition property="html-file-exists">
+            <available file="${jfx.deployment.html}"/>
+        </condition>
+        <condition property="html-file-exists+netbeans.home">
+            <and>
+                <isset property="html-file-exists"/>
+                <isset property="netbeans.home"/>
+            </and>
+        </condition>
+    </target>
+
+    <!-- set property javafx.enable.concurrent.external.runs=true to enable multiple runs of the same WebStart or Run-in-Browser project -->
+    <target name="-check-concurrent-html-runs" depends="-set-html-file">
+        <condition property="disable-concurrent-runs">
+            <or>
+                <not>
+                    <and>
+                        <isset property="javafx.enable.concurrent.external.runs"/>
+                        <equals arg1="${javafx.enable.concurrent.external.runs}" arg2="true" trim="true"/>
+                    </and>
+                </not>
+                <and>
+                    <isset property="html-template-available"/>
+                    <available file="${javafx.run.htmltemplate.processed}"/>
+                </and>
+            </or>
+        </condition>
+        <condition property="temp.run.html" value="${jfx.deployment.html}">
+            <isset property="disable-concurrent-runs"/>
+        </condition>
+    </target>
+    <target name="-warn-concurrent-html-runs" unless="disable-concurrent-runs">
+        <echo message="Note: Concurrent Run in Browser enabled.${line.separator}Temporary directory ${temp.run.dir}${line.separator}will remain unused when execution in browser has finished. Use project Clean to delete unused directories."/>
+    </target>
+
+    <target name="jfxbe-run" if="html-file-exists" depends="-mark-project-state-running,-clean-if-config-changed,-mark-project-needs-jnlp,-check-jdk-7u4or5-mac,jar,
+            -check-selected-browser-path,-set-html-file,-check-jfx-runtime,-check-concurrent-html-runs,-create-temp-run-dir,-warn-insufficient-signing"
+            description="Start JavaFX execution in browser">
+        <echo message="Executing ${temp.run.html} using ${javafx.run.inbrowser}"/>
+        <echo message="(${javafx.run.inbrowser.path})"/>
+        <property name="javafx.run.inbrowser.arguments" value=""/>
+        <exec executable="${javafx.run.inbrowser.path}">
+            <arg line="${javafx.run.inbrowser.arguments}"/>
+            <arg file="${temp.run.html}"/>
+        </exec>
+        <antcall target="-warn-concurrent-html-runs"/>
+    </target>
+    
+    <target name="jfxbe-debug" if="html-file-exists+netbeans.home" depends="-mark-project-state-debugging-in-browser,-init-debug-args,
+            clean,-debug-start-debugger,-mark-project-needs-jnlp,-check-jdk-7u4or5-mac,jar,
+            -check-selected-browser-path,-set-html-file,-check-jfx-runtime,-warn-insufficient-signing,
+            -debug-jfxbe-debuggee" description="Debug JavaFX project in browser">
+        <!-- after the session clean up the jnlp containing debug settings -->
+        <antcall target="clean"/>
+    </target>
+        
+    <target name="-debug-jfxbe-debuggee" depends="-init-debug-args">
+        <echo message="Executing ${jfx.deployment.html} in debug mode using ${javafx.run.inbrowser}"/>
+        <echo message="(${javafx.run.inbrowser.path})"/>
+        <property name="javafx.run.inbrowser.arguments" value=""/>
+        <exec executable="${javafx.run.inbrowser.path}">
+            <arg line="${javafx.run.inbrowser.arguments}"/>
+            <env key="_JPI_VM_OPTIONS" value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+            <arg file="${jfx.deployment.html}"/>
+        </exec>
+    </target>
+
+    <target if="html-file-exists+netbeans.home" name="-profile-check-html">
+        <antcall target="-profile-check-1"/>
+    </target>
+
+    <target name="-do-jfxbe-profile" depends="-mark-project-state-profiling,-mark-project-needs-jnlp,
+            -check-jdk-7u4or5-mac,jar,-check-selected-browser-path,-set-html-file,-check-jfx-runtime,-warn-insufficient-signing">
+        <echo message="Executing ${jfx.deployment.html} in profile mode using ${javafx.run.inbrowser}"/>
+        <echo message="(${javafx.run.inbrowser.path})"/>
+        <property name="run.jvmargs.ide" value=""/>
+        <property name="javafx.run.inbrowser.arguments" value=""/>
+        <exec executable="${javafx.run.inbrowser.path}">
+            <arg line="${javafx.run.inbrowser.arguments}"/>
+            <env key="_JPI_VM_OPTIONS" value="${run.jvmargs.ide}"/>
+            <arg file="${jfx.deployment.html}"/>
+        </exec>
+    </target>
+
+    <target name="jfxbe-profile" if="profiler.configured"
+        depends="-profile-check-html"
+        description="Profile JavaFX project in browser">
+        <startprofiler/>
+        <antcall target="-do-jfxbe-profile"/>
+    </target>
+
+    <target name="jfxbe-run-noscript" depends="-set-fallback-no-javascript, jfxbe-run"/>
+
+    <target name="jfxbe-debug-noscript" depends="-set-fallback-no-javascript, jfxbe-debug"/>
+
+    <target name="jfxbe-profile-noscript" depends="-set-fallback-no-javascript, jfxbe-profile"/>
+
+
+</project>
diff --git a/Sexta-FeiraInterface/nbproject/private/configs/Executar_como_WebStart.properties b/Sexta-FeiraInterface/nbproject/private/configs/Executar_como_WebStart.properties
new file mode 100644
index 0000000..86ae865
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/private/configs/Executar_como_WebStart.properties
@@ -0,0 +1,2 @@
+# Do not modify this property in this configuration. It can be re-generated.
+javafx.run.as=webstart
diff --git a/Sexta-FeiraInterface/nbproject/private/configs/Executar_no_Browser.properties b/Sexta-FeiraInterface/nbproject/private/configs/Executar_no_Browser.properties
new file mode 100644
index 0000000..f4e8549
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/private/configs/Executar_no_Browser.properties
@@ -0,0 +1,2 @@
+# Do not modify this property in this configuration. It can be re-generated.
+javafx.run.as=embedded
diff --git a/Sexta-FeiraInterface/nbproject/private/private.properties b/Sexta-FeiraInterface/nbproject/private/private.properties
new file mode 100644
index 0000000..71b459e
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/private/private.properties
@@ -0,0 +1,6 @@
+auxiliary.org-netbeans-modules-projectapi.issue214819_5f_fx_5f_enabled=true
+# N\u00e3o h\u00e1 necessidade de se alterar essa propriedade, a menos que se esteja personalizando a infraestrutura da tarefa Ant do JavaFX
+endorsed.javafx.ant.classpath=.
+javafx.run.inbrowser=<Browser Default do Sistema>
+javafx.run.inbrowser.path=C:\\Program Files\\Internet Explorer\\iexplore.exe
+user.properties.file=C:\\Users\\Gazebo\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
diff --git a/Sexta-FeiraInterface/nbproject/private/retriever/catalog.xml b/Sexta-FeiraInterface/nbproject/private/retriever/catalog.xml
new file mode 100644
index 0000000..e69de29
diff --git a/Sexta-FeiraInterface/nbproject/project.properties b/Sexta-FeiraInterface/nbproject/project.properties
new file mode 100644
index 0000000..19f483e
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/project.properties
@@ -0,0 +1,115 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=Sexta-FeiraInterface
+application.vendor=Gazebo
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+compile.on.save=true
+compile.on.save.unsupported.javafx=true
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/Sexta-FeiraInterface.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.json-simple-1.1.jar=C:\\Users\\Gazebo\\.m2\\repository\\com\\googlecode\\json-simple\\json-simple\\1.1\\json-simple-1.1.jar
+includes=**
+# Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
+jar.archive.disabled=true
+jar.compress=false
+javac.classpath=\
+    ${javafx.classpath.extension}:\
+    ${file.reference.json-simple-1.1.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+javafx.application.implementation.version=1.0
+javafx.binarycss=false
+javafx.classpath.extension=\
+    ${java.home}/lib/javaws.jar:\
+    ${java.home}/lib/deploy.jar:\
+    ${java.home}/lib/plugin.jar
+javafx.deploy.allowoffline=true
+# If true, application update mode is set to 'background', if false, update mode is set to 'eager'
+javafx.deploy.backgroundupdate=false
+javafx.deploy.embedJNLP=true
+javafx.deploy.includeDT=true
+# Definir como verdadeiro impede a cria\u00e7\u00e3o de c\u00f3pia tempor\u00e1ria de artefatos de implanta\u00e7\u00e3o antes de cada execu\u00e7\u00e3o (desativa as execu\u00e7\u00f5es atuais)
+javafx.disable.concurrent.runs=false
+# Definir como verdadeiro ativa v\u00e1rias execu\u00e7\u00f5es simult\u00e2neas do mesmo WebStart ou projeto Run-in-Browser
+javafx.enable.concurrent.external.runs=false
+# This is a JavaFX project
+javafx.enabled=true
+javafx.fallback.class=com.javafx.main.NoJavaFXFallback
+# Main class for JavaFX
+javafx.main.class=com.friday.SextaFeiraInterface
+javafx.preloader.class=
+# This project does not use Preloader
+javafx.preloader.enabled=false
+javafx.preloader.jar.filename=
+javafx.preloader.jar.path=
+javafx.preloader.project.path=
+javafx.preloader.type=none
+# Set true for GlassFish only. Rebases manifest classpaths of JARs in lib dir. Not usable with signed JARs.
+javafx.rebase.libs=false
+javafx.run.height=600
+javafx.run.width=800
+# Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0+ projects
+jnlp.enabled=false
+# Main class for Java launcher
+main.class=com.javafx.main.Main
+# Para uma melhor seguran\u00e7a, especifique um atributo de manifesto da Base de c\u00f3digo mais restrito para impedir que RIAs sejam adaptados
+manifest.custom.codebase=*
+# Especificar o atributo de manifesto de Permiss\u00f5es para substituir o default (op\u00e7\u00f5es: sandbox, all-permissions)
+manifest.custom.permissions=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${dist.jar}:\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/Sexta-FeiraInterface/nbproject/project.xml b/Sexta-FeiraInterface/nbproject/project.xml
new file mode 100644
index 0000000..ba5234a
--- /dev/null
+++ b/Sexta-FeiraInterface/nbproject/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
+            <extension file="jfx-impl.xml" id="jfx3">
+                <dependency dependsOn="-jfx-copylibs" target="-post-jar"/>
+                <dependency dependsOn="-rebase-libs" target="-post-jar"/>
+                <dependency dependsOn="jfx-deployment" target="-post-jar"/>
+                <dependency dependsOn="jar" target="debug"/>
+                <dependency dependsOn="jar" target="profile"/>
+                <dependency dependsOn="jar" target="run"/>
+            </extension>
+        </buildExtensions>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>Sexta-FeiraInterface</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/Interface/SextaFeiraInterface/src/main/java/Interface/FridayComunication.java b/Sexta-FeiraInterface/src/com/friday/FridayComunication.java
similarity index 51%
rename from Interface/SextaFeiraInterface/src/main/java/Interface/FridayComunication.java
rename to Sexta-FeiraInterface/src/com/friday/FridayComunication.java
index 55525f5..935f27a 100644
--- a/Interface/SextaFeiraInterface/src/main/java/Interface/FridayComunication.java
+++ b/Sexta-FeiraInterface/src/com/friday/FridayComunication.java
@@ -1,14 +1,21 @@
-package Interface;
+
+package com.friday;
+
+import java.io.FileReader;
+import java.io.IOException;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 public class FridayComunication {
     private static JSONObject jsonObject;
     private static JSONParser parser;
 
-    private static JSONObject readJsonFile() {
+    public static JSONObject readJsonFile() {
         parser = new JSONParser();
 
         try {
-            jsonObject = (JSONObject) parser.parse(new FileReader("E:\\Sexta-Feira-Mark_6\\Interface\\SextaFeiraInterface\\src\\main\\FridayComunication.json"));
+            jsonObject = (JSONObject) parser.parse(new FileReader("E:\\Sexta-Feira-Mark_6\\Sexta-FeiraInterface\\src\\com\\friday\\FridayComunication.json"));
         } catch (ParseException | IOException e) {
             e.printStackTrace();
         }
diff --git a/Sexta-FeiraInterface/src/com/friday/FridayComunication.json b/Sexta-FeiraInterface/src/com/friday/FridayComunication.json
new file mode 100644
index 0000000..407630c
--- /dev/null
+++ b/Sexta-FeiraInterface/src/com/friday/FridayComunication.json
@@ -0,0 +1,5 @@
+{
+    "action": 0,
+    "content": null,
+    "url": ".com"
+}
\ No newline at end of file
diff --git a/Sexta-FeiraInterface/src/com/friday/Scene.fxml b/Sexta-FeiraInterface/src/com/friday/Scene.fxml
new file mode 100644
index 0000000..efd5b80
--- /dev/null
+++ b/Sexta-FeiraInterface/src/com/friday/Scene.fxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.image.*?>
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="720.0" prefWidth="1280.0" styleClass="bodybg" stylesheets="@../styles/Styles.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.friday.SceneController">
+   <children>
+      <Label fx:id="lblTime" layoutX="120.0" layoutY="41.0" prefHeight="112.0" prefWidth="187.0" text="12:20" textFill="#ff6600" AnchorPane.leftAnchor="120.0" AnchorPane.topAnchor="41.0">
+         <font>
+            <Font name="Impact" size="68.0" />
+         </font>
+      </Label>
+      <Label fx:id="lblWeekDay" layoutX="952.0" layoutY="55.0" prefHeight="84.0" prefWidth="358.0" text="Sexta-Feira " textFill="#ff6600" AnchorPane.rightAnchor="-30.0" AnchorPane.topAnchor="55.0">
+         <font>
+            <Font name="Impact" size="55.0" />
+         </font>
+      </Label>
+      <Label fx:id="lblDayMonth" layoutX="709.0" layoutY="63.0" text="30/06" textFill="#ff6600" AnchorPane.rightAnchor="431.0" AnchorPane.topAnchor="63.0">
+         <font>
+            <Font name="Impact" size="55.0" />
+         </font>
+      </Label>
+      <TableView fx:id="tableView" editable="true" layoutX="72.0" layoutY="163.0" prefHeight="494.0" prefWidth="1082.0" visible="false" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="120.0" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="200.0">
+         <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+         </columnResizePolicy></TableView>
+      <ImageView fx:id="imageView" fitHeight="589.0" fitWidth="967.0" layoutX="375.0" layoutY="147.0" nodeOrientation="INHERIT" pickOnBounds="true" visible="false" AnchorPane.leftAnchor="400.0" AnchorPane.topAnchor="200.0" />
+   </children>
+</AnchorPane>
diff --git a/Interface/SextaFeiraInterface/src/main/java/Interface/FXMLController.java b/Sexta-FeiraInterface/src/com/friday/SceneController.java
similarity index 97%
rename from Interface/SextaFeiraInterface/src/main/java/Interface/FXMLController.java
rename to Sexta-FeiraInterface/src/com/friday/SceneController.java
index a58eb6e..eacbb84 100644
--- a/Interface/SextaFeiraInterface/src/main/java/Interface/FXMLController.java
+++ b/Sexta-FeiraInterface/src/com/friday/SceneController.java
@@ -1,4 +1,4 @@
-package Interface;
+package com.friday;
 
 import java.io.File;
 import java.lang.reflect.Array;
@@ -37,7 +37,7 @@
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.util.Callback;
 
-public class FXMLController implements Initializable {
+public class SceneController implements Initializable {
 
     @FXML
     private Label lblTime;
@@ -72,8 +72,7 @@ public class FXMLController implements Initializable {
     private TableColumn DeviceColumn = new TableColumn<JSONArray, String>("Device");
     private TableColumn DeviceDescColumn = new TableColumn<JSONArray, String>("Descrição");
     private TableColumn DeviceActionsColumn = new TableColumn<JSONArray, String>("Número de ações");
-
-    ServerConnection connection;
+    
     JSONArray arrayResponse;
     JSONObject response;
     String imagePath;
@@ -114,7 +113,7 @@ public void handle(Event event) {
 
     private void connectionLoop() {
         response = FridayComunication.readJsonFile();
-        action = response.get("action");
+        action = Integer.parseInt(response.get("action").toString());
 
         switch (action) {
             case 0:
@@ -126,7 +125,7 @@ private void connectionLoop() {
                 
                 if (!tableView.getColumns().contains(commandColumn)) {
                     imageView.setVisible(false);
-                    setTableData("getInteractions");
+                    setTableData();
 
                     addInteractionsColumns();
 
@@ -137,7 +136,7 @@ private void connectionLoop() {
             case 2:
                 if (!tableView.getColumns().contains(homeWorkColumn)) {
                     imageView.setVisible(false);
-                    setTableData("getHomeWorks");
+                    setTableData();
                     addHomeWorksColumns();
                 }
                 break;
@@ -145,7 +144,7 @@ private void connectionLoop() {
             case 3:
                 if (!tableView.getColumns().contains(projectColumn)) {
                     imageView.setVisible(false);
-                    setTableData("getProjects");
+                    setTableData();
                     addProjectsColumns();
                 }
                 break;
@@ -154,7 +153,7 @@ private void connectionLoop() {
 
                 if (!tableView.getColumns().contains(DeviceColumn)) {
                     imageView.setVisible(false);
-                    setTableData("getDevices");
+                    setTableData();
 
                     addDevicesColumns();
 
@@ -383,10 +382,10 @@ public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
         tableView.setVisible(true);
     }
 
-    private void setTableData(String request){
+    private void setTableData(){
         tableView.getItems().clear();
 
-        response = (JSONObject) connection.receive(request);
+        response = (JSONObject) FridayComunication.readJsonFile().get("content");
         System.out.println(response);
 
         for (int c = 0; c < response.size(); c++) {
diff --git a/Interface/SextaFeiraInterface/src/main/java/Interface/MainApp.java b/Sexta-FeiraInterface/src/com/friday/SextaFeiraInterface.java
similarity index 55%
rename from Interface/SextaFeiraInterface/src/main/java/Interface/MainApp.java
rename to Sexta-FeiraInterface/src/com/friday/SextaFeiraInterface.java
index bf8cb14..cdd92d6 100644
--- a/Interface/SextaFeiraInterface/src/main/java/Interface/MainApp.java
+++ b/Sexta-FeiraInterface/src/com/friday/SextaFeiraInterface.java
@@ -1,42 +1,42 @@
-package Interface;
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.friday;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-
-public class MainApp extends Application {
-
+/**
+ *
+ * @author Gazebo
+ */
+public class SextaFeiraInterface extends Application {
+    
     @Override
     public void start(Stage stage) throws Exception {
         Runtime.getRuntime().exec("cmd.exe /c start E:\\Sexta-Feira-Mark_6\\Sexta-Feira(A.I.)\\Sexta-Feira(A.I.).py");
         
-        Parent root = FXMLLoader.load(getClass().getResource("/fxml/Scene.fxml"));
+        Parent root = FXMLLoader.load(getClass().getResource("Scene.fxml"));
         
         Scene scene = new Scene(root);
-        scene.getStylesheets().add("/styles/Styles.css");
-
+        
         stage.setTitle("Sexta-Feira");
         stage.setScene(scene);
-
         stage.show();
-        stage.setFullScreen(true);
         
+        stage.setFullScreen(true);
     }
 
     /**
-     * The main() method is ignored in correctly deployed JavaFX application.
-     * main() serves only as fallback in case the application can not be
-     * launched through deployment artifacts, e.g., in IDEs with limited FX
-     * support. NetBeans ignores main().
-     *
      * @param args the command line arguments
      */
     public static void main(String[] args) {
         launch(args);
     }
-
+    
 }
diff --git a/Sexta-FeiraInterface/src/com/styles/BackgroundFriday.jpg b/Sexta-FeiraInterface/src/com/styles/BackgroundFriday.jpg
new file mode 100644
index 0000000..07d16fc
Binary files /dev/null and b/Sexta-FeiraInterface/src/com/styles/BackgroundFriday.jpg differ
diff --git a/Sexta-FeiraInterface/src/com/styles/Styles.css b/Sexta-FeiraInterface/src/com/styles/Styles.css
new file mode 100644
index 0000000..c7c7648
--- /dev/null
+++ b/Sexta-FeiraInterface/src/com/styles/Styles.css
@@ -0,0 +1,4 @@
+.bodybg{
+    -fx-background-image: url('BackgroundFriday.jpg');
+    -fx-background-size: 100% 100%;
+}
\ No newline at end of file