hg merge release-3.1 (merge release3.1 into development)
This commit is contained in:
commit
2d90af7b5b
14
.hgignore
14
.hgignore
|
@ -7,8 +7,11 @@ syntax: regexp
|
||||||
^org\.adempiere\.install/bin/.*\.*$
|
^org\.adempiere\.install/bin/.*\.*$
|
||||||
^org\.adempiere\.ui\.zk/dist$
|
^org\.adempiere\.ui\.zk/dist$
|
||||||
^org\.adempiere\.ui\.zk/bin/.*\.*$
|
^org\.adempiere\.ui\.zk/bin/.*\.*$
|
||||||
|
^[^/]+/lib/.*\.jar$
|
||||||
|
^[^/]+/.*\.jar$
|
||||||
|
^[^/]+/WEB-INF/lib/.*\.jar$
|
||||||
|
^db/ddlutils/lib/.*\.jar$
|
||||||
|
|
||||||
syntax: regexp
|
|
||||||
^lib/plugins$
|
^lib/plugins$
|
||||||
^plugins/.*\.class$
|
^plugins/.*\.class$
|
||||||
^adempiere-local\.properties$
|
^adempiere-local\.properties$
|
||||||
|
@ -24,8 +27,6 @@ syntax: regexp
|
||||||
^org\.adempiere\.ui\.swing/bin/.*\.*$
|
^org\.adempiere\.ui\.swing/bin/.*\.*$
|
||||||
^org\.adempiere\.report\.jasper\.fonts/bin/.*\.*$
|
^org\.adempiere\.report\.jasper\.fonts/bin/.*\.*$
|
||||||
|
|
||||||
|
|
||||||
syntax: regexp
|
|
||||||
^org.adempiere.tomcat.config/META-INF/tomcat/server\.xml$
|
^org.adempiere.tomcat.config/META-INF/tomcat/server\.xml$
|
||||||
^org\.apache\.ecs/bin/.*\.class$
|
^org\.apache\.ecs/bin/.*\.class$
|
||||||
^org\.adempiere\.replication/bin/.*\.class$
|
^org\.adempiere\.replication/bin/.*\.class$
|
||||||
|
@ -62,18 +63,12 @@ syntax: regexp
|
||||||
^work/.*$
|
^work/.*$
|
||||||
^hazelcast\.xml$
|
^hazelcast\.xml$
|
||||||
|
|
||||||
syntax: regexp
|
|
||||||
swingclient.product.*
|
swingclient.product.*
|
||||||
server.product.*
|
server.product.*
|
||||||
|
|
||||||
syntax: regexp
|
|
||||||
^org\.zkoss\.zk\.library/bin$
|
^org\.zkoss\.zk\.library/bin$
|
||||||
syntax: regexp
|
|
||||||
\.class$
|
|
||||||
syntax: regexp
|
|
||||||
\.class$
|
\.class$
|
||||||
|
|
||||||
syntax: regexp
|
|
||||||
^org\.zkoss\.zk\.library/.*/calendar.*\.jar$
|
^org\.zkoss\.zk\.library/.*/calendar.*\.jar$
|
||||||
^org\.zkoss\.zk\.library/.*/ckez.*\.jar$
|
^org\.zkoss\.zk\.library/.*/ckez.*\.jar$
|
||||||
^org\.zkoss\.zk\.library/.*/gmapsz.*\.jar$
|
^org\.zkoss\.zk\.library/.*/gmapsz.*\.jar$
|
||||||
|
@ -89,3 +84,4 @@ syntax: regexp
|
||||||
^packout
|
^packout
|
||||||
^RemoteSystemsTempFiles
|
^RemoteSystemsTempFiles
|
||||||
|
|
||||||
|
^fitnesse/FitNesseRoot/FitLibraryWeb/[^/]+\.zip$
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,6 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fitnesse2.jar" dest="fitnesse2.jar" usetimestamp="true" verbose="true" retries="5"/>
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1,22 +0,0 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<?artifactRepository version='1.1.0'?>
|
|
||||||
<repository name='idempiere local repository - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
|
|
||||||
<properties size='2'>
|
|
||||||
<property name='p2.timestamp' value='1410940772016'/>
|
|
||||||
<property name='p2.compressed' value='false'/>
|
|
||||||
</properties>
|
|
||||||
<mappings size='3'>
|
|
||||||
<rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
|
|
||||||
<rule filter='(& (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
|
|
||||||
<rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
|
|
||||||
</mappings>
|
|
||||||
<artifacts size='1'>
|
|
||||||
<artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'>
|
|
||||||
<properties size='3'>
|
|
||||||
<property name='artifact.size' value='27244'/>
|
|
||||||
<property name='download.size' value='27244'/>
|
|
||||||
<property name='download.md5' value='12db1250ba0e1ee705771d8ce293ce52'/>
|
|
||||||
</properties>
|
|
||||||
</artifact>
|
|
||||||
</artifacts>
|
|
||||||
</repository>
|
|
|
@ -1,45 +0,0 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<?metadataRepository version='1.1.0'?>
|
|
||||||
<repository name='idempiere local repository - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
|
|
||||||
<properties size='2'>
|
|
||||||
<property name='p2.timestamp' value='1410940772018'/>
|
|
||||||
<property name='p2.compressed' value='false'/>
|
|
||||||
</properties>
|
|
||||||
<units size='1'>
|
|
||||||
<unit id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1' singleton='false'>
|
|
||||||
<update id='org.apache.felix.webconsole.plugins.packageadmin' range='[0.0.0,1.0.0.1)' severity='0'/>
|
|
||||||
<properties size='4'>
|
|
||||||
<property name='org.eclipse.equinox.p2.name' value='Apache Felix Web Console Package Admin Service Plugin'/>
|
|
||||||
<property name='org.eclipse.equinox.p2.description' value='Plugin providing support to query the Package Admin service for various details; e.g. finding duplicate package exports or finding bundles exporting given packages'/>
|
|
||||||
<property name='org.eclipse.equinox.p2.provider' value='The Apache Software Foundation'/>
|
|
||||||
<property name='org.eclipse.equinox.p2.doc.url' value='http://www.apache.org/'/>
|
|
||||||
</properties>
|
|
||||||
<provides size='3'>
|
|
||||||
<provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
|
|
||||||
<provided namespace='osgi.bundle' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
|
|
||||||
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
|
|
||||||
</provides>
|
|
||||||
<requires size='8'>
|
|
||||||
<required namespace='java.package' name='javax.servlet' range='0.0.0'/>
|
|
||||||
<required namespace='java.package' name='javax.servlet.http' range='0.0.0'/>
|
|
||||||
<required namespace='java.package' name='org.apache.commons.io' range='[1.4.0,3.0.0)'/>
|
|
||||||
<required namespace='java.package' name='org.apache.felix.webconsole' range='[3.1.0,4.0.0)'/>
|
|
||||||
<required namespace='java.package' name='org.json' range='0.0.0'/>
|
|
||||||
<required namespace='java.package' name='org.osgi.framework' range='[1.3.0,2.0.0)'/>
|
|
||||||
<required namespace='java.package' name='org.osgi.service.packageadmin' range='[1.2.0,2.0.0)'/>
|
|
||||||
<required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.0,2.0.0)'/>
|
|
||||||
</requires>
|
|
||||||
<artifacts size='1'>
|
|
||||||
<artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
|
|
||||||
</artifacts>
|
|
||||||
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
|
|
||||||
<touchpointData size='1'>
|
|
||||||
<instructions size='1'>
|
|
||||||
<instruction key='manifest'>
|
|
||||||
Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin
Bundle-Version: 1.0.0.1

