midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3136:all stuff relate library of idempiere 

update and use osgi version of library (passay, itextpdf, bcprov, super-csv)
This commit is contained in:
hieplq 2016-07-07 19:05:05 +07:00
parent d4be017105
commit 1ca5d9835d
24 changed files with 125 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.adempiere.base-feature/feature.xml
View File

@ -265,5 +265,38 @@
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.passay"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.itextpdf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcprov"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.cryptacular"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="net.sf.supercsv.super-csv"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

4
org.adempiere.base/.classpath
View File

@ -7,21 +7,17 @@
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/> <classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
<classpathentry exported="true" kind="lib" path="passay-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/> <classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/> <classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
<classpathentry exported="true" kind="lib" path="jython-engine.jar"/> <classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
<classpathentry exported="true" kind="lib" path="jython.jar"/> <classpathentry exported="true" kind="lib" path="jython.jar"/>
<classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/> <classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/>
<classpathentry exported="true" kind="lib" path="barbecue-1.5-beta1.jar"/> <classpathentry exported="true" kind="lib" path="barbecue-1.5-beta1.jar"/>
<classpathentry exported="true" kind="lib" path="iText-2.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="jcommon-1.0.23.jar"/> <classpathentry exported="true" kind="lib" path="jcommon-1.0.23.jar"/>
<classpathentry exported="true" kind="lib" path="jfreechart-1.0.19.jar"/> <classpathentry exported="true" kind="lib" path="jfreechart-1.0.19.jar"/>
<classpathentry exported="true" kind="lib" path="jnlp.jar"/> <classpathentry exported="true" kind="lib" path="jnlp.jar"/>
<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/> <classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="super-csv-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/> <classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
<classpathentry exported="true" kind="lib" path="bcprov-jdk15on-1.46.jar"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

