Compare commits
301 Commits
release/8.
...
cmeng/tmp/
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae32f80ea9 | ||
|
|
72c11045a9 | ||
|
|
cc84dfffb6 | ||
|
|
249f91b6de | ||
|
|
8c1a8995d9 | ||
|
|
7398af81c7 | ||
|
|
6a546b134a | ||
|
|
49b47b16a8 | ||
|
|
9cc26cd33a | ||
|
|
e418bd6510 | ||
|
|
2734f706d5 | ||
|
|
4c96ffc367 | ||
|
|
66fbcde8d2 | ||
|
|
be625ab3ee | ||
|
|
e4958bb494 | ||
|
|
487dcf08d6 | ||
|
|
0e3b5eb9d9 | ||
|
|
123ce87273 | ||
|
|
b32f6ec697 | ||
|
|
35171da7d9 | ||
|
|
04efc3ada0 | ||
|
|
bb67871008 | ||
|
|
6af9c4ee98 | ||
|
|
13e096e752 | ||
|
|
47268fad44 | ||
|
|
8115399b97 | ||
|
|
721b3de01e | ||
|
|
f6ab592562 | ||
|
|
2751229fbe | ||
|
|
e8f5139248 | ||
|
|
a5c0992356 | ||
|
|
708091be96 | ||
|
|
4a43182f39 | ||
|
|
3a31923c97 | ||
|
|
cd69df6ca7 | ||
|
|
ef25314bba | ||
|
|
d1214eddb3 | ||
|
|
829ba7a572 | ||
|
|
d9f1c04b07 | ||
|
|
b62353969a | ||
|
|
c4a60de7dd | ||
|
|
b8bd877a97 | ||
|
|
32cbc40ffc | ||
|
|
9b530b68b3 | ||
|
|
f8790d0597 | ||
|
|
843cccff2d | ||
|
|
249d40f4be | ||
|
|
93a5a1842d | ||
|
|
4465b7539e | ||
|
|
05fe5ebd78 | ||
|
|
35ba1c7dec | ||
|
|
cd025ab26c | ||
|
|
96823a247b | ||
|
|
d4ef464d10 | ||
|
|
5629a19ec1 | ||
|
|
5bc4f7e536 | ||
|
|
de34ef2e0f | ||
|
|
513a0026e9 | ||
|
|
42e24269e7 | ||
|
|
7da74ee9ce | ||
|
|
92a8bae40d | ||
|
|
8dc29d227c | ||
|
|
fc3ccf48fd | ||
|
|
065859a00a | ||
|
|
2c20ddcf20 | ||
|
|
8cef3416ca | ||
|
|
36cda8c80f | ||
|
|
fee8c502a6 | ||
|
|
36d4eaa32b | ||
|
|
aff0f14066 | ||
|
|
223b173995 | ||
|
|
57c80b2474 | ||
|
|
0098757eea | ||
|
|
abe8279842 | ||
|
|
75eef3b4f4 | ||
|
|
572d3f7442 | ||
|
|
07b105e021 | ||
|
|
f1252fb198 | ||
|
|
7022e89faa | ||
|
|
6be7f102dd | ||
|
|
59bd368ae4 | ||
|
|
a9b8d1e085 | ||
|
|
2ea31df991 | ||
|
|
e44378bd76 | ||
|
|
419adb67e9 | ||
|
|
6ec03713a3 | ||
|
|
2d9904378b | ||
|
|
e541c3a75d | ||
|
|
feaf9e516b | ||
|
|
3aa3e21582 | ||
|
|
a640f1a0e3 | ||
|
|
36f228c840 | ||
|
|
2b40550ff4 | ||
|
|
96a75df148 | ||
|
|
ed960cbf8a | ||
|
|
83fa4543c4 | ||
|
|
80da90a14f | ||
|
|
4adc7f0354 | ||
|
|
57e9574e9d | ||
|
|
c30c1109e4 | ||
|
|
79472b4e32 | ||
|
|
2dfae00169 | ||
|
|
f4f1bf3fb6 | ||
|
|
8f5d517779 | ||
|
|
5c9a80937a | ||
|
|
2f3f5ee9b2 | ||
|
|
4f362f4423 | ||
|
|
057c9d9276 | ||
|
|
bb14c4fdaf | ||
|
|
29638dc7aa | ||
|
|
72830bf1f7 | ||
|
|
5a28729481 | ||
|
|
67508cca0d | ||
|
|
6d75380549 | ||
|
|
5b06de4df9 | ||
|
|
48d1297a8b | ||
|
|
7b5b26f325 | ||
|
|
d866f8a853 | ||
|
|
17a2e919fc | ||
|
|
d760cbd25e | ||
|
|
7e6bab7819 | ||
|
|
35a9fead7e | ||
|
|
2a67ced722 | ||
|
|
576d7e63f9 | ||
|
|
7b9f8948df | ||
|
|
c5fd7d97d4 | ||
|
|
8321757d44 | ||
|
|
9892e8a86d | ||
|
|
afb2687746 | ||
|
|
14c248bc10 | ||
|
|
af0b7a2d3b | ||
|
|
84a5fa74db | ||
|
|
21f53c14c2 | ||
|
|
3c3ddcf4f3 | ||
|
|
0e63ab14c7 | ||
|
|
50a6c0096c | ||
|
|
152e672b12 | ||
|
|
5bff796d45 | ||
|
|
ecb8c2d693 | ||
|
|
e2ac795f4c | ||
|
|
78d977871b | ||
|
|
3bf8e16503 | ||
|
|
118731263c | ||
|
|
72232409b8 | ||
|
|
43ea3e1628 | ||
|
|
b832982551 | ||
|
|
d35f3d2589 | ||
|
|
7d2f9c40eb | ||
|
|
791ced6856 | ||
|
|
cbe2bb000d | ||
|
|
3dba3ac322 | ||
|
|
97502bfae4 | ||
|
|
e4d56a9c76 | ||
|
|
2d8a6ad376 | ||
|
|
d6faaab7d5 | ||
|
|
77a502e480 | ||
|
|
f2980de168 | ||
|
|
a999d64f4c | ||
|
|
9173316f02 | ||
|
|
a080f9ff63 | ||
|
|
6f1190ee4d | ||
|
|
545b864bfd | ||
|
|
eca54ac7ca | ||
|
|
4218e443c4 | ||
|
|
63a0a09d99 | ||
|
|
3e0973ff19 | ||
|
|
5391b48920 | ||
|
|
112625f8f7 | ||
|
|
1732c6f9b5 | ||
|
|
9e4f5bb1dc | ||
|
|
d6431794d7 | ||
|
|
7ba8c9a37a | ||
|
|
13f391bc87 | ||
|
|
b5469fb531 | ||
|
|
31b8b5467c | ||
|
|
c6901ce17d | ||
|
|
a613d635d7 | ||
|
|
1deaf892c8 | ||
|
|
27540097e4 | ||
|
|
e7d0282538 | ||
|
|
6541771b5c | ||
|
|
22a24f13be | ||
|
|
3861eeaa7a | ||
|
|
a54e0e72a3 | ||
|
|
2c25ae3771 | ||
|
|
f6511ae89f | ||
|
|
19eca3dfec | ||
|
|
5f89ab04b2 | ||
|
|
70f464f593 | ||
|
|
a4c2535692 | ||
|
|
58d6ec8ac2 | ||
|
|
57a92b3e84 | ||
|
|
0f24c04458 | ||
|
|
f7d399692b | ||
|
|
3782b860b4 | ||
|
|
c020bb15e9 | ||
|
|
e222af6665 | ||
|
|
c78077f09e | ||
|
|
af94813a99 | ||
|
|
ef2aff872f | ||
|
|
a6b2275a32 | ||
|
|
2334c578a1 | ||
|
|
e128252b66 | ||
|
|
547ad1d694 | ||
|
|
71c6234cab | ||
|
|
6f02dd7443 | ||
|
|
3e9834bd80 | ||
|
|
031689f083 | ||
|
|
bad2301bee | ||
|
|
3038b140a3 | ||
|
|
eefa078591 | ||
|
|
66d8e597f3 | ||
|
|
54b17eea2c | ||
|
|
c47775c2f0 | ||
|
|
9d8b79465f | ||
|
|
e2dc1e9a00 | ||
|
|
e962f9cd2f | ||
|
|
6bb84e0372 | ||
|
|
074c4e9042 | ||
|
|
53f33e7a02 | ||
|
|
f505cd58cd | ||
|
|
f03218164a | ||
|
|
12ead4619e | ||
|
|
88d64fbe8e | ||
|
|
be36d6f345 | ||
|
|
dbc6d113ea | ||
|
|
9d6d0b5f2f | ||
|
|
73e8e28e56 | ||
|
|
bb12e394f8 | ||
|
|
1557474f25 | ||
|
|
91f19609e8 | ||
|
|
e3a0772610 | ||
|
|
cb7bc645ce | ||
|
|
a1095d8d2e | ||
|
|
724a82dde4 | ||
|
|
d692eb0088 | ||
|
|
3170a61736 | ||
|
|
34c380bb33 | ||
|
|
6ae9750c4f | ||
|
|
3891599573 | ||
|
|
e556a39c4e | ||
|
|
db14446448 | ||
|
|
b2c2e65b0a | ||
|
|
88f328b9b6 | ||
|
|
1fc8ef0894 | ||
|
|
1a1698e27b | ||
|
|
69f3e4b340 | ||
|
|
56af81bdbc | ||
|
|
5a2441b2f2 | ||
|
|
2d9998f886 | ||
|
|
95a920cf88 | ||
|
|
697a49294d | ||
|
|
55af9efbfc | ||
|
|
75a05ec18d | ||
|
|
8038722fa7 | ||
|
|
8b0692e2d6 | ||
|
|
f9fb319f79 | ||
|
|
5ffae2364b | ||
|
|
ec1da68a4e | ||
|
|
ed5135c814 | ||
|
|
17309e5abc | ||
|
|
06178fbc2e | ||
|
|
c6a11aa5ff | ||
|
|
42335629c4 | ||
|
|
5441f05bfd | ||
|
|
82eedbeb27 | ||
|
|
5f3fcc1f69 | ||
|
|
5249e19a8a | ||
|
|
bf34aae7ad | ||
|
|
9b4ca1d33f | ||
|
|
bd8a39cf01 | ||
|
|
cc6697b350 | ||
|
|
8f62485600 | ||
|
|
82243d59ac | ||
|
|
2502d31aaf | ||
|
|
df2d7343ec | ||
|
|
bc660975e5 | ||
|
|
9fe8679535 | ||
|
|
11efa75ac6 | ||
|
|
a0fd5cdae5 | ||
|
|
ee76694e1c | ||
|
|
7dbb3020dd | ||
|
|
3b3be3a38e | ||
|
|
7bebb2dd41 | ||
|
|
69bec6798c | ||
|
|
b1f6d21099 | ||
|
|
a623cac57f | ||
|
|
718889c5ca | ||
|
|
8bcf305d3d | ||
|
|
f50a2d9148 | ||
|
|
3a6c61c3d6 | ||
|
|
206463a376 | ||
|
|
081cb65784 | ||
|
|
771a3b472d | ||
|
|
a032ac99d6 | ||
|
|
7717b3e202 | ||
|
|
ffa3316b40 | ||
|
|
615e5bd5e3 | ||
|
|
85a693f6e2 | ||
|
|
f11620e9f2 | ||
|
|
516e4a8fa6 |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.designer.feature" label="Designer Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.designer.feature" label="Designer Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.fragment.jars.di.feature"
|
||||
label="Fragment Jars in DI"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.di.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.gmf.feature"
|
||||
label="Gmf"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
GMF
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.gmf.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.0.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos">
|
||||
<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.8.8.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license>[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.0.1.qualifier">
|
||||
<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.8.8.qualifier">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
@@ -16,7 +16,6 @@
|
||||
<import plugin="org.talend.repository" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.talend.utils" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.common.ui.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.commons.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.commons.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.core.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
@@ -44,14 +43,12 @@
|
||||
<plugin id="org.talend.migrationTool.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.model.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.json.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.sqlbuilder.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.presentation.onboarding.resource.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.view.di.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.repository.view.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.repository.feature" label="Repository Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.repository.feature" label="Repository Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.azurestorage.feature"
|
||||
label="Azure Storage"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Azure Storage
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.googledrive.feature"
|
||||
label="Google Drive"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Google drive component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.jdbc.feature"
|
||||
label="JDBC_feature"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.jdbc.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.jira.feature"
|
||||
label="Jira"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Jira component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.marketo.feature"
|
||||
label="Marketo"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Marketo component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.marklogic.feature"
|
||||
label="Marklogic"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Marklogic component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.netsuite.feature"
|
||||
label="Netsuite"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Netsuite
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.salesforce.feature"
|
||||
label="Salesforce"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Salesforce component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.snowflake.feature"
|
||||
label="SNOWFLAKE_feature"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Snowflake
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.studio.components.tcompv0.splunk.feature"
|
||||
label="Splunk"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Splunk component
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.tos.components.feature"
|
||||
label="Components-feature"
|
||||
version="8.0.1.qualifier">
|
||||
version="8.8.8.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
@@ -248,12 +248,5 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.designer.esb.components.rs.consumer"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.core.feature" label="Feature" version="8.0.1.qualifier">
|
||||
<feature id="org.talend.tos.core.feature" label="Feature" version="8.8.8.qualifier">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.core.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.feature" label="Tos feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.tos.feature" label="Tos feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license>[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.0.1.qualifier">
|
||||
<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.8.8.qualifier">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
@@ -46,5 +46,4 @@
|
||||
<plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
|
||||
<plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
|
||||
<plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>
|
||||
<plugin id="org.talend.libraries.esb" download-size="0" install-size="0" version="0.0.0"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Abstract Map Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Alfresco Output Component Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: CodeGen Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.talend.core.repository,
|
||||
org.eclipse.emf.codegen,
|
||||
|
||||
@@ -7,6 +7,7 @@ bin.includes = plugin.xml,\
|
||||
jet_stub/,\
|
||||
plugin.properties,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_es.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_ja.properties,\
|
||||
|
||||
@@ -56,9 +56,8 @@
|
||||
String jobClassPackageFolder = codeGenArgument.getCurrentProjectName().toLowerCase() + '/' + jobFolderName;
|
||||
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
|
||||
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
|
||||
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
|
||||
String MDC_CLASS = "org.slf4j.MDC";
|
||||
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
|
||||
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
|
||||
|
||||
boolean exist_tParallelize = false;
|
||||
List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
|
||||
@@ -322,8 +321,6 @@
|
||||
globalMap.put(GLOBAL_CONNECTION_POOL_KEY, connectionPool);
|
||||
}
|
||||
<%}%>
|
||||
|
||||
private final static java.util.Properties jobInfo = new java.util.Properties();
|
||||
|
||||
public static void main(String[] args){
|
||||
final <%=className %> <%=className %>Class = new <%=className %>();
|
||||
@@ -337,42 +334,6 @@
|
||||
|
||||
System.exit(exitCode);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private void getjobInfo() {
|
||||
final String TEMPLATE_PATH = "src/main/templates/jobInfo_template.properties";
|
||||
final String BUILD_PATH = "../jobInfo.properties";
|
||||
final String path = this.getClass().getResource("").getPath();
|
||||
if(path.lastIndexOf("target") > 0) {
|
||||
final java.io.File templateFile = new java.io.File(
|
||||
path.substring(0, path.lastIndexOf("target")).concat(TEMPLATE_PATH));
|
||||
if (templateFile.exists()) {
|
||||
readJobInfo(templateFile);
|
||||
return;
|
||||
}
|
||||
}
|
||||
readJobInfo(new java.io.File(BUILD_PATH));
|
||||
}
|
||||
|
||||
private void readJobInfo(java.io.File jobInfoFile){
|
||||
|
||||
if(jobInfoFile.exists()) {
|
||||
try {
|
||||
jobInfo.load(new java.io.FileInputStream(jobInfoFile));
|
||||
} catch (IOException e) {
|
||||
<%if(isLog4jEnabled){%>
|
||||
log.debug("Read jobInfo.properties file fail: " + e.getMessage());
|
||||
<%}%>
|
||||
|
||||
}
|
||||
}
|
||||
<%if(isLog4jEnabled){%>
|
||||
log.info(String.format("Project name: %s\tJob name: %s\tGIT Commit ID: %s\tTalend Version: %s",
|
||||
projectName,jobName,jobInfo.getProperty("gitCommitId"), "<%=System.getProperties().getProperty("talend.studio.version")%>"));
|
||||
<%}%>
|
||||
}
|
||||
|
||||
<%
|
||||
if (isTestContainer) {
|
||||
@@ -554,34 +515,8 @@
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
|
||||
<%}%>
|
||||
}
|
||||
|
||||
getjobInfo();
|
||||
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
|
||||
<%}%>
|
||||
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
java.util.Set<Object> jobInfoKeys = jobInfo.keySet();
|
||||
for(Object jobInfoKey: jobInfoKeys) {
|
||||
<%=MDC_CLASS%>.put("_" + jobInfoKey.toString(), jobInfo.get(jobInfoKey).toString());
|
||||
}
|
||||
<%=MDC_CLASS%>.put("_pid", pid);
|
||||
<%=MDC_CLASS%>.put("_rootPid", rootPid);
|
||||
<%=MDC_CLASS%>.put("_fatherPid", fatherPid);
|
||||
<%=MDC_CLASS%>.put("_projectName", projectName);
|
||||
<%=MDC_CLASS%>.put("_startTimestamp",java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT ));
|
||||
<%=MDC_CLASS%>.put("_jobRepositoryId","<%=process.getId() %>");
|
||||
<%=MDC_CLASS%>.put("_compiledAtTimestamp","<%=java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT )%>");
|
||||
|
||||
java.lang.management.RuntimeMXBean mx = java.lang.management.ManagementFactory.getRuntimeMXBean();
|
||||
String[] mxNameTable = mx.getName().split("@"); //$NON-NLS-1$
|
||||
if (mxNameTable.length == 2) {
|
||||
<%=MDC_CLASS%>.put("_systemPid", mxNameTable[0]);
|
||||
} else {
|
||||
<%=MDC_CLASS%>.put("_systemPid", String.valueOf(java.lang.Thread.currentThread().getId()));
|
||||
}
|
||||
|
||||
<%
|
||||
}%>
|
||||
|
||||
<%
|
||||
INode jobCatcherNode = null;
|
||||
@@ -707,26 +642,14 @@
|
||||
pid = TalendString.getAsciiRandomString(6);
|
||||
}
|
||||
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
<%=MDC_CLASS%>.put("_pid", pid);
|
||||
<%}%>
|
||||
|
||||
if (rootPid==null) {
|
||||
rootPid = pid;
|
||||
}
|
||||
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
<%=MDC_CLASS%>.put("_rootPid", rootPid);
|
||||
<%}%>
|
||||
|
||||
if (fatherPid==null) {
|
||||
fatherPid = pid;
|
||||
}else{
|
||||
isChildJob = true;
|
||||
}
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
<%=MDC_CLASS%>.put("_fatherPid", fatherPid);
|
||||
<%}%>
|
||||
|
||||
<%
|
||||
if (stats) {
|
||||
@@ -960,12 +883,7 @@
|
||||
}
|
||||
%>
|
||||
//Resume: jobStart
|
||||
resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt));
|
||||
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
<%=MDC_CLASS%>.put("_context", contextStr);
|
||||
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Started.");
|
||||
<%}%>
|
||||
resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt));
|
||||
|
||||
<%
|
||||
if (stats) {
|
||||
@@ -1238,15 +1156,9 @@ this.globalResumeTicket = false;//to run others jobs
|
||||
if (!componentName.equals("tJobStructureCatcher") && !componentName.equals("tLogCatcher") && !componentName.equals("tFlowMeterCatcher") && !componentName.equals("tAssertCatcher") && !componentName.equals("tStatCatcher") && !componentName.equals("tAsyncIn")) {
|
||||
%>
|
||||
<%=createCallProcess(rootNode, className, false) %>
|
||||
<%
|
||||
if (process.getNodesOfType("tStatCatcher").size() > 0) {
|
||||
%>
|
||||
<%=statsErrorHandlingAfterMainCall(rootNode, process.getNodesOfType("tStatCatcher"))%>
|
||||
<%
|
||||
}
|
||||
}
|
||||
}
|
||||
}// end if(isRunInMultiThread)
|
||||
<% }
|
||||
}
|
||||
}// end if(isRunInMultiThread)
|
||||
%>
|
||||
|
||||
this.globalResumeTicket = true;//to run tPostJob
|
||||
@@ -1380,15 +1292,6 @@ if (execStat) {
|
||||
returnCode = errorCode.intValue();
|
||||
}
|
||||
resumeUtil.addLog("JOB_ENDED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","" + returnCode,"","","");
|
||||
resumeUtil.flush();
|
||||
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
|
||||
<%=MDC_CLASS%>.remove("_subJobName");
|
||||
<%=MDC_CLASS%>.remove("_subJobPid");
|
||||
<%=MDC_CLASS%>.remove("_systemPid");
|
||||
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Finished - status: " + status + " returnCode: " + returnCode );
|
||||
<%}%>
|
||||
|
||||
return returnCode;
|
||||
|
||||
|
||||
@@ -42,10 +42,10 @@ public class CLASS
|
||||
|
||||
//List< ? extends IConnection> onSubJobErrorConns = rootNode.getOutgoingConnections(EConnectionType.ON_SUBJOB_ERROR);
|
||||
//if(onSubJobErrorConns!=null){
|
||||
// for(IConnection conn : onSubJobErrorConns) {
|
||||
// for(IConnection conn : onSubJobErrorConns) {
|
||||
// toReturn += createCallProcess(conn.getTarget(), className, isMultiThread);
|
||||
// }
|
||||
//}
|
||||
//}
|
||||
if(isMultiThread){
|
||||
toReturn += "\n}catch (java.lang.Error e_" + rootNode.getUniqueName() + ") {\n";
|
||||
toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
|
||||
@@ -55,20 +55,7 @@ public class CLASS
|
||||
toReturn += "\n}";
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
public String statsErrorHandlingAfterMainCall(INode rootNode, List<? extends INode> statsNodes) {
|
||||
String catchErrorReturn = "catch (Error error_" + rootNode.getUniqueName() + " ) {\n";
|
||||
catchErrorReturn+="end = System.currentTimeMillis();\n";
|
||||
for (INode statCatcherNode : statsNodes) {
|
||||
catchErrorReturn += statCatcherNode.getUniqueName() + ".addMessage(\"failure\", (end-startTime));\n";
|
||||
catchErrorReturn += "try {\n " + statCatcherNode.getDesignSubjobStartNode().getUniqueName() + "Process(globalMap);\n";
|
||||
catchErrorReturn += "} catch (Exception e_" + statCatcherNode.getUniqueName() + ") {\n";
|
||||
catchErrorReturn += "e_" + statCatcherNode.getUniqueName() + ".printStackTrace();\n}\n";
|
||||
}
|
||||
catchErrorReturn+= "throw error_" + rootNode.getUniqueName() + ";\n}\n";
|
||||
return catchErrorReturn;
|
||||
}
|
||||
|
||||
|
||||
public String generate(Object argument) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -36,15 +36,6 @@
|
||||
boolean stats = codeGenArgument.isStatistics();
|
||||
boolean trace = codeGenArgument.isTrace();
|
||||
boolean isRunInMultiThread = codeGenArgument.getIsRunInMultiThread();
|
||||
|
||||
boolean exportTypeSpringBoot = false;
|
||||
if (process instanceof org.talend.core.model.process.IProcess2) {
|
||||
org.talend.core.model.process.IProcess2 p2 = (org.talend.core.model.process.IProcess2) process;
|
||||
if (p2.getProperty() != null && p2.getProperty().getAdditionalProperties() != null) {
|
||||
exportTypeSpringBoot = "REST_MS".equals(p2.getProperty().getAdditionalProperties().get(org.talend.core.runtime.process.TalendProcessArgumentConstant.ARG_BUILD_TYPE));
|
||||
}
|
||||
}
|
||||
|
||||
List<IContextParameter> params = new ArrayList<IContextParameter>();
|
||||
params=process.getContextManager().getDefaultContext().getContextParameterList();
|
||||
String className = process.getName();
|
||||
@@ -150,8 +141,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
|
||||
}
|
||||
}
|
||||
|
||||
boolean isChildRouteJob = !process.getNodesOfType("tRouteInput").isEmpty();
|
||||
boolean talendEsbJobFactory = actAsProvider || isChildRouteJob;
|
||||
boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
|
||||
boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process);
|
||||
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
|
||||
@@ -255,11 +245,6 @@ if(isRunInMultiThread){
|
||||
|
||||
<%//uft-8 is for temp file, for example: tSortRow, tMap. Because they need keep reversibility.%>
|
||||
private final static String utf8Charset = "UTF-8";
|
||||
|
||||
<%
|
||||
if(!exportTypeSpringBoot || isChildRouteJob){
|
||||
%>
|
||||
|
||||
//contains type for every context property
|
||||
public class PropertiesWithType extends java.util.Properties {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@@ -280,16 +265,9 @@ if(!exportTypeSpringBoot || isChildRouteJob){
|
||||
return propertyTypes.get(key);
|
||||
}
|
||||
}
|
||||
<%
|
||||
}
|
||||
%>
|
||||
|
||||
// create and load default properties
|
||||
private java.util.Properties defaultProps = new java.util.Properties();
|
||||
|
||||
<%
|
||||
if(!exportTypeSpringBoot){
|
||||
%>
|
||||
|
||||
// create application properties with default
|
||||
public class ContextProperties extends PropertiesWithType {
|
||||
|
||||
@@ -355,10 +333,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
|
||||
}
|
||||
%>
|
||||
}
|
||||
|
||||
<%
|
||||
}
|
||||
%>
|
||||
protected ContextProperties context = new ContextProperties(); // will be instanciated by MS.
|
||||
public ContextProperties getContext() {
|
||||
return this.context;
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
boolean stat = codeGenArgument.isStatistics();
|
||||
boolean containsTPartitioner = subTree.getRootNode().getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J_ACTIVATE__"));
|
||||
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J2_ACTIVATE__"));//log4j2 enable
|
||||
String MDC_CLASS = "org.slf4j.MDC";
|
||||
%>
|
||||
|
||||
<%
|
||||
@@ -1605,11 +1603,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
|
||||
globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 0);
|
||||
|
||||
final boolean execStat = this.execStat;
|
||||
<%if(isLog4jEnabled && isLog4j2Enabled) {%>
|
||||
<%=MDC_CLASS%>.put("_subJobName", "<%=subTree.getName() %>");
|
||||
<%=MDC_CLASS%>.put("_subJobPid", TalendString.getAsciiRandomString(6));
|
||||
<%}%>
|
||||
|
||||
<%
|
||||
boolean isParallelize = false;
|
||||
for (INode node : subTree.getNodes()) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -36,7 +36,7 @@ CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u3
|
||||
CodeGenInit.createProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210
|
||||
CodeGenInit.deleteProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u524A\u9664
|
||||
CodeGenInit.initTemplate=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u521D\u671F\u5316
|
||||
CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u3092\u524A\u9664
|
||||
CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u306E\u524A\u9664
|
||||
CodeGenInit.saveWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u4FDD\u5B58\u4E2D
|
||||
DocumentRootImpl.mixed= (\u4E21\u7528:
|
||||
NodesSubTree.enableParallel=__ENABLE_PARALLEL__
|
||||
|
||||
@@ -152,9 +152,7 @@ public class CodeGeneratorService implements ICodeGeneratorService {
|
||||
ComponentsFactoryProvider.getInstance().resetCache();
|
||||
ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
|
||||
ILibraryManagerService.class);
|
||||
//TUP-31721: The generated studio index will include every possible values with TP_ALL license .
|
||||
//Studio 8 will not re-generate the index after applying patch and installing any component.
|
||||
librairesManagerService.clearCache(false);
|
||||
librairesManagerService.clearCache();
|
||||
CorePlugin.getDefault().getLibrariesService().syncLibraries();
|
||||
Job job = CodeGeneratorEmittersPoolFactory.initialize();
|
||||
// achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107
|
||||
|
||||
@@ -46,7 +46,6 @@ import org.talend.commons.exception.BusinessException;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.utils.io.FilesUtils;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ILibraryManagerService;
|
||||
import org.talend.core.language.LanguageManager;
|
||||
import org.talend.core.model.component_cache.ComponentsCache;
|
||||
import org.talend.core.model.components.AbstractComponentsProvider;
|
||||
@@ -59,7 +58,6 @@ import org.talend.core.model.components.IComponentsFactory;
|
||||
import org.talend.core.model.components.IComponentsHandler;
|
||||
import org.talend.core.model.components.filters.ComponentsFactoryProviderManager;
|
||||
import org.talend.core.model.components.filters.IComponentFactoryFilter;
|
||||
import org.talend.core.model.general.ModuleNeeded;
|
||||
import org.talend.core.runtime.util.ComponentsLocationProvider;
|
||||
import org.talend.core.ui.IJobletProviderService;
|
||||
import org.talend.core.ui.ISparkJobletProviderService;
|
||||
@@ -370,8 +368,6 @@ public class ComponentsFactory implements IComponentsFactory {
|
||||
} else {
|
||||
componentList.add(currentComp);
|
||||
customComponentList.add(currentComp);
|
||||
|
||||
syncCustomComponentLibs(currentFolder, currentComp.getModulesNeeded());
|
||||
}
|
||||
} catch (MissingMainXMLComponentFileException e) {
|
||||
log.trace(currentFolder.getName() + " is not a " + getCodeLanguageSuffix() + " component", e); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
@@ -391,18 +387,6 @@ public class ComponentsFactory implements IComponentsFactory {
|
||||
}
|
||||
}
|
||||
|
||||
private void syncCustomComponentLibs(File componentFolder, List<ModuleNeeded> modulesNeeded) {
|
||||
try {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
|
||||
ILibraryManagerService libraryService = GlobalServiceRegister.getDefault()
|
||||
.getService(ILibraryManagerService.class);
|
||||
libraryService.deployLibsFromCustomComponents(componentFolder, modulesNeeded);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void loadComponentsFromFolder(String pathSource, AbstractComponentsProvider provider) {
|
||||
// Changed by Marvin Wang on Feb.22 for bug TDI-19166, caz the test ConnectionManagerTest maybe get the null
|
||||
// context.
|
||||
|
||||
@@ -55,9 +55,6 @@ public enum EInternalTemplate {
|
||||
CAMEL_RUNIF("camel_run_if", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
CAMEL_SPECIALLINKS("camel_speciallinks", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
MICROSERVICE_APP("microservice_app", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
MICROSERVICE_APP_MS_CONTEXT_PROPERTIES("microservice_app_ms_context_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
MICROSERVICE_APP_CONTEXT_PROPERTIES("microservice_app_context_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
MICROSERVICE_APP_PROPERTIES("microservice_app_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
HEADER_ADDITIONAL("header_additional", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Exchange Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.ui,
|
||||
|
||||
@@ -8,6 +8,7 @@ bin.includes = META-INF/,\
|
||||
model/,\
|
||||
content/,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_it.properties,\
|
||||
plugin_ja.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -89,9 +89,9 @@ ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u30A2
|
||||
ExchangeWebService.insertionRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u633F\u5165\u6210\u529F\u3002
|
||||
ImportExchangeDialog.dialogTitle=Talend Exchange \u304B\u3089\u9805\u76EE\u306E\u9078\u629E
|
||||
ImportExchangeDialog.WARNING=\u8B66\u544A
|
||||
ImportExchangeDialog.NOTSELECTWARNING=\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u9805\u76EE\u3092\uFF11\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044...
|
||||
ImportExchangeDialog.downloadProgressBar=\u9805\u76EE\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044!
|
||||
ImportExchangeDialog.EXTENSION_NAME=\u62E1\u5F35\u5B50\u540D
|
||||
ImportExchangeDialog.NOTSELECTWARNING=\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30A2\u30A4\u30C6\u30E0\u3092\uFF11\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044...
|
||||
ImportExchangeDialog.downloadProgressBar=\u30A2\u30A4\u30C6\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044!
|
||||
ImportExchangeDialog.EXTENSION_NAME=Extension\u540D
|
||||
ImportExchangeDialog.AUTHOR_NAME=\u4F5C\u6210\u8005\u540D
|
||||
ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
|
||||
ImportExchangeDialog.EXTENSION_DESCRIPTION=\u62E1\u5F35\u306E\u8AAC\u660E
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Components Libs Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.components.libs
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
<version>1.0.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
<name>NetSuite_Management</name>
|
||||
<version>1.0.3</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.talend</groupId>
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
<name>Netsuite_Client</name>
|
||||
<version>1.0.0</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<dependencies>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -7,6 +7,15 @@
|
||||
<version>1.0.1-20190326</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>adal4j</artifactId>
|
||||
<version>1.6.6-20220707</version>
|
||||
<version>1.6.4-20211021</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>adal4j</name>
|
||||
<description>
|
||||
@@ -94,7 +94,7 @@
|
||||
<dependency>
|
||||
<groupId>com.nimbusds</groupId>
|
||||
<artifactId>oauth2-oidc-sdk</artifactId>
|
||||
<version>6.5</version>
|
||||
<version>9.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.nimbusds</groupId>
|
||||
@@ -104,12 +104,12 @@
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.8.9</version>
|
||||
<version>2.8.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.34</version>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
|
||||
@@ -40,7 +40,6 @@ import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import com.nimbusds.oauth2.sdk.ParseException;
|
||||
import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPRequest;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPResponse;
|
||||
import org.slf4j.Logger;
|
||||
@@ -138,7 +137,7 @@ class AdalOAuthRequest extends HTTPRequest {
|
||||
HttpHelper.configureAdditionalHeaders(conn, params);
|
||||
conn.setDoOutput(true);
|
||||
conn.setRequestProperty("Content-Type",
|
||||
CommonContentTypes.APPLICATION_URLENCODED.toString());
|
||||
HTTPContentType.ApplicationURLEncoded.contentType);
|
||||
|
||||
if (this.getQuery() != null) {
|
||||
try(final OutputStreamWriter writer = new OutputStreamWriter(
|
||||
|
||||
@@ -37,7 +37,6 @@ import com.nimbusds.oauth2.sdk.ParseException;
|
||||
import com.nimbusds.oauth2.sdk.SerializeException;
|
||||
import com.nimbusds.oauth2.sdk.TokenErrorResponse;
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
|
||||
import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPRequest;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPResponse;
|
||||
import com.nimbusds.oauth2.sdk.util.URLUtils;
|
||||
@@ -146,7 +145,7 @@ class AdalTokenRequest {
|
||||
* @return
|
||||
* @throws SerializeException
|
||||
*/
|
||||
AdalOAuthRequest toOAuthRequest() throws SerializeException {
|
||||
AdalOAuthRequest toOAuthRequest() throws SerializeException, ParseException {
|
||||
|
||||
if (this.uri == null) {
|
||||
throw new SerializeException("The endpoint URI is not specified");
|
||||
@@ -155,7 +154,7 @@ class AdalTokenRequest {
|
||||
final AdalOAuthRequest httpRequest = new AdalOAuthRequest(
|
||||
HTTPRequest.Method.POST, this.uri, headerMap, this.proxy,
|
||||
this.sslSocketFactory);
|
||||
httpRequest.setContentType(CommonContentTypes.APPLICATION_URLENCODED);
|
||||
httpRequest.setContentType(HTTPContentType.ApplicationURLEncoded.contentType);
|
||||
final Map<String, List<String>> params = this.grant.toParameters();
|
||||
httpRequest.setQuery(URLUtils.serializeParameters(params));
|
||||
if (this.clientAuth != null) {
|
||||
|
||||
@@ -28,12 +28,9 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.mail.internet.ContentType;
|
||||
|
||||
import com.nimbusds.oauth2.sdk.SerializeException;
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
|
||||
import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPRequest;
|
||||
import com.nimbusds.oauth2.sdk.id.ClientID;
|
||||
import com.nimbusds.oauth2.sdk.util.URLUtils;
|
||||
@@ -60,15 +57,15 @@ class ClientAuthenticationPost extends ClientAuthentication {
|
||||
if (httpRequest.getMethod() != HTTPRequest.Method.POST)
|
||||
throw new SerializeException("The HTTP request method must be POST");
|
||||
|
||||
ContentType ct = httpRequest.getContentType();
|
||||
String ct = String.valueOf(httpRequest.getEntityContentType());
|
||||
|
||||
if (ct == null)
|
||||
throw new SerializeException("Missing HTTP Content-Type header");
|
||||
|
||||
if (!ct.match(CommonContentTypes.APPLICATION_URLENCODED))
|
||||
if (!ct.equals(HTTPContentType.ApplicationURLEncoded.contentType))
|
||||
throw new SerializeException(
|
||||
"The HTTP Content-Type header must be "
|
||||
+ CommonContentTypes.APPLICATION_URLENCODED);
|
||||
+ HTTPContentType.ApplicationURLEncoded.contentType);
|
||||
|
||||
Map<String, List<String>> params = httpRequest.getQueryParameters();
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
package com.microsoft.aad.adal4j;
|
||||
|
||||
/**
|
||||
* Enum containing HTTP Content-Type header values
|
||||
*/
|
||||
enum HTTPContentType {
|
||||
|
||||
ApplicationURLEncoded("application/x-www-form-urlencoded; charset=UTF-8"),
|
||||
ApplicationJSON("application/json; charset=UTF-8");
|
||||
|
||||
public final String contentType;
|
||||
|
||||
HTTPContentType(String contentType) {
|
||||
this.contentType = contentType;
|
||||
}
|
||||
}
|
||||
@@ -47,7 +47,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
</dependency>
|
||||
<!-- Spring 3 dependencies -->
|
||||
<dependency>
|
||||
|
||||
@@ -52,8 +52,8 @@ public class AdalOAuthRequestTest extends AbstractAdalTests {
|
||||
assertNotNull(request);
|
||||
}
|
||||
|
||||
|
||||
@Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Couldn't parse Content-Type header: Invalid Content-Type value: In Content-Type string <invalid-content>, expected '/', got null")
|
||||
@Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp =
|
||||
"Couldn't parse Content-Type header: Invalid Content-Type value: Invalid content type string")
|
||||
public void testCreateResponseContentTypeParsingFailure()
|
||||
throws Exception {
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ import com.nimbusds.oauth2.sdk.*;
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
|
||||
import com.nimbusds.oauth2.sdk.auth.Secret;
|
||||
import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPResponse;
|
||||
import com.nimbusds.oauth2.sdk.id.ClientID;
|
||||
import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
|
||||
@@ -77,7 +76,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
|
||||
"\"correlation_id\":\"3a...95a\"," +
|
||||
"\"claims\":\"" + claims + "\"}";
|
||||
httpResponse.setContent(content);
|
||||
httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
|
||||
httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
|
||||
|
||||
EasyMock.expect(request.toOAuthRequest()).andReturn(adalOAuthHttpRequest).times(1);
|
||||
EasyMock.expect(adalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
|
||||
@@ -131,7 +130,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
|
||||
@Test
|
||||
public void testToOAuthRequestNonEmptyCorrelationId()
|
||||
throws MalformedURLException, SerializeException,
|
||||
URISyntaxException {
|
||||
URISyntaxException, ParseException {
|
||||
final ClientAuthentication ca = new ClientSecretPost(
|
||||
new ClientID("id"), new Secret("secret"));
|
||||
final AuthorizationGrant ag = new AuthorizationCodeGrant(
|
||||
@@ -155,7 +154,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
|
||||
@Test
|
||||
public void testToOAuthRequestNullCorrelationId_NullClientAuth()
|
||||
throws MalformedURLException, SerializeException,
|
||||
URISyntaxException {
|
||||
URISyntaxException, ParseException {
|
||||
final AuthorizationGrant ag = new AuthorizationCodeGrant(
|
||||
new AuthorizationCode("code"),
|
||||
new URI("http://my.redirect.com"));
|
||||
|
||||
@@ -33,7 +33,6 @@ import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
|
||||
import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
|
||||
import com.nimbusds.oauth2.sdk.http.HTTPResponse;
|
||||
import org.easymock.Capture;
|
||||
import org.easymock.EasyMock;
|
||||
@@ -196,7 +195,7 @@ public class DeviceCodeFlowTest {
|
||||
"\"correlation_id\":\"ff60101b-cb23-4a52-82cb-9966f466327a\"}";
|
||||
|
||||
httpResponse.setContent(content);
|
||||
httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
|
||||
httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
|
||||
|
||||
EasyMock.expect(request.toOAuthRequest()).andReturn(adalOAuthHttpRequest).times(1);
|
||||
EasyMock.expect(adalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
@@ -6,7 +6,16 @@
|
||||
|
||||
<groupId>org.talend.components.lib</groupId>
|
||||
<artifactId>azure-utils</artifactId>
|
||||
<version>1.0.2</version>
|
||||
<version>1.0.3</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://github.com/Talend/tdi-studio-se/blob/master/main/plugins/org.talend.designer.components.libs/libs_src/azure-utils/LICENSE</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
<name>talend-bonita-client</name>
|
||||
<version>1.0.1</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
|
||||
@@ -7,10 +7,18 @@
|
||||
|
||||
<name>commons-net-talend</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
<slf4.version>1.7.34</slf4.version>
|
||||
<slf4.version>1.7.25</slf4.version>
|
||||
<lombok.version>1.18.12</lombok.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@@ -7,6 +7,13 @@
|
||||
|
||||
<name>Cyberark-wrapper</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
@@ -9,6 +9,15 @@
|
||||
|
||||
<name>talend-copy</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<groupId>net.sf.json-lib</groupId>
|
||||
<artifactId>json-lib</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>2.4.8-talend</version>
|
||||
<version>2.4.7-talend</version>
|
||||
<name>json-lib</name>
|
||||
|
||||
<properties>
|
||||
@@ -232,7 +232,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
<scope>runtime</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
@@ -48,6 +48,7 @@ import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.io.StringReader;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -172,6 +173,11 @@ public class XMLSerializer {
|
||||
* flag for if parse empty elements as empty strings
|
||||
*/
|
||||
private boolean useEmptyStrings;
|
||||
|
||||
/**
|
||||
* flag to use scientific notation while working with Float values.
|
||||
*/
|
||||
private boolean useScientificNotation;
|
||||
|
||||
/**
|
||||
* Creates a new XMLSerializer with default options.<br>
|
||||
@@ -205,6 +211,7 @@ public class XMLSerializer {
|
||||
setKeepCData( false );
|
||||
setEscapeLowerChars( false );
|
||||
setKeepArrayName( false );
|
||||
setUseScientificNotation( false );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -360,7 +367,15 @@ public class XMLSerializer {
|
||||
return typeHintsEnabled;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return the useScientificNotation value
|
||||
*/
|
||||
public boolean isUseScientificNotation() {
|
||||
return useScientificNotation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a JSON value from a XML string.
|
||||
*
|
||||
* @param xml A well-formed xml document in a String
|
||||
@@ -652,6 +667,15 @@ public class XMLSerializer {
|
||||
this.typeHintsCompatibility = typeHintsCompatibility;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets whether to use scientific notation while working with Float values.
|
||||
* @param useScientificNotation Value of the useScientificNotation to set.
|
||||
*/
|
||||
public void setUseScientificNotation(boolean useScientificNotation) {
|
||||
this.useScientificNotation = useScientificNotation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets wether JSON types will be included as attributes.
|
||||
*/
|
||||
@@ -1335,12 +1359,12 @@ public class XMLSerializer {
|
||||
jsonArray.element(Integer.valueOf(element.getValue()));
|
||||
}
|
||||
} catch (NumberFormatException e) {
|
||||
jsonArray.element(Double.valueOf(element.getValue()));
|
||||
jsonArray.element(processFloatValues(element));
|
||||
}
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
|
||||
jsonArray.element(Integer.valueOf(element.getValue()));
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
|
||||
jsonArray.element(Double.valueOf(element.getValue()));
|
||||
jsonArray.element(processFloatValues(element));
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
|
||||
String[] params = null;
|
||||
String text = element.getValue();
|
||||
@@ -1371,6 +1395,14 @@ public class XMLSerializer {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Object processFloatValues(Element element) {
|
||||
if (!isUseScientificNotation()) {
|
||||
return new BigDecimal(element.getValue());
|
||||
} else {
|
||||
return Double.valueOf(element.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private void setValue( JSONObject jsonObject, Element element, String defaultType ) {
|
||||
String clazz = getClass( element );
|
||||
@@ -1423,12 +1455,12 @@ public class XMLSerializer {
|
||||
setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
|
||||
}
|
||||
} catch (NumberFormatException e) {
|
||||
setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
|
||||
setOrAccumulate(jsonObject, key, processFloatValues(element));
|
||||
}
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
|
||||
setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
|
||||
setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
|
||||
setOrAccumulate(jsonObject, key, processFloatValues(element));
|
||||
} else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
|
||||
String[] params = null;
|
||||
String text = element.getValue();
|
||||
|
||||
@@ -10,6 +10,14 @@
|
||||
<name>Marketo SOAP API SDK</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<cxf.version>3.5.5</cxf.version>
|
||||
<cxf.version>3.3.10</cxf.version>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -4,9 +4,17 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend</groupId>
|
||||
<artifactId>talendMQRFH2</artifactId>
|
||||
<version>1.3.0-20220912</version>
|
||||
<version>1.1.0-20220307</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -39,7 +47,7 @@
|
||||
<dependency>
|
||||
<groupId>com.ibm.mq</groupId>
|
||||
<artifactId>com.ibm.mq.allclient</artifactId>
|
||||
<version>9.2.5.0</version>
|
||||
<version>9.2.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
@@ -59,7 +67,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<!-- #################################################### -->
|
||||
|
||||
<!-- modification 1: config -->
|
||||
<property name="jar.name" value="MsmqTalend-1.0.5.jar" />
|
||||
<property name="jar.name" value="MsmqTalend-1.0.0.jar" />
|
||||
<property name="component.name" value="tMicrosoftMQInput" />
|
||||
<property name="author.name" value="ytao" />
|
||||
|
||||
|
||||
@@ -27,8 +27,7 @@
|
||||
|
||||
package ionic.Msmq;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
|
||||
/**
|
||||
* The Queue class represents a message queue in MSMQ.
|
||||
@@ -96,8 +95,6 @@ public class Queue
|
||||
int getValue() { return _accessFlag; }
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.getLogger(Queue.class.getName());
|
||||
private static boolean initialized;
|
||||
|
||||
/**
|
||||
* <p>Call this constructor to open a queue by name for SEND and
|
||||
@@ -136,7 +133,6 @@ public class Queue
|
||||
private void _init(String queueName, int access)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
// the openQueue native method causes the _queueSlot to be set.
|
||||
int rc = 0;
|
||||
if (access == 0x01) // RECEIVE
|
||||
@@ -153,9 +149,7 @@ public class Queue
|
||||
}
|
||||
else { rc= 0xC00E0006; /* MQ_INVALID_PARAMETER */ }
|
||||
|
||||
if (rc!=0) {
|
||||
throw new MessageQueueException("Cannot open queue.", rc);
|
||||
}
|
||||
if (rc!=0) throw new MessageQueueException("Cannot open queue.", rc);
|
||||
|
||||
_name= queueName;
|
||||
_formatName= "unknown";
|
||||
@@ -182,17 +176,14 @@ public class Queue
|
||||
public static Queue create(String queuePath, String queueLabel, boolean isTransactional)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
int rc= nativeCreateQueue( queuePath, queueLabel, (isTransactional)?1:0);
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot create queue.", rc);
|
||||
}
|
||||
// DIRECT=OS ? or DIRECT=TCP ?
|
||||
String a1= "OS";
|
||||
char[] c= queuePath.toCharArray();
|
||||
if ((c[0]>='1') && (c[0]<='9')) {
|
||||
a1= "TCP"; // assume ip address
|
||||
}
|
||||
if ((c[0]>='1')
|
||||
&& (c[0]<='9')) a1= "TCP"; // assume ip address
|
||||
|
||||
Queue q= new Queue("DIRECT=" + a1 + ":" + queuePath);
|
||||
q._name= queuePath;
|
||||
@@ -210,11 +201,9 @@ public class Queue
|
||||
public static void delete(String queuePath)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
int rc= nativeDeleteQueue( queuePath );
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot delete queue.", rc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -229,16 +218,14 @@ public class Queue
|
||||
public void send(Message msg, boolean highPriority, TransactionType t)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
int rc= nativeSendBytes(msg.getBody(),
|
||||
msg.getLabel(),
|
||||
msg.getCorrelationId(),
|
||||
t.getValue(),
|
||||
highPriority
|
||||
);
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot send.", rc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -284,16 +271,14 @@ public class Queue
|
||||
throws MessageQueueException, java.io.UnsupportedEncodingException
|
||||
|
||||
{
|
||||
initialize();
|
||||
int rc= nativeSendBytes(s.getBytes("UTF-8"), // bytes of string
|
||||
"", // empty label
|
||||
null, // empty correlationId
|
||||
0, // outside any transaction
|
||||
false // false = not high priority
|
||||
);
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot send.", rc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -306,16 +291,14 @@ public class Queue
|
||||
public void send(byte[] b)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
int rc= nativeSendBytes(b,
|
||||
"", // empty label
|
||||
null, // empty correlationId
|
||||
0, // outside any transaction
|
||||
false // false = not high priority
|
||||
);
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot send.", rc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -325,15 +308,13 @@ public class Queue
|
||||
private ionic.Msmq.Message _internal_receive(int timeout, int ReadOrPeek)
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
Message msg = new Message();
|
||||
|
||||
int rc = nativeReceiveBytes(msg, timeout, ReadOrPeek);
|
||||
//int rc = nativeReceiveBytes(timeout, ReadOrPeek);
|
||||
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot receive.", rc);
|
||||
}
|
||||
|
||||
return msg;
|
||||
}
|
||||
@@ -397,11 +378,10 @@ public class Queue
|
||||
public void close()
|
||||
throws MessageQueueException
|
||||
{
|
||||
initialize();
|
||||
|
||||
int rc=nativeClose();
|
||||
if (rc!=0) {
|
||||
if (rc!=0)
|
||||
throw new MessageQueueException("Cannot close.", rc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -460,59 +440,38 @@ public class Queue
|
||||
|
||||
// --------------------------------------------
|
||||
// private members
|
||||
private int _queueSlot = 0;
|
||||
private String _name;
|
||||
private String _formatName;
|
||||
private String _label;
|
||||
private boolean _isTransactional;
|
||||
int _queueSlot = 0;
|
||||
String _name;
|
||||
String _formatName;
|
||||
String _label;
|
||||
boolean _isTransactional;
|
||||
|
||||
// --------------------------------------------
|
||||
// static initializer
|
||||
private static void initialize() {
|
||||
if (initialized) {
|
||||
return;
|
||||
}
|
||||
synchronized (Queue.class) {
|
||||
if (initialized) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
loadLib();
|
||||
nativeInit();
|
||||
initialized = true;
|
||||
} catch (Throwable e) {
|
||||
LOG.log(Level.SEVERE, "Error during library initialization. ", e);
|
||||
if (e instanceof Error) {
|
||||
throw (Error) e;
|
||||
}
|
||||
if (e instanceof RuntimeException) {
|
||||
throw (RuntimeException) e;
|
||||
}
|
||||
throw new IllegalStateException("Initialization failure. ", e);
|
||||
}
|
||||
}
|
||||
static {
|
||||
//System.loadLibrary("MsmqJava");
|
||||
loadLib();
|
||||
nativeInit();
|
||||
}
|
||||
|
||||
/* Try extracting and loading library from jar */
|
||||
|
||||
private static void loadLib() throws Exception {
|
||||
String libName = "MsmqJava";
|
||||
String dllName = libName + ".dll";
|
||||
private static void loadLib() {
|
||||
String dllName = "MsmqJava.dll";
|
||||
String TMP_HOME = System.getProperty("java.io.tmpdir");
|
||||
// TMP_HOME = "d:";
|
||||
String SEPARATOR = System.getProperty("file.separator");
|
||||
String fileName = TMP_HOME + SEPARATOR + dllName;
|
||||
java.io.File file = new java.io.File(fileName);
|
||||
java.io.FileOutputStream os = null;
|
||||
java.io.InputStream is = null;
|
||||
boolean extracted = false;
|
||||
boolean useLocalLib = true;
|
||||
boolean loadSuccess = true;
|
||||
|
||||
try {
|
||||
if (!file.exists()) {
|
||||
|
||||
is = Queue.class.getResourceAsStream("/" + dllName);
|
||||
if (is != null) {
|
||||
LOG.info("Unpacking local native library.");
|
||||
extracted = true;
|
||||
int read;
|
||||
byte[] buffer = new byte[4096];
|
||||
@@ -520,62 +479,31 @@ public class Queue
|
||||
while ((read = is.read(buffer)) != -1) {
|
||||
os.write(buffer, 0, read);
|
||||
}
|
||||
} else {
|
||||
LOG.info("No local native library found.");
|
||||
useLocalLib = false;
|
||||
os.close();
|
||||
is.close();
|
||||
}
|
||||
}
|
||||
loadSuccess = false;
|
||||
if (useLocalLib) {
|
||||
LOG.info("Using previously unpacked local native library.");
|
||||
if (fileName.indexOf(SEPARATOR) != -1) {
|
||||
|
||||
System.load(fileName);
|
||||
} else {
|
||||
LOG.info("Using native library from system.");
|
||||
System.loadLibrary(libName);
|
||||
System.loadLibrary(fileName);
|
||||
}
|
||||
loadSuccess = true;
|
||||
} catch (Throwable e) {
|
||||
if (loadSuccess) {
|
||||
throw e; // throw exception if unrelated to library loading
|
||||
}
|
||||
if (useLocalLib) {
|
||||
LOG.warning("Unable to load local native library \"" + dllName
|
||||
+ "\" with system path \"" + System.getenv("PATH")
|
||||
+ "\", trying to load from system. ");
|
||||
try {
|
||||
System.loadLibrary(libName);
|
||||
loadSuccess = true; // successfully recovered from error condition
|
||||
LOG.info("Native library \"" + dllName + "\" loaded from system.");
|
||||
} catch (Throwable t) {
|
||||
LOG.log(Level.WARNING, "Loading native library failed. ", t);
|
||||
}
|
||||
}
|
||||
if (!loadSuccess) {
|
||||
LOG.severe("Unable to load native library \"" + dllName
|
||||
+ "\" with library path \"" + System.getProperty("java.library.path")
|
||||
+ "\" and system path \"" + System.getenv("PATH") + "\"");
|
||||
throw e;
|
||||
}
|
||||
} finally {
|
||||
try {
|
||||
if (os != null)
|
||||
os.close();
|
||||
} catch (Throwable e) {
|
||||
LOG.log(Level.WARNING, "Closing library file output stream failed. ", e);
|
||||
} catch (java.io.IOException e1) {
|
||||
}
|
||||
try {
|
||||
if (is != null)
|
||||
is.close();
|
||||
} catch (Throwable e) {
|
||||
LOG.log(Level.WARNING, "Closing library resource stream failed. ", e);
|
||||
}
|
||||
try {
|
||||
if (extracted && file.exists()) {
|
||||
file.delete();
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
LOG.log(Level.WARNING, "Removing library file failed. ", e);
|
||||
} catch (java.io.IOException e1) {
|
||||
}
|
||||
if (extracted && file.exists())
|
||||
file.delete();
|
||||
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>org.neo4j.talend</groupId>
|
||||
<artifactId>neo4j-talend-component</artifactId>
|
||||
<version>1.4-20220912</version>
|
||||
<version>1.3-20191012</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Neo4j Talend </name>
|
||||
@@ -103,19 +103,19 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.34</version>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<!-- Talend log4j library -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.34</version>
|
||||
<version>1.7.25</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- JUnit -->
|
||||
|
||||
@@ -7,6 +7,14 @@
|
||||
<version>1.0.1</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -4,12 +4,20 @@
|
||||
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>simpleexcel</artifactId>
|
||||
<version>2.6-20220912</version>
|
||||
<version>2.5-20201119</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>simpleexcel</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -46,6 +54,11 @@
|
||||
<artifactId>poi</artifactId>
|
||||
<version>4.1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-scratchpad</artifactId>
|
||||
<version>4.1.2</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
@@ -61,7 +74,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
</dependency>
|
||||
|
||||
<!--test-->
|
||||
|
||||
@@ -76,18 +76,6 @@ public class DefaultTalendSheetContentsHandler implements TalendXSSFSheetXMLHand
|
||||
* when currentCellReferecnce is "A1" ,and next currentCellReferecnce is "C1",we need add a null value for "B1"
|
||||
*/
|
||||
private void checkHasNullValue(String cellReference) {
|
||||
/*
|
||||
Avoid the NPE for old format.
|
||||
When the row is like that:
|
||||
<row><c t="inlineStr"><is><t>Cell text</t></is></c></row>
|
||||
the cellReference (comes from XSSFSheetXMLHandler::startElement) is null
|
||||
because it's taken from the <c> attribute 'r', for new format the same row is looks like this
|
||||
<row r="1" collapsed="false" outlineLevel="0" customHeight="false" hidden="false" ht="12.8" customFormat="false">
|
||||
<c r="A1" t="s" s="0"><v>0</v></c>
|
||||
</row>
|
||||
and the cellReference is "A1"
|
||||
*/
|
||||
if (cellReference == null) return;
|
||||
currentColumnIndex = ColumnUtil.calculateIndexOfColumn(cellReference);
|
||||
// Might be the empty string.
|
||||
for (int i = lastColumnIndex; i < currentColumnIndex - 1; i++) {
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
|
||||
<name>talend-soap</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
|
||||
@@ -2,13 +2,21 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.talend.components</groupId>
|
||||
<groupId>org.talend.components.lib</groupId>
|
||||
<artifactId>talend-aws</artifactId>
|
||||
<version>1.2</version>
|
||||
<version>1.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>talend-aws</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -41,8 +49,8 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>1.12.315</version>
|
||||
<artifactId>aws-java-sdk</artifactId>
|
||||
<version>1.11.848</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
|
||||
@@ -7,13 +7,21 @@
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>talend-codegen-utils</artifactId>
|
||||
<!-- release for revert version of library -->
|
||||
<version>0.32.0</version>
|
||||
<version>0.31.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<avro.version>1.8.0</avro.version>
|
||||
<components.version>0.37.17</components.version>
|
||||
<daikon.version>7.0.5</daikon.version>
|
||||
<components.version>0.30.0</components.version>
|
||||
<daikon.version>0.31.11</daikon.version>
|
||||
<hamcrest.version>1.3</hamcrest.version>
|
||||
<junit.version>4.12</junit.version>
|
||||
<java-formatter.plugin.version>0.1.0</java-formatter.plugin.version>
|
||||
|
||||
@@ -7,11 +7,19 @@
|
||||
|
||||
<groupId>org.talend.components.lib</groupId>
|
||||
<artifactId>talend-db-exasol</artifactId>
|
||||
<version>2.1.6</version>
|
||||
<version>2.1.5</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>talend-db-exasol</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -36,18 +44,18 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.34</version>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.34</version>
|
||||
<version>1.7.25</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -4,7 +4,15 @@
|
||||
<groupId>org.talend</groupId>
|
||||
<artifactId>talend-httputil</artifactId>
|
||||
<name>talend-httputil</name>
|
||||
<version>1.0.6</version>
|
||||
<version>1.0.7</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -20,7 +28,7 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>2.11.4</version>
|
||||
<version>2.13.2.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -28,14 +36,6 @@
|
||||
<artifactId>json-lib</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.0</version>
|
||||
<type>jar</type>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
package org.talend.http;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.http.entity.ContentType;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
import org.apache.http.entity.ContentType;
|
||||
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import org.apache.http.entity.ContentType;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
|
||||
public class HttpUtil {
|
||||
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
<artifactId>job-audit</artifactId>
|
||||
<version>1.5</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
<daikon.audit.version>1.16.1</daikon.audit.version>
|
||||
|
||||
@@ -3,10 +3,11 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>talend-mscrm</artifactId>
|
||||
<version>3.15-20220912</version>
|
||||
<version>3.11-20220401</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
|
||||
<name>talend-mscrm</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
@@ -14,7 +15,7 @@
|
||||
<distribution>may be downloaded from the Maven repository</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
@@ -25,15 +26,15 @@
|
||||
<httpclient.version>4.5.13</httpclient.version>
|
||||
<httpcore.version>4.4.13</httpcore.version>
|
||||
<junit.version>4.13.2</junit.version>
|
||||
<adal4j.version>1.6.6-20220707</adal4j.version>
|
||||
<jackson.version>2.13.4</jackson.version>
|
||||
<jackson-databind.version>2.13.4.2</jackson-databind.version>
|
||||
<adal4j.version>1.6.4-20211021</adal4j.version>
|
||||
<jackson.version>2.13.2</jackson.version>
|
||||
<jackson-databind.version>2.13.2.2</jackson-databind.version>
|
||||
|
||||
<!-- plugin's versions -->
|
||||
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
|
||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
||||
</properties>
|
||||
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
@@ -68,7 +69,7 @@
|
||||
</releases>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.axis2</groupId>
|
||||
@@ -78,7 +79,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.22</version>
|
||||
<version>1.2.19</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
@@ -101,7 +102,7 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-client-core</artifactId>
|
||||
@@ -143,6 +144,11 @@
|
||||
<version>${junit.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>adal4j</artifactId>
|
||||
<version>${adal4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
@@ -151,24 +157,13 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
<version>${jackson-databind.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>msal4j</artifactId>
|
||||
<version>1.11.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.8.9</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
/*
|
||||
* An XML document type.
|
||||
* Localname: anyType
|
||||
* Namespace: http://schemas.microsoft.com/2003/10/Serialization/
|
||||
* Java type: com.microsoft.schemas._2003._10.serialization.AnyTypeDocument
|
||||
*
|
||||
* Automatically generated - do not modify.
|
||||
*/
|
||||
package com.microsoft.schemas._2003._10.serialization;
|
||||
|
||||
|
||||
/**
|
||||
* A document containing one anyType(@http://schemas.microsoft.com/2003/10/Serialization/) element.
|
||||
*
|
||||
* This is a complex type.
|
||||
*/
|
||||
public interface AnyTypeDocument extends org.apache.xmlbeans.XmlObject
|
||||
{
|
||||
public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)
|
||||
org.apache.xmlbeans.XmlBeans.typeSystemForClassLoader(AnyTypeDocument.class.getClassLoader(), "schemaorg_apache_xmlbeans.system.s7EBB4BC9E00A8FB74293D27D6A5BA466").resolveHandle("anytyped84adoctype");
|
||||
|
||||
/**
|
||||
* Gets the "anyType" element
|
||||
*/
|
||||
org.apache.xmlbeans.XmlObject getAnyType();
|
||||
|
||||
/**
|
||||
* Tests for nil "anyType" element
|
||||
*/
|
||||
boolean isNilAnyType();
|
||||
|
||||
/**
|
||||
* Sets the "anyType" element
|
||||
*/
|
||||
void setAnyType(org.apache.xmlbeans.XmlObject anyType);
|
||||
|
||||
/**
|
||||
* Appends and returns a new empty "anyType" element
|
||||
*/
|
||||
org.apache.xmlbeans.XmlObject addNewAnyType();
|
||||
|
||||
/**
|
||||
* Nils the "anyType" element
|
||||
*/
|
||||
void setNilAnyType();
|
||||
|
||||
/**
|
||||
* A factory class with static methods for creating instances
|
||||
* of this type.
|
||||
*/
|
||||
|
||||
public static final class Factory
|
||||
{
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument newInstance() {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newInstance( type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument newInstance(org.apache.xmlbeans.XmlOptions options) {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newInstance( type, options ); }
|
||||
|
||||
/** @param xmlAsString the string value to parse */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.lang.String xmlAsString) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xmlAsString, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.lang.String xmlAsString, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xmlAsString, type, options ); }
|
||||
|
||||
/** @param file the file from which to load an xml document */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.File file) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( file, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.File file, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( file, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( u, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( u, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( is, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( is, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( r, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( r, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(javax.xml.stream.XMLStreamReader sr) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( sr, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(javax.xml.stream.XMLStreamReader sr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( sr, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( node, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( node, type, options ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyTypeDocument parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyTypeDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, null ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, options ); }
|
||||
|
||||
private Factory() { } // No instance of this class allowed
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
/*
|
||||
* An XML document type.
|
||||
* Localname: anyURI
|
||||
* Namespace: http://schemas.microsoft.com/2003/10/Serialization/
|
||||
* Java type: com.microsoft.schemas._2003._10.serialization.AnyURIDocument
|
||||
*
|
||||
* Automatically generated - do not modify.
|
||||
*/
|
||||
package com.microsoft.schemas._2003._10.serialization;
|
||||
|
||||
|
||||
/**
|
||||
* A document containing one anyURI(@http://schemas.microsoft.com/2003/10/Serialization/) element.
|
||||
*
|
||||
* This is a complex type.
|
||||
*/
|
||||
public interface AnyURIDocument extends org.apache.xmlbeans.XmlObject
|
||||
{
|
||||
public static final org.apache.xmlbeans.SchemaType type = (org.apache.xmlbeans.SchemaType)
|
||||
org.apache.xmlbeans.XmlBeans.typeSystemForClassLoader(AnyURIDocument.class.getClassLoader(), "schemaorg_apache_xmlbeans.system.s7EBB4BC9E00A8FB74293D27D6A5BA466").resolveHandle("anyuri2736doctype");
|
||||
|
||||
/**
|
||||
* Gets the "anyURI" element
|
||||
*/
|
||||
java.lang.String getAnyURI();
|
||||
|
||||
/**
|
||||
* Gets (as xml) the "anyURI" element
|
||||
*/
|
||||
org.apache.xmlbeans.XmlAnyURI xgetAnyURI();
|
||||
|
||||
/**
|
||||
* Tests for nil "anyURI" element
|
||||
*/
|
||||
boolean isNilAnyURI();
|
||||
|
||||
/**
|
||||
* Sets the "anyURI" element
|
||||
*/
|
||||
void setAnyURI(java.lang.String anyURI);
|
||||
|
||||
/**
|
||||
* Sets (as xml) the "anyURI" element
|
||||
*/
|
||||
void xsetAnyURI(org.apache.xmlbeans.XmlAnyURI anyURI);
|
||||
|
||||
/**
|
||||
* Nils the "anyURI" element
|
||||
*/
|
||||
void setNilAnyURI();
|
||||
|
||||
/**
|
||||
* A factory class with static methods for creating instances
|
||||
* of this type.
|
||||
*/
|
||||
|
||||
public static final class Factory
|
||||
{
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument newInstance() {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newInstance( type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument newInstance(org.apache.xmlbeans.XmlOptions options) {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newInstance( type, options ); }
|
||||
|
||||
/** @param xmlAsString the string value to parse */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.lang.String xmlAsString) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xmlAsString, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.lang.String xmlAsString, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xmlAsString, type, options ); }
|
||||
|
||||
/** @param file the file from which to load an xml document */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.File file) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( file, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.File file, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( file, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( u, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( u, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( is, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( is, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( r, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( r, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(javax.xml.stream.XMLStreamReader sr) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( sr, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(javax.xml.stream.XMLStreamReader sr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( sr, type, options ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( node, type, null ); }
|
||||
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( node, type, options ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static com.microsoft.schemas._2003._10.serialization.AnyURIDocument parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return (com.microsoft.schemas._2003._10.serialization.AnyURIDocument) org.apache.xmlbeans.XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, null ); }
|
||||
|
||||
/** @deprecated {@link org.apache.xmlbeans.xml.stream.XMLInputStream} */
|
||||
public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
|
||||
return org.apache.xmlbeans.XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, options ); }
|
||||
|
||||
private Factory() { } // No instance of this class allowed
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user