|
|
||||||
</instruction>
|
|
||||||
</instructions>
|
|
||||||
</touchpointData>
|
|
||||||
</unit>
|
|
||||||
</units>
|
|
||||||
</repository>
|
|
|
@ -6,8 +6,17 @@ SET DEFINE OFF
|
||||||
UPDATE AD_Column SET FieldLength=4000,Updated=TO_DATE('2015-08-20 15:37:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=50122
|
UPDATE AD_Column SET FieldLength=4000,Updated=TO_DATE('2015-08-20 15:37:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=50122
|
||||||
;
|
;
|
||||||
|
|
||||||
-- Aug 20, 2015 3:37:48 PM CEST
|
-- Column is NVARCHAR so we must drop it before changing its type to VARCHAR
|
||||||
ALTER TABLE AD_Package_Exp_Detail MODIFY SQLStatement VARCHAR2(4000) DEFAULT NULL
|
ALTER TABLE AD_Package_Exp_Detail ADD Tmp_SQLStatement VARCHAR2(4000) DEFAULT NULL
|
||||||
|
;
|
||||||
|
|
||||||
|
UPDATE AD_Package_Exp_Detail SET Tmp_SQLStatement = TO_CHAR(SQLStatement)
|
||||||
|
;
|
||||||
|
|
||||||
|
ALTER TABLE AD_Package_Exp_Detail DROP COLUMN SQLStatement
|
||||||
|
;
|
||||||
|
|
||||||
|
ALTER TABLE AD_Package_Exp_Detail RENAME COLUMN Tmp_SQLStatement TO SQLStatement
|
||||||
;
|
;
|
||||||
|
|
||||||
SELECT register_migration_script('201508201340_IDEMPIERE-2778.sql') FROM dual
|
SELECT register_migration_script('201508201340_IDEMPIERE-2778.sql') FROM dual
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,26 @@
|
||||||
|
reference: https://idempiere.atlassian.net/browse/IDEMPIERE-2940
|
||||||
|
|
||||||
|
1. asume folder contain your idempiere repository is /mnt/data/dev/bitbucket/main-sync/idempiere-experimental
|
||||||
|
|
||||||
|
2. asume folder contain new repository is /mnt/data/dev/bitbucket/main-sync/idempiere-reduce
|
||||||
|
|
||||||
|
3. active convert extension in your mercurial
|
||||||
|
https://www.mercurial-scm.org/wiki/ConvertExtension#Configuration
|
||||||
|
|
||||||
|
Add the following lines to your .hgrc or to enable the extension :
|
||||||
|
[extensions]
|
||||||
|
hgext.convert=
|
||||||
|
|
||||||
|
4. run shell command:
|
||||||
|
IDEMPIERE_ROOT=/mnt/data/dev/bitbucket/main-sync/idempiere-experimental
|
||||||
|
IDEMPIERE_REDUCE=/mnt/data/dev/bitbucket/main-sync/idempiere-reduce
|
||||||
|
|
||||||
|
hg convert --filemap $IDEMPIERE_ROOT/migration/reduce_repository/exclude_file_map.txt $IDEMPIERE_ROOT $IDEMPIERE_REDUCE
|
||||||
|
|
||||||
|
5. wait (about 30 miutes) for process finish
|
||||||
|
|
||||||
|
6. in new repository do below command to delete latest commit of convert extension
|
||||||
|
|
||||||
|
7. hg rollback --verbose -f
|
||||||
|
|
||||||
|
8. upload your new repository to your server or bitbucket
|
|
@ -117,7 +117,7 @@
|
||||||
id="org.eclipse.jetty.osgi-servlet-api"
|
id="org.eclipse.jetty.osgi-servlet-api"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.1.0.M0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
|
|
@ -280,7 +280,6 @@ Export-Package: bsh,
|
||||||
org.jfree.chart.annotations,
|
org.jfree.chart.annotations,
|
||||||
org.jfree.chart.axis,
|
org.jfree.chart.axis,
|
||||||
org.jfree.chart.block,
|
org.jfree.chart.block,
|
||||||
org.jfree.chart.demo,
|
|
||||||
org.jfree.chart.editor,
|
org.jfree.chart.editor,
|
||||||
org.jfree.chart.encoders,
|
org.jfree.chart.encoders,
|
||||||
org.jfree.chart.entity,
|
org.jfree.chart.entity,
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,25 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/org/beanshell/bsh/2.0b5/bsh-2.0b5.jar" dest="bsh-2.0b5.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
|
||||||
|
http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
|
||||||
|
-->
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/groovy-engine.jar" dest="groovy-engine.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/bsh-engine.jar" dest="bsh-engine.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/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? -->
|
||||||
|
<get src="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/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="http://central.maven.org/maven2/org/passay/passay/1.0/passay-1.0.jar" dest="passay-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1025,11 +1025,11 @@ class Restriction implements Serializable
|
||||||
// clean code
|
// clean code
|
||||||
if (Code instanceof String)
|
if (Code instanceof String)
|
||||||
{
|
{
|
||||||
if (Code.toString().startsWith("'"))
|
if (Code.toString().startsWith("'") && Code.toString().endsWith("'")) {
|
||||||
Code = Code.toString().substring(1);
|
Code = Code.toString().substring(1);
|
||||||
if (Code.toString().endsWith("'"))
|
|
||||||
Code = Code.toString().substring(0, Code.toString().length()-2);
|
Code = Code.toString().substring(0, Code.toString().length()-2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (infoDisplay != null)
|
if (infoDisplay != null)
|
||||||
InfoDisplay = infoDisplay.trim();
|
InfoDisplay = infoDisplay.trim();
|
||||||
else if (code != null)
|
else if (code != null)
|
||||||
|
|
|
@ -801,6 +801,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
|
||||||
XhtmlDocument doc = new XhtmlDocument();
|
XhtmlDocument doc = new XhtmlDocument();
|
||||||
doc.getHtml().setNeedClosingTag(false);
|
doc.getHtml().setNeedClosingTag(false);
|
||||||
doc.getBody().setNeedClosingTag(false);
|
doc.getBody().setNeedClosingTag(false);
|
||||||
|
doc.appendHead("<meta charset=\"UTF-8\" />");
|
||||||
doc.appendBody(table);
|
doc.appendBody(table);
|
||||||
appendInlineCss (doc);
|
appendInlineCss (doc);
|
||||||
if (extension != null && extension.getStyleURL() != null)
|
if (extension != null && extension.getStyleURL() != null)
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,6 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/spiffy-with_source-all-0.05.jar" dest="spiffy-with_source-all-0.05.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/extend.jar" dest="extend.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,5 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar" dest="ant-contrib-1.0b3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,9 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<!-- seem payment sdk is change without use verisign.jar, i can find out this lib. maybe have to update this plug-in
|
||||||
|
http://paypal.github.io/sdk/#ppo-payflow-->
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jpayment.jar" dest="jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/Verisign.jar" dest="Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/payflow.jar" dest="payflow.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,13 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="lib" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="lib/commons-beanutils-1.8.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/net/sf/jasperreports/jasperreports/5.6.1/jasperreports-5.6.1.jar" dest="lib/jasperreports-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/net/sf/jasperreports/jasperreports-fonts/5.6.1/jasperreports-fonts-5.6.1.jar" dest="lib/jasperreports-fonts-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar" dest="lib/jackson-core-2.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/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="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/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" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -19,7 +19,7 @@
|
||||||
<cq:advisorNode namePattern="^org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
|
<cq:advisorNode namePattern="^org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
|
||||||
<cq:advisorNode namePattern="^org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.0,2.9.1)"/>
|
<cq:advisorNode namePattern="^org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.0,2.9.1)"/>
|
||||||
<cq:advisorNode namePattern="^org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.7.2)"/>
|
<cq:advisorNode namePattern="^org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.7.2)"/>
|
||||||
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.2.2]"/>
|
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.3.0)"/>
|
||||||
<cq:advisorNode namePattern="^org\.objectweb(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,5.0.1]"/>
|
<cq:advisorNode namePattern="^org\.objectweb(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,5.0.1]"/>
|
||||||
<cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
|
<cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
|
||||||
<cq:advisorNode namePattern="^javax\.ejb$" componentType="osgi.bundle" versionOverride="[3.1.1,3.1.2)"/>
|
<cq:advisorNode namePattern="^javax\.ejb$" componentType="osgi.bundle" versionOverride="[3.1.1,3.1.2)"/>
|
||||||
|
@ -30,4 +30,7 @@
|
||||||
<cq:advisorNode namePattern="^org\.apache\.servicemix\.bundles\.cglib$" componentType="osgi.bundle" versionOverride="raw:[3.1.0.'1',3.1.0.'1']/format(n[.n=0;[.n=0;]][d?S=M;]):3.1_1,3.1_1"/>
|
<cq:advisorNode namePattern="^org\.apache\.servicemix\.bundles\.cglib$" componentType="osgi.bundle" versionOverride="raw:[3.1.0.'1',3.1.0.'1']/format(n[.n=0;[.n=0;]][d?S=M;]):3.1_1,3.1_1"/>
|
||||||
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" versionOverride="[3.1.0.M0,3.1.0.M0]"/>
|
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" versionOverride="[3.1.0.M0,3.1.0.M0]"/>
|
||||||
<cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.3.0)"/>
|
<cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.3.0)"/>
|
||||||
|
<cq:advisorNode namePattern="^javax\.annotation-api$" versionOverride="[1.2.0,1.2.0]"/>
|
||||||
|
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" versionOverride="[1.0.0,1.0.0]"/>
|
||||||
|
<cq:advisorNode namePattern="org.apache.commons.io" componentType="osgi.bundle" versionOverride="[1.4.0,2.0.0)"/>
|
||||||
</cq:componentQuery>
|
</cq:componentQuery>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
|
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
|
||||||
<rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="workspace.bundle"/>
|
<rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="bundles.maven"/>
|
||||||
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.feature" failOnError="false"/>
|
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.feature" failOnError="false"/>
|
||||||
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
|
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
|
||||||
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="orbit"/>
|
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="orbit"/>
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
|
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
|
||||||
<rm:property key="buckminster.source" value="false"/>
|
<rm:property key="buckminster.source" value="false"/>
|
||||||
<rm:property key="buckminster.mutable" value="false"/>
|
<rm:property key="buckminster.mutable" value="false"/>
|
||||||
<rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
|
<rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
|
||||||
</rm:provider>
|
</rm:provider>
|
||||||
</rm:searchPath>
|
</rm:searchPath>
|
||||||
<rm:searchPath name="restlet.maven">
|
<rm:searchPath name="restlet.maven">
|
||||||
|
@ -121,6 +121,7 @@
|
||||||
<maven:entry artifactId="org.apache.felix.webconsole.plugins.ds" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.ds"/>
|
<maven:entry artifactId="org.apache.felix.webconsole.plugins.ds" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.ds"/>
|
||||||
<maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
|
<maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
|
||||||
<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:mappings>
|
</maven:mappings>
|
||||||
</rm:provider>
|
</rm:provider>
|
||||||
</rm:searchPath>
|
</rm:searchPath>
|
||||||
|
|
|
@ -48,9 +48,20 @@
|
||||||
<path path="idempiereServer.${target.ws}.${target.os}.${target.arch}.zip" ></path>
|
<path path="idempiereServer.${target.ws}.${target.os}.${target.arch}.zip" ></path>
|
||||||
</products>
|
</products>
|
||||||
</public>
|
</public>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<actorProperties>
|
||||||
|
<property key="buildFile" value="copyjars.xml" />
|
||||||
|
<property key="targets" value="copy" />
|
||||||
|
</actorProperties>
|
||||||
|
</public>
|
||||||
</actions>
|
</actions>
|
||||||
<groups>
|
<groups>
|
||||||
<!-- Place your Groups here -->
|
<!-- Place your Groups here -->
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<private name="buckminster.postbind">
|
||||||
|
<attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</private>
|
||||||
</groups>
|
</groups>
|
||||||
<alterDependencies>
|
<alterDependencies>
|
||||||
<!-- Place your Dependency alterations here -->
|
<!-- Place your Dependency alterations here -->
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="data/seed" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/Adempiere_pg84.jar" dest="data/seed/Adempiere_pg84.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/Adempiere_pg.jar" dest="data/seed/Adempiere_pg.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
|
||||||
|
<mkdir dir="../db/ddlutils/lib" />
|
||||||
|
<get src="http://central.maven.org/maven2/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib-1.0b1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="../db/ddlutils/lib/commons-beanutils-1.7.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar" dest="../db/ddlutils/lib/commons-betwixt-0.8-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" dest="../db/ddlutils/lib/commons-codec-1.3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" dest="../db/ddlutils/lib/commons-collections-3.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar" dest="../db/ddlutils/lib/commons-dbcp-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-digester/commons-digester/1.7/commons-digester-1.7.jar" dest="../db/ddlutils/lib/commons-digester-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="../db/ddlutils/lib/commons-lang-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="../db/ddlutils/lib/commons-logging-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="../db/ddlutils/lib/commons-pool-1.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/ddlutils/ddlutils/1.0/ddlutils-1.0.jar" dest="../db/ddlutils/lib/DdlUtils-1.0-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/dom4j/dom4j/1.4/dom4j-1.4.jar" dest="../db/ddlutils/lib/dom4j-1.4.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro-2.0.8.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api-1.0.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<mkdir dir="../db/ddlutils/postgresql/pljava" />
|
||||||
|
<get src="http://central.maven.org/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
|
||||||
|
<mkdir dir="../fitnesse/FitNesseRoot/FitLibraryWeb" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
|
||||||
|
<mkdir dir="../ztl" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/ztl/ztl/2.0.0-SNAPSHOT/ztl-2.0.0-SNAPSHOT.jar" dest="../ztl/ztl-2.0.0-SNAPSHOT.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -117,7 +117,7 @@
|
||||||
id="javax.annotation-api"
|
id="javax.annotation-api"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.2.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
@ -252,27 +252,6 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.apache.felix.webconsole"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="0.0.0"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.apache.felix.webconsole.plugins.memoryusage"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="0.0.0"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.apache.felix.webconsole.plugins.packageadmin"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="1.0.0.1"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.json"
|
id="org.json"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
<plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
|
<plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
|
||||||
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
|
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
|
||||||
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
|
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.apache.felix.webconsole.plugins.packageadmin" autoStart="true" startLevel="0" />
|
|
||||||
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
|
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
|
||||||
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
|
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
|
||||||
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
|
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
|
||||||
osgi.install.area=setup
|
osgi.install.area=setup
|
||||||
equinox.use.ds=true
|
equinox.use.ds=true
|
||||||
osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
||||||
|
|
|
@ -244,7 +244,7 @@ configure_perform()
|
||||||
!
|
!
|
||||||
echo "Done"
|
echo "Done"
|
||||||
fi
|
fi
|
||||||
grep ${ADEMPIERE_WEB_PORT} ${IDEMPIERE_HOME}/jettyhome/etc/jetty.xml > /dev/null 2>&1
|
grep ${ADEMPIERE_WEB_PORT} ${IDEMPIERE_HOME}/jettyhome/etc/jetty-selector.xml > /dev/null 2>&1
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
echo "Error deploying iDempiere, please verify and try again"
|
echo "Error deploying iDempiere, please verify and try again"
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,7 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="WEB-INF/lib" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jardiff.jar" dest="WEB-INF/lib/jardiff.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jnlp-servlet.jar" dest="WEB-INF/lib/jnlp-servlet.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -53,7 +53,7 @@ ClientName = iDempiere Server
|
||||||
|
|
||||||
#Custom Credits & Copyright tail
|
#Custom Credits & Copyright tail
|
||||||
Credits = Welcome to the iDempiere (OSGi+ADempiere) 3.1 Page!
|
Credits = Welcome to the iDempiere (OSGi+ADempiere) 3.1 Page!
|
||||||
Copyriright = || by <a href="http://www.company.com" target="blank">Company</a>
|
Copyriright = || by <a href="http://www.idempiere.org" target="blank">iDempiere Community</a>
|
||||||
|
|
||||||
#Custom RSS (rss1 to rss5)
|
#Custom RSS (rss1 to rss5)
|
||||||
rssOn = true
|
rssOn = true
|
||||||
|
|
|
@ -19,18 +19,18 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.equinox.executable"
|
id="org.eclipse.equinox.executable"
|
||||||
version="3.6.100.v20140819-1617"
|
version="0.0.0"
|
||||||
os="linux,macosx,win32"
|
os="linux,macosx,win32"
|
||||||
ws="cocoa,gtk,win32"
|
ws="cocoa,gtk,win32"
|
||||||
arch="x86,x86_64"/>
|
arch="x86,x86_64"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.equinox.server.core"
|
id="org.eclipse.equinox.server.core"
|
||||||
version="1.3.0.v20140909-1633"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.equinox.server.p2"
|
id="org.eclipse.equinox.server.p2"
|
||||||
version="1.2.100.v20140606-1602"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.bundles.external"
|
id="org.adempiere.bundles.external"
|
||||||
|
@ -38,11 +38,11 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.core.feature"
|
id="org.eclipse.ecf.core.feature"
|
||||||
version="1.1.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.core.ssl.feature"
|
id="org.eclipse.ecf.core.ssl.feature"
|
||||||
version="1.0.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.osgi.compatibility.plugins.feature"
|
id="org.eclipse.osgi.compatibility.plugins.feature"
|
||||||
|
@ -52,83 +52,83 @@
|
||||||
id="javax.xml"
|
id="javax.xml"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.3.4.v201005080400"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.ant"
|
id="org.apache.ant"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.9.2.v201404171502"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.core.contenttype"
|
id="org.eclipse.core.contenttype"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.4.200.v20140207-1251"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.core.runtime"
|
id="org.eclipse.core.runtime"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.10.0.v20140318-2214"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.equinox.p2.director.app"
|
id="org.eclipse.equinox.p2.director.app"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.300.v20140228-1829"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.equinox.p2.publisher"
|
id="org.eclipse.equinox.p2.publisher"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.3.0.v20140911-0143"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.ant.core"
|
id="org.eclipse.ant.core"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.3.0.v20140518-0042"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.core.variables"
|
id="org.eclipse.core.variables"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.2.800.v20130819-1716"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.felix.gogo.command"
|
id="org.apache.felix.gogo.command"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201209301215"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.felix.gogo.runtime"
|
id="org.apache.felix.gogo.runtime"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201209301036"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.felix.gogo.shell"
|
id="org.apache.felix.gogo.shell"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201212101605"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.equinox.console"
|
id="org.eclipse.equinox.console"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.1.0.v20140131-1639"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,9 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/org/swinglabs/swingx/1.6/swingx-1.6.jar" dest="swingx-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="looks-2.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<!-- old version is only for swing, but can't find out old version, so use jar for Swing, SWT and JavaFX to keep same version -->
|
||||||
|
<get src="http://central.maven.org/maven2/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="miglayout-3.7.1-swing.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/jpedal.jar" dest="jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -861,4 +861,22 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
|
||||||
Events.sendEvent(gridPanel, new Event("onSelectRow", gridPanel, checkBox));
|
Events.sendEvent(gridPanel, new Event("onSelectRow", gridPanel, checkBox));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the new value in the field, changes the display logic in the dependant fields
|
||||||
|
* @param dependantFields
|
||||||
|
*/
|
||||||
|
public void checkDependants(ArrayList<GridField> dependantFields){
|
||||||
|
|
||||||
|
for ( GridField field : dependantFields ){
|
||||||
|
|
||||||
|
WEditor editor = editors.get(field);
|
||||||
|
boolean isEditable = field.isEditableGrid(true);
|
||||||
|
editor.setReadWrite(isEditable);
|
||||||
|
if( isEditable )
|
||||||
|
gridPanel.refresh(gridTab);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,11 +12,14 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
package org.adempiere.webui.util;
|
package org.adempiere.webui.util;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.adempiere.base.Core;
|
import org.adempiere.base.Core;
|
||||||
import org.adempiere.exceptions.AdempiereException;
|
import org.adempiere.exceptions.AdempiereException;
|
||||||
|
import org.adempiere.webui.adwindow.GridTabRowRenderer;
|
||||||
|
import org.adempiere.webui.component.Grid;
|
||||||
import org.adempiere.webui.editor.WEditor;
|
import org.adempiere.webui.editor.WEditor;
|
||||||
import org.adempiere.webui.event.ValueChangeEvent;
|
import org.adempiere.webui.event.ValueChangeEvent;
|
||||||
import org.adempiere.webui.event.ValueChangeListener;
|
import org.adempiere.webui.event.ValueChangeListener;
|
||||||
|
@ -26,6 +29,7 @@ import org.compiere.model.GridTable;
|
||||||
import org.compiere.util.CLogger;
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Trx;
|
import org.compiere.util.Trx;
|
||||||
|
import org.zkoss.zul.RowRenderer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transfer data from editor to GridTab
|
* Transfer data from editor to GridTab
|
||||||
|
@ -166,6 +170,27 @@ public class GridTabDataBinder implements ValueChangeListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Checks if the change in a field modifies the display logic in the dependant fields
|
||||||
|
Object source = e.getSource();
|
||||||
|
if (source != null && source instanceof WEditor) {
|
||||||
|
WEditor editor = (WEditor) source;
|
||||||
|
ArrayList<GridField> dependants = gridTab.getDependantFields(editor.getColumnName());
|
||||||
|
if (dependants != null
|
||||||
|
&& !dependants.isEmpty()
|
||||||
|
&& editor.getComponent() != null //Editor
|
||||||
|
&& editor.getComponent().getParent() != null //Cell
|
||||||
|
&& editor.getComponent().getParent().getParent() != null //Row
|
||||||
|
&& editor.getComponent().getParent().getParent().getParent() != null //Rows
|
||||||
|
&& editor.getComponent().getParent().getParent().getParent().getParent() != null //Grid
|
||||||
|
&& editor.getComponent().getParent().getParent().getParent().getParent() instanceof Grid) {
|
||||||
|
Grid listBox = (Grid) editor.getComponent().getParent().getParent().getParent().getParent();
|
||||||
|
RowRenderer<Object[]> renderer = listBox.getRowRenderer();
|
||||||
|
GridTabRowRenderer gtr = (GridTabRowRenderer)renderer;
|
||||||
|
if( gtr != null )
|
||||||
|
gtr.checkDependants(dependants);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} // ValueChange
|
} // ValueChange
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,11 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="WEB-INF/lib" />
|
||||||
|
<get src="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/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="http://central.maven.org/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="https://bitbucket.org/idempiere/idempiere-experimental/downloads/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,10 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<!--in maven has newer version, but now keep old version
|
||||||
|
http://central.maven.org/maven2/org/codeartisans/thirdparties/swing/org-netbeans-api-visual/2.23.1/org-netbeans-api-visual-2.23.1.jar
|
||||||
|
http://central.maven.org/maven2/org/codeartisans/thirdparties/swing/org-openide-util/8.6.2/org-openide-util-8.6.2.jar
|
||||||
|
-->
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/org-netbeans-api-visual.jar" dest="org-netbeans-api-visual.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/org-openide-util.jar" dest="org-openide-util.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,8 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/c3p0-oracle-thin-extras-0.9.5.jar" dest="c3p0-oracle-thin-extras-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/ojdbc7.jar" dest="ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,7 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/org/postgresql/postgresql/9.4-1204-jdbc41/postgresql-9.4-1204-jdbc41.jar" dest="postgresql-9.4-1204.jdbc41.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1,4 +1,4 @@
|
||||||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
|
||||||
osgi.install.area=director
|
osgi.install.area=director
|
||||||
equinox.use.ds=true
|
equinox.use.ds=true
|
||||||
osgi.bundles=org.eclipse.core.net@start,\
|
osgi.bundles=org.eclipse.core.net@start,\
|
||||||
|
|
|
@ -31,27 +31,27 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.core.feature"
|
id="org.eclipse.ecf.core.feature"
|
||||||
version="1.1.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.core.ssl.feature"
|
id="org.eclipse.ecf.core.ssl.feature"
|
||||||
version="1.0.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.filetransfer.feature"
|
id="org.eclipse.ecf.filetransfer.feature"
|
||||||
version="3.9.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.filetransfer.httpclient4.feature"
|
id="org.eclipse.ecf.filetransfer.httpclient4.feature"
|
||||||
version="3.9.1.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
|
id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
|
||||||
version="1.0.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.ecf.filetransfer.ssl.feature"
|
id="org.eclipse.ecf.filetransfer.ssl.feature"
|
||||||
version="1.0.0.v20140827-1444"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.osgi.compatibility.plugins.feature"
|
id="org.eclipse.osgi.compatibility.plugins.feature"
|
||||||
|
@ -162,21 +162,21 @@
|
||||||
id="org.apache.felix.gogo.command"
|
id="org.apache.felix.gogo.command"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201209301215"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.felix.gogo.runtime"
|
id="org.apache.felix.gogo.runtime"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201209301036"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.felix.gogo.shell"
|
id="org.apache.felix.gogo.shell"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.10.0.v201212101605"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -23,20 +23,6 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.apache.felix.webconsole.plugins.memoryusage"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="0.0.0"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.apache.felix.webconsole.plugins.packageadmin"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="0.0.0"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.idempiere.felix.webconsole"
|
id="org.idempiere.felix.webconsole"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,16 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="lib" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fitlibrary-2.0.jar" dest="lib/fitlibrary-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fitnesse.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<!--old version is 2.35, can't find out in maven also homepage.
|
||||||
|
when host old version (2.35) to bitbucket.org can't donwload by ant, maybe big file (even it's download normal with browse).
|
||||||
|
|
||||||
|
not sure why use a standalone (full) version.
|
||||||
|
in case use lib version, we can download at maven, it's small http://central.maven.org/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
|
||||||
|
<get src="http://selenium-release.storage.googleapis.com/2.39/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.35.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,6 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/com/hazelcast/hazelcast/3.5.3/hazelcast-3.5.3.jar" dest="hazelcast-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/com/hazelcast/hazelcast-cloud/3.5.3/hazelcast-cloud-3.5.3.jar" dest="hazelcast-cloud-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -16,9 +16,13 @@ import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
import org.adempiere.util.ServerContext;
|
import org.adempiere.util.ServerContext;
|
||||||
import org.compiere.model.MSession;
|
import org.compiere.model.MSession;
|
||||||
import org.compiere.model.MUser;
|
import org.compiere.model.MUser;
|
||||||
|
@ -29,6 +33,7 @@ import org.compiere.util.Env;
|
||||||
import org.compiere.util.KeyNamePair;
|
import org.compiere.util.KeyNamePair;
|
||||||
import org.compiere.util.Language;
|
import org.compiere.util.Language;
|
||||||
import org.compiere.util.Login;
|
import org.compiere.util.Login;
|
||||||
|
import org.idempiere.adInterface.x10.ADLoginRequest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author deepak
|
* @author deepak
|
||||||
|
@ -46,6 +51,12 @@ public class CompiereService {
|
||||||
private int m_M_Warehouse_ID;
|
private int m_M_Warehouse_ID;
|
||||||
private String m_locale;
|
private String m_locale;
|
||||||
private String m_userName;
|
private String m_userName;
|
||||||
|
private String m_password;
|
||||||
|
private int m_expiryMinutes;
|
||||||
|
private long m_lastAuthorizationTime;
|
||||||
|
private String m_IPAddress;
|
||||||
|
private static Map<String,CompiereService> csMap = new HashMap<String, CompiereService>();
|
||||||
|
private static Map<String,Properties> ctxMap = new HashMap<String, Properties>();
|
||||||
|
|
||||||
private boolean m_loggedin = false;
|
private boolean m_loggedin = false;
|
||||||
|
|
||||||
|
@ -131,12 +142,23 @@ public class CompiereService {
|
||||||
*/
|
*/
|
||||||
public void disconnect()
|
public void disconnect()
|
||||||
{
|
{
|
||||||
if (m_connected)
|
// TODO: create a thread that checks expired connected compiereservices and log them out
|
||||||
{
|
if (! isExpired()) {
|
||||||
Env.logout();
|
// do not close, save session in cache
|
||||||
ServerContext.dispose();
|
if (! csMap.containsValue(this)) {
|
||||||
m_loggedin = false;
|
String key = getKey(m_AD_Client_ID,
|
||||||
m_connected = false;
|
m_AD_Org_ID,
|
||||||
|
m_userName,
|
||||||
|
m_AD_Role_ID,
|
||||||
|
m_M_Warehouse_ID,
|
||||||
|
m_locale,
|
||||||
|
m_password,
|
||||||
|
m_IPAddress);
|
||||||
|
csMap.put(key.toString(), this);
|
||||||
|
Properties savedCache = new Properties();
|
||||||
|
savedCache.putAll(Env.getCtx());
|
||||||
|
ctxMap.put(key.toString(), savedCache);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -279,6 +301,9 @@ public class CompiereService {
|
||||||
session = MSession.get (getCtx(), true);
|
session = MSession.get (getCtx(), true);
|
||||||
}
|
}
|
||||||
session.setWebSession("WebService");
|
session.setWebSession("WebService");
|
||||||
|
|
||||||
|
session.setDescription(session.getDescription() + "\nUser Agent: " + getCtx().getProperty("#UserAgent"));
|
||||||
|
|
||||||
session.saveEx();
|
session.saveEx();
|
||||||
|
|
||||||
m_loggedin = true;
|
m_loggedin = true;
|
||||||
|
@ -325,4 +350,101 @@ public class CompiereService {
|
||||||
return m_userName;
|
return m_userName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return set password
|
||||||
|
*/
|
||||||
|
public void setPassword(String pass) {
|
||||||
|
m_password = pass;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return logged in password of current request
|
||||||
|
*/
|
||||||
|
public String getPassword() {
|
||||||
|
return m_password;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return set expiry minutes
|
||||||
|
*/
|
||||||
|
public void setExpiryMinutes(int expiryMinutes) {
|
||||||
|
m_expiryMinutes = expiryMinutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return logged in expiry minutes of current request
|
||||||
|
*/
|
||||||
|
public int getExpiryMinutes() {
|
||||||
|
return m_expiryMinutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void refreshLastAuthorizationTime() {
|
||||||
|
m_lastAuthorizationTime = System.currentTimeMillis();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIPAddress(String remoteAddr) {
|
||||||
|
m_IPAddress = remoteAddr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CompiereService get(HttpServletRequest req, ADLoginRequest loginRequest) {
|
||||||
|
String key = getKey(loginRequest.getClientID(),
|
||||||
|
loginRequest.getOrgID(),
|
||||||
|
loginRequest.getUser(),
|
||||||
|
loginRequest.getRoleID(),
|
||||||
|
loginRequest.getWarehouseID(),
|
||||||
|
loginRequest.getLang(),
|
||||||
|
loginRequest.getPass(),
|
||||||
|
req.getRemoteAddr());
|
||||||
|
CompiereService l_cs = null;
|
||||||
|
if (csMap.containsKey(key)) {
|
||||||
|
l_cs = csMap.get(key);
|
||||||
|
if (l_cs != null) {
|
||||||
|
if (l_cs.isExpired()) {
|
||||||
|
l_cs = null;
|
||||||
|
} else {
|
||||||
|
Properties cachedCtx = ctxMap.get(key);
|
||||||
|
Env.getCtx().putAll(cachedCtx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return l_cs;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getKey(
|
||||||
|
int aD_Client_ID,
|
||||||
|
int aD_Org_ID,
|
||||||
|
String userName,
|
||||||
|
int aD_Role_ID,
|
||||||
|
int m_Warehouse_ID,
|
||||||
|
String locale,
|
||||||
|
String password,
|
||||||
|
String iPAddress) {
|
||||||
|
StringBuilder key = new StringBuilder()
|
||||||
|
.append(aD_Client_ID).append("|")
|
||||||
|
.append(aD_Org_ID).append("|")
|
||||||
|
.append(userName).append("|")
|
||||||
|
.append(aD_Role_ID).append("|")
|
||||||
|
.append(m_Warehouse_ID).append("|")
|
||||||
|
.append(locale).append("|")
|
||||||
|
.append(password).append("|")
|
||||||
|
.append(iPAddress);
|
||||||
|
return key.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isExpired() {
|
||||||
|
boolean expired =
|
||||||
|
(
|
||||||
|
(getExpiryMinutes() <= 0)
|
||||||
|
|| (m_lastAuthorizationTime + (getExpiryMinutes() * 60000) <= System.currentTimeMillis())
|
||||||
|
);
|
||||||
|
if (m_connected && expired)
|
||||||
|
{
|
||||||
|
Env.logout();
|
||||||
|
ServerContext.dispose();
|
||||||
|
m_loggedin = false;
|
||||||
|
m_connected = false;
|
||||||
|
}
|
||||||
|
return expired;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ import javax.jws.WebService;
|
||||||
import javax.xml.namespace.QName;
|
import javax.xml.namespace.QName;
|
||||||
import javax.xml.ws.WebServiceContext;
|
import javax.xml.ws.WebServiceContext;
|
||||||
|
|
||||||
|
import org.apache.commons.codec.binary.Base64;
|
||||||
import org.apache.cxf.jaxrs.ext.MessageContext;
|
import org.apache.cxf.jaxrs.ext.MessageContext;
|
||||||
import org.apache.xmlbeans.StringEnumAbstractBase.Table;
|
import org.apache.xmlbeans.StringEnumAbstractBase.Table;
|
||||||
import org.compiere.model.I_AD_Column;
|
import org.compiere.model.I_AD_Column;
|
||||||
|
@ -1392,9 +1393,12 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
if (m_webservicetype.isOutputColumnNameAllowed(columnName)) {
|
if (m_webservicetype.isOutputColumnNameAllowed(columnName)) {
|
||||||
DataField dfid = dr.addNewField();
|
DataField dfid = dr.addNewField();
|
||||||
dfid.setColumn(columnName);
|
dfid.setColumn(columnName);
|
||||||
if (po.get_Value(i) != null)
|
if (po.get_Value(i) != null){
|
||||||
|
if(po.get_Value(i) instanceof byte[]){
|
||||||
|
dfid.setVal(new String(Base64.encodeBase64((byte[]) po.get_Value(i))));
|
||||||
|
}else
|
||||||
dfid.setVal(po.get_Value(i).toString());
|
dfid.setVal(po.get_Value(i).toString());
|
||||||
else
|
}else
|
||||||
dfid.setVal(null);
|
dfid.setVal(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1541,6 +1545,9 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
|
||||||
if (m_webservicetype.isOutputColumnNameAllowed(columnName)) {
|
if (m_webservicetype.isOutputColumnNameAllowed(columnName)) {
|
||||||
DataField dfid = dr.addNewField();
|
DataField dfid = dr.addNewField();
|
||||||
dfid.setColumn(columnName);
|
dfid.setColumn(columnName);
|
||||||
|
if(rsquery.getObject(columnName) instanceof byte[])
|
||||||
|
dfid.setVal(new String(Base64.encodeBase64(rsquery.getBytes(columnName))));
|
||||||
|
else
|
||||||
dfid.setVal(rsquery.getString(columnName));
|
dfid.setVal(rsquery.getString(columnName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,6 +85,16 @@ public class AbstractService {
|
||||||
protected String login(ADLoginRequest loginRequest, String webService, String method, String serviceType) {
|
protected String login(ADLoginRequest loginRequest, String webService, String method, String serviceType) {
|
||||||
|
|
||||||
CompiereService m_cs = getCompiereService();
|
CompiereService m_cs = getCompiereService();
|
||||||
|
if (m_cs.getUserName() == null) {
|
||||||
|
HttpServletRequest req = getHttpServletRequest();
|
||||||
|
// search for a non-expired CompiereService with same login data
|
||||||
|
CompiereService cachedCs = CompiereService.get(req, loginRequest);
|
||||||
|
if (cachedCs != null) {
|
||||||
|
m_cs = cachedCs;
|
||||||
|
req.setAttribute(COMPIERE_SERVICE, cachedCs);
|
||||||
|
return authenticate(webService, method, serviceType, cachedCs); // already logged with same data
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (m_cs.isLoggedIn() && m_cs.getAD_Client_ID() == loginRequest.getClientID() && loginRequest.getClientID() == Env.getAD_Client_ID(Env.getCtx())
|
if (m_cs.isLoggedIn() && m_cs.getAD_Client_ID() == loginRequest.getClientID() && loginRequest.getClientID() == Env.getAD_Client_ID(Env.getCtx())
|
||||||
&& m_cs.getAD_Org_ID() == loginRequest.getOrgID() && m_cs.getAD_Role_ID() == loginRequest.getRoleID()
|
&& m_cs.getAD_Org_ID() == loginRequest.getOrgID() && m_cs.getAD_Role_ID() == loginRequest.getRoleID()
|
||||||
|
@ -99,6 +109,9 @@ public class AbstractService {
|
||||||
KeyNamePair[] clients = login.getClients(loginRequest.getUser(), loginRequest.getPass());
|
KeyNamePair[] clients = login.getClients(loginRequest.getUser(), loginRequest.getPass());
|
||||||
if (clients == null)
|
if (clients == null)
|
||||||
return "Error login - User invalid";
|
return "Error login - User invalid";
|
||||||
|
m_cs.setPassword(loginRequest.getPass());
|
||||||
|
m_cs.setExpiryMinutes(loginRequest.getStage());
|
||||||
|
m_cs.setIPAddress(getHttpServletRequest().getRemoteAddr());
|
||||||
|
|
||||||
boolean okclient = false;
|
boolean okclient = false;
|
||||||
KeyNamePair selectedClient = null;
|
KeyNamePair selectedClient = null;
|
||||||
|
@ -119,6 +132,8 @@ public class AbstractService {
|
||||||
Env.setContext(m_cs.getCtx(), "#AD_User_ID", user.getAD_User_ID() );
|
Env.setContext(m_cs.getCtx(), "#AD_User_ID", user.getAD_User_ID() );
|
||||||
Env.setContext(m_cs.getCtx(), "#AD_User_Name", user.getName() );
|
Env.setContext(m_cs.getCtx(), "#AD_User_Name", user.getName() );
|
||||||
Env.setContext(m_cs.getCtx(), "#SalesRep_ID", user.getAD_User_ID() );
|
Env.setContext(m_cs.getCtx(), "#SalesRep_ID", user.getAD_User_ID() );
|
||||||
|
String userAgent = getHttpServletRequest().getHeader("User-Agent");
|
||||||
|
Env.setContext(m_cs.getCtx(), "#UserAgent", userAgent == null ? "Unknown" : userAgent);
|
||||||
}
|
}
|
||||||
|
|
||||||
KeyNamePair[] roles = login.getRoles(loginRequest.getUser(), selectedClient);
|
KeyNamePair[] roles = login.getRoles(loginRequest.getUser(), selectedClient);
|
||||||
|
@ -247,6 +262,8 @@ public class AbstractService {
|
||||||
if(ret!=null && ret.length()>0)
|
if(ret!=null && ret.length()>0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
m_cs.refreshLastAuthorizationTime();
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -331,7 +348,11 @@ public class AbstractService {
|
||||||
OutputField outField= outputFields.addNewOutputField();
|
OutputField outField= outputFields.addNewOutputField();
|
||||||
outField.setColumn(colName);
|
outField.setColumn(colName);
|
||||||
if(po.get_Value(indCol)!=null){
|
if(po.get_Value(indCol)!=null){
|
||||||
|
if(po.get_Value(indCol) instanceof byte[])
|
||||||
|
outField.setValue(new String(Base64.encodeBase64((byte[]) po.get_Value(indCol))));
|
||||||
|
else
|
||||||
outField.setValue(po.get_Value(indCol).toString());
|
outField.setValue(po.get_Value(indCol).toString());
|
||||||
|
|
||||||
Lookup lookup = poInfo.getColumnLookup(indCol);
|
Lookup lookup = poInfo.getColumnLookup(indCol);
|
||||||
if(lookup != null){
|
if(lookup != null){
|
||||||
//Setting text
|
//Setting text
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,26 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="WEB-INF/lib" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar" dest="WEB-INF/lib/spring-osgi-extender-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" dest="WEB-INF/lib/stax2-api-3.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j-1.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf-2.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core-2.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/xmlbeans/xmlbeans/2.5.0/xmlbeans-2.5.0.jar" dest="WEB-INF/lib/xmlbeans-2.5.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/axis/axis/1.4/axis-1.4.jar" dest="WEB-INF/lib/axis.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery-0.5.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://central.maven.org/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<con:soapui-project activeEnvironment="Default" name="iDempiereWebServices" resourceRoot="" soapui-version="4.5.1" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ModelADServiceSoapBinding" type="wsdl" bindingName="{http://idempiere.org/ADInterface/1_0}ModelADServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="https://localhost:8443/ADInterface/services/ModelADService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="https://localhost:8443/ADInterface/services/ModelADService?wsdl"><con:part><con:url>https://localhost:8443/ADInterface/services/ModelADService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ModelADService" targetNamespace="http://idempiere.org/ADInterface/1_0" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://idempiere.org/ADInterface/1_0" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
<con:soapui-project activeEnvironment="Default" name="iDempiereWebServices" resourceRoot="" soapui-version="5.2.0" id="c74e8d3a-4667-448a-b934-57e47e02b513" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ModelADServiceSoapBinding" type="wsdl" bindingName="{http://idempiere.org/ADInterface/1_0}ModelADServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="https://localhost:8443/ADInterface/services/ModelADService?wsdl" id="636ca04b-14ca-4f21-a33f-d6db380eb889" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="https://localhost:8443/ADInterface/services/ModelADService?wsdl"><con:part><con:url>https://localhost:8443/ADInterface/services/ModelADService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ModelADService" targetNamespace="http://idempiere.org/ADInterface/1_0" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://idempiere.org/ADInterface/1_0" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||||
<wsdl:types>
|
<wsdl:types>
|
||||||
<xsd:schema elementFormDefault="qualified" targetNamespace="http://idempiere.org/ADInterface/1_0">
|
<xsd:schema elementFormDefault="qualified" targetNamespace="http://idempiere.org/ADInterface/1_0">
|
||||||
<xsd:element name="WindowTabData" type="tns:WindowTabData"/>
|
<xsd:element name="WindowTabData" type="tns:WindowTabData"/>
|
||||||
|
@ -461,7 +461,7 @@
|
||||||
<soap:address location="https://localhost:8443/ADInterface/services/ModelADService"/>
|
<soap:address location="https://localhost:8443/ADInterface/services/ModelADService"/>
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="createData" bindingOperationName="createData" type="Request-Response" outputName="createDataResponse" inputName="createData" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Create BP GlobalQSS (GW Working)"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="createData" bindingOperationName="createData" type="Request-Response" outputName="createDataResponse" inputName="createData" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="b1a8aa17-872b-480c-82c5-b7eb52461448"><con:settings/><con:call name="Sample Create BP GlobalQSS (GW Working)" id="79a381a1-28bd-4b82-bff4-0e11ca9ec485"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:createData>
|
<_0:createData>
|
||||||
|
@ -473,7 +473,7 @@
|
||||||
<_0:Action>Create</_0:Action>
|
<_0:Action>Create</_0:Action>
|
||||||
<_0:DataRow>
|
<_0:DataRow>
|
||||||
<_0:field column="Value">
|
<_0:field column="Value">
|
||||||
<_0:val>GlobalQSS</_0:val>
|
<_0:val>GlobalQSS3</_0:val>
|
||||||
</_0:field>
|
</_0:field>
|
||||||
<_0:field column="Name">
|
<_0:field column="Name">
|
||||||
<_0:val>Quality Systems & Solutions</_0:val>
|
<_0:val>Quality Systems & Solutions</_0:val>
|
||||||
|
@ -511,7 +511,7 @@
|
||||||
</_0:ModelCRUDRequest>
|
</_0:ModelCRUDRequest>
|
||||||
</_0:createData>
|
</_0:createData>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/createData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="createUpdateData" bindingOperationName="createUpdateData" type="Request-Response" outputName="createUpdateDataResponse" inputName="createUpdateData" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="deleteData" bindingOperationName="deleteData" type="Request-Response" outputName="deleteDataResponse" inputName="deleteData" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Delete BP TreeFarm (must fail)"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/createData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="createUpdateData" bindingOperationName="createUpdateData" type="Request-Response" outputName="createUpdateDataResponse" inputName="createUpdateData" receivesAttachments="false" sendsAttachments="false" id="74f22761-09da-4e08-a6d7-07895193a4b4"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="deleteData" bindingOperationName="deleteData" type="Request-Response" outputName="deleteDataResponse" inputName="deleteData" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="260aa155-2bd4-49ca-b090-9ee544ae3448"><con:settings/><con:call name="Sample Delete BP TreeFarm (must fail)" id="ae9dfb1d-829f-4aa8-b7c1-1e456e1febdf"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:deleteData>
|
<_0:deleteData>
|
||||||
|
@ -535,7 +535,7 @@
|
||||||
</_0:ModelCRUDRequest>
|
</_0:ModelCRUDRequest>
|
||||||
</_0:deleteData>
|
</_0:deleteData>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/deleteData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getList" bindingOperationName="getList" type="Request-Response" outputName="getListResponse" inputName="getList" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Get List Sales Region"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/deleteData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getList" bindingOperationName="getList" type="Request-Response" outputName="getListResponse" inputName="getList" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="114ae40e-bd46-43f7-ba67-90d8ce910a09"><con:settings/><con:call name="Sample Get List Sales Region" id="fb1227c9-40ec-40df-a69a-7303b6ef060c"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:getList>
|
<_0:getList>
|
||||||
|
@ -558,7 +558,7 @@
|
||||||
</_0:ModelGetListRequest>
|
</_0:ModelGetListRequest>
|
||||||
</_0:getList>
|
</_0:getList>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/getList"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="queryData" bindingOperationName="queryData" type="Request-Response" outputName="queryDataResponse" inputName="queryData" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample get BP Standard < S"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/getList"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="queryData" bindingOperationName="queryData" type="Request-Response" outputName="queryDataResponse" inputName="queryData" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="89241412-dbae-4e50-900f-1bbf15a2cdc1"><con:settings/><con:call name="Sample get BP Standard < S" id="86238272-82d6-4633-abf7-3331fe49924f"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:queryData>
|
<_0:queryData>
|
||||||
|
@ -587,7 +587,7 @@
|
||||||
</_0:ModelCRUDRequest>
|
</_0:ModelCRUDRequest>
|
||||||
</_0:queryData>
|
</_0:queryData>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/queryData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="readData" bindingOperationName="readData" type="Request-Response" outputName="readDataResponse" inputName="readData" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Read TreeFarm"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/queryData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="readData" bindingOperationName="readData" type="Request-Response" outputName="readDataResponse" inputName="readData" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="cf8588aa-2f6a-403a-bf4e-d25366e6ceaf"><con:settings/><con:call name="Sample Read TreeFarm" id="bc8c007f-6a26-4e27-9ccb-72f1e71ac020"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:readData>
|
<_0:readData>
|
||||||
|
@ -611,7 +611,7 @@
|
||||||
</_0:ModelCRUDRequest>
|
</_0:ModelCRUDRequest>
|
||||||
</_0:readData>
|
</_0:readData>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/readData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runProcess" bindingOperationName="runProcess" type="Request-Response" outputName="runProcessResponse" inputName="runProcess" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Run Storage Detail"><con:description>Example on how to run report Storage Detail with HQ Warehouse and Patio Chair as parameters You need to define web service security for: Web Service Type: RunStorageDetail Web Service Parameters: AD_Process_ID Constant 236 AD_Menu_ID Constant 0 AD_Record_ID Constant 0 And allow execution to the WebService role on the report. </con:description><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/readData"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runProcess" bindingOperationName="runProcess" type="Request-Response" outputName="runProcessResponse" inputName="runProcess" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="c2828880-9129-4974-a3d9-011669bf30a4"><con:settings/><con:call name="Run Storage Detail" id="74fe3335-0fd2-4dc0-89e6-d36c42f84cc2"><con:description>Example on how to run report Storage Detail with HQ Warehouse and Patio Chair as parameters You need to define web service security for: Web Service Type: RunStorageDetail Web Service Parameters: AD_Process_ID Constant 236 AD_Menu_ID Constant 0 AD_Record_ID Constant 0 And allow execution to the WebService role on the report. </con:description><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:runProcess>
|
<_0:runProcess>
|
||||||
|
@ -637,7 +637,7 @@
|
||||||
</_0:ModelRunProcessRequest>
|
</_0:ModelRunProcessRequest>
|
||||||
</_0:runProcess>
|
</_0:runProcess>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/runProcess"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Sample Process Invoice (GW Working)"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/runProcess"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Sample Process Invoice (GW Working)" id="12dd32a2-b4e1-4e35-ae3c-3b8d30a8afcc"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:runProcess>
|
<_0:runProcess>
|
||||||
|
@ -658,7 +658,7 @@
|
||||||
</_0:ModelRunProcessRequest>
|
</_0:ModelRunProcessRequest>
|
||||||
</_0:runProcess>
|
</_0:runProcess>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/runProcess"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="setDocAction" bindingOperationName="setDocAction" type="Request-Response" outputName="setDocActionResponse" inputName="setDocAction" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Complete Order"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/runProcess"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="setDocAction" bindingOperationName="setDocAction" type="Request-Response" outputName="setDocActionResponse" inputName="setDocAction" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="f8129fb1-59dd-4e74-92ff-5533874f0ce9"><con:settings/><con:call name="Sample Complete Order" id="8533047e-0377-4554-b16d-12bdd921a3c0"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:setDocAction>
|
<_0:setDocAction>
|
||||||
|
@ -682,7 +682,7 @@
|
||||||
</_0:ModelSetDocActionRequest>
|
</_0:ModelSetDocActionRequest>
|
||||||
</_0:setDocAction>
|
</_0:setDocAction>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/setDocAction"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="updateData" bindingOperationName="updateData" type="Request-Response" outputName="updateDataResponse" inputName="updateData" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Sample Update TreeFarm URL"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/setDocAction"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="updateData" bindingOperationName="updateData" type="Request-Response" outputName="updateDataResponse" inputName="updateData" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="92fe010b-2d30-4570-ab35-d98712b65de6"><con:settings/><con:call name="Sample Update TreeFarm URL" id="f11f6c58-a293-4eb5-ba04-55f6f3d035fd"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/ModelADService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:updateData>
|
<_0:updateData>
|
||||||
|
@ -711,4 +711,4 @@
|
||||||
</_0:ModelCRUDRequest>
|
</_0:ModelCRUDRequest>
|
||||||
</_0:updateData>
|
</_0:updateData>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/updateData"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/ModelADService/updateData"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<con:soapui-project name="idempiere-composite2" soapui-version="4.5.1" activeEnvironment="Default" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="compositeInterfaceSoapBinding" type="wsdl" bindingName="{http://idempiere.org/ADInterface/1_0}compositeInterfaceSoapBinding" soapVersion="1_1" anonymous="optional" definition="https://localhost:8443/ADInterface/services/compositeInterface?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="https://localhost:8443/ADInterface/services/compositeInterface?wsdl"><con:part><con:url>https://localhost:8443/ADInterface/services/compositeInterface?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="compositeInterface" targetNamespace="http://idempiere.org/ADInterface/1_0" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://idempiere.org/ADInterface/1_0" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
<con:soapui-project name="idempiere-composite2" soapui-version="5.2.0" activeEnvironment="Default" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" id="deb80e74-01a5-45f8-bcca-3c8252c7e825" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="compositeInterfaceSoapBinding" type="wsdl" bindingName="{http://idempiere.org/ADInterface/1_0}compositeInterfaceSoapBinding" soapVersion="1_1" anonymous="optional" definition="https://localhost:8443/ADInterface/services/compositeInterface?wsdl" id="5ac83ca8-1291-4121-8e1e-1ec034faf398" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="https://localhost:8443/ADInterface/services/compositeInterface?wsdl"><con:part><con:url>https://localhost:8443/ADInterface/services/compositeInterface?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="compositeInterface" targetNamespace="http://idempiere.org/ADInterface/1_0" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://idempiere.org/ADInterface/1_0" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||||
<wsdl:types>
|
<wsdl:types>
|
||||||
<xsd:schema elementFormDefault="qualified" targetNamespace="http://idempiere.org/ADInterface/1_0">
|
<xsd:schema elementFormDefault="qualified" targetNamespace="http://idempiere.org/ADInterface/1_0">
|
||||||
<xsd:element name="WindowTabData" type="tns:WindowTabData"/>
|
<xsd:element name="WindowTabData" type="tns:WindowTabData"/>
|
||||||
|
@ -385,7 +385,7 @@
|
||||||
<soap:address location="https://localhost:8443/ADInterface/services/compositeInterface"/>
|
<soap:address location="https://localhost:8443/ADInterface/services/compositeInterface"/>
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>https://localhost:8443/ADInterface/services/compositeInterface</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="compositeOperation" bindingOperationName="compositeOperation" type="Request-Response" outputName="compositeOperationResponse" inputName="compositeOperation" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/compositeInterface</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>https://localhost:8443/ADInterface/services/compositeInterface</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="compositeOperation" bindingOperationName="compositeOperation" type="Request-Response" outputName="compositeOperationResponse" inputName="compositeOperation" receivesAttachments="false" sendsAttachments="false" anonymous="optional" id="5755b491-d433-47cf-ba9d-90387bd55ca0"><con:settings/><con:call name="Request 1" id="d95190b9-1d24-4da0-86b2-1a87a68776f4"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/compositeInterface</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
<soapenv:Header/>
|
<soapenv:Header/>
|
||||||
<soapenv:Body>
|
<soapenv:Body>
|
||||||
<_0:compositeOperation>
|
<_0:compositeOperation>
|
||||||
|
@ -648,4 +648,23 @@
|
||||||
</_0:CompositeRequest>
|
</_0:CompositeRequest>
|
||||||
</_0:compositeOperation>
|
</_0:compositeOperation>
|
||||||
</soapenv:Body>
|
</soapenv:Body>
|
||||||
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/CompositeService/compositeOperation"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
|
</soapenv:Envelope>]]></con:request><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/CompositeService/compositeOperation"/><con:wsrmConfig version="1.2"/></con:call><con:call id="1c61f633-bef6-4bcd-b42d-024e77daa14e" name="OnlyLogin"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>https://localhost:8443/ADInterface/services/compositeInterface</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_0="http://idempiere.org/ADInterface/1_0">
|
||||||
|
<soapenv:Header/>
|
||||||
|
<soapenv:Body>
|
||||||
|
<_0:compositeOperation>
|
||||||
|
<_0:CompositeRequest>
|
||||||
|
<_0:serviceType>TestLogin</_0:serviceType>
|
||||||
|
<_0:ADLoginRequest>
|
||||||
|
<_0:user>WebServicex</_0:user>
|
||||||
|
<_0:pass>WebService</_0:pass>
|
||||||
|
<_0:lang>en_US</_0:lang>
|
||||||
|
<_0:ClientID>11</_0:ClientID>
|
||||||
|
<_0:RoleID>50004</_0:RoleID>
|
||||||
|
<_0:OrgID>11</_0:OrgID>
|
||||||
|
<_0:WarehouseID>103</_0:WarehouseID>
|
||||||
|
<_0:stage>9</_0:stage>
|
||||||
|
</_0:ADLoginRequest>
|
||||||
|
</_0:CompositeRequest>
|
||||||
|
</_0:compositeOperation>
|
||||||
|
</soapenv:Body>
|
||||||
|
</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/CompositeService/compositeOperation"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,5 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.2/slf4j-jdk14-1.7.2.jar" dest="slf4j-jdk14-1.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -0,0 +1,5 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<get src="http://central.maven.org/maven2/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar" dest="batik-ext.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1,30 +1,21 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/calendar.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/calendar.jar" sourcepath="lib/src/calendar-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/ckez.jar" sourcepath="lib/src/ckez-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/commons-fileupload.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/commons-fileupload.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/commons-io.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/commons-io.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/Filters.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar" sourcepath="lib/src/gmapsz-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/timelinez.jar" sourcepath="lib/src/timelinez-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/jruby-complete.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar" sourcepath="lib/src/timeplotz-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zcommon.jar" sourcepath="lib/src/zcommon-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/json_simple.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zel.jar" sourcepath="lib/src/zel-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zhtml.jar" sourcepath="lib/src/zhtml-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zk.jar" sourcepath="lib/src/zk-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zkbind.jar" sourcepath="lib/src/zkbind-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/mvel.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zkplus.jar" sourcepath="lib/src/zkplus-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/ognl.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zul.jar" sourcepath="lib/src/zul-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
|
<classpathentry exported="true" kind="lib" path="lib/zweb.jar" sourcepath="lib/src/zweb-sources.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zcommon.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zel.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zhtml.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zk.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zkbind.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zkplus.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zul.jar"/>
|
|
||||||
<classpathentry exported="true" kind="lib" path="lib/zweb.jar"/>
|
|
||||||
<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="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Zk Library
|
Bundle-Name: iDempiere Zk Library
|
||||||
Bundle-SymbolicName: org.zkoss.zk.library
|
Bundle-SymbolicName: org.zkoss.zk.library
|
||||||
Bundle-Version: 7.0.7.20151022
|
Bundle-Version: 7.0.7.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||||
Import-Package: bsh,
|
Import-Package: bsh,
|
||||||
bsh.classpath,
|
bsh.classpath,
|
||||||
|
@ -155,19 +155,9 @@ Import-Package: bsh,
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
lib/calendar.jar,
|
lib/calendar.jar,
|
||||||
lib/ckez.jar,
|
lib/ckez.jar,
|
||||||
lib/commons-el.jar,
|
|
||||||
lib/commons-fileupload.jar,
|
lib/commons-fileupload.jar,
|
||||||
lib/commons-io.jar,
|
lib/commons-io.jar,
|
||||||
lib/Filters.jar,
|
|
||||||
lib/gmapsz.jar,
|
lib/gmapsz.jar,
|
||||||
lib/jruby-complete.jar,
|
|
||||||
lib/js.jar,
|
|
||||||
lib/json_simple.jar,
|
|
||||||
lib/junit.jar,
|
|
||||||
lib/jxl.jar,
|
|
||||||
lib/jython.jar,
|
|
||||||
lib/mvel.jar,
|
|
||||||
lib/ognl.jar,
|
|
||||||
lib/timelinez.jar,
|
lib/timelinez.jar,
|
||||||
lib/timeplotz.jar,
|
lib/timeplotz.jar,
|
||||||
lib/zcommon.jar,
|
lib/zcommon.jar,
|
||||||
|
@ -177,46 +167,18 @@ Bundle-ClassPath: .,
|
||||||
lib/zkbind.jar,
|
lib/zkbind.jar,
|
||||||
lib/zkplus.jar,
|
lib/zkplus.jar,
|
||||||
lib/zul.jar,
|
lib/zul.jar,
|
||||||
lib/zweb.jar
|
lib/zweb.jar,
|
||||||
Export-Package: com.jhlabs.image,
|
lib/junit.jar
|
||||||
com.jhlabs.math,
|
Export-Package: junit.extensions,
|
||||||
com.jhlabs.vecmath,
|
|
||||||
com.xhaus.modjy,
|
|
||||||
com.ziclix.python.sql,
|
|
||||||
com.ziclix.python.sql.connect,
|
|
||||||
com.ziclix.python.sql.handler,
|
|
||||||
com.ziclix.python.sql.pipe,
|
|
||||||
com.ziclix.python.sql.pipe.csv,
|
|
||||||
com.ziclix.python.sql.pipe.db,
|
|
||||||
com.ziclix.python.sql.procedure,
|
|
||||||
com.ziclix.python.sql.resource,
|
|
||||||
com.ziclix.python.sql.util,
|
|
||||||
common,
|
|
||||||
common.log,
|
|
||||||
javatests,
|
|
||||||
jline,
|
|
||||||
junit.extensions,
|
|
||||||
junit.framework,
|
junit.framework,
|
||||||
junit.runner,
|
junit.runner,
|
||||||
junit.textui,
|
junit.textui,
|
||||||
jxl,
|
|
||||||
jxl.biff,
|
|
||||||
jxl.biff.drawing,
|
|
||||||
jxl.biff.formula,
|
|
||||||
jxl.demo,
|
|
||||||
jxl.format,
|
|
||||||
jxl.read.biff,
|
|
||||||
jxl.write,
|
|
||||||
jxl.write.biff,
|
|
||||||
metainfo.mesg,
|
metainfo.mesg,
|
||||||
metainfo.org.zkoss.util.media,
|
metainfo.org.zkoss.util.media,
|
||||||
metainfo.tld,
|
metainfo.tld,
|
||||||
metainfo.xel,
|
metainfo.xel,
|
||||||
metainfo.xml,
|
metainfo.xml,
|
||||||
metainfo.zk,
|
metainfo.zk,
|
||||||
ognl,
|
|
||||||
org.apache.commons.el,
|
|
||||||
org.apache.commons.el.parser,
|
|
||||||
org.apache.commons.fileupload;version="1.2.2",
|
org.apache.commons.fileupload;version="1.2.2",
|
||||||
org.apache.commons.fileupload.disk;version="1.2.2",
|
org.apache.commons.fileupload.disk;version="1.2.2",
|
||||||
org.apache.commons.fileupload.portlet;version="1.2.2",
|
org.apache.commons.fileupload.portlet;version="1.2.2",
|
||||||
|
@ -228,54 +190,6 @@ Export-Package: com.jhlabs.image,
|
||||||
org.apache.commons.io.input;version="2.1.0",
|
org.apache.commons.io.input;version="2.1.0",
|
||||||
org.apache.commons.io.monitor,
|
org.apache.commons.io.monitor,
|
||||||
org.apache.commons.io.output;version="2.1.0",
|
org.apache.commons.io.output;version="2.1.0",
|
||||||
org.jruby,
|
|
||||||
org.jruby.anno,
|
|
||||||
org.jruby.ast,
|
|
||||||
org.jruby.ast.executable,
|
|
||||||
org.jruby.ast.types,
|
|
||||||
org.jruby.ast.util,
|
|
||||||
org.jruby.ast.visitor,
|
|
||||||
org.jruby.common,
|
|
||||||
org.jruby.compiler,
|
|
||||||
org.jruby.compiler.impl,
|
|
||||||
org.jruby.compiler.util,
|
|
||||||
org.jruby.environment,
|
|
||||||
org.jruby.evaluator,
|
|
||||||
org.jruby.exceptions,
|
|
||||||
org.jruby.ext,
|
|
||||||
org.jruby.ext.ffi,
|
|
||||||
org.jruby.ext.ffi.io,
|
|
||||||
org.jruby.ext.socket,
|
|
||||||
org.jruby.gen,
|
|
||||||
org.jruby.internal.runtime,
|
|
||||||
org.jruby.internal.runtime.methods,
|
|
||||||
org.jruby.java.addons,
|
|
||||||
org.jruby.java.invokers,
|
|
||||||
org.jruby.java.proxies,
|
|
||||||
org.jruby.javasupport,
|
|
||||||
org.jruby.javasupport.bsf,
|
|
||||||
org.jruby.javasupport.proxy,
|
|
||||||
org.jruby.javasupport.util,
|
|
||||||
org.jruby.lexer.yacc,
|
|
||||||
org.jruby.management,
|
|
||||||
org.jruby.parser,
|
|
||||||
org.jruby.platform,
|
|
||||||
org.jruby.runtime,
|
|
||||||
org.jruby.runtime.builtin,
|
|
||||||
org.jruby.runtime.callback,
|
|
||||||
org.jruby.runtime.callsite,
|
|
||||||
org.jruby.runtime.component,
|
|
||||||
org.jruby.runtime.invokedynamic,
|
|
||||||
org.jruby.runtime.load,
|
|
||||||
org.jruby.runtime.marshal,
|
|
||||||
org.jruby.runtime.scope,
|
|
||||||
org.jruby.util,
|
|
||||||
org.jruby.util.collections,
|
|
||||||
org.jruby.util.io,
|
|
||||||
org.jruby.util.string,
|
|
||||||
org.jruby.util.unsafe,
|
|
||||||
org.json.simple,
|
|
||||||
org.json.simple.parser,
|
|
||||||
org.junit,
|
org.junit,
|
||||||
org.junit.internal,
|
org.junit.internal,
|
||||||
org.junit.internal.requests,
|
org.junit.internal.requests,
|
||||||
|
@ -284,128 +198,6 @@ Export-Package: com.jhlabs.image,
|
||||||
org.junit.runner.manipulation,
|
org.junit.runner.manipulation,
|
||||||
org.junit.runner.notification,
|
org.junit.runner.notification,
|
||||||
org.junit.runners,
|
org.junit.runners,
|
||||||
org.mozilla.classfile,
|
|
||||||
org.mozilla.javascript,
|
|
||||||
org.mozilla.javascript.continuations,
|
|
||||||
org.mozilla.javascript.debug,
|
|
||||||
org.mozilla.javascript.jdk11,
|
|
||||||
org.mozilla.javascript.jdk13,
|
|
||||||
org.mozilla.javascript.jdk15,
|
|
||||||
org.mozilla.javascript.optimizer,
|
|
||||||
org.mozilla.javascript.regexp,
|
|
||||||
org.mozilla.javascript.resources,
|
|
||||||
org.mozilla.javascript.serialize,
|
|
||||||
org.mozilla.javascript.tools,
|
|
||||||
org.mozilla.javascript.tools.idswitch,
|
|
||||||
org.mozilla.javascript.tools.jsc,
|
|
||||||
org.mozilla.javascript.tools.resources,
|
|
||||||
org.mozilla.javascript.xml,
|
|
||||||
org.mozilla.javascript.xml.impl.xmlbeans,
|
|
||||||
org.mozilla.javascript.xmlimpl,
|
|
||||||
org.mvel,
|
|
||||||
org.mvel.asm,
|
|
||||||
org.mvel.ast,
|
|
||||||
org.mvel.ast.cache,
|
|
||||||
org.mvel.conversion,
|
|
||||||
org.mvel.debug,
|
|
||||||
org.mvel.integration,
|
|
||||||
org.mvel.integration.impl,
|
|
||||||
org.mvel.math,
|
|
||||||
org.mvel.optimizers,
|
|
||||||
org.mvel.optimizers.impl.asm,
|
|
||||||
org.mvel.optimizers.impl.refl,
|
|
||||||
org.mvel.optimizers.impl.refl.collection,
|
|
||||||
org.mvel.tests,
|
|
||||||
org.mvel.tests.main,
|
|
||||||
org.mvel.tests.main.res,
|
|
||||||
org.mvel.tests.perftests,
|
|
||||||
org.mvel.tests.special,
|
|
||||||
org.mvel.util,
|
|
||||||
org.python,
|
|
||||||
org.python.antlr,
|
|
||||||
org.python.antlr.adapter,
|
|
||||||
org.python.antlr.ast,
|
|
||||||
org.python.antlr.base,
|
|
||||||
org.python.antlr.op,
|
|
||||||
org.python.antlr.runtime,
|
|
||||||
org.python.antlr.runtime.debug,
|
|
||||||
org.python.antlr.runtime.misc,
|
|
||||||
org.python.antlr.runtime.tree,
|
|
||||||
org.python.apache.html.dom,
|
|
||||||
org.python.apache.wml,
|
|
||||||
org.python.apache.wml.dom,
|
|
||||||
org.python.apache.xerces.dom,
|
|
||||||
org.python.apache.xerces.dom.events,
|
|
||||||
org.python.apache.xerces.dom3.as,
|
|
||||||
org.python.apache.xerces.impl,
|
|
||||||
org.python.apache.xerces.impl.dtd,
|
|
||||||
org.python.apache.xerces.impl.dtd.models,
|
|
||||||
org.python.apache.xerces.impl.dv,
|
|
||||||
org.python.apache.xerces.impl.dv.dtd,
|
|
||||||
org.python.apache.xerces.impl.dv.util,
|
|
||||||
org.python.apache.xerces.impl.dv.xs,
|
|
||||||
org.python.apache.xerces.impl.io,
|
|
||||||
org.python.apache.xerces.impl.msg,
|
|
||||||
org.python.apache.xerces.impl.validation,
|
|
||||||
org.python.apache.xerces.impl.xpath,
|
|
||||||
org.python.apache.xerces.impl.xpath.regex,
|
|
||||||
org.python.apache.xerces.impl.xs,
|
|
||||||
org.python.apache.xerces.impl.xs.identity,
|
|
||||||
org.python.apache.xerces.impl.xs.models,
|
|
||||||
org.python.apache.xerces.impl.xs.opti,
|
|
||||||
org.python.apache.xerces.impl.xs.traversers,
|
|
||||||
org.python.apache.xerces.impl.xs.util,
|
|
||||||
org.python.apache.xerces.jaxp,
|
|
||||||
org.python.apache.xerces.jaxp.datatype,
|
|
||||||
org.python.apache.xerces.jaxp.validation,
|
|
||||||
org.python.apache.xerces.parsers,
|
|
||||||
org.python.apache.xerces.util,
|
|
||||||
org.python.apache.xerces.xinclude,
|
|
||||||
org.python.apache.xerces.xni,
|
|
||||||
org.python.apache.xerces.xni.grammars,
|
|
||||||
org.python.apache.xerces.xni.parser,
|
|
||||||
org.python.apache.xerces.xpointer,
|
|
||||||
org.python.apache.xerces.xs,
|
|
||||||
org.python.apache.xerces.xs.datatypes,
|
|
||||||
org.python.apache.xml.serialize,
|
|
||||||
org.python.compiler,
|
|
||||||
org.python.constantine,
|
|
||||||
org.python.constantine.platform,
|
|
||||||
org.python.constantine.platform.darwin,
|
|
||||||
org.python.constantine.platform.fake,
|
|
||||||
org.python.constantine.platform.freebsd,
|
|
||||||
org.python.constantine.platform.linux,
|
|
||||||
org.python.constantine.platform.openbsd,
|
|
||||||
org.python.constantine.platform.sunos,
|
|
||||||
org.python.core,
|
|
||||||
org.python.core.adapter,
|
|
||||||
org.python.core.io,
|
|
||||||
org.python.core.packagecache,
|
|
||||||
org.python.core.util,
|
|
||||||
org.python.expose,
|
|
||||||
org.python.modules,
|
|
||||||
org.python.modules._collections,
|
|
||||||
org.python.modules._csv,
|
|
||||||
org.python.modules._functools,
|
|
||||||
org.python.modules._weakref,
|
|
||||||
org.python.modules.random,
|
|
||||||
org.python.modules.sre,
|
|
||||||
org.python.modules.thread,
|
|
||||||
org.python.modules.time,
|
|
||||||
org.python.modules.zipimport,
|
|
||||||
org.python.objectweb.asm,
|
|
||||||
org.python.objectweb.asm.commons,
|
|
||||||
org.python.objectweb.asm.signature,
|
|
||||||
org.python.objectweb.asm.util,
|
|
||||||
org.python.posix,
|
|
||||||
org.python.posix.util,
|
|
||||||
org.python.tests,
|
|
||||||
org.python.tests.identity,
|
|
||||||
org.python.tests.inbred,
|
|
||||||
org.python.tests.mro,
|
|
||||||
org.python.tests.props,
|
|
||||||
org.python.util,
|
|
||||||
org.w3c.dom.html,
|
|
||||||
org.zkforge.ckez,
|
org.zkforge.ckez,
|
||||||
org.zkforge.json.simple,
|
org.zkforge.json.simple,
|
||||||
org.zkforge.json.simple.parser,
|
org.zkforge.json.simple.parser,
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
<cs:private name="buckminster.postbind">
|
<cs:private name="buckminster.postbind">
|
||||||
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
<cs:attribute name="fetch.sources.jars" alias="action.requirements" />
|
<!--<cs:attribute name="fetch.sources.jars" alias="action.requirements" />-->
|
||||||
</cs:private>
|
</cs:private>
|
||||||
</groups>
|
</groups>
|
||||||
</cspecExtension>
|
</cspecExtension>
|
||||||
|
|
|
@ -1,21 +1,11 @@
|
||||||
output.. = bin/
|
output.. = bin/
|
||||||
bin.includes = META-INF/,\
|
bin.includes = META-INF/,\
|
||||||
.,\
|
.,\
|
||||||
lib/jython.jar,\
|
|
||||||
lib/calendar.jar,\
|
lib/calendar.jar,\
|
||||||
lib/ckez.jar,\
|
lib/ckez.jar,\
|
||||||
lib/commons-el.jar,\
|
|
||||||
lib/commons-fileupload.jar,\
|
lib/commons-fileupload.jar,\
|
||||||
lib/commons-io.jar,\
|
lib/commons-io.jar,\
|
||||||
lib/Filters.jar,\
|
|
||||||
lib/gmapsz.jar,\
|
lib/gmapsz.jar,\
|
||||||
lib/jruby-complete.jar,\
|
|
||||||
lib/js.jar,\
|
|
||||||
lib/json_simple.jar,\
|
|
||||||
lib/junit.jar,\
|
|
||||||
lib/jxl.jar,\
|
|
||||||
lib/mvel.jar,\
|
|
||||||
lib/ognl.jar,\
|
|
||||||
lib/timelinez.jar,\
|
lib/timelinez.jar,\
|
||||||
lib/timeplotz.jar,\
|
lib/timeplotz.jar,\
|
||||||
lib/zcommon.jar,\
|
lib/zcommon.jar,\
|
||||||
|
@ -25,5 +15,6 @@ bin.includes = META-INF/,\
|
||||||
lib/zkbind.jar,\
|
lib/zkbind.jar,\
|
||||||
lib/zkplus.jar,\
|
lib/zkplus.jar,\
|
||||||
lib/zul.jar,\
|
lib/zul.jar,\
|
||||||
lib/zweb.jar
|
lib/zweb.jar,\
|
||||||
|
lib/junit.jar
|
||||||
source.. = src/
|
source.. = src/
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
<get src="http://central.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3.jar" dest="lib/jython.jar" usetimestamp="true" verbose="true" retries="5"/>
|
<get src="http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar" dest="lib/commons-fileupload.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
<get src="http://central.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15.jar" dest="lib/jruby-complete.jar" usetimestamp="true" verbose="true" retries="5"/>
|
<get src="http://central.maven.org/maven2/commons-io/commons-io/2.1/commons-io-2.1.jar" dest="lib/commons-io.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="https://bitbucket.org/idempiere/idempiere-experimental/downloads/junit.jar" dest="lib/junit.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
</target>
|
</target>
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue