diff --git a/b6/.classpath b/b6/.classpath index 869ee4bc95..07bc82a2a4 100755 --- a/b6/.classpath +++ b/b6/.classpath @@ -1,11 +1,6 @@ - - - - - @@ -170,5 +165,10 @@ + + + + + diff --git a/b6/.project b/b6/.project index 31bffd4d1f..00147e3abb 100644 --- a/b6/.project +++ b/b6/.project @@ -20,8 +20,14 @@ + + com.genuitec.eclipse.springframework.springbuilder + + + + com.genuitec.eclipse.springframework.springnature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature diff --git a/b6/.settings/com.genuitec.eclipse.migration.prefs b/b6/.settings/com.genuitec.eclipse.migration.prefs new file mode 100644 index 0000000000..19a406166b --- /dev/null +++ b/b6/.settings/com.genuitec.eclipse.migration.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +performed.operation.me.install.springfacet=1.0 diff --git a/b6/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/b6/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000000..6ee36ae3cd --- /dev/null +++ b/b6/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/b6/.settings/org.eclipse.wst.common.project.facet.core.xml b/b6/.settings/org.eclipse.wst.common.project.facet.core.xml index a0342ef269..bf0cb449e3 100644 --- a/b6/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/b6/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,4 +2,5 @@ + diff --git a/b6/commander4j.jar b/b6/commander4j.jar index cc4e68971e..fb10fd7b0a 100644 Binary files a/b6/commander4j.jar and b/b6/commander4j.jar differ diff --git a/b6/labels/zebra_200dpi_pallet_label_a5_cdf_val.lbl b/b6/labels/zebra_200dpi_pallet_label_a5_cdf_val.lbl index 3cb1d483ad..cb5b88a386 100644 --- a/b6/labels/zebra_200dpi_pallet_label_a5_cdf_val.lbl +++ b/b6/labels/zebra_200dpi_pallet_label_a5_cdf_val.lbl @@ -22,7 +22,7 @@ DEFINE BARCODE END *END* /* Heading for Label 1 */ -^FO40,0002^A0N,80,73^CI27^FH^FD<*CUSTOMER_NAME*>^FS +^FO40,0002^A0N,80,73^CI27^FH^FDC&D FOODS SPAIN^FS ^FO10835,0002^A0N,80,73^CI27^FDL<*LABEL_NO*>^FS /* Printed by xxxxxxxxxxxxxxxx * / diff --git a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar index cc4e68971e..fb10fd7b0a 100644 Binary files a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war index de4733389a..6d8452cfea 100644 Binary files a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war and b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war differ diff --git a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar index cc4e68971e..fb10fd7b0a 100644 Binary files a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_react/dist/b6web_t10_react.war b/b6web_t10_react/dist/b6web_t10_react.war index 5f3931a755..e3a2bbfd56 100644 Binary files a/b6web_t10_react/dist/b6web_t10_react.war and b/b6web_t10_react/dist/b6web_t10_react.war differ diff --git a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar index cc4e68971e..fb10fd7b0a 100644 Binary files a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war index 6408da5f2f..ecbe1c9aa1 100644 Binary files a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war and b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war differ diff --git a/c4jWS/jsconfig.json b/c4jWS/jsconfig.json new file mode 100644 index 0000000000..d7d204dddb --- /dev/null +++ b/c4jWS/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "disableSizeLimit": true, + "allowJs": true, + "module": "commonjs", + "target": "es6", + "checkJs": true + } +} \ No newline at end of file diff --git a/c4jWS/target/c4jWS.war b/c4jWS/target/c4jWS.war index cc38d342cd..864c8bd162 100644 Binary files a/c4jWS/target/c4jWS.war and b/c4jWS/target/c4jWS.war differ