diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 727e5bacd8..6d8c0db261 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -265,5 +265,38 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 53f016ef63..9d1123c354 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -7,21 +7,17 @@
-
-
-
-
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 4d08fb727e..8eb35eb5e1 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -10,15 +10,11 @@ Bundle-ClassPath: base.jar,
jython.jar,
cron4j-2.2.5.jar,
barbecue-1.5-beta1.jar,
- iText-2.1.7.jar,
jcommon-1.0.23.jar,
jfreechart-1.0.19.jar,
jnlp.jar,
groovy-all-1.7.5.jar,
- super-csv-2.2.0.jar,
barcode4j-2.1.jar,
- bcprov-jdk15on-1.46.jar,
- passay-1.0.jar,
bsh-2.0b6.jar
Export-Package: bsh,
bsh.classpath,
@@ -30,28 +26,6 @@ Export-Package: bsh,
bsh.servlet,
bsh.util,
com.akunagroup.uk.postcode,
- com.lowagie.text,
- com.lowagie.text.exceptions,
- com.lowagie.text.factories,
- com.lowagie.text.html,
- com.lowagie.text.html.simpleparser,
- com.lowagie.text.pdf,
- com.lowagie.text.pdf.codec,
- com.lowagie.text.pdf.codec.wmf,
- com.lowagie.text.pdf.collection,
- com.lowagie.text.pdf.crypto,
- com.lowagie.text.pdf.draw,
- com.lowagie.text.pdf.events,
- com.lowagie.text.pdf.fonts,
- com.lowagie.text.pdf.fonts.cmaps,
- com.lowagie.text.pdf.hyphenation,
- com.lowagie.text.pdf.interfaces,
- com.lowagie.text.pdf.internal,
- com.lowagie.text.pdf.parser,
- com.lowagie.text.xml,
- com.lowagie.text.xml.simpleparser,
- com.lowagie.text.xml.xmp,
- com.lowagie.tools,
groovy.beans,
groovy.grape,
groovy.inspect,
@@ -122,88 +96,6 @@ Export-Package: bsh,
org.adempiere.print.export,
org.adempiere.process,
org.adempiere.util,
- org.bouncycastle,
- org.bouncycastle.asn1,
- org.bouncycastle.asn1.bc,
- org.bouncycastle.asn1.cmp,
- org.bouncycastle.asn1.cms,
- org.bouncycastle.asn1.cms.ecc,
- org.bouncycastle.asn1.crmf,
- org.bouncycastle.asn1.cryptopro,
- org.bouncycastle.asn1.eac,
- org.bouncycastle.asn1.esf,
- org.bouncycastle.asn1.ess,
- org.bouncycastle.asn1.gnu,
- org.bouncycastle.asn1.iana,
- org.bouncycastle.asn1.icao,
- org.bouncycastle.asn1.isismtt,
- org.bouncycastle.asn1.isismtt.ocsp,
- org.bouncycastle.asn1.isismtt.x509,
- org.bouncycastle.asn1.kisa,
- org.bouncycastle.asn1.microsoft,
- org.bouncycastle.asn1.misc,
- org.bouncycastle.asn1.mozilla,
- org.bouncycastle.asn1.nist,
- org.bouncycastle.asn1.ntt,
- org.bouncycastle.asn1.ocsp,
- org.bouncycastle.asn1.oiw,
- org.bouncycastle.asn1.pkcs,
- org.bouncycastle.asn1.sec,
- org.bouncycastle.asn1.smime,
- org.bouncycastle.asn1.teletrust,
- org.bouncycastle.asn1.tsp,
- org.bouncycastle.asn1.util,
- org.bouncycastle.asn1.x500,
- org.bouncycastle.asn1.x500.style,
- org.bouncycastle.asn1.x509,
- org.bouncycastle.asn1.x509.qualified,
- org.bouncycastle.asn1.x509.sigi,
- org.bouncycastle.asn1.x9,
- org.bouncycastle.crypto,
- org.bouncycastle.crypto.agreement,
- org.bouncycastle.crypto.agreement.kdf,
- org.bouncycastle.crypto.agreement.srp,
- org.bouncycastle.crypto.digests,
- org.bouncycastle.crypto.encodings,
- org.bouncycastle.crypto.engines,
- org.bouncycastle.crypto.examples,
- org.bouncycastle.crypto.generators,
- org.bouncycastle.crypto.io,
- org.bouncycastle.crypto.macs,
- org.bouncycastle.crypto.modes,
- org.bouncycastle.crypto.modes.gcm,
- org.bouncycastle.crypto.paddings,
- org.bouncycastle.crypto.params,
- org.bouncycastle.crypto.prng,
- org.bouncycastle.crypto.signers,
- org.bouncycastle.crypto.tls,
- org.bouncycastle.crypto.util,
- org.bouncycastle.i18n,
- org.bouncycastle.i18n.filter,
- org.bouncycastle.jce,
- org.bouncycastle.jce.examples,
- org.bouncycastle.jce.exception,
- org.bouncycastle.jce.interfaces,
- org.bouncycastle.jce.netscape,
- org.bouncycastle.jce.provider,
- org.bouncycastle.jce.provider.asymmetric,
- org.bouncycastle.jce.provider.asymmetric.ec,
- org.bouncycastle.jce.provider.symmetric,
- org.bouncycastle.jce.spec,
- org.bouncycastle.math.ec,
- org.bouncycastle.mozilla,
- org.bouncycastle.ocsp,
- org.bouncycastle.openssl,
- org.bouncycastle.util,
- org.bouncycastle.util.encoders,
- org.bouncycastle.util.io,
- org.bouncycastle.util.io.pem,
- org.bouncycastle.util.test,
- org.bouncycastle.voms,
- org.bouncycastle.x509,
- org.bouncycastle.x509.examples,
- org.bouncycastle.x509.extension,
- org.bouncycastle.x509.util,
org.codehaus.groovy,
org.codehaus.groovy.ant,
org.codehaus.groovy.antlr,
@@ -345,14 +237,7 @@ Export-Package: bsh,
org.krysalis.barcode4j.output.svg,
org.krysalis.barcode4j.servlet,
org.krysalis.barcode4j.tools,
- org.krysalis.barcode4j.xalan,
- org.supercsv.cellprocessor,
- org.supercsv.cellprocessor.constraint,
- org.supercsv.cellprocessor.ift,
- org.supercsv.exception,
- org.supercsv.io,
- org.supercsv.prefs,
- org.supercsv.util
+ org.krysalis.barcode4j.xalan
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.sun.mail.smtp;version="1.5",
javax.activation,
@@ -393,4 +278,9 @@ Eclipse-ExtensibleAPI: true
Bundle-Activator: org.adempiere.base.BaseActivator
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0"
+Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
+ org.passay;bundle-version="0.0.0",
+ org.cryptacular,
+ com.itextpdf;bundle-version="0.0.0",
+ net.sf.supercsv.super-csv;bundle-version="0.0.0",
+ bcprov;bundle-version="1.54.0"
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index df32192598..3c019641d8 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -7,13 +7,11 @@ bin.includes = META-INF/,\
jython.jar,\
cron4j-2.2.5.jar,\
barbecue-1.5-beta1.jar,\
- iText-2.1.7.jar,\
jcommon-1.0.23.jar,\
jfreechart-1.0.19.jar,\
jnlp.jar,\
OSGI-INF/,\
groovy-all-1.7.5.jar,\
- super-csv-2.2.0.jar,\
OSGI-INF/dslocator.xml,\
OSGI-INF/serverbean.xml,\
OSGI-INF/statusbean.xml,\
@@ -32,8 +30,6 @@ bin.includes = META-INF/,\
OSGI-INF/addressvalidationeventhandler.xml,\
schema/,\
barcode4j-2.1.jar,\
- bcprov-jdk15on-1.46.jar,\
- passay-1.0.jar,\
bsh-2.0b6.jar
output.base.jar = bin/
src.includes = schema/
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 17f762d934..7e41f38344 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -11,15 +11,11 @@
-
-
-
-
diff --git a/org.adempiere.base/src/org/adempiere/pdf/Document.java b/org.adempiere.base/src/org/adempiere/pdf/Document.java
index 3900ca4883..a3e53819d3 100644
--- a/org.adempiere.base/src/org/adempiere/pdf/Document.java
+++ b/org.adempiere.base/src/org/adempiere/pdf/Document.java
@@ -23,12 +23,12 @@ import java.io.OutputStream;
import org.compiere.model.MSysConfig;
-import com.lowagie.text.FontFactory;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.pdf.DefaultFontMapper;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfTemplate;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.FontFactory;
+import com.itextpdf.text.Rectangle;
+import com.itextpdf.awt.DefaultFontMapper;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfTemplate;
+import com.itextpdf.text.pdf.PdfWriter;
/**
* Generate PDF document using iText
@@ -46,8 +46,8 @@ public class Document {
try {
final PageFormat pf = pageable.getPageFormat(0);
- final com.lowagie.text.Document document =
- new com.lowagie.text.Document(new Rectangle(
+ final com.itextpdf.text.Document document =
+ new com.itextpdf.text.Document(new Rectangle(
(int) pf.getWidth(), (int) pf.getHeight()));
final PdfWriter writer = PdfWriter.getInstance(
document, output);
diff --git a/org.adempiere.base/src/org/compiere/model/MPasswordRule.java b/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
index 585d5a9ab6..52831c7470 100644
--- a/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
@@ -32,25 +32,21 @@ import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.idempiere.util.HistoryRuleSupportHash;
-import org.passay.AlphabeticalCharacterRule;
-import org.passay.AlphabeticalSequenceRule;
import org.passay.CharacterCharacteristicsRule;
+import org.passay.CharacterRule;
import org.passay.DictionarySubstringRule;
-import org.passay.DigitCharacterRule;
+import org.passay.EnglishCharacterData;
+import org.passay.EnglishSequenceData;
+import org.passay.IllegalSequenceRule;
import org.passay.LengthRule;
-import org.passay.LowercaseCharacterRule;
import org.passay.MessageResolver;
-import org.passay.NumericalSequenceRule;
import org.passay.PasswordData;
import org.passay.PasswordGenerator;
import org.passay.PasswordValidator;
import org.passay.PropertiesMessageResolver;
-import org.passay.QwertySequenceRule;
import org.passay.RepeatCharacterRegexRule;
import org.passay.Rule;
import org.passay.RuleResult;
-import org.passay.SpecialCharacterRule;
-import org.passay.UppercaseCharacterRule;
import org.passay.UsernameRule;
import org.passay.WhitespaceRule;
import org.passay.dictionary.ArrayWordList;
@@ -136,24 +132,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
if (getDigitCharacter() > 0) {
// require at least n digit in passwords
numValidations++;
- charRule.getRules().add(new DigitCharacterRule(getDigitCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
}
if (getNonAlphaNumericCharacter() > 0) {
// require at least n non-alphanumeric char
numValidations++;
- charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
}
if (getUppercaseCharacter() > 0) {
numValidations++;
- charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));
}
if (getLowercaseCharacter() > 0) {
numValidations++;
- charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
}
if (getAlphabeticalCharacter() > 0){
numValidations++;
- charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter()));
+ charRule.getRules().add(new CharacterRule (EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
}
if (! charRule.getRules().isEmpty()) {
charRule.setNumberOfCharacteristics(numValidations);
@@ -161,14 +157,14 @@ public class MPasswordRule extends X_AD_PasswordRule {
}
if (getAlphabeticalSequence() > 0) {
- ruleList.add(new AlphabeticalSequenceRule(getAlphabeticalSequence(), true));
+ ruleList.add(new IllegalSequenceRule (EnglishSequenceData.Alphabetical, getAlphabeticalSequence(), true));
}
if (getNumericalSequence() > 0) {
- ruleList.add(new NumericalSequenceRule(getNumericalSequence(), true));
+ ruleList.add(new IllegalSequenceRule(EnglishSequenceData.Numerical, getNumericalSequence(), true));
}
if (getQWERTYSequence() > 0) {
- ruleList.add(new QwertySequenceRule(getQWERTYSequence(), true));
+ ruleList.add(new IllegalSequenceRule(EnglishSequenceData.USQwerty, getQWERTYSequence(), true));
}
if (getRepeatCharacterRegex() > 0) {
@@ -269,24 +265,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
if (getDigitCharacter() > 0) {
// require at least n digit in passwords
numValidations++;
- charRule.getRules().add(new DigitCharacterRule(getDigitCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
}
if (getNonAlphaNumericCharacter() > 0) {
// require at least n non-alphanumeric char
numValidations++;
- charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
}
if (getUppercaseCharacter() > 0) {
numValidations++;
- charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));
}
if (getLowercaseCharacter() > 0) {
numValidations++;
- charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
}
if (getAlphabeticalCharacter() > 0){
numValidations++;
- charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter()));
+ charRule.getRules().add(new CharacterRule(EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
}
if (! charRule.getRules().isEmpty()) {
charRule.setNumberOfCharacteristics(numValidations);
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 43f6eff121..4e864b50be 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,5 +1,7 @@
+
+
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 263b095be6..4c88f6dfb8 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
lib/jackson-core-2.1.4.jar,
lib/xalan-2.7.1.jar,
lib/jasperreports-functions-5.6.1.jar,
- lib/joda-time-2.1.jar
+ lib/joda-time-2.1.jar,
+ lib/itext-2.1.7.jar,
+ lib/bcprov-jdk14-140.jar
Export-Package: .,
com.fasterxml.jackson.core,
com.fasterxml.jackson.core.base,
@@ -242,4 +244,5 @@ Import-Package: org.apache.commons.collections,
org.w3c.tools.codec
DynamicImport-Package: *
Eclipse-BuddyPolicy: registered
+Require-Bundle: bcprov;bundle-version="1.53.0"
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index df3c10112c..dc4d13af94 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -6,4 +6,6 @@ bin.includes = META-INF/,\
lib/jackson-core-2.1.4.jar,\
lib/xalan-2.7.1.jar,\
lib/jasperreports-functions-5.6.1.jar,\
- lib/joda-time-2.1.jar
+ lib/joda-time-2.1.jar,\
+ lib/itext-2.1.7.jar,\
+ lib/bcprov-jdk14-140.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 093b6028e8..56058ecfef 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -9,5 +9,7 @@
+
+
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 6925d5530b..064b10c54e 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -10,6 +10,13 @@
+
+
+
+
+
+
+
@@ -127,6 +134,13 @@
+
+
+
+
+
+
+
diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
index 78be9f0fed..b0229162d8 100644
--- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
+++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
@@ -9,15 +9,15 @@ import java.io.InputStream;
import java.io.Serializable;
import java.net.URL;
import java.text.SimpleDateFormat;
+import java.util.Base64;
import java.util.Date;
import java.util.Properties;
import java.util.logging.Level;
+
import org.compiere.util.CLogger;
import org.compiere.util.Ini;
import org.compiere.util.SecureEngine;
-import com.lowagie.text.pdf.codec.Base64;
-
public final class Prop implements Serializable {
/**
@@ -208,7 +208,7 @@ public final class Prop implements Serializable {
try {
fis = new URL(getProperty(TEMPLATE_PATH)+getProperty(TEMPLATE_NAME)+"/styles/template.css");
byte data[]=read(fis);
- ret+=Base64.encodeBytes(data);
+ ret+=Base64.getEncoder().encode (data);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
@@ -288,7 +288,7 @@ public final class Prop implements Serializable {
byte data[]=read(fis);
if(data==null||data.length<=0)
return null;
- ret+=Base64.encodeBytes(data);
+ ret+=Base64.getEncoder().encode (data);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
index 637db33338..fc12ae08e5 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
@@ -20,6 +20,7 @@ package org.compiere.grid;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FocusTraversalPolicy;
+import java.awt.Font;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -56,7 +57,6 @@ import org.compiere.util.Util;
import org.jdesktop.swingx.JXCollapsiblePane;
import org.jdesktop.swingx.border.DropShadowBorder;
-import com.lowagie.text.Font;
/**
* Single Row Panel.
@@ -453,7 +453,7 @@ public final class VPanel extends CTabbedPane
else // Label or null
{
CLabel label = new CLabel(fieldGroup, CLabel.LEADING);
- label.setFont(AdempierePLAF.getFont_Label().deriveFont(Font.BOLDITALIC, AdempierePLAF.getFont_Label().getSize2D()));
+ label.setFont(AdempierePLAF.getFont_Label().deriveFont(Font.BOLD | Font.ITALIC, AdempierePLAF.getFont_Label().getSize2D()));
m_main.add(label, "newline, spanx, growx");
m_main.add(new JSeparator(), "newline, spanx, growx");
// reset
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index a2ddecbaf2..3ff157a612 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -25,5 +25,11 @@
download-size="0"
install-size="0"
version="3.1.0.qualifier"/>
-
+
+
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index e4eb7a7d31..a8d48ff9d4 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -3,9 +3,5 @@
-
-
-
-
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 92d99b27a6..0cbb990284 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -31,11 +31,7 @@ Import-Package: javax.activation,
org.slf4j.helpers;version="1.7.2",
org.slf4j.spi;version="1.7.2"
DynamicImport-Package: action.images
-Bundle-ClassPath: .,
- WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,
- WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,
- WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,
- WEB-INF/lib/atmosphere-runtime-1.0.4.jar
+Bundle-ClassPath: .
Export-Package: fi.jawsy.jawwa.zk.atmosphere,
metainfo.zk,
org.adempiere.webui,
@@ -68,25 +64,7 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
org.adempiere.webui.theme,
org.adempiere.webui.util,
org.adempiere.webui.window,
- org.apache.catalina,
- org.apache.catalina.comet,
- org.atmosphere.cache,
- org.atmosphere.client,
- org.atmosphere.config,
- org.atmosphere.config.service,
- org.atmosphere.container,
- org.atmosphere.container.version,
- org.atmosphere.cpr,
- org.atmosphere.di,
- org.atmosphere.handler,
- org.atmosphere.interceptor,
- org.atmosphere.util,
- org.atmosphere.util.uri,
- org.atmosphere.websocket,
- org.atmosphere.websocket.protocol,
- org.jboss.servlet.http,
org.zkforge.keylistener,
- web.js.jawwa.atmosphere,
web.js.zkforge,
web.js.zkforge.mold
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
@@ -101,7 +79,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
zul;bundle-version="0.0.0",
zweb;bundle-version="0.0.0",
org.junit;bundle-version="0.0.0",
- org.apache.commons.io;bundle-version="0.0.0"
+ org.apache.commons.io;bundle-version="0.0.0",
+ com.itextpdf;bundle-version="0.0.0",
+ org.atmosphere.runtime;bundle-version="0.0.0"
Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true
Web-ContextPath: webui
diff --git a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
index b3ef369db2..6c518c079e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
@@ -217,7 +217,7 @@ public class AtmosphereServerPush implements ServerPush {
}
if (!resource.isSuspended()) {
- resource.suspend(-1, false);
+ resource.suspend(-1);
}
this.resource.set(resource);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
index cd7eab8467..fd9f7f3fce 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
@@ -73,12 +73,12 @@ import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions;
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfImportedPage;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfImportedPage;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfWriter;
/**
* ZK Application Environment and utilities
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
index 859d90ec7e..c92169b069 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
@@ -71,11 +71,11 @@ import org.zkoss.zul.Html;
import org.zkoss.zul.Label;
import org.zkoss.zul.Vlayout;
-import com.lowagie.text.Document;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfImportedPage;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfImportedPage;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfWriter;
/**
* Dialog to Start process or report.
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
index 173616f7d7..cca67597f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
@@ -70,7 +70,7 @@ import org.zkoss.zul.Center;
import org.zkoss.zul.Filedownload;
import org.zkoss.zul.South;
-import com.lowagie.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfReader;
/**
* Payment Print & Export
diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
index 610cc58220..956e8af021 100644
--- a/org.adempiere.ui.zk/WEB-INF/web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/web.xml
@@ -17,12 +17,16 @@
org.atmosphere.cpr.broadcasterCacheClass
- org.atmosphere.cache.HeaderBroadcasterCache
+ org.atmosphere.cache.SessionBroadcasterCache
org.atmosphere.cpr.AtmosphereInterceptor
org.atmosphere.client.TrackMessageSizeInterceptor
+
+ org.atmosphere.websocket.suppressJSR356
+ true
+
0
true
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index b0771035e9..6d8752a10d 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -24,10 +24,6 @@ bin.includes = META-INF/,\
OSGI-INF/defaultpaymentformfactory.xml,\
OSGI-INF/processfactory.xml,\
OSGI-INF/defaultprintshippinglabel.xml,\
- WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,\
- WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,\
- WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,\
- WEB-INF/lib/atmosphere-runtime-1.0.4.jar,\
OSGI-INF/defaultcreatefromfactory.xml,\
OSGI-INF/defaultformfactory.xml,\
OSGI-INF/feedbackservice.xml,\
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index 5ff30c5b5a..e5f8327b03 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -1,10 +1,6 @@
-
-
-
-