124
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -10,15 +10,11 @@ Bundle-ClassPath: base.jar,
jython.jar, jython.jar,
cron4j-2.2.5.jar, cron4j-2.2.5.jar,
barbecue-1.5-beta1.jar, barbecue-1.5-beta1.jar,
iText-2.1.7.jar,
jcommon-1.0.23.jar, jcommon-1.0.23.jar,
jfreechart-1.0.19.jar, jfreechart-1.0.19.jar,
jnlp.jar, jnlp.jar,
groovy-all-1.7.5.jar, groovy-all-1.7.5.jar,
super-csv-2.2.0.jar,
barcode4j-2.1.jar, barcode4j-2.1.jar,
bcprov-jdk15on-1.46.jar,
passay-1.0.jar,
bsh-2.0b6.jar bsh-2.0b6.jar
Export-Package: bsh, Export-Package: bsh,
bsh.classpath, bsh.classpath,
@ -30,28 +26,6 @@ Export-Package: bsh,
bsh.servlet, bsh.servlet,
bsh.util, bsh.util,
com.akunagroup.uk.postcode, 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.beans,
groovy.grape, groovy.grape,
groovy.inspect, groovy.inspect,
@ -122,88 +96,6 @@ Export-Package: bsh,
org.adempiere.print.export, org.adempiere.print.export,
org.adempiere.process, org.adempiere.process,
org.adempiere.util, 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,
org.codehaus.groovy.ant, org.codehaus.groovy.ant,
org.codehaus.groovy.antlr, org.codehaus.groovy.antlr,
@ -345,14 +237,7 @@ Export-Package: bsh,
org.krysalis.barcode4j.output.svg, org.krysalis.barcode4j.output.svg,
org.krysalis.barcode4j.servlet, org.krysalis.barcode4j.servlet,
org.krysalis.barcode4j.tools, org.krysalis.barcode4j.tools,
org.krysalis.barcode4j.xalan, 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
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.sun.mail.smtp;version="1.5", Import-Package: com.sun.mail.smtp;version="1.5",
javax.activation, javax.activation,
@ -393,4 +278,9 @@ Eclipse-ExtensibleAPI: true
Bundle-Activator: org.adempiere.base.BaseActivator Bundle-Activator: org.adempiere.base.BaseActivator
Service-Component: OSGI-INF/*.xml Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy 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"

4
org.adempiere.base/build.properties
View File

@ -7,13 +7,11 @@ bin.includes = META-INF/,\
jython.jar,\ jython.jar,\
cron4j-2.2.5.jar,\ cron4j-2.2.5.jar,\
barbecue-1.5-beta1.jar,\ barbecue-1.5-beta1.jar,\
iText-2.1.7.jar,\
jcommon-1.0.23.jar,\ jcommon-1.0.23.jar,\
jfreechart-1.0.19.jar,\ jfreechart-1.0.19.jar,\
jnlp.jar,\ jnlp.jar,\
OSGI-INF/,\ OSGI-INF/,\
groovy-all-1.7.5.jar,\ groovy-all-1.7.5.jar,\
super-csv-2.2.0.jar,\
OSGI-INF/dslocator.xml,\ OSGI-INF/dslocator.xml,\
OSGI-INF/serverbean.xml,\ OSGI-INF/serverbean.xml,\
OSGI-INF/statusbean.xml,\ OSGI-INF/statusbean.xml,\
@ -32,8 +30,6 @@ bin.includes = META-INF/,\
OSGI-INF/addressvalidationeventhandler.xml,\ OSGI-INF/addressvalidationeventhandler.xml,\
schema/,\ schema/,\
barcode4j-2.1.jar,\ barcode4j-2.1.jar,\
bcprov-jdk15on-1.46.jar,\
passay-1.0.jar,\
bsh-2.0b6.jar bsh-2.0b6.jar
output.base.jar = bin/ output.base.jar = bin/
src.includes = schema/ src.includes = schema/

4
org.adempiere.base/copyjars.xml
View File

@ -11,15 +11,11 @@
<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="iText-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
<!-- jnlp is not used in idempiere? --> <!-- jnlp is not used in idempiere? -->
<get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/net/sf/supercsv/super-csv/2.2.0/super-csv-2.2.0.jar" dest="super-csv-2.2.0.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" dest="bcprov-jdk15on-1.46.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/passay/passay/1.0/passay-1.0.jar" dest="passay-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
</target> </target>
</project> </project>

16
org.adempiere.base/src/org/adempiere/pdf/Document.java
View File

@ -23,12 +23,12 @@ import java.io.OutputStream;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import com.lowagie.text.FontFactory; import com.itextpdf.text.FontFactory;
import com.lowagie.text.Rectangle; import com.itextpdf.text.Rectangle;
import com.lowagie.text.pdf.DefaultFontMapper; import com.itextpdf.awt.DefaultFontMapper;
import com.lowagie.text.pdf.PdfContentByte; import com.itextpdf.text.pdf.PdfContentByte;
import com.lowagie.text.pdf.PdfTemplate; import com.itextpdf.text.pdf.PdfTemplate;
import com.lowagie.text.pdf.PdfWriter; import com.itextpdf.text.pdf.PdfWriter;
/** /**
* Generate PDF document using iText * Generate PDF document using iText
@ -46,8 +46,8 @@ public class Document {
try { try {
final PageFormat pf = pageable.getPageFormat(0); final PageFormat pf = pageable.getPageFormat(0);
final com.lowagie.text.Document document = final com.itextpdf.text.Document document =
new com.lowagie.text.Document(new Rectangle( new com.itextpdf.text.Document(new Rectangle(
(int) pf.getWidth(), (int) pf.getHeight())); (int) pf.getWidth(), (int) pf.getHeight()));
final PdfWriter writer = PdfWriter.getInstance( final PdfWriter writer = PdfWriter.getInstance(
document, output); document, output);

38
org.adempiere.base/src/org/compiere/model/MPasswordRule.java
View File

@ -32,25 +32,21 @@ import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.idempiere.util.HistoryRuleSupportHash; import org.idempiere.util.HistoryRuleSupportHash;
import org.passay.AlphabeticalCharacterRule;
import org.passay.AlphabeticalSequenceRule;
import org.passay.CharacterCharacteristicsRule; import org.passay.CharacterCharacteristicsRule;
import org.passay.CharacterRule;
import org.passay.DictionarySubstringRule; 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.LengthRule;
import org.passay.LowercaseCharacterRule;
import org.passay.MessageResolver; import org.passay.MessageResolver;
import org.passay.NumericalSequenceRule;
import org.passay.PasswordData; import org.passay.PasswordData;
import org.passay.PasswordGenerator; import org.passay.PasswordGenerator;
import org.passay.PasswordValidator; import org.passay.PasswordValidator;
import org.passay.PropertiesMessageResolver; import org.passay.PropertiesMessageResolver;
import org.passay.QwertySequenceRule;
import org.passay.RepeatCharacterRegexRule; import org.passay.RepeatCharacterRegexRule;
import org.passay.Rule; import org.passay.Rule;
import org.passay.RuleResult; import org.passay.RuleResult;
import org.passay.SpecialCharacterRule;
import org.passay.UppercaseCharacterRule;
import org.passay.UsernameRule; import org.passay.UsernameRule;
import org.passay.WhitespaceRule; import org.passay.WhitespaceRule;
import org.passay.dictionary.ArrayWordList; import org.passay.dictionary.ArrayWordList;
@ -136,24 +132,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
if (getDigitCharacter() > 0) { if (getDigitCharacter() > 0) {
// require at least n digit in passwords // require at least n digit in passwords
numValidations++; numValidations++;
charRule.getRules().add(new DigitCharacterRule(getDigitCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
} }
if (getNonAlphaNumericCharacter() > 0) { if (getNonAlphaNumericCharacter() > 0) {
// require at least n non-alphanumeric char // require at least n non-alphanumeric char
numValidations++; numValidations++;
charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
} }
if (getUppercaseCharacter() > 0) { if (getUppercaseCharacter() > 0) {
numValidations++; numValidations++;
charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));
} }
if (getLowercaseCharacter() > 0) { if (getLowercaseCharacter() > 0) {
numValidations++; numValidations++;
charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
} }
if (getAlphabeticalCharacter() > 0){ if (getAlphabeticalCharacter() > 0){
numValidations++; numValidations++;
charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter())); charRule.getRules().add(new CharacterRule (EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
} }
if (! charRule.getRules().isEmpty()) { if (! charRule.getRules().isEmpty()) {
charRule.setNumberOfCharacteristics(numValidations); charRule.setNumberOfCharacteristics(numValidations);
@ -161,14 +157,14 @@ public class MPasswordRule extends X_AD_PasswordRule {
} }
if (getAlphabeticalSequence() > 0) { if (getAlphabeticalSequence() > 0) {
ruleList.add(new AlphabeticalSequenceRule(getAlphabeticalSequence(), true)); ruleList.add(new IllegalSequenceRule (EnglishSequenceData.Alphabetical, getAlphabeticalSequence(), true));
} }
if (getNumericalSequence() > 0) { if (getNumericalSequence() > 0) {
ruleList.add(new NumericalSequenceRule(getNumericalSequence(), true)); ruleList.add(new IllegalSequenceRule(EnglishSequenceData.Numerical, getNumericalSequence(), true));
} }
if (getQWERTYSequence() > 0) { if (getQWERTYSequence() > 0) {
ruleList.add(new QwertySequenceRule(getQWERTYSequence(), true)); ruleList.add(new IllegalSequenceRule(EnglishSequenceData.USQwerty, getQWERTYSequence(), true));
} }
if (getRepeatCharacterRegex() > 0) { if (getRepeatCharacterRegex() > 0) {
@ -269,24 +265,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
if (getDigitCharacter() > 0) { if (getDigitCharacter() > 0) {
// require at least n digit in passwords // require at least n digit in passwords
numValidations++; numValidations++;
charRule.getRules().add(new DigitCharacterRule(getDigitCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
} }
if (getNonAlphaNumericCharacter() > 0) { if (getNonAlphaNumericCharacter() > 0) {
// require at least n non-alphanumeric char // require at least n non-alphanumeric char
numValidations++; numValidations++;
charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
} }
if (getUppercaseCharacter() > 0) { if (getUppercaseCharacter() > 0) {
numValidations++; numValidations++;
charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));
} }
if (getLowercaseCharacter() > 0) { if (getLowercaseCharacter() > 0) {
numValidations++; numValidations++;
charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
} }
if (getAlphabeticalCharacter() > 0){ if (getAlphabeticalCharacter() > 0){
numValidations++; numValidations++;
charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter())); charRule.getRules().add(new CharacterRule(EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
} }
if (! charRule.getRules().isEmpty()) { if (! charRule.getRules().isEmpty()) {
charRule.setNumberOfCharacteristics(numValidations); charRule.setNumberOfCharacteristics(numValidations);

2
org.adempiere.report.jasper.library/.classpath
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-140.jar"/>
<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-5.6.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-5.6.1.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

5
org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
View File

@ -10,7 +10,9 @@ Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
lib/jackson-core-2.1.4.jar, lib/jackson-core-2.1.4.jar,
lib/xalan-2.7.1.jar, lib/xalan-2.7.1.jar,
lib/jasperreports-functions-5.6.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: ., Export-Package: .,
com.fasterxml.jackson.core, com.fasterxml.jackson.core,
com.fasterxml.jackson.core.base, com.fasterxml.jackson.core.base,
@ -242,4 +244,5 @@ Import-Package: org.apache.commons.collections,
org.w3c.tools.codec org.w3c.tools.codec
DynamicImport-Package: * DynamicImport-Package: *
Eclipse-BuddyPolicy: registered Eclipse-BuddyPolicy: registered
Require-Bundle: bcprov;bundle-version="1.53.0"

4
org.adempiere.report.jasper.library/build.properties
View File

@ -6,4 +6,6 @@ bin.includes = META-INF/,\
lib/jackson-core-2.1.4.jar,\ lib/jackson-core-2.1.4.jar,\
lib/xalan-2.7.1.jar,\ lib/xalan-2.7.1.jar,\
lib/jasperreports-functions-5.6.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

2
org.adempiere.report.jasper.library/copyjars.xml
View File

@ -9,5 +9,7 @@
<get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="lib/itext-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/bouncycastle/bcprov-jdk14/140/bcprov-jdk14-140.jar" dest="lib/bcprov-jdk14-140.jar" usetimestamp="true" verbose="true" retries="5" />
</target> </target>
</project> </project>

14
org.adempiere.sdk-feature/adempiere.rmap
View File

@ -10,6 +10,13 @@
<rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/> <rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/>
<rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/> <rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/>
<rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/> <rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/>
<rm:locator pattern="^org\.passay$" searchPathRef="bundles.maven" />
<rm:locator pattern="^com\.itextpdf$" searchPathRef="bundles.maven" />
<rm:locator pattern="^bcpkix$" searchPathRef="bundles.maven" />
<rm:locator pattern="^bcprov$" searchPathRef="bundles.maven" />
<rm:locator pattern="^org\.cryptacular$" searchPathRef="bundles.maven" />
<rm:locator pattern="^net\.sf\.supercsv\.super-csv$" searchPathRef="bundles.maven" />
<rm:locator pattern="^org\.atmosphere\.runtime$" searchPathRef="bundles.maven" />
<rm:locator pattern="^javax\.websocket\-api$" searchPathRef="bundles.maven"/> <rm:locator pattern="^javax\.websocket\-api$" searchPathRef="bundles.maven"/>
<rm:locator pattern="^javax\.annotation\-api$" searchPathRef="bundles.maven"/> <rm:locator pattern="^javax\.annotation\-api$" searchPathRef="bundles.maven"/>
<rm:locator pattern="^javax\.management\.j2ee\-api$" searchPathRef="bundles.maven"/> <rm:locator pattern="^javax\.management\.j2ee\-api$" searchPathRef="bundles.maven"/>
@ -127,6 +134,13 @@
<maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/> <maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
<maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/> <maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/>
<maven:entry artifactId="javassist" groupId="org.javassist" name="javassist"/> <maven:entry artifactId="javassist" groupId="org.javassist" name="javassist"/>
<maven:entry groupId="org.passay" artifactId="passay" name="org.passay" />
<maven:entry groupId="com.itextpdf" artifactId="itextpdf" name="com.itextpdf" />
<maven:entry groupId="org.bouncycastle" artifactId="bcpkix-jdk15on" name="bcpkix" />
<maven:entry groupId="org.bouncycastle" artifactId="bcprov-jdk15on" name="bcprov" />
<maven:entry groupId="org.cryptacular" artifactId="cryptacular" name="org.cryptacular" />
<maven:entry groupId="net.sf.supercsv" artifactId="super-csv" name="net.sf.supercsv.super-csv" />
<maven:entry groupId="org.atmosphere" artifactId="atmosphere-runtime" name="org.atmosphere.runtime" />
</maven:mappings> </maven:mappings>
</rm:provider> </rm:provider>
</rm:searchPath> </rm:searchPath>

8
org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
View File

@ -9,15 +9,15 @@ import java.io.InputStream;
import java.io.Serializable; import java.io.Serializable;
import java.net.URL; import java.net.URL;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date; import java.util.Date;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Ini; import org.compiere.util.Ini;
import org.compiere.util.SecureEngine; import org.compiere.util.SecureEngine;
import com.lowagie.text.pdf.codec.Base64;
public final class Prop implements Serializable { public final class Prop implements Serializable {
/** /**
@ -208,7 +208,7 @@ public final class Prop implements Serializable {
try { try {
fis = new URL(getProperty(TEMPLATE_PATH)+getProperty(TEMPLATE_NAME)+"/styles/template.css"); fis = new URL(getProperty(TEMPLATE_PATH)+getProperty(TEMPLATE_NAME)+"/styles/template.css");
byte data[]=read(fis); byte data[]=read(fis);
ret+=Base64.encodeBytes(data); ret+=Base64.getEncoder().encode (data);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
@ -288,7 +288,7 @@ public final class Prop implements Serializable {
byte data[]=read(fis); byte data[]=read(fis);
if(data==null||data.length<=0) if(data==null||data.length<=0)
return null; return null;
ret+=Base64.encodeBytes(data); ret+=Base64.getEncoder().encode (data);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {

4
org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
View File

@ -20,6 +20,7 @@ package org.compiere.grid;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.FocusTraversalPolicy; import java.awt.FocusTraversalPolicy;
import java.awt.Font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -56,7 +57,6 @@ import org.compiere.util.Util;
import org.jdesktop.swingx.JXCollapsiblePane; import org.jdesktop.swingx.JXCollapsiblePane;
import org.jdesktop.swingx.border.DropShadowBorder; import org.jdesktop.swingx.border.DropShadowBorder;
import com.lowagie.text.Font;
/** /**
* Single Row Panel. * Single Row Panel.
@ -453,7 +453,7 @@ public final class VPanel extends CTabbedPane
else // Label or null else // Label or null
{ {
CLabel label = new CLabel(fieldGroup, CLabel.LEADING); 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(label, "newline, spanx, growx");
m_main.add(new JSeparator(), "newline, spanx, growx"); m_main.add(new JSeparator(), "newline, spanx, growx");
// reset // reset

8
org.adempiere.ui.zk-feature/feature.xml
View File

@ -25,5 +25,11 @@
download-size="0" download-size="0"
install-size="0" install-size="0"
version="3.1.0.qualifier"/> version="3.1.0.qualifier"/>
<plugin
id="org.atmosphere.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

4
org.adempiere.ui.zk/.classpath
View File

@ -3,9 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="WEB-INF/src"/> <classpathentry kind="src" path="WEB-INF/src"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" sourcepath="WEB-INF/lib/src/atmosphere-runtime-1.0.4-sources.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

28
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -31,11 +31,7 @@ Import-Package: javax.activation,
org.slf4j.helpers;version="1.7.2", org.slf4j.helpers;version="1.7.2",
org.slf4j.spi;version="1.7.2" org.slf4j.spi;version="1.7.2"
DynamicImport-Package: action.images DynamicImport-Package: action.images
Bundle-ClassPath: ., 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
Export-Package: fi.jawsy.jawwa.zk.atmosphere, Export-Package: fi.jawsy.jawwa.zk.atmosphere,
metainfo.zk, metainfo.zk,
org.adempiere.webui, org.adempiere.webui,
@ -68,25 +64,7 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
org.adempiere.webui.theme, org.adempiere.webui.theme,
org.adempiere.webui.util, org.adempiere.webui.util,
org.adempiere.webui.window, 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, org.zkforge.keylistener,
web.js.jawwa.atmosphere,
web.js.zkforge, web.js.zkforge,
web.js.zkforge.mold web.js.zkforge.mold
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", 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", zul;bundle-version="0.0.0",
zweb;bundle-version="0.0.0", zweb;bundle-version="0.0.0",
org.junit;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 Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true Eclipse-ExtensibleAPI: true
Web-ContextPath: webui Web-ContextPath: webui

2
org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
View File

@ -217,7 +217,7 @@ public class AtmosphereServerPush implements ServerPush {
} }
if (!resource.isSuspended()) { if (!resource.isSuspended()) {
resource.suspend(-1, false); resource.suspend(-1);
} }
this.resource.set(resource); this.resource.set(resource);

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -73,12 +73,12 @@ import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Execution; import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import com.lowagie.text.Document; import com.itextpdf.text.Document;
import com.lowagie.text.DocumentException; import com.itextpdf.text.DocumentException;
import com.lowagie.text.pdf.PdfContentByte; import com.itextpdf.text.pdf.PdfContentByte;
import com.lowagie.text.pdf.PdfImportedPage; import com.itextpdf.text.pdf.PdfImportedPage;
import com.lowagie.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfReader;
import com.lowagie.text.pdf.PdfWriter; import com.itextpdf.text.pdf.PdfWriter;
/** /**
* ZK Application Environment and utilities * ZK Application Environment and utilities

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -71,11 +71,11 @@ import org.zkoss.zul.Html;
import org.zkoss.zul.Label; import org.zkoss.zul.Label;
import org.zkoss.zul.Vlayout; import org.zkoss.zul.Vlayout;
import com.lowagie.text.Document; import com.itextpdf.text.Document;
import com.lowagie.text.pdf.PdfContentByte; import com.itextpdf.text.pdf.PdfContentByte;
import com.lowagie.text.pdf.PdfImportedPage; import com.itextpdf.text.pdf.PdfImportedPage;
import com.lowagie.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfReader;
import com.lowagie.text.pdf.PdfWriter; import com.itextpdf.text.pdf.PdfWriter;
/** /**
* Dialog to Start process or report. * Dialog to Start process or report.

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
View File

@ -70,7 +70,7 @@ import org.zkoss.zul.Center;
import org.zkoss.zul.Filedownload; import org.zkoss.zul.Filedownload;
import org.zkoss.zul.South; import org.zkoss.zul.South;
import com.lowagie.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfReader;
/** /**
* Payment Print & Export * Payment Print & Export

6
org.adempiere.ui.zk/WEB-INF/web.xml
View File

@ -17,12 +17,16 @@
</init-param> </init-param>
<init-param> <init-param>
<param-name>org.atmosphere.cpr.broadcasterCacheClass</param-name> <param-name>org.atmosphere.cpr.broadcasterCacheClass</param-name>
<param-value>org.atmosphere.cache.HeaderBroadcasterCache</param-value> <param-value>org.atmosphere.cache.SessionBroadcasterCache</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>org.atmosphere.cpr.AtmosphereInterceptor</param-name> <param-name>org.atmosphere.cpr.AtmosphereInterceptor</param-name>
<param-value>org.atmosphere.client.TrackMessageSizeInterceptor</param-value> <param-value>org.atmosphere.client.TrackMessageSizeInterceptor</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.websocket.suppressJSR356</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
<!-- Remove async-supported if you are not using Servlet 3.0 --> <!-- Remove async-supported if you are not using Servlet 3.0 -->
<async-supported>true</async-supported> <async-supported>true</async-supported>

4
org.adempiere.ui.zk/build.properties
View File

@ -24,10 +24,6 @@ bin.includes = META-INF/,\
OSGI-INF/defaultpaymentformfactory.xml,\ OSGI-INF/defaultpaymentformfactory.xml,\
OSGI-INF/processfactory.xml,\ OSGI-INF/processfactory.xml,\
OSGI-INF/defaultprintshippinglabel.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/defaultcreatefromfactory.xml,\
OSGI-INF/defaultformfactory.xml,\ OSGI-INF/defaultformfactory.xml,\
OSGI-INF/feedbackservice.xml,\ OSGI-INF/feedbackservice.xml,\

4
org.adempiere.ui.zk/copyjars.xml
View File

@ -1,10 +1,6 @@
<project name="zklibrary" basedir="." default="copy"> <project name="zklibrary" basedir="." default="copy">
<target name="copy"> <target name="copy">
<mkdir dir="WEB-INF/lib" /> <mkdir dir="WEB-INF/lib" />
<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-jbossweb/1.0.4/atmosphere-compat-jbossweb-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat/1.0.4/atmosphere-compat-tomcat-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat7/1.0.4/atmosphere-compat-tomcat7-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-runtime/1.0.4/atmosphere-runtime-1.0.4.jar" dest="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.file.srv}/jarfile/3.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" /> <get src="${url.file.srv}/jarfile/3.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
</target> </target>