Compare commits

..

156 Commits

Author SHA1 Message Date
Sébastien Gandon
efa93e6395 Merge release/5.4.1/tis_shared and release/5.4.1/tos for release/5.4.1. 2014-06-22 14:17:13 +02:00
nrousseau
2bbdcd808a merge r111666 from trunk to branch 5.4
bug TUP-1476 fixed: After deleting Structures and Maps from Mapping perspective: Job's in Integration perspective do not open anymore per doble-click


git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111667 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-12-03 09:25:08 +00:00
amaumont
c0ade49e40 merge r111650 from trunk to branch 5.4
fix TDI-28205 : Studio can not lauch after we start up a studio with a remote link twice at the same time.
perform the lock of the workspace in the Studio launcher (only for TIS not TOS) and not anymore in the Login Dialog.
https://jira.talendforge.org/browse/TDI-28205


git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111652 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-12-02 15:22:49 +00:00
nrousseau
d45618a86b merge r111636 from trunk to branch 5.4
TUP-1462 : problem with Empty Recycle Bin. It kept dependency with the previous repository view instead of update to the current one.


git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111638 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-12-02 10:49:30 +00:00
nrousseau
411ba1ba4c merge r111635 from trunk to branch 5.4
TUP-1461 : enable the delete of specific folders since it seems no use now.


git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111637 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-12-02 10:41:28 +00:00
nrousseau
13497bd081 merge r111607 from trunk to branch 5.4
bug TDI-28320 fixed : got a NPE when click the sql builder database structure folder .


git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111610 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-29 11:39:31 +00:00
rdubois
479a3f7858 Fix Bug TDI-27260 : forgot to include the jars into build.properties
git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@111603 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-29 10:21:09 +00:00
ycbai
81b38cbedb TDI-28278 : YARN doesn't support Kerberos
git-svn-id: http://talendforge.org/svn/tos/trunk@111525 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 11:06:26 +00:00
msjian
b6d51ce6eb TDQ-8387: fix get Empty cheat sheet when opening TOS DQ and refact some code
git-svn-id: http://talendforge.org/svn/tos/trunk@111524 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 11:01:33 +00:00
ilazebny
ca08e4e0b2 Update version to 5.4.1 in poms
git-svn-id: http://talendforge.org/svn/tis_shared/trunk@111520 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 10:48:02 +00:00
ilazebny
1c8a11de02 Update version to 5.4.1 in poms
git-svn-id: http://talendforge.org/svn/tos/trunk@111518 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 10:47:28 +00:00
plv
ae40d0613d bug TDI-28277:Error in "Create new LDAP schema" wizard
git-svn-id: http://talendforge.org/svn/tos/trunk@111508 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 09:53:51 +00:00
ggu
f0c53151e5 TUP-1358: fixed the problem for deploy the lib to svn.
git-svn-id: http://talendforge.org/svn/tos/trunk@111499 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 09:06:33 +00:00
ycbai
2ca737b846 TDI-28278 : YARN doesn't support Kerberos
git-svn-id: http://talendforge.org/svn/tos/trunk@111489 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 07:51:01 +00:00
nrousseau
c9a4843632 TUP-1430 : remove the dependent policy from org.talend.libraries.apache, and reexport some dependencies from the apache.commons
git-svn-id: http://talendforge.org/svn/tos/trunk@111477 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 03:15:51 +00:00
zwzhao
ca633ebfcf TUP-1326 : change the function name
git-svn-id: http://talendforge.org/svn/tos/trunk@111474 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-26 02:34:14 +00:00
hcyi
58975a485f bug TDI-28273 : to create / add to all features where the org.talend.librariesmanager.ui is included .
git-svn-id: http://talendforge.org/svn/tos/trunk@111447 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 11:30:47 +00:00
ggu
7d1867387b TUP-1358: fixed the problem for thread locks.
git-svn-id: http://talendforge.org/svn/tos/trunk@111443 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 11:25:54 +00:00
hcyi
547d3a0b58 bug TDI-28273 : create NL plugin : org.talend.librariesmanager.ui.nl .
git-svn-id: http://talendforge.org/svn/tos/trunk@111437 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 10:49:01 +00:00
plv
aef58100e3 bug TDI-28199:Must restart studio to connect to SQL Server with Windows Authentication after using invalid DB name
git-svn-id: http://talendforge.org/svn/tos/trunk@111434 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 10:43:56 +00:00
ycbai
59058fef46 TDI-28257 : no response for Read schema of HDFS
git-svn-id: http://talendforge.org/svn/tos/trunk@111418 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 10:00:56 +00:00
wchen
47143d35b6 bug TUP-1225 fixed: Export Dependencies doesn't pick up hierarchical mapper maps.
git-svn-id: http://talendforge.org/svn/tos/trunk@111396 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 07:44:54 +00:00
nrousseau
658ef88857 TDI-28267 : babili update
git-svn-id: http://talendforge.org/svn/tos/trunk@111395 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 07:33:18 +00:00
ggu
ade8116143 TUP-1261: update the build for AMC RAP.
git-svn-id: http://talendforge.org/svn/tos/trunk@111388 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 05:55:47 +00:00
wliu
3628625c11 Fix Bug TDI-28201 : revert the code of routines:TalendString.java and append thread Id for tmp table name.
https://jira.talendforge.org/browse/TDI-28201

git-svn-id: http://talendforge.org/svn/tos/trunk@111379 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 03:49:32 +00:00
hcyi
a17ea5a018 bug TDI-28096 : revert the change , the problem of popup the wrong relationship jar .
git-svn-id: http://talendforge.org/svn/tos/trunk@111374 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-25 02:28:50 +00:00
nrousseau
9c1f146fba TDI-28094 : improve speed of export item, avoid to expand too many things if not needed. And set a progress monitor to be able to cancel if it's too slow.
git-svn-id: http://talendforge.org/svn/tos/trunk@111313 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-22 06:42:25 +00:00
zshen
a80a0d524c Fix Work Item TDQ-8027 : Use module view to allow user specify the algorithm jar in match analysis editor.
Remove String EMPTY="" from org.talend.commons.utils.StringUtils and use org.apache.commons.lang.StringUtils instead of it.

git-svn-id: http://talendforge.org/svn/tos/trunk@111307 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-22 03:15:00 +00:00
jzhao
339134d8d1 Fixed Bug TDI-28201: tGreenplumBulkExec component tries to create twice times same table name
https://jira.talendforge.org/browse/TDI-28201
Note:Make sure Random create different seed in muilt thread

git-svn-id: http://talendforge.org/svn/tos/trunk@111283 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 10:46:35 +00:00
hcyi
983b5d9891 bug TDI-28096 fixed : the problem of popup the wrong relationship jar .
git-svn-id: http://talendforge.org/svn/tos/trunk@111281 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 10:19:25 +00:00
plv
3f130bad0a bug TDI-28203:impact analysis cannot detect the dup joblet with DB queries
git-svn-id: http://talendforge.org/svn/tos/trunk@111277 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 09:48:19 +00:00
sgandon
c6fd94ec1e DOCT-2912 : changed the message in the license review dialog as it is not yet in babili
git-svn-id: http://talendforge.org/svn/tos/trunk@111271 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 08:37:30 +00:00
jjzhou
682418e918 fix Bug TDI-26818: tRunJob / transmit whole context : Passing a Document (org.dom4j.Document wrapper) in a shared Object context variable throws a StackOverflow exception
https://jira.talendforge.org/browse/TDI-26818

git-svn-id: http://talendforge.org/svn/tos/trunk@111258 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 06:28:48 +00:00
jjzhou
68ff9da976 fix Bug TDI-26818: tRunJob / transmit whole context : Passing a Document (org.dom4j.Document wrapper) in a shared Object context variable throws a StackOverflow exception
https://jira.talendforge.org/browse/TDI-26818

git-svn-id: http://talendforge.org/svn/tos/trunk@111248 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 05:41:14 +00:00
ldong
647523c7bb bug TDI-28198 fixed:Job launches and runs even with compilation errors in child job.
git-svn-id: http://talendforge.org/svn/tos/trunk@111228 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-21 02:53:01 +00:00
hcyi
19b2d37526 bug TUP-1358 : revert the change code .
git-svn-id: http://talendforge.org/svn/tos/trunk@111202 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-20 09:33:33 +00:00
yyin
79d4048308 TDQ-8299 remove useless tag
git-svn-id: http://talendforge.org/svn/tos/trunk@111187 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-20 08:04:06 +00:00
ycbai
e0713ac27c improve junit ExtractMetaDataFromDataBaseTest.
git-svn-id: http://talendforge.org/svn/tos/trunk@111185 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-20 07:53:07 +00:00
ycbai
bdd7b66133 TUP-1388 : Studio : Review licences dialog box is confusing.
git-svn-id: http://talendforge.org/svn/tos/trunk@111178 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-20 06:43:57 +00:00
jyhu
985469b7bf Fix Bug TDI-27260 : 5.3.1 tBonitaDeploy composant is not displaying 5.10 in the simple parameter Bonita version list .
https://jira.talendforge.org/browse/TDI-27260


git-svn-id: http://talendforge.org/svn/tos/trunk@111167 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-20 03:24:28 +00:00
zshen
8660bdc70f TDQ-8217remove dependency org.talend.core.runtime from org.talend.libraries.apache.cxf
git-svn-id: http://talendforge.org/svn/tos/trunk@111150 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 10:19:27 +00:00
amaumont
8e78256f62 TDI-27939 JobServerStateChecker cannot restart when any connections to JobServer are stucked temporarily due to unreachable host
Fix TAC JUnit error:
---------------------------------
Expected: is "141414141414141414141414141414141414141414141414141414141414"
     got: "14141414141414141414141414141414141414141414141414141414"

	at org.talend.administrator.dashboard.business.taskexecution.logfile.TaskExecutionLogManagerTest$1ThreadSafetyTester.assertFinal(TaskExecutionLogManagerTest.java:378)
	at org.talend.test.utils.threading.AbstractThreadSafetyTester.start(AbstractThreadSafetyTester.java:95)
	at org.talend.administrator.dashboard.business.taskexecution.logfile.TaskExecutionLogManagerTest.launchThreadSafetyTest(TaskExecutionLogManagerTest.java:386)
	at org.talend.administrator.dashboard.business.taskexecution.logfile.TaskExecutionLogManagerTest.testMemory(TaskExecutionLogManagerTest.java:301)

git-svn-id: http://talendforge.org/svn/tos/trunk@111146 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 09:50:22 +00:00
wchen
87f58b36f8 bug TUP-1382 fixed: Can not import TDM Items in folder with charactor "." or empty space.
git-svn-id: http://talendforge.org/svn/tos/trunk@111145 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 09:46:19 +00:00
zwzhao
282080a320 feature TUP-1326 : Need a common svn folder to share libraries between studios and commandline
git-svn-id: http://talendforge.org/svn/tos/trunk@111144 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 09:43:41 +00:00
mzhao
545f3a03e2 TDQ-7999 Adapt the recource loading API in DQ to handle references when importing DQ demo project (new system)
git-svn-id: http://talendforge.org/svn/tos/trunk@111138 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 09:22:16 +00:00
plv
bfb8110548 bug TDI-28107:Ldif Preview in step3 is incorrect after click back,next
git-svn-id: http://talendforge.org/svn/tos/trunk@111137 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 09:21:45 +00:00
ycbai
9f4018c047 TDI-28196 : improve hadoop properties part.
git-svn-id: http://talendforge.org/svn/tos/trunk@111133 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 08:53:45 +00:00
zshen
a5e6b8b925 Fix Work Item TDQ-8027 : modify UDIJarSelectDialog to list class name and support custom matcher selected
git-svn-id: http://talendforge.org/svn/tos/trunk@111120 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 07:19:47 +00:00
zshen
4e68407d4f Fix Work Item TDQ-8027 : modify UDIJarSelectDialog to list class name and support custom matcher selected
git-svn-id: http://talendforge.org/svn/tos/trunk@111112 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-19 06:12:58 +00:00
amaumont
de82dda985 TDI-27939 JobServerStateChecker cannot restart when any connections to JobServer are stucked temporarily due to unreachable host
- don't cancel the JobServerStateChecker inititalization if the previous threadPool has again any of its threads running
- call directly threadPool.shutdownNow() to launch interruptions straight away, and not only prevent new executions
- add warning messages when JobServerStateChecker is canceled for othe reasons
- add ILockerByKey.shutdownNow() to force shutdown of locker without waiting for calls on unlock for all locks


git-svn-id: http://talendforge.org/svn/tos/trunk@111084 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 13:23:37 +00:00
sgandon
67ef03651d fixed TUP-1201 : TDM : Cannot create Oracle DB Connection
added com.oakland in the default list of prefixes accepted for the jar loading hook of the Studio.
https://jira.talendforge.org/browse/TUP-1201

git-svn-id: http://talendforge.org/svn/tos/trunk@111073 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 10:36:45 +00:00
ldong
28f70fdb03 bug TDI-28124 fixed:tdb2input can't guess schema from join sql on system table.
git-svn-id: http://talendforge.org/svn/tos/trunk@111061 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 09:46:04 +00:00
nrousseau
af325d3472 TUP-1376 : minimize the number of calls of FileLocator
git-svn-id: http://talendforge.org/svn/tos/trunk@111060 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 09:43:24 +00:00
nrousseau
c46c6b73b7 TUP-1376 : minimize the number of calls of FileLocator
git-svn-id: http://talendforge.org/svn/tos/trunk@111058 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 09:40:08 +00:00
zwzhao
819c295805 feature TUP-1326 : Need a common svn folder to share libraries between studios and commandline
git-svn-id: http://talendforge.org/svn/tos/trunk@111055 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 09:20:25 +00:00
hcyi
06e8225628 bug TUP-1358 fixed : Studio frozen if download missing jars while import items .
git-svn-id: http://talendforge.org/svn/tos/trunk@111053 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 09:18:36 +00:00
bchen
68e77bfe05 Fix Bug TDI-27953 : tMap compile issue
https://jira.talendforge.org/browse/TDI-27953

git-svn-id: http://talendforge.org/svn/tos/trunk@111049 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 08:24:58 +00:00
zwzhao
5edefe067b feature TUP-1326 : Need a common svn folder to share libraries between studios and commandline
git-svn-id: http://talendforge.org/svn/tos/trunk@111043 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 07:40:34 +00:00
nrousseau
88d06d25c7 TDI-27435 : change UNIQUE_NAME category to FLOW since now more kinds of row have UNIQUE_NAME
git-svn-id: http://talendforge.org/svn/tos/trunk@111038 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 07:18:16 +00:00
hfchang
dc044c9ddd bug TDI-28084 fixed : paste columns button not working tFilterRow
git-svn-id: http://talendforge.org/svn/tos/trunk@111037 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-18 07:11:39 +00:00
sgandon
7a425e2c3a Add new item to download optional libraries and automatically select them
git-svn-id: http://talendforge.org/svn/tos/trunk@111023 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-15 16:23:37 +00:00
sgandon
277de13d7a Add new item to download optional libraries and automatically select them
git-svn-id: http://talendforge.org/svn/tos/trunk@111022 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-15 16:23:36 +00:00
hcyi
3a589afd80 bug TUP-1228 fixed : tMDMDelete dependencies install issue .
git-svn-id: http://talendforge.org/svn/tos/trunk@111011 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-15 10:07:40 +00:00
zwzhao
f010193b71 feature TUP-1326 : Need a common svn folder to share libraries between studios and commandline
git-svn-id: http://talendforge.org/svn/tos/trunk@111010 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-15 10:02:46 +00:00
hwang
a2b7936e0e TDI-28139:Can't move a Standard Job or MR job to a folder which under MR job or Standard Job
git-svn-id: http://talendforge.org/svn/tos/trunk@110995 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-15 07:19:04 +00:00
hbhong
9cffe0166e TUP-204: Add MDM menus on the studio initial welcome page
git-svn-id: http://talendforge.org/svn/tos/trunk@110941 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-14 09:28:40 +00:00
wchen
7377d8a88c bug TDI-27778 fixed: It needs to wait for more than 1 min after clicking Next button when creating Reference Check Validation Rule item.
git-svn-id: http://talendforge.org/svn/tos/trunk@110922 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-14 07:04:42 +00:00
ycbai
34c37a1944 TDI-28020 : Hadoop properties set in HDFS metadata is not retrievable in Hadoop configuration
git-svn-id: http://talendforge.org/svn/tos/trunk@110896 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-14 03:12:24 +00:00
nrousseau
a395dd4c57 TDI-28025 : change default text
git-svn-id: http://talendforge.org/svn/tos/trunk@110887 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-14 01:48:34 +00:00
hwang
3286e2eab0 TDI-28012:Detect dependencies not displaying job elements correctly for M/R job
git-svn-id: http://talendforge.org/svn/tos/trunk@110877 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 10:38:10 +00:00
qiongli
aa0528563d TDQ-8300 add a test case of 'testGetDatabaseMetaData_FourArguments4SybaseIQ()'
git-svn-id: http://talendforge.org/svn/tos/trunk@110868 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 09:26:37 +00:00
qiongli
21fc95fad4 TDQ-8300 make sybaseIQ can fill catalog.
git-svn-id: http://talendforge.org/svn/tos/trunk@110867 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 09:23:32 +00:00
nrousseau
eeef5ac914 TUP-1231 : fix some problems of display for the console
git-svn-id: http://talendforge.org/svn/tos/trunk@110865 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 08:58:16 +00:00
hwang
06e46084a7 TDI-28092:SAPhana:No component seleted dialog pop up
git-svn-id: http://talendforge.org/svn/tos/trunk@110831 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 03:29:49 +00:00
hwang
af77151adc TDI-28092:SAPhana:No component seleted dialog pop up
git-svn-id: http://talendforge.org/svn/tos/trunk@110830 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 03:29:22 +00:00
hcyi
1e6dc9c742 bug TUP-1228 fixed : tMDMDelete dependencies install issue .
git-svn-id: http://talendforge.org/svn/tos/trunk@110829 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 03:19:29 +00:00
nrousseau
e5cb7b6216 TDI-27672 : enable the org as column name, only disable some columns where it can't generate any java code.
git-svn-id: http://talendforge.org/svn/tos/trunk@110825 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-13 03:09:10 +00:00
plv
f54b4d7bf9 bug TDI-27783:Fail to data view of hive connection
git-svn-id: http://talendforge.org/svn/tos/trunk@110811 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-12 10:31:46 +00:00
zwzhao
7c27f8e259 bug TDI-27575 fixed : Salesforce: Empty content in dialog when do "Check login" for QAuth2 login type
git-svn-id: http://talendforge.org/svn/tos/trunk@110763 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-12 02:08:24 +00:00
zwzhao
1a6487f5e2 bug TDI-27575 fixed : Salesforce: Empty content in dialog when do "Check login" for QAuth2 login type
git-svn-id: http://talendforge.org/svn/tos/trunk@110755 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-11 09:39:30 +00:00
ldong
c487dec633 bug TUP-1259 fixed:add the proxy setting for TOS.
git-svn-id: http://talendforge.org/svn/tos/trunk@110734 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-11 07:06:23 +00:00
wguo
66bfcfc753 TDI-26842: JobServer throws warning with relative path
https://jira.talendforge.org/browse/TDI-26842
remove exception ,   if folder not exist then no deletion operation

git-svn-id: http://talendforge.org/svn/tos/trunk@110721 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-11 06:12:11 +00:00
jzhao
e0757d25bd Fixed Bug TDI-27838: tRunJob "Die on child error" doesn't work with parallel execution
https://jira.talendforge.org/browse/TDI-27838
Note:Iterator line multithreadedRunResult error

git-svn-id: http://talendforge.org/svn/tos/trunk@110700 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 10:05:29 +00:00
zwzhao
699cf61a2c bug TDI-27302 fixed : NPE when opening migrated jobs in studio
git-svn-id: http://talendforge.org/svn/tos/trunk@110691 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 09:09:51 +00:00
amaumont
7d00f20e47 Fix JUnit error:
org.talend.utils.thread.TimeoutTaskTest.testResultOK (from org.talend.test.GenericTestsJUnit4Suite)
expected:<OK> but was:<java.util.concurrent.FutureTask@100fff0>
Stacktrace
junit.framework.AssertionFailedError: expected:<OK> but was:<java.util.concurrent.FutureTask@100fff0>
	at org.talend.utils.thread.TimeoutTaskTest.testResultOK(TimeoutTaskTest.java:50)

git-svn-id: http://talendforge.org/svn/tos/trunk@110684 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 08:35:42 +00:00
plv
1ea6f59c8f bug TDI-28004:improve the exception detail
git-svn-id: http://talendforge.org/svn/tos/trunk@110682 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 08:27:48 +00:00
ycbai
6f4b29ed10 TDI-28026 : Pivotal retrieve schema doesn't give a warning when connection is wrong
git-svn-id: http://talendforge.org/svn/tos/trunk@110681 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 07:51:14 +00:00
ggu
c83671d88d TUP-1190: ignore to check the tac for "useless" ItemType.
git-svn-id: http://talendforge.org/svn/tos/trunk@110677 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-08 06:52:53 +00:00
ggu
d497eb20ef TUP-1190: match the key only. ignore to check the name of enum.
git-svn-id: http://talendforge.org/svn/tos/trunk@110624 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-07 09:36:49 +00:00
ggu
8b18c90d9f TUP-1190: update the junit.
git-svn-id: http://talendforge.org/svn/tos/trunk@110622 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-07 09:15:05 +00:00
wchen
2e6f6ce910 bug TUP-1225 fixed: Export Dependencies doesn't pick up hierarchical mapper maps.
git-svn-id: http://talendforge.org/svn/tos/trunk@110604 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-07 07:16:13 +00:00
hfchang
3932b6fe78 bug TDI-27952 fixed : Problem about create folder
git-svn-id: http://talendforge.org/svn/tos/trunk@110594 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-07 05:43:19 +00:00
nrousseau
f8f3c873a8 TUP-1263 : remove the classpath dependency on jdt-compiler-3.1.1.jar since there is another plugin for this jar.
git-svn-id: http://talendforge.org/svn/tos/trunk@110581 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-07 02:40:41 +00:00
nrousseau
286fcb1982 TDI-23973 : remove wrong dependency added on r110458
git-svn-id: http://talendforge.org/svn/tos/trunk@110534 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-06 02:20:35 +00:00
wchen
62b4b6b4fc bug TDI-27941 fixed: Can generate tHMap auto when drag one map to job
git-svn-id: http://talendforge.org/svn/tos/trunk@110529 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-06 01:40:20 +00:00
plv
b43f70e1e7 bug TDI-27784:A shell is activated after pressing Finish button when creating General JDBC for DB2 and Teradata.
git-svn-id: http://talendforge.org/svn/tos/trunk@110500 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 08:18:21 +00:00
ycbai
68d1c6b07d TDI-27813 : Hive embedded mode with kerberos authentication cannot work
git-svn-id: http://talendforge.org/svn/tos/trunk@110497 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 07:49:46 +00:00
hfchang
643515026c task TDI-27947 finished: Create junit for KeywordsValidator (TDI-19420)
git-svn-id: http://talendforge.org/svn/tos/trunk@110495 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 07:45:40 +00:00
nrousseau
fb816450ac TDI-27902 : change dependencies for archiva / hcatalog.
git-svn-id: http://talendforge.org/svn/tos/trunk@110493 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 07:43:21 +00:00
ggu
12de09e05b TDI-12876: add the trace debug for inner joblet connections.
git-svn-id: http://talendforge.org/svn/tos/trunk@110486 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 06:39:47 +00:00
ldong
4fc4c1b237 bug TDI-27238 fixed:only add lazy load for the metadata dialog,not impact other case.
git-svn-id: http://talendforge.org/svn/tos/trunk@110476 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-05 03:43:04 +00:00
nrousseau
27d38be00f TUP-1193: update hibernate dependency
git-svn-id: http://talendforge.org/svn/tos/trunk@110460 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 10:31:03 +00:00
sgandon
592c7bb4d8 revert the feature content to add missing javax.transaction
git-svn-id: http://talendforge.org/svn/tos/trunk@110458 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 10:25:41 +00:00
hwang
ef0f1eb9ad TDI-27829:Error when open advanced setting on tSapHanaInput/Output components
git-svn-id: http://talendforge.org/svn/tos/trunk@110448 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 09:17:19 +00:00
hfchang
6675fb1e13 bug TDI-27712 fixed:Unconventional Error-pop-up text for a failed creation of a MDM Connection
git-svn-id: http://talendforge.org/svn/tos/trunk@110443 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 08:55:25 +00:00
hfchang
032d6f4098 bug TDI-26003 fixed : same name subfolder can't display for Edit properties->Path
git-svn-id: http://talendforge.org/svn/tos/trunk@110432 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 07:19:31 +00:00
nrousseau
e3902411d1 TDI-27902 : update for missing xml in the build
git-svn-id: http://talendforge.org/svn/tos/trunk@110423 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 05:00:54 +00:00
zshen
67480616e2 Fix Bug TDQ-8217 : try to add java udi to column analysis get serveral dialog to download jar.
remove not must dependency org.talend.core.runtime

git-svn-id: http://talendforge.org/svn/tos/trunk@110415 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-04 04:08:28 +00:00
hfchang
ed4e76869d bug TDI-27712 fixed:Unconventional Error-pop-up text for a failed creation of a MDM Connection
git-svn-id: http://talendforge.org/svn/tos/trunk@110393 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-01 09:56:50 +00:00
nrousseau
b97bb26e35 TUP-913 : fix some problems of memory... related to jobs / folders... and code cleanup for the isDeleted in the actions
git-svn-id: http://talendforge.org/svn/tos/trunk@110383 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-01 08:54:01 +00:00
hfchang
46446c987a bug TDI-27712 fixed : Unconventional Error-pop-up text for a failed creation of a MDM Connection
git-svn-id: http://talendforge.org/svn/tos/trunk@110356 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-01 05:52:11 +00:00
hfchang
0e0af42a3c bug TDI-26007 fixed : Should increase the display if item have long description
put the method cutStr() from PathUtils to AbStractTreeToolTips

git-svn-id: http://talendforge.org/svn/tos/trunk@110347 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-01 03:27:12 +00:00
hfchang
380da53e84 bug TDI-26007 fixed : Should increase the display if item have long description
put the method cutStr() from PathUtils to AbStractTreeToolTips

git-svn-id: http://talendforge.org/svn/tos/trunk@110346 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-11-01 03:27:01 +00:00
sgandon
dc6709a790 TDI-23973 : IE Fails to access AMC from TAC, tune the AMC web to launch with new RAP 1.5.2 target platform
https://jira.talendforge.org/browse/TDI-23973

git-svn-id: http://talendforge.org/svn/tos/trunk@110323 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 15:23:04 +00:00
hfchang
96f57ba2ae bug TDI-26003 fixed : same name subfolder can't display for Edit properties->Path
git-svn-id: http://talendforge.org/svn/tos/trunk@110319 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 10:24:24 +00:00
plv
702599b5f9 bug TDI-27877:tHiveInput : DBName/SchemaName is showing in the SELECT stattement of the HIVE QL generated; it should be only appear in the FROM clause (not in the SELECT)
git-svn-id: http://talendforge.org/svn/tos/trunk@110316 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 10:13:47 +00:00
plv
a1638c36c4 bug TDI-27865:Hive Connection Wizard - Error message not informative
git-svn-id: http://talendforge.org/svn/tos/trunk@110306 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 09:22:27 +00:00
yliu
b4eecf4ed6 TDI-25753: Warning message in Jobserver side saying property not found
https://jira.talendforge.org/browse/TDI-25753
add a getValue method without warning

git-svn-id: http://talendforge.org/svn/tos/trunk@110303 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 09:04:40 +00:00
ldong
1213b9f485 bug TDI-27855 fixed:Error information when we cancel to install jars before it starts to download.
git-svn-id: http://talendforge.org/svn/tos/trunk@110299 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-31 08:30:05 +00:00
sgandon
11fe9f16b7 TDI-25022 : TAC Migration script display scary exception before running. Fix feature to avoid 2 version of org.apache.commons.codec
git-svn-id: http://talendforge.org/svn/tos/trunk@110264 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 16:37:51 +00:00
ldong
25c5cb4842 bug TUP-1144 fixed:delete the migration and update the demo project.
git-svn-id: http://talendforge.org/svn/tos/trunk@110224 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 07:39:26 +00:00
zwzhao
2252880e86 TUP-1159 : problems for drag hive component from repository to job ,not include hadoop properties.
git-svn-id: http://talendforge.org/svn/tos/trunk@110223 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 07:35:28 +00:00
hfchang
f56e2129e5 bug TDI-27853 fixed : Create file xml output if type path and file name manual can't get file schema.
git-svn-id: http://talendforge.org/svn/tos/trunk@110218 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 06:24:07 +00:00
hwang
ec6df2b8f0 TDI-27912:Junit runs to failure
git-svn-id: http://talendforge.org/svn/tos/trunk@110217 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 06:20:08 +00:00
wchen
4feeee8ad7 bug TDI-27695 fixed: Migration:After do migration and logon old project, has error message in error log list
git-svn-id: http://talendforge.org/svn/tos/trunk@110213 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 05:53:45 +00:00
xqliu
ce5e272b51 Fix Bug TDQ-8198 : tDqReportRun job can not run when changing the datamart from one type to another.
https://jira.talendforge.org/browse/TDQ-8198
add a "Refresh Dependency" button

git-svn-id: http://talendforge.org/svn/tos/trunk@110207 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 03:53:08 +00:00
wchen
6a0ea4300a bug TDI-27778 fixed: It needs to wait for more than 1 min after clicking Next button when creating Reference Check Validation Rule item.
git-svn-id: http://talendforge.org/svn/tos/trunk@110191 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-30 01:44:53 +00:00
hwang
540aa4a0a5 TUP-1162 :Studio License dialog for missing libs lacks of explanation
git-svn-id: http://talendforge.org/svn/tos/trunk@110170 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-29 09:10:06 +00:00
wchen
013b8e0f8b bug TDI-25228 fixed: update junit
git-svn-id: http://talendforge.org/svn/tos/trunk@110125 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-29 03:32:36 +00:00
wwang
a9f2935ce3 Fix Bug TDI-27366 : remove GenerateDocumentHelper
https://jira.talendforge.org/browse/TDI-27366

git-svn-id: http://talendforge.org/svn/tos/trunk@110123 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-29 03:26:29 +00:00
nrousseau
59ca926dcb TDI-27902 : change dependencies for archiva / hcatalog.
git-svn-id: http://talendforge.org/svn/tos/trunk@110109 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-29 02:19:25 +00:00
ilazebny
a2f03a89f7 Update version in poms to 5.4.1-SNAPSHOT
git-svn-id: http://talendforge.org/svn/tis_shared/trunk@110095 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 11:05:38 +00:00
ilazebny
aefff7a68f Update version in poms to 5.4.1-SNAPSHOT
git-svn-id: http://talendforge.org/svn/tos/trunk@110091 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 10:48:00 +00:00
ggu
fadd5fc396 TDI-27905: fixed a mistake for import handler.
git-svn-id: http://talendforge.org/svn/tos/trunk@110059 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 08:28:25 +00:00
ggu
ac2bb1831e TDI-27905: add a validator for demo project.
git-svn-id: http://talendforge.org/svn/tos/trunk@110058 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 08:25:48 +00:00
xqliu
d58a529d81 Fix Bug TDQ-8226 : add new context group will not drity the report.
https://jira.talendforge.org/browse/TDQ-8226
create a new service to handle the report editor's dirty status

git-svn-id: http://talendforge.org/svn/tos/trunk@110053 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 07:12:03 +00:00
hwang
c898fa8ed0 TDI-27456:The joblet output row value will be rename to default after change the joblet
git-svn-id: http://talendforge.org/svn/tos/trunk@110044 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 06:21:25 +00:00
hwang
66ee9cde2b TDI-27456:The joblet output row value will be rename to default after change the joblet
git-svn-id: http://talendforge.org/svn/tos/trunk@110041 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-28 05:47:06 +00:00
ycbai
87e7b006d1 bug TDI-27890 fixed : Hive Embeded:retrive schema failed.
git-svn-id: http://talendforge.org/svn/tos/trunk@110012 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-25 10:20:48 +00:00
hfchang
b32f336b02 bug: TDI-26003 same name subfolder can't display for Edit properties->Path fixed.
Comment out the method findFolder().

git-svn-id: http://talendforge.org/svn/tos/trunk@110006 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-25 09:13:37 +00:00
hfchang
d15839f3b6 bug:TDI-26003 same name subfolder can't display for Edit properties->Path fixed
git-svn-id: http://talendforge.org/svn/tos/trunk@110002 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-25 09:00:37 +00:00
ycbai
fd076ba7a8 TUP-1159 : can not create HDP 2.0 for hive connection
git-svn-id: http://talendforge.org/svn/tos/trunk@109954 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 14:31:19 +00:00
hfchang
81b5504a2a add a null value validate for the parameter of cutStr();
git-svn-id: http://talendforge.org/svn/tos/trunk@109931 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 09:49:22 +00:00
jyhu
dbe58c381b Fix Bug TDI-26705: Property name of ERROR_MESSAGE is inconsistent between displaying inside Outline and inside code .
https://jira.talendforge.org/browse/TDI-26705
fixed issue comment by bchen.

git-svn-id: http://talendforge.org/svn/tos/trunk@109926 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 09:19:21 +00:00
ycbai
e55ec5cc57 bug TDI-27860 fixed : can't create hive connection successfully for mapr 3.0.1
git-svn-id: http://talendforge.org/svn/tos/trunk@109924 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 09:13:27 +00:00
zwzhao
3a133d6aaf bug TDI-27746 fixed : when to duplicate job(s), it does not send property change event of COPY type
git-svn-id: http://talendforge.org/svn/tos/trunk@109916 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 07:54:04 +00:00
ycbai
e29bbcea61 bug TUP-1159 : Add missed classloader configurations.
git-svn-id: http://talendforge.org/svn/tos/trunk@109914 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 07:42:01 +00:00
zwzhao
a97701183a bug TDI-27736 fixed : studio has no response if browse an empty json file for creation
git-svn-id: http://talendforge.org/svn/tos/trunk@109907 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 06:21:25 +00:00
ycbai
07a9320037 update talend properties file
git-svn-id: http://talendforge.org/svn/tos/trunk@109904 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 05:36:44 +00:00
wchen
06f6cb4a3f bug TDI-22986 fixed: Routines:Use a routine in a job, after deleted the routine forever, re-open the job, can not detect the routine lost and get an error
git-svn-id: http://talendforge.org/svn/tos/trunk@109893 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 03:07:04 +00:00
hfchang
844d5af6e6 bug TDI-26007 fixed : Should increase the display if item have long description
git-svn-id: http://talendforge.org/svn/tos/trunk@109892 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 03:07:04 +00:00
hfchang
1a9a0ad342 bug TDI-26007 fixed : Should increase the display if item have long description
git-svn-id: http://talendforge.org/svn/tos/trunk@109891 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 03:06:18 +00:00
wchen
70f244ec25 bug TDI-22986 fixed: Routines:Use a routine in a job, after deleted the routine forever, re-open the job, can not detect the routine lost and get an error
git-svn-id: http://talendforge.org/svn/tos/trunk@109884 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-24 02:11:46 +00:00
plv
ecd227a773 bug TDI-27137:Function for "Guess Schema" can not be used for JavaDB Embeded Database.
git-svn-id: http://talendforge.org/svn/tos/trunk@109864 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-23 10:31:14 +00:00
ycbai
3c31fe6025 bug TDI-27825 fixed : Create file xml,use shift choose many schema,drag to right side,there is error.
git-svn-id: http://talendforge.org/svn/tos/trunk@109862 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-23 10:25:14 +00:00
ldong
6a96603d75 bug TDI-27780 fixed:Fix some JUnits.
git-svn-id: http://talendforge.org/svn/tos/trunk@109839 f6f1c999-d317-4740-80b0-e6d1abc6f99e
2013-10-23 07:14:40 +00:00
205 changed files with 25417 additions and 22982 deletions

View File

@@ -12,7 +12,7 @@
// ============================================================================
package org.talend.commons.ui.runtime;
import java.util.Properties;
import java.util.Hashtable;
import org.eclipse.swt.widgets.Display;
import org.osgi.framework.BundleActivator;
@@ -32,7 +32,7 @@ public class CommonUIPlugin implements BundleActivator {
*/
@Override
public void start(BundleContext context) throws Exception {
Properties props = new Properties();
Hashtable props = new Hashtable();
context.registerService(ExceptionService.class.getName(), new ExceptionServiceImpl(), props);
}

View File

@@ -189,6 +189,7 @@
install-size="0"
version="1.2.15.v201012070815"
unpack="false"/>
<plugin
id="org.apache.log4j"
download-size="0"
@@ -772,8 +773,8 @@
install-size="0"
version="3.1.0.v201005080502"
unpack="false"/>
<plugin
<plugin
id="org.apache.commons.httpclient"
download-size="0"
install-size="0"
@@ -791,7 +792,7 @@
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="1.3.0.v20100518-1140"
version="0.0.0"
unpack="false"/>
<plugin
@@ -855,7 +856,8 @@
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
<plugin
id="org.apache.commons.httpclient"
download-size="0"
install-size="0"
@@ -924,6 +926,7 @@
install-size="0"
version="1.0.4.v201101211617"
unpack="false"/>
<plugin
id="org.apache.commons.logging"
download-size="0"
@@ -931,4 +934,11 @@
version="1.1.1.v201101211721"
unpack="false"/>
<plugin
id="org.eclipse.ui.net"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@@ -7,7 +7,7 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
org.apache.commons.beanutils,
org.apache.commons.collections,
org.apache.commons.httpclient,
org.apache.commons.lang,
org.apache.commons.lang;visibility:=reexport,
org.eclipse.core.runtime,
org.eclipse.emf.ecore.xmi,
org.talend.libraries.apache

View File

@@ -226,15 +226,15 @@ public class StringUtils {
}
out[outLen++] = (char) value;
} else {
if (aChar == 't')
if (aChar == 't') {
aChar = '\t';
else if (aChar == 'r')
} else if (aChar == 'r') {
aChar = '\r';
else if (aChar == 'n')
} else if (aChar == 'n') {
aChar = '\n';
else if (aChar == 'f')
} else if (aChar == 'f') {
aChar = '\f';
else if (Character.isDigit(aChar)) {
} else if (Character.isDigit(aChar)) {
int value = 0;
for (int i = 0; i < 3; i++) {
@@ -268,7 +268,7 @@ public class StringUtils {
out[outLen++] = aChar;
}
} else {
out[outLen++] = (char) aChar;
out[outLen++] = aChar;
}
}
return new String(out, 0, outLen);
@@ -326,12 +326,13 @@ public class StringUtils {
if (len < 0) {
return str;
}
if ("".equals(str) || str == null)
if ("".equals(str) || str == null) {
return null;
else if (str.length() <= len) {
} else if (str.length() <= len) {
return str;
} else
} else {
return str.substring(0, len);
}
}
private static final String OPEN_BRACE = "{";

View File

@@ -47,10 +47,7 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
rsCat.close();
for (String catalogName : catList) {
String sql = "select count(*) from " + catalogName //$NON-NLS-1$
+ ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = '" + login //$NON-NLS-1$
+ "') or suid in (select altsuid from " + catalogName //$NON-NLS-1$
+ ".dbo.sysalternates a, master.dbo.syslogins b where b.name = '" + login + "' and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
String sql = createSqlByLoginAndCatalog(login, catalogName);
ResultSet rs = null;
Statement stmt = null;
try {
@@ -124,4 +121,19 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
return tableResultSet;
}
/**
*
* get a sql query by login name and catalog name.
*
* @param loginName
* @param catalogName
* @return
*/
protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
return "select count(*) from " + catalogName //$NON-NLS-1$
+ ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = '" + loginName //$NON-NLS-1$
+ "') or suid in (select altsuid from " + catalogName //$NON-NLS-1$
+ ".dbo.sysalternates a, master.dbo.syslogins b where b.name = '" + loginName + "' and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
}
}

View File

@@ -0,0 +1,44 @@
// ============================================================================
//
// Copyright (C) 2006-2012 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.commons.utils.database;
import java.sql.Connection;
import java.sql.SQLException;
/**
* created by qiongli on 2013-11-13 Detailled comment
*
*/
public class SybaseIQDatabaseMetaData extends SybaseDatabaseMetaData {
/**
* DOC qiongli SybaseIQDatabaseMetaData constructor comment.
*
* @param connection
* @throws SQLException
*/
public SybaseIQDatabaseMetaData(Connection connection) throws SQLException {
super(connection);
}
/*
* Override this method,because sybase iq doesn't support sysalternates.
*/
@Override
protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
return "select count(*) from " + catalogName //$NON-NLS-1$
+ ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = '" + loginName + "')"; //$NON-NLS-1$ //$NON-NLS-2$
}
}

View File

@@ -16,14 +16,15 @@ package org.talend.commons.utils.threading.lockerbykey;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* DOC amaumont class global comment. Detailled comment
* DOC amaumont class global comment. Detailled comment
*/
public interface ILockerByKey<KP> {
public abstract int getCleanPeriod();
public abstract void shutdownNow();
public abstract void shutdown();
public abstract LockerValue<KP> getLockerValue(KP key);

View File

@@ -68,6 +68,8 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
private boolean detectSuspectLocks = false;
private boolean forceShutdown;
static {
String optionKey = "detectSuspectLocks";
String detectSuspectLocksStr = System.getProperty(optionKey);
@@ -358,9 +360,13 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
* The default clean will do an automatic clean all 1000 unlock operation, you can disable or change this value from
* the constructor.
*/
@Override
public void clean() {
synchronized (lockAllOperations) {
waitForRunningOperationsEnded();
blockAllOperations();
if (!(forceShutdown && shuttingDown)) {
waitForRunningOperationsEnded();
}
Collection<LockerValue<KP>> values = mapKeyLockToValueLock.values();
if (log.isTraceEnabled()) {
log.trace("Cleaning " + this.toString() + " : " + values.size() + " keys/values ...");
@@ -396,7 +402,6 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
}
private void waitForRunningOperationsEnded() {
blockAllOperations();
while (runningOperations.get() > 0) {
try {
Thread.sleep(1);
@@ -450,10 +455,19 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
return mapKeyLockToValueLock.get(internalKeyLock);
}
@Override
public synchronized void shutdownNow() {
forceShutdown = true;
shutdown();
}
@Override
public synchronized void shutdown() {
shuttingDown = true;
waitForRunningOperationsEnded();
blockAllOperations();
if (!forceShutdown) {
waitForRunningOperationsEnded();
}
Collection<LockerValue<KP>> values = mapKeyLockToValueLock.values();
for (LockerValue<KP> lockerValue : values) {
Collection<Thread> queuedThreads = lockerValue.getLock().getQueuedThreads();
@@ -465,6 +479,7 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
stopped = true;
}
@Override
public String toString() {
return "LockerByKey:" + super.toString();
}
@@ -584,6 +599,7 @@ public class LockerByKey<KP> implements ILockerByKey<KP> {
this.key = key;
}
@Override
public String toString() {
return StringUtils.replacePrms(InternalKeyLock.class.getSimpleName() + ": key={0}", key); //$NON-NLS-1$
}

View File

@@ -117,6 +117,7 @@ public class LockerByKeyUnrestricted<KP> implements ILockerByKey<KP> {
ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
@Override
public Thread newThread(Runnable r) {
Thread newThread = defaultThreadFactory.newThread(r);
newThread.setName(poolName + "_" + newThread.getName());
@@ -624,6 +625,14 @@ public class LockerByKeyUnrestricted<KP> implements ILockerByKey<KP> {
runningOperations.incrementAndGet();
}
@Override
public synchronized void shutdownNow() {
shuttingDown = true;
locker.shutdownNow();
threadPool.shutdownNow();
stopped = true;
}
@Override
public synchronized void shutdown() {
shuttingDown = true;
@@ -642,14 +651,17 @@ public class LockerByKeyUnrestricted<KP> implements ILockerByKey<KP> {
return locker.isLocked(key);
}
@Override
public List<LockerValue<KP>> getSuspectLocks(long timeDetectionLimitMs) {
return locker.getSuspectLocks(timeDetectionLimitMs);
}
@Override
public void setDetectSuspectLocks(boolean detectSuspectLocks) {
locker.setDetectSuspectLocks(detectSuspectLocks);
}
@Override
public boolean isDetectSuspectLocks() {
return locker.isDetectSuspectLocks();
}

View File

@@ -1 +1 @@
talend.version=5.4.0
talend.version=5.4.1

View File

@@ -14,6 +14,8 @@ package org.talend.commons.ui.command;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
@@ -66,6 +68,13 @@ public class CommandStackForComposite extends CommandStack {
};
this.refComposite.getDisplay().addFilter(SWT.KeyDown, keyListener);
this.refComposite.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
CommandStackForComposite.this.refComposite.getDisplay().removeFilter(SWT.KeyDown, keyListener);
keyListener = null;
}
});
}
/**

View File

@@ -22,8 +22,6 @@ import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Table;
import org.talend.commons.ui.swt.advanced.dataeditor.AbstractDataTableEditorView;
import org.talend.commons.ui.swt.advanced.dataeditor.ExtendedToolbarView;
import org.talend.commons.ui.swt.advanced.dataeditor.button.AddPushButtonForExtendedTable;
import org.talend.commons.ui.swt.advanced.dataeditor.button.PastePushButton;
import org.talend.commons.ui.swt.advanced.dataeditor.button.PastePushButtonForExtendedTable;
@@ -136,7 +134,7 @@ public class HadoopPropertiesTableView extends AbstractDataTableEditorView<HashM
@Override
protected Object getObjectToAdd() {
HashMap<String, Object> hpt = getModel().createHadoopPropertiesType();
hpt.put(PROPERTY, "\"new line\"");
hpt.put(PROPERTY, "new line");
hpt.put(VALUE, "");
return hpt;
}

View File

@@ -32,6 +32,8 @@ public class CopyPushButtonForExtendedTable extends CopyPushButton implements IE
private EnableStateListenerForTableButton enableStateHandler;
public static int colNum;
/**
* DOC amaumont SchemaTargetAddPushButton constructor comment.
*
@@ -49,6 +51,7 @@ public class CopyPushButtonForExtendedTable extends CopyPushButton implements IE
ISelection selection = tableViewer.getSelection();
StructuredSelection structuredSelection = (StructuredSelection) selection;
Object[] objects = structuredSelection.toArray();
colNum = getExtendedTableViewer().getTableViewerCreator().getTable().getColumnCount();
return new ExtendedTableCopyCommand(Arrays.asList(objects));
}

View File

@@ -82,8 +82,17 @@ public abstract class PastePushButtonForExtendedTable extends PastePushButton im
public boolean getEnabledState() {
Object data = SimpleClipboard.getInstance().getData();
return super.getEnabledState() && data != null && data instanceof List
&& !getExtendedControlViewer().isReadOnly();
boolean flag = true;
int a = CopyPushButtonForExtendedTable.colNum;
int colNum = getExtendedTableViewer().getTableViewerCreator().getTable().getColumnCount();
if (data != null) {
if (colNum == a) {
flag = true;
} else {
flag = false;
}
}
return super.getEnabledState() && data != null && data instanceof List && !getExtendedControlViewer().isReadOnly()
&& flag;
}
}

View File

@@ -83,6 +83,8 @@ public abstract class AbstractTreeTooltip {
tip.dispose();
}
String content = getTooltipContent(item);
// add a line
content = cutStr(content, 30);
if (content == null) {
return;
}
@@ -106,6 +108,38 @@ public abstract class AbstractTreeTooltip {
}
/*
* author by hfchang
*
* make a string line wrap autom
*/
private String cutStr(String str, int len) {
String s = "";
if (str == null || "".equals(str)) {
return null;
}
if (str.length() < len) {
s += str;
}
for (int i = 0; i < str.length(); i++) {
int r = i % len;
if (i != 0 && i <= len) {
if (r == 0) {
s += str.substring(i - len, len) + "\n";
}
} else if (i > len) {
String laststr = str.substring(i - 1);
if (laststr.length() > len) {
s += cutStr(laststr, len);
} else {
s += laststr;
}
break;
}
}
return s;
}
protected void checkShellBounds(Shell tip, Event event) {
TreeItem item = table.getItem(new Point(event.x, event.y));
if (item != null) {

View File

@@ -27,12 +27,35 @@ import org.eclipse.ui.internal.util.PrefUtil;
* this class is used for cheatsheet view display.
*
*/
@SuppressWarnings("restriction")
public class CheatSheetUtils {
private static CheatSheetUtils instance;
/**
* this flag means the first time when studio start. only when this value is true, when close the welcome page, we
* will display and maximum display cheatsheet view, else do nothing.
*/
private boolean isFirstTime = true;
/**
* Sets the isFirstTime.
*
* @param isFirstTime the isFirstTime to set
*/
public void setFirstTime(boolean isFirstTime) {
this.isFirstTime = isFirstTime;
}
/**
* Getter for isFirstTime.
*
* @return the isFirstTime
*/
public boolean isFirstTime() {
return this.isFirstTime;
}
public static final String DQ_PERSPECTIVE_ID = "org.talend.dataprofiler.DataProfilingPerspective";//$NON-NLS-1$
private static Logger log = Logger.getLogger(CheatSheetUtils.class);
@@ -51,12 +74,12 @@ public class CheatSheetUtils {
*/
public void maxDisplayCheatSheetView(CheatSheetView view) {
// ADD msjian TDQ-7407 2013-8-23: Only display the Cheat Sheet view on new startup of the studio
if (isFirstTime && !PrefUtil.getAPIPreferenceStore().getBoolean(this.getClass().getSimpleName())) {
if (isFirstTime() && !PrefUtil.getAPIPreferenceStore().getBoolean(this.getClass().getSimpleName())) {
PartPane pane = ((PartSite) view.getSite()).getPane();
view.getSite().getPage().toggleZoom(pane.getPartReference());
view.setFocus();
isFirstTime = false;
setFirstTime(false);
PrefUtil.getAPIPreferenceStore().setValue(this.getClass().getSimpleName(), true);
}
// TDQ-7407~

View File

@@ -29,5 +29,4 @@ public class PathUtils {
public static String getOSPath(String path) {
return Path.fromPortableString(path).toOSString();
}
}

View File

@@ -48,6 +48,10 @@ public class MyURLClassLoader extends URLClassLoader {
super(urls, Class.class.getClassLoader());
}
public MyURLClassLoader(URL[] urls, ClassLoader parentLoader) {
super(urls, parentLoader);
}
@SuppressWarnings("unchecked")//$NON-NLS-1$
public Class[] getAssignableClasses(Class type) throws IOException {
List classes = new ArrayList();
@@ -102,8 +106,9 @@ public class MyURLClassLoader extends URLClassLoader {
}
public static String changeFileNameToClassName(String name) {
if (name == null)
if (name == null) {
throw new IllegalArgumentException("File Name == null");
}
String className = null;
if (name.toLowerCase().endsWith(".class")) {
className = name.replace('/', '.');

View File

@@ -1189,12 +1189,20 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
<plugin
id="org.talend.osgi.lib.loader"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.librariesmanager.ui.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>

View File

@@ -30,6 +30,7 @@ Export-Package: org.talend.core.ldap,
org.talend.repository.model,
org.talend.repository.model.actions,
org.talend.repository.preview,
org.talend.repository.svn,
org.talend.repository.ui.actions,
org.talend.repository.ui.dialog,
org.talend.repository.ui.utils,

View File

@@ -14,6 +14,7 @@
<extension-point id="repoViewLinker" name="Repo View Linker" schema="schema/repoViewLinker.exsd"/>
<extension-point id="repositorySeeker" name="Repository Seeker" schema="schema/repositorySeeker.exsd"/>
<extension-point id="extended_repositorynode_handler" name="Extended Repository Node Handler" schema="schema/extended_repositorynode_handler.exsd"/>
<extension-point id="repository_review_filter" name="repository_review_filter" schema="schema/repository_review_filter.exsd"/>
<extension
point="org.talend.core.runtime.service">

View File

@@ -18,7 +18,7 @@
</annotation>
<complexType>
<sequence>
<element ref="ExtendedNodeHandler"/>
<element ref="extendedRepNodeHander"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
@@ -47,7 +47,7 @@
</complexType>
</element>
<element name="ExtendedNodeHandler">
<element name="extendedRepNodeHander">
<complexType>
<attribute name="class" type="string" use="required">
<annotation>

View File

@@ -176,6 +176,14 @@ This attribute is used to indicate the multiple same name is allowed when creati
</documentation>
</annotation>
</attribute>
<attribute name="isAllowPlainFolder" type="boolean">
<annotation>
<documentation>
Default is false.
This attribute is used to indicate folder name using ResourcesPlugin.getWorkspace().validateName(label, IResource.FOLDER) to validate but not talend default folder pattern when the value is true.
</documentation>
</annotation>
</attribute>
</complexType>
</element>

View File

@@ -0,0 +1,109 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.talend.core.repository" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<meta.schema plugin="org.talend.core.repository" id="repository_review_filter" name="repository_review_filter"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<meta.element />
</appinfo>
</annotation>
<complexType>
<sequence>
<element ref="filter" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="id" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute translatable="true"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="filter">
<complexType>
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute kind="java" basedOn=":org.talend.core.model.repository.IRepositoryReviewFilter"/>
</appinfo>
</annotation>
</attribute>
<attribute name="comment" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
</complexType>
</element>
<annotation>
<appinfo>
<meta.section type="since"/>
</appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="examples"/>
</appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="implementation"/>
</appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
</schema>

View File

@@ -14,6 +14,8 @@ package org.talend.core.repository.model;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Date;
import java.util.Dictionary;
@@ -37,6 +39,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -69,11 +72,13 @@ import org.talend.core.AbstractDQModelService;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ICoreService;
import org.talend.core.IESBService;
import org.talend.core.ISVNProviderServiceInCoreRuntime;
import org.talend.core.ITDQRepositoryService;
import org.talend.core.PluginChecker;
import org.talend.core.context.Context;
import org.talend.core.context.RepositoryContext;
import org.talend.core.exception.TalendInternalPersistenceException;
import org.talend.core.language.ECodeLanguage;
import org.talend.core.language.LanguageManager;
import org.talend.core.model.general.ModuleNeeded;
import org.talend.core.model.general.Project;
@@ -494,7 +499,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
checkFileNameAndPath(project, label, RepositoryConstants.TDQ_ALL_ITEM_PATTERN, type, path, true);
} else if (type == ERepositoryObjectType.METADATA_FILE_XML) {
checkFileNameAndPath(project, label, RepositoryConstants.SIMPLE_FOLDER_PATTERN, type, path, true);
} else if (type == ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "ROUTE_RESOURCES")) { //$NON-NLS-1$
} else if (type.isAllowPlainFolder()) {
if (org.eclipse.core.runtime.Status.OK_STATUS != ResourcesPlugin.getWorkspace().validateName(label, IResource.FOLDER)) {
throw new IllegalArgumentException(Messages.getString(
"ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern", label)); //$NON-NLS-1$
@@ -1344,9 +1349,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
}
}
Item targetItem = this.repositoryFactoryFromProvider.copy(sourceItem, targetPath, changeLabelWithCopyPrefix);
// if ((sourceItem instanceof ProcessItem || sourceItem instanceof JobletProcessItem)) {
// fireRepositoryPropertyChange(ERepositoryActionName.JOB_COPY.getName(), sourceItem, targetItem);
// }
fireRepositoryPropertyChange(ERepositoryActionName.COPY.getName(), sourceItem, targetItem);
return targetItem;
}
@@ -1365,6 +1368,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
}
}
Item targetItem = this.repositoryFactoryFromProvider.copy(sourceItem, targetPath, newItemLabel);
fireRepositoryPropertyChange(ERepositoryActionName.COPY.getName(), sourceItem, targetItem);
return targetItem;
}

View File

@@ -0,0 +1,28 @@
// ============================================================================
//
// Copyright (C) 2006-2013 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.repository.svn;
import java.util.Collection;
import org.eclipse.core.runtime.IPath;
/**
* created by wchen on 2013-10-30 Detailled comment
*
*/
public interface SvnHook {
public void unloadAndRemoveResources(Collection<String> changedPaths);
public Boolean accept(IPath projectRelativePath);
}

View File

@@ -87,6 +87,7 @@ public class CreateFolderAction extends AContextualAction {
* @see org.talend.repository.ui.actions.ITreeContextualAction#init(org.eclipse.jface.viewers.TreeViewer,
* org.eclipse.jface.viewers.IStructuredSelection)
*/
@Override
public void init(TreeViewer viewer, IStructuredSelection selection) {
boolean canWork = !selection.isEmpty() && selection.size() == 1;
IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
@@ -115,7 +116,7 @@ public class CreateFolderAction extends AContextualAction {
|| (ERepositoryObjectType.SQLPATTERNS.equals(property) && !isUnderUserDefined(node))) {
canWork = false;
}
if (node.getObject().getProperty().getItem().getState().isDeleted()) {
if (node.getObject().isDeleted()) {
canWork = false;
}
break;

View File

@@ -90,8 +90,10 @@ import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.service.ICoreUIService;
import org.talend.cwm.helper.SubItemHelper;
import org.talend.designer.business.diagram.custom.IDiagramModelService;
import org.talend.designer.core.ICamelDesignerCoreService;
import org.talend.designer.core.IDesignerCoreService;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.designer.runprocess.IRunProcessService;
import org.talend.expressionbuilder.ExpressionPersistance;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.ContextReferenceBean;
@@ -126,6 +128,8 @@ public class DeleteAction extends AContextualAction {
private static final String DELETE_FOREVER_TOOLTIP = Messages.getString("DeleteAction.action.logicalToolTipText"); //$NON-NLS-1$
private boolean forceBuild = false;
public DeleteAction() {
super();
setId(ActionFactory.DELETE.getId());
@@ -240,8 +244,7 @@ public class DeleteAction extends AContextualAction {
types.add(node.getObjectType());
} else if (node.getType() == ENodeType.SIMPLE_FOLDER) {
FolderItem folderItem = (FolderItem) node.getObject().getProperty().getItem();
if (node.getChildren().size() > 0 && !folderItem.getState().isDeleted()) {
if (node.getChildren().size() > 0 && !node.getObject().isDeleted()) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(
IESBService.class);
@@ -367,6 +370,12 @@ public class DeleteAction extends AContextualAction {
try {
PlatformUI.getWorkbench().getProgressService().run(false, false, iRunnableWithProgress);
// fix for TDI-22986 , force build the .java if routine is deleted physical
if (forceBuild) {
IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
IRunProcessService.class);
service.buildJavaProject();
}
} catch (Exception e) {
ExceptionHandler.process(e);
}
@@ -426,8 +435,7 @@ public class DeleteAction extends AContextualAction {
*/
private void deleteFolder(final RepositoryNode node, final IProxyRepositoryFactory factory,
final DeleteActionCache deleteActionCache) {
FolderItem folderItem = (FolderItem) node.getObject().getProperty().getItem();
if (folderItem.getState().isDeleted()) {
if (node.getObject().isDeleted()) {
// if folder has been deleted already
try {
deleteElements(factory, deleteActionCache, node);
@@ -459,7 +467,7 @@ public class DeleteAction extends AContextualAction {
return;
}
folderItem = factory.getFolderItem(ProjectManager.getInstance().getCurrentProject(), objectType, path);
FolderItem folderItem = factory.getFolderItem(ProjectManager.getInstance().getCurrentProject(), objectType, path);
folderItem.getState().setDeleted(true);
String fullPath = ""; //$NON-NLS-1$
@@ -1282,6 +1290,19 @@ public class DeleteAction extends AContextualAction {
handler.deleteNode(objToDelete);
}
if (nodeType == ERepositoryObjectType.ROUTINES || nodeType == ERepositoryObjectType.PIG_UDF) {
forceBuild = true;
}
if (!forceBuild) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister
.getDefault().getService(ICamelDesignerCoreService.class);
if (nodeType == camelService.getBeansType()) {
forceBuild = true;
}
}
}
factory.deleteObjectPhysical(objToDelete);
ExpressionPersistance.getInstance().jobDeleted(objToDelete.getLabel());
}

View File

@@ -23,8 +23,8 @@ import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
import org.talend.core.model.general.Project;
import org.talend.core.model.process.IProcess2;
import org.talend.core.model.properties.Item;
@@ -99,13 +99,13 @@ public final class DeleteActionCache {
* revert the original values.
*/
public void clearRecords() {
List list = getOpenedProcessList();
List<IProcess2> list = getOpenedProcessList();
if (list != null) {
list.clear();
}
list = getProcessList();
if (list != null) {
list.clear();
List<IRepositoryViewObject> listobj = getProcessList();
if (listobj != null) {
listobj.clear();
}
MultiKeyMap map = getOpenProcessMap();
if (map != null) {

View File

@@ -57,6 +57,7 @@ import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.properties.ConnectionItem;
import org.talend.core.model.properties.DatabaseConnectionItem;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.JobletProcessItem;
import org.talend.core.model.properties.PigudfItem;
import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.properties.PropertiesFactory;
@@ -480,7 +481,7 @@ public class DuplicateAction extends AContextualAction {
}
}
if (copy instanceof ProcessItem) {
if (copy instanceof ProcessItem || copy instanceof JobletProcessItem) {
RelationshipItemBuilder.getInstance().addOrUpdateItem(copy);
}
// MOD qiongli 2012-10-16 TDQ-6166 notify sqlExplore when duplicate a new
@@ -563,7 +564,7 @@ public class DuplicateAction extends AContextualAction {
// for camel
synDuplicatedBean(newItem);
}
if (newItem instanceof ProcessItem) {
if (newItem instanceof ProcessItem || newItem instanceof JobletProcessItem) {
RelationshipItemBuilder.getInstance().addOrUpdateItem(newItem);
}

View File

@@ -54,11 +54,14 @@ import org.talend.core.repository.model.ProxyRepositoryFactory;
import org.talend.core.repository.utils.AbstractResourceChangesService;
import org.talend.core.repository.utils.RepositoryNodeDeleteManager;
import org.talend.core.repository.utils.TDQServiceRegister;
import org.talend.designer.core.ICamelDesignerCoreService;
import org.talend.designer.runprocess.IRunProcessService;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.ERepositoryStatus;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.IRepositoryNode;
import org.talend.repository.model.IRepositoryNode.ENodeType;
import org.talend.repository.model.IRepositoryNode.EProperties;
import org.talend.repository.model.ItemReferenceBean;
import org.talend.repository.model.RepositoryNode;
import org.talend.repository.model.RepositoryNodeUtilities;
@@ -73,6 +76,8 @@ import org.talend.repository.ui.views.IRepositoryView;
*/
public class EmptyRecycleBinAction extends AContextualAction {
private boolean forceBuild = false;
public EmptyRecycleBinAction() {
super();
this.setText(Messages.getString("EmptyRecycleBinAction.action.title")); //$NON-NLS-1$
@@ -117,6 +122,7 @@ public class EmptyRecycleBinAction extends AContextualAction {
final Shell shell = getShell();
if (!(MessageDialog.openQuestion(shell, title, message))) {
DeleteActionCache.getInstance().revertParameters();
return;
}
@@ -179,6 +185,13 @@ public class EmptyRecycleBinAction extends AContextualAction {
};
try {
PlatformUI.getWorkbench().getProgressService().run(true, true, iRunnableWithProgress);
// fix for TDI-22986 , force build the .java if routine is deleted physical
if (forceBuild) {
IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
IRunProcessService.class);
service.buildJavaProject();
}
} catch (Exception e) {
ExceptionHandler.process(e);
}
@@ -195,16 +208,7 @@ public class EmptyRecycleBinAction extends AContextualAction {
});
}
// TDI-21238, have done listener to refresh in new CNF repository view
// MOD qiongli 2011-1-24,avoid to refresh repositoryView for top
// if (!PluginChecker.isOnlyTopLoaded()) {
// RepositoryManager.refresh(ERepositoryObjectType.JOB_SCRIPT);
// IRepositoryView view = getViewPart();
// if (view != null) {
// view.refresh();
// }
// }
DeleteActionCache.getInstance().revertParameters();
}
protected Shell getShell() {
@@ -275,7 +279,20 @@ public class EmptyRecycleBinAction extends AContextualAction {
for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
handler.deleteNode(objToDelete);
}
ERepositoryObjectType nodeType = (ERepositoryObjectType) currentNode
.getProperties(EProperties.CONTENT_TYPE);
if (nodeType == ERepositoryObjectType.ROUTINES || nodeType == ERepositoryObjectType.PIG_UDF) {
forceBuild = true;
}
if (!forceBuild) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister
.getDefault().getService(ICamelDesignerCoreService.class);
if (nodeType == camelService.getBeansType()) {
forceBuild = true;
}
}
}
factory.deleteObjectPhysical(ProjectManager.getInstance().getCurrentProject(), objToDelete, null,
true);
}

View File

@@ -120,6 +120,7 @@ public class RenameFolderAction extends AContextualAction {
* @see org.talend.repository.ui.actions.ITreeContextualAction#init(org.eclipse.jface.viewers.TreeViewer,
* org.eclipse.jface.viewers.IStructuredSelection)
*/
@Override
public void init(TreeViewer viewer, IStructuredSelection selection) {
boolean canWork = !selection.isEmpty() && selection.size() == 1;
IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
@@ -142,7 +143,7 @@ public class RenameFolderAction extends AContextualAction {
|| RepositoryConstants.USER_DEFINED.equals(label)) {
canWork = false;
}
if (node.getObject() != null && node.getObject().getProperty().getItem().getState().isDeleted()) {
if (node.getObject() != null && node.getObject().isDeleted()) {
canWork = false;
}
break;

View File

@@ -101,10 +101,10 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
ProcessConverterType.CONVERTER_FOR_MAPREDUCE);
if (ERepositoryObjectType.PROCESS == (sourceNode.getObjectType())) {
IRepositoryViewObject repViewObj = sourceNode.getObject();
convertService.convertFromProcess(repViewObj.getProperty().getItem(), repViewObj);
convertService.convertFromProcess(repViewObj.getProperty().getItem(), repViewObj, targetNode);
} else if (ERepositoryObjectType.PROCESS_MR == (sourceNode.getObjectType())) {
IRepositoryViewObject repViewObj = sourceNode.getObject();
convertService.convertToProcess(repViewObj.getProperty().getItem(), repViewObj);
convertService.convertToProcess(repViewObj.getProperty().getItem(), repViewObj, targetNode);
}
}
}

View File

@@ -85,9 +85,9 @@ public class FolderWizard extends Wizard {
*/
@Override
public void addPages() {
//only route resources is considered as plain folder currently
boolean isPlainFolder = (type == ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "ROUTE_RESOURCES"));
// route/tdm resources are considered as plain folder currently
boolean isPlainFolder = type == null ? false : type.isAllowPlainFolder();
mainPage = new FolderWizardPage(defaultLabel, isPlainFolder);
addPage(mainPage);
if (defaultLabel != null) {

View File

@@ -337,6 +337,7 @@ repository.jobdoc=\u30B8\u30E7\u30D6\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
XSDValidater.IllegalArgument=\u5165\u529BXSD\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
repository.context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
repository.column=COLUMN
repository.documentation=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
repository.folder=\u30D5\u30A9\u30EB\u30C0
repository.generated=\u751F\u6210\u3055\u308C\u305F
repository.jobdoc=\u30B8\u30E7\u30D6\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8

View File

@@ -23,6 +23,7 @@ import junit.framework.Assert;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
@@ -112,9 +113,15 @@ public class ERepositoryObjectTypeTest {
MDM_TRANSFORMERV2("MDM.TransformerV2"), // process
MDM_UNIVERSE("MDM.Universe"), // Version
MDM_VIEW("MDM.View"), // View
MDM_WORKFLOW("MDM.Workflow")// Workflow
MDM_WORKFLOW("MDM.Workflow"), // Workflow
;
DATABASES("DATABASES"),
JOBLET_DOC("repository.jobletdoc"),
MAPS("MAPS"),
NAMESPACES("NAMESPACES"),
REPORTS("REPORTS"),
SAMPLE_DATA("SAMPLE_DATA"),
STRUCTURES("STRUCTURES"), ;
private String i18nKey;
@@ -140,6 +147,14 @@ public class ERepositoryObjectTypeTest {
return null;
}
public static ItemType getByKey(String key) {
for (ItemType type : values()) {
if (type.getI18nKey().equals(key)) {
return type;
}
}
return null;
}
// /**
// * return the message value according to Messages.properties
// *
@@ -179,17 +194,20 @@ public class ERepositoryObjectTypeTest {
continue;
}
if (valid(type)) {
String typeName = type.getType();
ItemType itemType = ItemType.get(typeName);
if (itemType == null) {
typeName = type.getType().replaceAll("_", "");
itemType = ItemType.get(typeName);
}
// FIXME, TUP-1190 don't check the name, only match the key.
String key = type.getKey();
ItemType itemType = ItemType.getByKey(key);
// if (itemType == null) {
// typeName = type.getType().replaceAll("_", "");
// itemType = ItemType.get(typeName);
// }
if (itemType == null) { // not found
missTypes.append(type.getType() + "(\"" + type.getKey() + "\"),");
missTypes.append('\n');
} else if (!itemType.name().equals(typeName) || !itemType.getI18nKey().equals(type.getKey())) {
notMatchedTypes.put(type, itemType);
} else if (!itemType.name().equals(type.getType())) {
// FIXME, TUP-1190 don't check the name, only match the key.
// notMatchedTypes.put(type, itemType);
}
// System.out.println(type.getType() + "(\"" + type.getKey() + "\"),");
}
@@ -332,6 +350,7 @@ public class ERepositoryObjectTypeTest {
}
@Test
@Ignore
public void testTacUnknownTypes() {
StringBuffer unknownKeyTypes = new StringBuffer(200);
for (ItemType itemType : ItemType.values()) {
@@ -342,7 +361,7 @@ public class ERepositoryObjectTypeTest {
break;
}
}
if (objType == null) {
if (objType == null) { // don't find the same key
unknownKeyTypes.append(itemType.name() + "(\"" + itemType.getI18nKey() + "\"),");
unknownKeyTypes.append('\n');
}

View File

@@ -0,0 +1,87 @@
// ============================================================================
//
// Copyright (C) 2006-2013 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.utils;
import static org.junit.Assert.assertEquals;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
/**
* DOC hcyi class global comment. Detailled comment
*/
public class KeywordsValidatorTest {
/**
* DOC hfchang Comment method "setUp".
*
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
}
/**
* DOC hfchang Comment method "tearDown".
*
* @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {
}
/**
* Test method for {@link org.talend.core.utils.KeywordsValidator#isKeyword(java.lang.String)}.
*/
@Test
public void testIsKeywordString() {
assertEquals(true, KeywordsValidator.isKeyword("org"));
assertEquals(true, KeywordsValidator.isKeyword("com"));
assertEquals(true, KeywordsValidator.isKeyword("net"));
assertEquals(true, KeywordsValidator.isKeyword("fr"));
assertEquals(true, KeywordsValidator.isKeyword("sf"));
assertEquals(true, KeywordsValidator.isKeyword("routines"));
assertEquals(true, KeywordsValidator.isKeyword("javax"));
assertEquals(true, KeywordsValidator.isKeyword("java"));
assertEquals(true, KeywordsValidator.isKeyword("etc"));
assertEquals(false, KeywordsValidator.isKeyword("abcd"));
}
/**
* Test method for {@link org.talend.core.utils.KeywordsValidator#isSqlKeyword(java.lang.String)}.
*/
@Test
public void testIsSqlKeywordString() {
assertEquals(true, KeywordsValidator.isSqlKeyword("update"));
assertEquals(true, KeywordsValidator.isSqlKeyword("delete"));
assertEquals(true, KeywordsValidator.isSqlKeyword("create"));
assertEquals(false, KeywordsValidator.isSqlKeyword("abcd"));
}
/**
* Test method for {@link org.talend.core.utils.KeywordsValidator#isSqlKeyword(java.lang.String, java.lang.String)}.
*/
@Test
public void testIsSqlKeywordStringString() {
assertEquals(true, KeywordsValidator.isSqlKeyword(null, null));
assertEquals(true, KeywordsValidator.isSqlKeyword("create", ""));
assertEquals(true, KeywordsValidator.isSqlKeyword("create", null));
assertEquals(true, KeywordsValidator.isSqlKeyword("update", "MYSQL"));
assertEquals(true, KeywordsValidator.isSqlKeyword("drop", "ORACLE"));
assertEquals(true, KeywordsValidator.isSqlKeyword("update", "HBASE"));
assertEquals(true, KeywordsValidator.isSqlKeyword("delete", "SQL_SERVER"));
}
}

View File

@@ -50,6 +50,7 @@ Export-Package: org.talend.commons.utils.generation,
org.talend.core.repository,
org.talend.core.runtime,
org.talend.core.runtime.repository.build,
org.talend.core.runtime.repository.demo,
org.talend.core.service,
org.talend.core.sqlbuilder.util,
org.talend.core.ui,

View File

@@ -1,158 +1,176 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.talend.core.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<meta.schema plugin="org.talend.core.runtime" id="demoProjects_provider" name="Demo Projects Provider"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<meta.element />
</appinfo>
</annotation>
<complexType>
<sequence minOccurs="0" maxOccurs="unbounded">
<element ref="demoProvider" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="id" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute translatable="true"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="demoProvider">
<complexType>
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
Unique id for each demo provider.
the &quot;override&quot; atrribute depend on this id value.
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
Will be displayed in the demo projects list, when import demo projects in dialog.
</documentation>
</annotation>
</attribute>
<attribute name="description" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="overrideId" type="string">
<annotation>
<documentation>
If set, and the override id is existed too, will override the existed one.
</documentation>
</annotation>
</attribute>
<attribute name="descHtml" type="string" use="required">
<annotation>
<documentation>
Will be displayed in the import demo dialog as description details.
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
<attribute name="projectUrl" type="string" use="required">
<annotation>
<documentation>
The path of deme project.
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
<attribute name="order" type="string">
<annotation>
<documentation>
When display, will depend on this order.
</documentation>
</annotation>
</attribute>
<attribute name="icon" type="string">
<annotation>
<documentation>
Will be displayed in the demo projects list, when import demo projects in dialog
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<annotation>
<appinfo>
<meta.section type="since"/>
</appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="examples"/>
</appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="implementation"/>
</appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
</schema>
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.talend.core.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<meta.schema plugin="org.talend.core.runtime" id="demoProjects_provider" name="Demo Projects Provider"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<meta.element />
</appinfo>
</annotation>
<complexType>
<sequence minOccurs="0" maxOccurs="unbounded">
<element ref="demoProvider" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="id" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute translatable="true"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="demoProvider">
<complexType>
<choice minOccurs="0" maxOccurs="1">
<element ref="validator"/>
</choice>
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
Unique id for each demo provider.
the &quot;override&quot; atrribute depend on this id value.
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
Will be displayed in the demo projects list, when import demo projects in dialog.
</documentation>
</annotation>
</attribute>
<attribute name="description" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="overrideId" type="string">
<annotation>
<documentation>
If set, and the override id is existed too, will override the existed one.
</documentation>
</annotation>
</attribute>
<attribute name="descHtml" type="string" use="required">
<annotation>
<documentation>
Will be displayed in the import demo dialog as description details.
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
<attribute name="projectUrl" type="string" use="required">
<annotation>
<documentation>
The path of deme project.
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
<attribute name="order" type="string">
<annotation>
<documentation>
When display, will depend on this order.
</documentation>
</annotation>
</attribute>
<attribute name="icon" type="string">
<annotation>
<documentation>
Will be displayed in the demo projects list, when import demo projects in dialog
</documentation>
<appinfo>
<meta.attribute kind="resource"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="validator">
<complexType>
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute kind="java" basedOn=":org.talend.core.runtime.repository.demo.IDemoProjectValidator"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<annotation>
<appinfo>
<meta.section type="since"/>
</appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="examples"/>
</appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="implementation"/>
</appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
</schema>

View File

@@ -0,0 +1,38 @@
// ============================================================================
//
// Copyright (C) 2006-2010 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core;
import java.util.List;
/**
* DOC zwzhao class global comment. Detailled comment
*/
public interface ISVNProviderServiceInCoreRuntime extends IService {
public boolean isSvnLibSetupOnTAC();
public boolean deployNewJar(List jars);
public boolean isInSvn(String filePath);
public void doUpdateAndCommit(String filePath);
public void createFolderAndLinkToSvn(String filePath);
public void synToSvn(String filePath);
public void synProjectLib(String filePath);
public void update();
}

View File

@@ -0,0 +1,35 @@
// ============================================================================
//
// Copyright (C) 2006-2013 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core;
import org.eclipse.ui.IWorkbenchPart;
/**
* created by xqliu on Jul 29, 2013 Detailled comment
*
*/
public interface ITdqContextService extends IService {
public void updateContextView(IWorkbenchPart part);
public void hideContextView(IWorkbenchPart part);
public void resetContextView();
/**
* set the report editor dirty according to the TdqContextViewComposite.
*
* @param manager the TdqContextViewComposite
*/
public void setReportEditorDirty(Object manager);
}

View File

@@ -106,7 +106,7 @@ public enum EDatabaseTypeName {
HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
SAPHana(
"SAPHana", "SAPHana", Boolean.TRUE, "SAPHana", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

View File

@@ -85,6 +85,8 @@ public class ConnParameterKeys {
public static final String HIVE_AUTHENTICATION_METASTOREURL = "HIVE_AUTHENTICATION_METASTOREURL";//$NON-NLS-1$
public static final String HIVE_AUTHENTICATION_DRIVERJAR_PATH = "HIVE_AUTHENTICATION_DRIVERJAR_PATH";//$NON-NLS-1$
public static final String HIVE_AUTHENTICATION_DRIVERCLASS = "HIVE_AUTHENTICATION_DRIVERCLASS";//$NON-NLS-1$
public static final String HIVE_AUTHENTICATION_USERNAME = "HIVE_AUTHENTICATION_USERNAME";//$NON-NLS-1$

View File

@@ -18,6 +18,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.utils.json.JSONArray;
import org.talend.utils.json.JSONException;
import org.talend.utils.json.JSONObject;
@@ -56,6 +57,10 @@ public class HadoopRepositoryUtil {
return jsonArr.toString();
}
public static List<HashMap<String, Object>> getHadoopPropertiesList(String propertiesJsonStr) throws JSONException {
return getHadoopPropertiesList(propertiesJsonStr, false);
}
/**
* DOC ycbai Comment method "getHadoopPropertiesList".
*
@@ -64,10 +69,12 @@ public class HadoopRepositoryUtil {
* </p>
*
* @param propertiesJsonStr
* @param includeQuotes
* @return
* @throws JSONException
*/
public static List<HashMap<String, Object>> getHadoopPropertiesList(String propertiesJsonStr) throws JSONException {
public static List<HashMap<String, Object>> getHadoopPropertiesList(String propertiesJsonStr, boolean includeQuotes)
throws JSONException {
List<HashMap<String, Object>> properties = new ArrayList<HashMap<String, Object>>();
if (StringUtils.isNotEmpty(propertiesJsonStr)) {
JSONArray jsonArr = new JSONArray(propertiesJsonStr);
@@ -77,7 +84,13 @@ public class HadoopRepositoryUtil {
Iterator<String> it = object.keys();
while (it.hasNext()) {
String key = it.next();
map.put(key, object.get(key));
String value = String.valueOf(object.get(key));
if (includeQuotes) {
value = TalendQuoteUtils.addQuotesIfNotExist(value);
} else {
value = TalendQuoteUtils.removeQuotesIfExist(value);
}
map.put(key, value);
}
properties.add(map);
}

View File

@@ -28,6 +28,8 @@ import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.widgets.Display;
@@ -211,7 +213,10 @@ public final class MetadataToolHelper {
}
public static boolean isValidColumnName(String name) {
if (name == null || KeywordsValidator.isKeyword(name)) {
if (name == null) {
return false;
}
if (!JavaConventions.validateFieldName(name, JavaCore.VERSION_1_6, JavaCore.VERSION_1_6).isOK()) {
return false;
}

View File

@@ -49,7 +49,7 @@ public enum HiveConnVersionInfo {
HDP_1_3(1, "HDP_1_3", "Hortonworks Data Platform V1.3.0(Condor)", true, true, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
HDP_2_0(1, "HDP_2_0", "Hortonworks Data Platform V2.0.0", true, false, true, true, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
HDP_2_0(1, "HDP_2_0", "Hortonworks Data Platform V2.0.0", true, false, true, false, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
APACHE_0_20_203(1, "APACHE_0_20_203", "Apache 0.20.203 (Hive 0.7.1)", false, HiveConnVersionInfo.APACHE), //$NON-NLS-1$//$NON-NLS-2$
@@ -59,7 +59,7 @@ public enum HiveConnVersionInfo {
Cloudera_CDH4(1, "Cloudera_CDH4", "Cloudera CDH4", true, true, HiveConnVersionInfo.CLOUDERA), //$NON-NLS-1$//$NON-NLS-2$
Cloudera_CDH4_YARN(1, "Cloudera_CDH4_YARN", "Cloudera CDH4 YARN", true, false, true, true, HiveConnVersionInfo.CLOUDERA), //$NON-NLS-1$//$NON-NLS-2$
Cloudera_CDH4_YARN(1, "Cloudera_CDH4_YARN", "Cloudera CDH4 YARN", true, false, true, false, HiveConnVersionInfo.CLOUDERA), //$NON-NLS-1$//$NON-NLS-2$
MAPR1(1, "MAPR1", "MapR 1.2.0", false, HiveConnVersionInfo.MAPR), //$NON-NLS-1$//$NON-NLS-2$

View File

@@ -32,6 +32,7 @@ import org.talend.core.database.conn.ConnParameterKeys;
import org.talend.core.database.conn.template.EDatabaseConnTemplate;
import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
import org.talend.core.hadoop.IHadoopClusterService;
import org.talend.core.hadoop.repository.HadoopRepositoryUtil;
import org.talend.core.hadoop.version.custom.ECustomVersionGroup;
import org.talend.core.language.ECodeLanguage;
import org.talend.core.language.LanguageManager;
@@ -87,9 +88,7 @@ import org.talend.core.service.IMetadataManagmentUiService;
import org.talend.core.utils.KeywordsValidator;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.cwm.helper.ConnectionHelper;
import org.talend.utils.json.JSONArray;
import org.talend.utils.json.JSONException;
import org.talend.utils.json.JSONObject;
/**
* DOC nrousseau class global comment. Detailled comment <br/>
@@ -985,6 +984,10 @@ public class RepositoryToComponentProperty {
if (dbVersionString != null) {
return dbVersionString.toUpperCase();
}
} else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
} else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_VERSION);
} else {
String driverValue = EDatabaseVersion4Drivers.getDriversStr(databaseType, dbVersionString);
if (EDatabaseConnTemplate.ORACLE_OCI.getDBDisplayName().equals(databaseType)
@@ -1205,49 +1208,26 @@ public class RepositoryToComponentProperty {
}
if (value.equals("HBASE_PARAMETERS")) {
List<HashMap<String, Object>> properties = new ArrayList<HashMap<String, Object>>();
try {
String message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES);
if (StringUtils.isNotEmpty(message)) {
JSONArray jsonArr = new JSONArray(message);
for (int i = 0; i < jsonArr.length(); i++) {
HashMap<String, Object> map = new HashMap();
JSONObject object = jsonArr.getJSONObject(i);
Iterator it = object.keys();
while (it.hasNext()) {
String key = (String) it.next();
map.put(key, TalendQuoteUtils.addQuotes((String) object.get(key)));
}
properties.add(map);
}
}
return HadoopRepositoryUtil.getHadoopPropertiesList(message, true);
} catch (JSONException e) {
e.printStackTrace();
ExceptionHandler.process(e);
}
return properties;
}
if (value.equals("HADOOP_ADVANCED_PROPERTIES")) {
List<HashMap<String, Object>> properties = new ArrayList<HashMap<String, Object>>();
try {
String message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES);
if (StringUtils.isNotEmpty(message)) {
JSONArray jsonArr = new JSONArray(message);
for (int i = 0; i < jsonArr.length(); i++) {
HashMap<String, Object> map = new HashMap();
JSONObject object = jsonArr.getJSONObject(i);
Iterator it = object.keys();
while (it.hasNext()) {
String key = (String) it.next();
map.put(key, TalendQuoteUtils.addQuotes((String) object.get(key)));
}
properties.add(map);
}
}
} catch (JSONException e) {
e.printStackTrace();
String message = null;
if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_PROPERTIES);
} else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES);
}
try {
return HadoopRepositoryUtil.getHadoopPropertiesList(message, true);
} catch (JSONException e) {
ExceptionHandler.process(e);
}
return properties;
}
if (value.equals("HADOOP_CUSTOM_JARS")) {
@@ -1325,7 +1305,7 @@ public class RepositoryToComponentProperty {
}
}
if (value.equals("MAPRED_JOB_TRACKER")) {
if (value.equals("MAPRED_JOB_TRACKER") || value.equals("MAPRED_RESOURCE_MANAGER")) {
String mapredJobTracker = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_JOB_TRACKER_URL);
if (mapredJobTracker == null) {
return mapredJobTracker;

View File

@@ -641,7 +641,7 @@ public abstract class AbstractNode implements INode {
* java.util.Map)
*/
@Override
public void reloadComponent(IComponent component, Map<String, Object> parameters) {
public void reloadComponent(IComponent component, Map<String, Object> parameters, boolean isUpdate) {
// TODO Auto-generated method stub
}

View File

@@ -67,6 +67,7 @@ public enum EParameterFieldType {
RULE_TYPE, // hywang add for feature 6484
TNS_EDITOR,
BROWSE_REPORTS, // bzhou add for feature 9745
REFRESH_REPORTS, // xqliu add for TDQ-8198
JAVA_COMMAND,
VALIDATION_RULE_TYPE,
DCSCHEMA, // Datacert custom EparameterFieldType for DCSchemaController

View File

@@ -61,7 +61,9 @@ public interface IConnectionCategory {
public static final int CUSTOM_NAME = 1 << 7;
/**
* For FLOW_MAIN, FLOW_REF, FLOW_MERGE, LOOKUP. Links that can have a specific name.
* For FLOW_MAIN, FLOW_REF, FLOW_MERGE. Links that can have a specific name. note that now: RUN_IF / ON_SUBJOB_OK /
* ON_SUBJOB_ERROR / ON_COMPONENT_OK / ON_COMPONENT_ERROR / ITERATE also have uniqunename property, even if those
* are only for internal use (not visible even in the default name)
*/
public static final int UNIQUE_NAME = 1 << 8;

View File

@@ -193,7 +193,7 @@ public interface INode extends IElement {
*/
public INodeConnector getConnectorFromName(final String connector);
public void reloadComponent(IComponent component, Map<String, Object> parameters);
public void reloadComponent(IComponent component, Map<String, Object> parameters, boolean isUpdate);
public INode getDesignSubjobStartNode();

View File

@@ -34,6 +34,7 @@ import org.eclipse.ui.IWorkbench;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.image.IImage;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Status;
import org.talend.core.runtime.CoreRuntimePlugin;
@@ -196,6 +197,19 @@ public abstract class AbstractRepositoryContentHandler implements IRepositoryCon
return null;
}
/*
* (non-Javadoc)
*
* @see org.talend.core.model.repository.IRepositoryContentHandler#newSchemaWizard(org.eclipse.ui.IWorkbench,
* boolean, org.talend.core.model.repository.IRepositoryViewObject,
* org.talend.core.model.metadata.builder.connection.MetadataTable, java.lang.String[], boolean)
*/
@Override
public IWizard newSchemaWizard(IWorkbench workbench, boolean creation, IRepositoryViewObject object,
MetadataTable metadataTable, String[] existingNames, boolean forceReadOnly) {
return null;
}
/*
* (non-Javadoc)
*

View File

@@ -362,6 +362,12 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
*/
private boolean isAllowMultiName = false;
/*
* This attribute is used to indicate folder name using ResourcesPlugin.getWorkspace().validateName(label,
* IResource.FOLDER) to validate but not talend default folder pattern when the value is true.
*/
private boolean isAllowPlainFolder = false;
private List<ERepositoryObjectType> parentTypes = new ArrayList<ERepositoryObjectType>();
private List<ERepositoryObjectType> childrenTypes = new ArrayList<ERepositoryObjectType>();
@@ -574,7 +580,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @see org.talend.core.model.repository.DynaEnum#toString()
*/
@Override
@@ -772,7 +778,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @seeorg.talend.core.model.properties.util.PropertiesSwitch# caseJobDocumentationItem
* (org.talend.core.model.properties.JobDocumentationItem)
*/
@@ -783,7 +789,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @seeorg.talend.core.model.properties.util.PropertiesSwitch# caseJobletDocumentationItem
* (org.talend.core.model.properties.JobletDocumentationItem)
*/
@@ -794,7 +800,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @see
* org.talend.core.model.properties.util.PropertiesSwitch#casePigudfItem(org.talend.core.model.properties
* .PigudfItem)
@@ -820,7 +826,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @seeorg.talend.core.model.properties.util.PropertiesSwitch# caseSQLPatternItem
* (org.talend.core.model.properties.SQLPatternItem)
*/
@@ -837,7 +843,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @seeorg.talend.core.model.properties.util.PropertiesSwitch# caseJobletProcessItem
* (org.talend.core.model.properties.JobletProcessItem)
*/
@@ -1020,9 +1026,9 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/**
* DOC bZhou Comment method "isDQItemType".
*
*
* This method is to estimat a type is a TDQ item or not.
*
*
* @return
*/
public boolean isDQItemType() {
@@ -1031,9 +1037,9 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/**
* DOC bZhou Comment method "isDIType".
*
*
* This method is to estimat a type belongs to Data Intergration.
*
*
* @param type
* @return
*/
@@ -1043,9 +1049,9 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/**
* DOC bZhou Comment method "isSharedType".
*
*
* This method is to estimat a type belongs to both DQ and DI product.
*
*
* @param type
* @return
*/
@@ -1055,7 +1061,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
/*
* (non-Javadoc)
*
*
* @see org.talend.core.model.repository.DynaEnum#name()
*/
@Override
@@ -1102,6 +1108,14 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
return isAllowMultiName;
}
public boolean isAllowPlainFolder() {
return isAllowPlainFolder;
}
public void setAllowPlainFolder(boolean isAllowPlainFolder) {
this.isAllowPlainFolder = isAllowPlainFolder;
}
public boolean addExtraProducts(String[] productsArray) {
if (productsArray != null && productsArray.length > 0) {
if (this.products == null && this.products.length == 0) {
@@ -1163,11 +1177,11 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
}
/**
*
*
* DOC ggu Comment method "valueOf".
*
*
* in order to adapte old codes. and enable to init this class at same times.
*
*
* @param clazz
* @param name
* @return

View File

@@ -15,8 +15,17 @@ package org.talend.core.model.repository;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.model.general.Project;
import org.talend.core.model.properties.FolderItem;
import org.talend.core.model.properties.ItemState;
import org.talend.core.model.properties.PropertiesFactory;
import org.talend.core.model.properties.Property;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.IProxyRepositoryService;
/**
* Represents a folder as a repository object.<br/>
@@ -30,12 +39,28 @@ public class Folder extends RepositoryObject implements IRepositoryObject {
private ERepositoryObjectType type;
private String projectLabel;
private String path;
public Folder(String id, String label) {
super(id, label);
}
public Folder(Property property, ERepositoryObjectType type) {
super(property);
super(property.getId(), property.getLabel());
FolderItem folderItem = PropertiesFactory.eINSTANCE.createFolderItem();
folderItem.setProperty(super.getProperty());
super.getProperty().setItem(folderItem);
ItemState itemState = PropertiesFactory.eINSTANCE.createItemState();
folderItem.setState(itemState);
itemState.setDeleted(property.getItem().getState().isDeleted());
path = property.getItem().getState().getPath();
itemState.setPath(path);
org.talend.core.model.properties.Project emfproject = ProjectManager.getInstance().getProject(property.getItem());
this.projectLabel = emfproject.getLabel();
this.type = type;
}
@@ -44,6 +69,7 @@ public class Folder extends RepositoryObject implements IRepositoryObject {
*
* @return ERepositoryObjectType.FOLDER
*/
@Override
public ERepositoryObjectType getRepositoryObjectType() {
return ERepositoryObjectType.FOLDER;
}
@@ -55,14 +81,43 @@ public class Folder extends RepositoryObject implements IRepositoryObject {
@Override
public List<IRepositoryViewObject> getChildren() {
List<IRepositoryViewObject> toReturn = new ArrayList<IRepositoryViewObject>();
FolderItem folderItem = (FolderItem) getProperty().getItem();
// disable the code for now, will return an empty list.
// in all case the code before must have some classcast exception since the children of folder can be something
// else than folder item !!
for (Object current : folderItem.getChildren()) {
IRepositoryObject currentChild = new Folder(((FolderItem) current).getProperty(), getContentType());
toReturn.add(currentChild);
}
// FolderItem folderItem = (FolderItem) getProperty().getItem();
//
// for (Object current : folderItem.getChildren()) {
// IRepositoryObject currentChild = new Folder(((FolderItem) current).getProperty(), getContentType());
// toReturn.add(currentChild);
// }
return toReturn;
}
/*
* (non-Javadoc)
*
* @see org.talend.core.model.repository.RepositoryObject#getProperty()
*/
@Override
public Property getProperty() {
if (this.projectLabel == null) {
// for SQL builder
return super.getProperty();
}
IProxyRepositoryFactory factory = null;
factory = ((IProxyRepositoryService) GlobalServiceRegister.getDefault().getService(IProxyRepositoryService.class))
.getProxyRepositoryFactory();
Project project = ProjectManager.getInstance().getProjectFromProjectLabel(this.projectLabel);
FolderItem folderItem = factory.getFolderItem(project, type,
new Path(StringUtils.join(new String[] { path, getLabel() }, "/"))); //$NON-NLS-1$
if (folderItem == null) {
// seems doesn't work only for job and joblet documentation.
return super.getProperty();
}
return folderItem.getProperty();
}
}

View File

@@ -12,19 +12,24 @@
// ============================================================================
package org.talend.core.model.repository;
import org.eclipse.jface.viewers.Viewer;
import java.util.List;
import org.talend.core.model.properties.Property;
/**
* created by wchen on 2013-8-22 Detailled comment
*
*/
public interface IExtendedNodeHandler {
public interface IExtendedRepositoryNodeHandler {
public Property getProperty(Object nodeObject);
public boolean isExportEnable(Object nodeObject);
public Object getParent(Object repositoryNode);
public boolean exportFilter(Viewer viewer, Object parentElement, Object element);
public ERepositoryObjectType getObjectType(Object repositoryNode);
public Object getRepositoryNode(IRepositoryViewObject repositoryObject);
public List getRepositoryNodeAndDependencies(IRepositoryViewObject repositoryObject);
}

View File

@@ -25,6 +25,7 @@ import org.eclipse.jface.wizard.IWizard;
import org.eclipse.ui.IWorkbench;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.image.IImage;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Status;
import org.talend.repository.model.IRepositoryNode;
@@ -138,10 +139,25 @@ public interface IRepositoryContentHandler {
* @param creation
* @param node
* @param existingNames
* @return a new wizard related to the node.
* @return a new connection wizard associated with the node.
*/
public IWizard newWizard(IWorkbench workbench, boolean creation, RepositoryNode node, String[] existingNames);
/**
*
* DOC ycbai Comment method "newSchemaWizard".
*
* @param workbench
* @param creation
* @param object
* @param metadataTable
* @param existingNames
* @param forceReadOnly
* @return a new schema wizard associated with the object.
*/
public IWizard newSchemaWizard(IWorkbench workbench, boolean creation, IRepositoryViewObject object,
MetadataTable metadataTable, String[] existingNames, boolean forceReadOnly);
/**
*
* DOC ycbai Comment method "deleteNode".

View File

@@ -0,0 +1,26 @@
// ============================================================================
//
// Copyright (C) 2006-2013 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.model.repository;
import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.jface.viewers.Viewer;
/**
* created by wchen on 2013-11-12 Detailled comment
*
*/
public interface IRepositoryReviewFilter extends IExecutableExtension {
public boolean filter(Viewer viewer, Object parentElement, Object element, String filterType);
}

View File

@@ -30,7 +30,9 @@ public class RepositoryContentManager {
static List<IRepositoryContentHandler> handlers = null;
static List<IExtendedNodeHandler> extendedNodeHandler = null;
static List<IExtendedRepositoryNodeHandler> extendedNodeHandler = null;
static List<IRepositoryReviewFilter> repositoryReviewFilter = null;
public static List<IRepositoryContentHandler> getHandlers() {
if (handlers == null) {
@@ -62,29 +64,66 @@ public class RepositoryContentManager {
*
* @return the extendedNodeHandler
*/
public static List<IExtendedNodeHandler> getExtendedNodeHandler() {
public static List<IExtendedRepositoryNodeHandler> getExtendedNodeHandler() {
if (extendedNodeHandler == null) {
extendedNodeHandler = new ArrayList<IExtendedNodeHandler>();
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = extensionRegistry
.getExtensionPoint("org.talend.core.repository.extended_repositorynode_handler"); //$NON-NLS-1$
if (extensionPoint != null) {
IExtension[] extensions = extensionPoint.getExtensions();
for (IExtension extension : extensions) {
IConfigurationElement[] configurationElements = extension.getConfigurationElements();
for (IConfigurationElement configurationElement : configurationElements) {
try {
Object service = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
if (service instanceof IExtendedNodeHandler) {
extendedNodeHandler.add((IExtendedNodeHandler) service);
synchronized (RepositoryContentManager.class) {
extendedNodeHandler = new ArrayList<IExtendedRepositoryNodeHandler>();
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = extensionRegistry
.getExtensionPoint("org.talend.core.repository.extended_repositorynode_handler"); //$NON-NLS-1$
if (extensionPoint != null) {
IExtension[] extensions = extensionPoint.getExtensions();
for (IExtension extension : extensions) {
IConfigurationElement[] configurationElements = extension.getConfigurationElements();
for (IConfigurationElement configurationElement : configurationElements) {
try {
Object service = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
if (service instanceof IExtendedRepositoryNodeHandler) {
extendedNodeHandler.add((IExtendedRepositoryNodeHandler) service);
}
} catch (CoreException e) {
ExceptionHandler.process(e);
}
} catch (CoreException e) {
ExceptionHandler.process(e);
}
}
}
}
}
return extendedNodeHandler;
}
/**
* Getter for extendedNodeHandler.
*
* @return the extendedNodeHandler
*/
public static List<IRepositoryReviewFilter> getRepositoryReviewFilters() {
if (repositoryReviewFilter == null) {
synchronized (RepositoryContentManager.class) {
repositoryReviewFilter = new ArrayList<IRepositoryReviewFilter>();
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = extensionRegistry
.getExtensionPoint("org.talend.core.repository.repository_review_filter"); //$NON-NLS-1$
if (extensionPoint != null) {
IExtension[] extensions = extensionPoint.getExtensions();
for (IExtension extension : extensions) {
IConfigurationElement[] configurationElements = extension.getConfigurationElements();
for (IConfigurationElement configurationElement : configurationElements) {
try {
Object service = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
if (service instanceof IRepositoryReviewFilter) {
repositoryReviewFilter.add((IRepositoryReviewFilter) service);
}
} catch (CoreException e) {
ExceptionHandler.process(e);
}
}
}
}
}
}
return repositoryReviewFilter;
}
}

View File

@@ -275,8 +275,8 @@ public class RepositoryNodeProviderRegistryReader extends RegistryReader {
// PTODO
String namePatternAttribute = element.getAttribute("name_pattern");
String isAllowMultiName = element.getAttribute("isAllowMultiName");
if(isAllowMultiName == null || isAllowMultiName.trim().equals("")){
isAllowMultiName = "false";
if (isAllowMultiName == null || isAllowMultiName.trim().equals("")) {
isAllowMultiName = "false";
}
String[] products = getProducts(element);
@@ -309,7 +309,7 @@ public class RepositoryNodeProviderRegistryReader extends RegistryReader {
String.class, String.class, String.class, int.class, boolean.class, String.class, String[].class,
boolean.class, String[].class, boolean[].class });
instance = dynamicConstructor.newInstance(key, label, folder, type, ordinal, false, alias, products,
Boolean.parseBoolean(isAllowMultiName), user_right, resource);
Boolean.parseBoolean(isAllowMultiName), user_right, resource);
} else {
Constructor dynamicConstructor = getConstructor(ERepositoryObjectType.class, new Class[] { String.class,
@@ -321,6 +321,13 @@ public class RepositoryNodeProviderRegistryReader extends RegistryReader {
if (instance != null && instance instanceof ERepositoryObjectType) {
ERepositoryObjectType currentType = (ERepositoryObjectType) instance;
String isAllowPlainFolder = element.getAttribute("isAllowPlainFolder");
if (isAllowPlainFolder == null || isAllowPlainFolder.trim().equals("")) {
isAllowPlainFolder = "false";
}
currentType.setAllowPlainFolder(Boolean.parseBoolean(isAllowPlainFolder));
String parentTypesAttr = element.getAttribute("parentNodeType");
if (parentTypesAttr != null) {
String[] parentTypes = parentTypesAttr.split(SPLIT_CHARS);

View File

@@ -372,7 +372,7 @@ public class RepositoryObject implements IRepositoryObject {
*/
@Override
public boolean isDeleted() {
return property.getItem().getState().isDeleted();
return getProperty().getItem().getState().isDeleted();
}
/*
@@ -393,7 +393,7 @@ public class RepositoryObject implements IRepositoryObject {
*/
@Override
public String getPath() {
return property.getItem().getState().getPath();
return getProperty().getItem().getState().getPath();
}
/*

View File

@@ -23,6 +23,7 @@ public enum ECodePart {
MAIN("main"), //$NON-NLS-1$
BEGIN("begin"), //$NON-NLS-1$
END("end"), //$NON-NLS-1$
FINALLY("finally"), //$NON-NLS-1$
MRCODE("mrcode"), //$NON-NLS-1$
MRCONFIG("mrconfig"), //$NON-NLS-1$
MRJOBFOOTER("mrjobfooter"); //$NON-NLS-1$

View File

@@ -80,6 +80,7 @@ import org.talend.core.model.utils.UpdateRepositoryHelper;
import org.talend.core.prefs.ITalendCorePrefConstants;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.service.IMRProcessService;
import org.talend.core.service.IMetadataManagmentService;
import org.talend.cwm.helper.ConnectionHelper;
import org.talend.designer.core.IDesignerCoreService;
@@ -944,16 +945,16 @@ public abstract class RepositoryUpdateManager {
return null;
}
// final List<IEditorReference> list = new ArrayList<IEditorReference>();
// Display.getDefault().syncExec(new Runnable() {
//
// @Override
// public void run() {
// IEditorReference[] reference = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
// .getEditorReferences();
// list.addAll(Arrays.asList(reference));
// }
// });
// final List<IEditorReference> list = new ArrayList<IEditorReference>();
// Display.getDefault().syncExec(new Runnable() {
//
// @Override
// public void run() {
// IEditorReference[] reference = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
// .getEditorReferences();
// list.addAll(Arrays.asList(reference));
// }
// });
List<IProcess2> openedProcessList = CoreRuntimePlugin.getInstance().getDesignerCoreService()
.getOpenedProcess(getEditors());
@@ -1351,6 +1352,12 @@ public abstract class RepositoryUpdateManager {
String version = null;
if (property.getItem() instanceof JobletProcessItem) { // for joblet
prefix = UpdatesConstants.JOBLET;
} else if (GlobalServiceRegister.getDefault().isServiceRegistered(IMRProcessService.class)) {
IMRProcessService mrProcessService = (IMRProcessService) GlobalServiceRegister.getDefault().getService(
IMRProcessService.class);
if (mrProcessService.isMapReduceItem(property.getItem())) {
prefix = UpdatesConstants.MAPREDUCE;
}
}
label = property.getLabel();
version = property.getVersion();

View File

@@ -43,6 +43,8 @@ public abstract class UpdateResult {
protected boolean isJoblet;
protected boolean isMR;
/**
* closed process only save ID and VERSION in UpdateResult
*/
@@ -297,6 +299,10 @@ public abstract class UpdateResult {
return isJoblet;
}
public boolean isMR() {
return isMR;
}
public void setUpdateObject(Object object) {
this.object = object;
}

View File

@@ -60,6 +60,8 @@ public final class UpdatesConstants {
public static final String JOB = Messages.getString("UpdatesConstants.Job"); //$NON-NLS-1$
public static final String MAPREDUCE = Messages.getString("UpdatesConstants.MR"); //$NON-NLS-1$
/*
* parameter name.
*/

View File

@@ -20,7 +20,7 @@ package org.talend.core.model.utils;
*/
public final class TalendPropertiesUtil {
private static boolean isEnabled(String key) {
public static boolean isEnabled(String key) {
String value = System.getProperty(key);
return Boolean.parseBoolean(value);
}

View File

@@ -445,6 +445,7 @@ UpdatesConstants.ContextGroup=Context Group
UpdatesConstants.Component=Component
UpdatesConstants.Joblet=Joblet
UpdatesConstants.Job=Job
UpdatesConstants.MR=Map_Reduce
UpdatesConstants.JobVersion=JobVersion
ProjectSettingsWizard.EditProjectPageTitle=Edit project
MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=Default Type

View File

@@ -0,0 +1,23 @@
// ============================================================================
//
// Copyright (C) 2006-2013 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.runtime.repository.demo;
import org.eclipse.core.runtime.IConfigurationElement;
/**
* DOC ggu class global comment. Detailled comment
*/
public interface IDemoProjectValidator {
boolean validate(IConfigurationElement element);
}

View File

@@ -45,6 +45,8 @@ public interface IJobletProviderService extends IService {
public boolean isJobletInOutComponent(INode node);
public boolean isJobletInputComponent(INode node);
public Property getJobletComponentItem(INode node);
public Property getJobletComponentItem(IComponent component);
@@ -113,4 +115,16 @@ public interface IJobletProviderService extends IService {
public boolean checkModify(IElement jobletContainer);
public boolean jobletIsDirty(INode node);
/**
* The shadow data connections are only display in editor, but won't be used to generate in final job codes.
*/
public IConnection[] getShadowDataConnections(IConnection conn);
/**
* Get the inner joblet data connections, those connections will be used to generate in final job codes. like
* <Joblet Unique Name>_<Connection Unique Name>, for example, JobletTest_1_row1.
*/
public IConnection[] getNonShadowDataConnections(INode node);
}

View File

@@ -163,6 +163,8 @@ public interface IDesignerCoreService extends IService {
*/
public void refreshComponentView(Item item);
public void refreshComponentView();
public boolean evaluate(final String string, List<? extends IElementParameter> listParam);
public int getDBConnectionTimeout();

View File

@@ -15,6 +15,7 @@ package org.talend.designer.core.convert;
import org.talend.core.model.process.IProcess;
import org.talend.core.model.properties.Item;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.repository.model.RepositoryNode;
/**
* This interface provides some methods to do the conversion between process and another process.
@@ -33,6 +34,16 @@ public interface IProcessConvertService {
*/
Item convertToProcess(Item item, IRepositoryViewObject repViewObject);
/**
* Converts the current child process extends process to process. For example, convert m/r process to common
* process.Added by Marvin Wang on Feb 18, 2013.
*
* @param item an item to be converted.
* @param repViewObject an object to be converted.
* @return
*/
Item convertToProcess(Item item, IRepositoryViewObject repViewObject, RepositoryNode targetNode);
/**
* Converts process to the current process which extends process. Added by Marvin Wang on Feb 18, 2013.
*
@@ -42,6 +53,16 @@ public interface IProcessConvertService {
*/
Item convertFromProcess(Item item, IRepositoryViewObject repViewObject);
/**
* Converts process to the current process which extends process. Added by hWang.
*
* @param item an item to be converted.
* @param repViewObject an object to be converted.
* @param targetNode provider path when d&d a node.
* @return
*/
Item convertFromProcess(Item item, IRepositoryViewObject repViewObject, RepositoryNode targetNode);
/**
* Returns a boolean value to indicate if the original item is delelted. Added by Marvin Wang on Jan 31, 2013.
*

View File

@@ -31,6 +31,8 @@ public interface IProcessMessageManager {
public void clearMessages();
public void updateConsole();
public Collection<IProcessMessage> getMessages();
public boolean isLastMessageEndWithCR();

View File

@@ -158,4 +158,6 @@ public interface IRunProcessService extends IService {
public boolean isJobRunning();
public void buildJavaProject();
}

View File

@@ -17,6 +17,7 @@ import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
@@ -24,6 +25,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.gmf.util.DisplayUtils;
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
import org.talend.core.PluginChecker;
import org.talend.core.model.general.Project;
@@ -234,6 +236,70 @@ public class RepositoryNodeUtilities {
return getRepositoryNode((IRepositoryNode) view.getRoot(), curNode, view, expanded);
}
private static IRepositoryNode viewRootNode;
public static RepositoryNode getRepositoryNode(IRepositoryViewObject curNode, IProgressMonitor monitor) {
if (curNode == null) {
return null;
}
viewRootNode = null;
DisplayUtils.getDisplay().syncExec(new Runnable() {
@Override
public void run() {
IRepositoryView view = getRepositoryView();
if (view != null) {
viewRootNode = (IRepositoryNode) view.getRoot();
}
}
});
if (viewRootNode == null) {
return null;
}
RepositoryNode toReturn = getRepositoryNode(viewRootNode, curNode, monitor);
viewRootNode = null;
return toReturn;
}
private static RepositoryNode getRepositoryNode(IRepositoryNode rootNode, IRepositoryViewObject curNode,
IProgressMonitor monitor) {
if (rootNode == null || curNode == null) {
return null;
}
if (monitor != null && monitor.isCanceled()) {
return null;
}
List<IRepositoryNode> children = rootNode.getChildren();
if (children != null) {
if (children.isEmpty()) {
rootNode.getRoot().initNode(rootNode);
children = rootNode.getChildren();
}
// in the first, search the current folder
List<IRepositoryNode> folderChild = new ArrayList<IRepositoryNode>();
for (IRepositoryNode childNode : children) {
RepositoryNode node = (RepositoryNode) childNode;
if (isRepositoryFolder(node) || node.getType() == ENodeType.REFERENCED_PROJECT) {
folderChild.add(node);
} else if (node.getId().equals(curNode.getId()) && node.getObjectType() == curNode.getRepositoryObjectType()) {
return node;
}
}
for (IRepositoryNode folderNode : folderChild) {
final RepositoryNode repositoryNode = getRepositoryNode(folderNode, curNode, monitor);
if (repositoryNode != null) {
return repositoryNode;
}
}
}
return null;
}
private static RepositoryNode getRepositoryNode(IRepositoryNode rootNode, IRepositoryViewObject curNode,
IRepositoryView view, boolean expanded) {
if (rootNode == null || curNode == null || view == null) {

View File

@@ -35,4 +35,5 @@ public interface IProjectRepositoryNode {
public void dispose();
public void initNode(final IRepositoryNode rootTypeNode);
}

View File

@@ -271,6 +271,7 @@ public abstract class AContextualAction extends Action implements ITreeContextua
return selection;
}
if (activePart instanceof IRepositoryView) {
workbenchPart = activePart;
return ((IRepositoryView) activePart).getViewer().getSelection();
}

View File

@@ -0,0 +1,3 @@
Metadata=Métadonnées
prefs=Talend
specificSetting=Paramètres spécifiques

View File

@@ -11,6 +11,7 @@ ComponentsFormatPreferencePage.formatLable=Format du libell
ComponentsFormatPreferencePage.remove=Remove
ComponentsFormatPreferencePage.ErrorTitle=ERROR
ComponentToRepositoryProperty.error=ERROR
ComponentToRepositoryProperty.ImpossibleUseOCI=Impossible d'utiliser le type OCI dans le référentiel.
ContextComposite.tableValue=Table des valeurs
ContextComposite.treeValue=Arbre des valeurs
ContextComposite.variable=Variables
@@ -195,8 +196,8 @@ PropertiesWizard.alreadyLockedByUser=Ces propri
PropertiesWizardPage.Author=Auteur
PropertiesWizardPage.Locker=Verrouillé par :
PropertiesWizardPage.Description=Description
PropertiesWizardPage.EmptyDescWarning=Il est déconseillé de laisser la description vide.
PropertiesWizardPage.EmptyPurposeWarning=Il est déconseillé de laisser l'objectif vide.
PropertiesWizardPage.EmptyDescWarning=Il est recommandé de ne pas laisser le champ Description vide.
PropertiesWizardPage.EmptyPurposeWarning=Il est recommandé de ne pas laisser le champ Objectif vide.
PropertiesWizardPage.ItemExistsError=Cet élément existe déjà. Vérifiez la corbeille et videz-la si besoin.
PropertiesWizardPage.KeywordsError=Le nom n'est pas un identifiant valide.
PropertiesWizardPage.Name=Nom

View File

@@ -277,7 +277,7 @@ VersionSection.Status=\u30b9\u30c6\u30fc\u30bf\u30b9
VariableItemEditor.new=\u65B0\u898F
VariableItemEditor.remove=\u524A\u9664
VariableItemEditor.twmplatePattern=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D1\u30BF\u30FC\u30F3\:
VariableItemEditor.variable=\u5909\u6570\:
VariableItemEditor.variable=\u5909\u6570\:
VersionSection.CreationDate=\u4F5C\u6210\u65E5
VersionSection.ModificationDate=\u4FEE\u6B63\u65E5\u4ED8
VersionSection.Status=\u30b9\u30c6\u30fc\u30bf\u30b9

View File

@@ -20,6 +20,8 @@ import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.widgets.Shell;
import org.talend.commons.ui.runtime.image.ECoreImage;
import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ITdqContextService;
import org.talend.core.model.process.IContext;
import org.talend.core.model.process.IProcess2;
import org.talend.core.model.update.EUpdateItemType;
@@ -61,6 +63,15 @@ public class ConfigureContextAction extends Action {
if (updateManager != null) {
updateManager.update(EUpdateItemType.CONTEXT);
}
} else {
// set the report editor dirty according to the manager(TdqContextViewComposite)
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITdqContextService.class)) {
ITdqContextService tdqContextService = (ITdqContextService) GlobalServiceRegister.getDefault()
.getService(ITdqContextService.class);
if (tdqContextService != null) {
tdqContextService.setReportEditorDirty(manager);
}
}
}
// refresh both
manager.refreshTableTab();

View File

@@ -487,6 +487,7 @@ public class ContextTemplateComposite extends AbstractContextTabEditComposite {
*/
public void clear() {
viewer.setInput(Collections.EMPTY_LIST);
helper.initHelper(null);
}
/**

View File

@@ -732,7 +732,7 @@ public class MetadataDialog extends Dialog {
@Override
protected void setTableViewerCreatorOptions(TableViewerCreator<IMetadataColumn> newTableViewerCreator) {
super.setTableViewerCreatorOptions(newTableViewerCreator);
// newTableViewerCreator.setLazyLoad(true);
newTableViewerCreator.setLazyLoad(true);
}
}

View File

@@ -412,13 +412,17 @@ public abstract class AbstractQueryGenerator implements IQueryGenerator {
schemaName = schema;
}
final String tableNameWithDBAndSchema = getTableNameWithDBAndSchema(dbName, schemaName, tableName);
String columnField = generateColumnFields(tableNameWithDBAndSchema);
if (dbType == EDatabaseTypeName.HIVE) {
columnField = generateColumnFields(tableName);
}
StringBuffer sql = new StringBuffer(100);
sql.append(TalendTextUtils.getQuoteChar());
sql.append(SQL_SELECT);
sql.append(SPACE);
// columns
sql.append(generateColumnFields(tableNameWithDBAndSchema));
sql.append(columnField);
//
sql.append(ENTER);
sql.append(SQL_FROM);

View File

@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.core.resources.IMarker;
import org.talend.core.CorePlugin;
import org.talend.core.model.properties.Item;
/**
* DOC xhuang class global comment. Detailled comment <br/>
@@ -63,6 +64,29 @@ public class TalendProblem extends Problem {
setNodeName(uniName);
}
public TalendProblem(ProblemStatus status, Item item, IMarker marker, String markerErrorMessage, Integer lineNumber,
String uniName, Integer charStart, Integer charEnd, ProblemType type) {
super();
setDescription(markerErrorMessage);
setStatus(status);
if (item.getProperty().getId() != null) {
BasicJobInfo jobInfo = new BasicJobInfo(item.getProperty().getId(), null, item.getProperty().getVersion());
jobInfo.setJobName(item.getProperty().getLabel());
setJobInfo(jobInfo);
}
this.javaUnitName = item.getProperty().getLabel();
this.marker = marker;
this.lineNumber = lineNumber;
this.unitName = uniName;
this.charStart = charStart;
this.charEnd = charEnd;
this.version = item.getProperty().getVersion();
setType(type);
setNodeName(uniName);
}
public String getVersion() {
return this.version;
}

View File

@@ -34,7 +34,7 @@ Export-Package: org.apache.commons.cli2,
org.apache.commons.digester.plugins.strategies,
org.apache.commons.digester.substitution,
org.apache.commons.digester.xmlrules
Require-Bundle: org.apache.commons.beanutils,
org.apache.commons.logging
Require-Bundle: org.apache.commons.beanutils;visibility:=reexport,
org.apache.commons.logging;visibility:=reexport
Bundle-ActivationPolicy: lazy

View File

@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/neethi-3.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.ws.rs-api-2.0-m10.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-api-2.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-2.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-rt-core-2.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-2.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-2.7.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>

View File

@@ -1,7 +1,705 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Cxf
Bundle-SymbolicName: org.talend.libraries.apache.cxf
Bundle-SymbolicName: org.talend.libraries.apache.cxf;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/cxf-api-2.7.5.jar,
lib/cxf-rt-bindings-xml-2.7.5.jar,
lib/cxf-rt-core-2.7.5.jar,
lib/cxf-rt-frontend-jaxrs-2.7.5.jar,
lib/cxf-rt-transports-http-2.7.5.jar,
lib/javax.ws.rs-api-2.0-m10.jar,
lib/neethi-3.0.1.jar
Export-Package: javax.ws.rs,
javax.ws.rs.client,
javax.ws.rs.container,
javax.ws.rs.core,
javax.ws.rs.ext,
org.apache.cxf;uses:="org.apache.cxf.common.i18n,org.apache.cxf.interceptor",
org.apache.cxf.annotations,
org.apache.cxf.attachment;
uses:="javax.activation,
new new org.apache.cxf.attachment,
javax.mail.internet,
org.apache.cxf.io,
org.apache.cxf.message,
new org.apache.cxf.attachment",
org.apache.cxf.binding;
uses:="javax.wsdl.extensions,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.service.model,
org.apache.cxf.transport,
org.apache.cxf.message,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor,
javax.wsdl",
org.apache.cxf.binding.xml;
uses:="org.apache.cxf,
org.apache.cxf.service.model,
org.apache.cxf.common.i18n,
org.apache.cxf.tools.validator,
org.apache.cxf.binding,
org.apache.cxf.message,
org.apache.cxf.interceptor",
org.apache.cxf.binding.xml.interceptor;uses:="org.apache.cxf.message,org.apache.cxf.interceptor",
org.apache.cxf.binding.xml.wsdl11;uses:="org.apache.cxf.wsdl,javax.wsdl.extensions,org.apache.cxf",
org.apache.cxf.bindings.xformat;uses:="org.apache.cxf.wsdl,javax.xml.bind,javax.xml.namespace",
org.apache.cxf.bus;
uses:="org.apache.cxf.configuration,
org.apache.cxf,
javax.management,
org.apache.cxf.management,
org.apache.cxf.interceptor",
org.apache.cxf.bus.blueprint;
uses:="org.apache.aries.blueprint,
org.apache.cxf.configuration,
org.osgi.service.blueprint.reflect,
org.apache.cxf.bus.extension,
org.apache.cxf.configuration.blueprint,
org.osgi.framework,
org.osgi.service.blueprint.container,
org.apache.aries.blueprint.mutable,
org.w3c.dom",
org.apache.cxf.bus.extension;
uses:="org.apache.cxf.configuration,
org.apache.cxf.bus,
org.apache.cxf,
org.apache.cxf.resource,
org.apache.cxf.common.i18n",
org.apache.cxf.bus.managers;
uses:="org.apache.cxf,
org.apache.cxf.ws.addressing,
javax.management,
org.apache.cxf.configuration.spring,
org.apache.cxf.binding,
org.apache.cxf.management,
javax.xml.namespace,
org.apache.cxf.phase,
org.apache.cxf.headers,
org.apache.cxf.workqueue,
org.apache.cxf.configuration,
org.apache.cxf.transport,
org.apache.cxf.endpoint,
org.apache.cxf.buslifecycle,
org.apache.cxf.extension",
org.apache.cxf.bus.osgi;
uses:="org.apache.cxf.workqueue,
org.apache.cxf.configuration,
org.apache.cxf,
org.osgi.util.tracker,
org.apache.cxf.bus.extension,
org.osgi.framework,
org.osgi.service.cm,
org.apache.cxf.buslifecycle",
org.apache.cxf.bus.resource;uses:="org.apache.cxf,org.apache.cxf.resource,org.apache.cxf.extension",
org.apache.cxf.bus.spring;
uses:="org.springframework.context.support,
org.springframework.beans.factory.config,
org.apache.cxf.resource,
org.apache.cxf.configuration.spring,
org.xml.sax,
org.springframework.beans.factory.support,
org.springframework.core,
org.apache.cxf.configuration,
org.springframework.beans.factory,
org.apache.cxf.interceptor,
org.apache.cxf.bus.extension,
org.apache.cxf,
org.springframework.core.io,
org.springframework.context,
org.springframework.beans.factory.xml,
javax.xml.parsers,
org.springframework.core.io.support,
org.w3c.dom,
org.apache.cxf.bus,
org.apache.cxf.buslifecycle",
org.apache.cxf.buslifecycle;uses:="org.apache.cxf",
org.apache.cxf.catalog;
uses:="org.apache.ws.commons.schema.resolver,
javax.wsdl.xml,
org.apache.cxf,
org.apache.xml.resolver.tools,
org.apache.xml.resolver,
org.xml.sax",
org.apache.cxf.common;uses:="javax.xml.namespace",
org.apache.cxf.common.annotation,
org.apache.cxf.common.classloader;uses:="javax.xml.namespace",
org.apache.cxf.common.commands;uses:="org.apache.cxf.common.i18n",
org.apache.cxf.common.i18n,
org.apache.cxf.common.injection;uses:="javax.annotation,org.apache.cxf.resource,org.apache.cxf.common.annotation",
org.apache.cxf.common.jaxb;
uses:="new org.apache.cxf.common.jaxb,
org.w3c.dom,
javax.xml.namespace,
org.xml.sax,
javax.xml.bind.attachment,
javax.xml.stream,
javax.xml.transform,
com.sun.xml.bind.marshaller,
javax.xml.transform.stream,
javax.xml.bind",
org.apache.cxf.common.logging;uses:="org.apache.log4j",
org.apache.cxf.common.security;uses:="org.apache.cxf.security",
org.apache.cxf.common.util;
uses:="net.sf.cglib.proxy,
javax.tools,
javax.xml.namespace,
org.apache.cxf.common.i18n",
org.apache.cxf.common.xmlschema;
uses:="org.apache.ws.commons.schema,
org.apache.ws.commons.schema.resolver,
org.apache.ws.commons.schema.extensions,
org.w3c.dom,
javax.xml.namespace,
org.w3c.dom.ls,
org.apache.ws.commons.schema.utils,
org.apache.cxf.common.i18n",
org.apache.cxf.configuration;uses:="org.apache.cxf.common.i18n",
org.apache.cxf.configuration.blueprint;
uses:="org.apache.aries.blueprint,
org.osgi.service.blueprint.reflect,
org.osgi.service.blueprint.container,
org.apache.aries.blueprint.mutable,
org.w3c.dom,
javax.xml.namespace",
org.apache.cxf.configuration.jsse;uses:="org.apache.cxf.configuration.security,javax.net.ssl",
org.apache.cxf.configuration.security;uses:="javax.xml.bind",
org.apache.cxf.configuration.spring;
uses:="org.springframework.context,
org.springframework.beans.factory.xml,
org.w3c.dom,
javax.xml.namespace,
org.springframework.beans.factory.wiring,
org.springframework.beans.factory.support,
org.apache.cxf.configuration,
javax.xml.bind,
org.springframework.beans.factory,
org.apache.cxf.extension",
org.apache.cxf.continuations;uses:="org.apache.cxf.message",
org.apache.cxf.databinding;
uses:="org.apache.ws.commons.schema,
org.apache.cxf.common.xmlschema,
org.apache.cxf,
org.apache.cxf.service,
javax.xml.validation,
org.apache.cxf.service.model,
org.w3c.dom,
javax.xml.namespace",
org.apache.cxf.databinding.source;
uses:="org.apache.cxf.staxutils,
org.apache.cxf.service,
org.apache.cxf.service.model,
org.apache.cxf.databinding,
javax.xml.transform.dom,
org.w3c.dom,
javax.xml.namespace,
javax.activation,
javax.xml.stream,
javax.xml.validation",
org.apache.cxf.databinding.source.mime;
uses:="org.apache.ws.commons.schema,
org.apache.ws.commons.schema.extensions,
org.w3c.dom,
javax.xml.namespace",
org.apache.cxf.databinding.stax;
uses:="org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.service.model,
org.apache.cxf.databinding,
org.apache.cxf.message,
javax.xml.namespace,
javax.xml.stream,
javax.xml.validation,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor",
org.apache.cxf.endpoint;
uses:="org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.ws.addressing,
org.apache.cxf.databinding,
org.apache.cxf.service.model,
javax.management,
org.apache.cxf.management,
org.apache.cxf.message,
org.apache.cxf.binding,
org.apache.cxf.phase,
javax.xml.namespace,
new org.apache.cxf.endpoint,
org.apache.cxf.configuration,
org.apache.cxf.common.i18n,
org.apache.cxf.transport,
org.apache.cxf.interceptor",
org.apache.cxf.extension,
org.apache.cxf.feature;
uses:="org.apache.cxf.annotations,
org.apache.cxf,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor",
org.apache.cxf.feature.transform;
uses:="org.apache.cxf.staxutils,
org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.io,
org.w3c.dom,
org.apache.cxf.message,
org.apache.cxf.phase,
javax.xml.stream,
javax.xml.transform,
org.apache.cxf.interceptor",
org.apache.cxf.feature.validation;
uses:="org.apache.cxf.annotations,
org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.service.model,
org.apache.cxf.endpoint",
org.apache.cxf.headers;uses:="org.apache.cxf.databinding,org.apache.cxf.interceptor,javax.xml.namespace",
org.apache.cxf.helpers;
uses:="org.apache.cxf.annotations,
javax.xml.parsers,
org.w3c.dom,
org.apache.cxf.message,
javax.wsdl,
org.xml.sax,
javax.xml.namespace,
javax.xml.transform,
javax.xml.transform.stream",
org.apache.cxf.interceptor;
uses:="org.apache.cxf.staxutils,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.io,
org.apache.cxf.databinding,
org.apache.cxf.service.model,
org.w3c.dom,
org.apache.cxf.message,
javax.xml.namespace,
org.apache.cxf.phase,
org.apache.cxf.service.invoker,
javax.xml.stream,
org.apache.cxf.transport,
org.apache.cxf.common.i18n,
org.apache.cxf.endpoint",
org.apache.cxf.interceptor.security;
uses:="javax.security.auth.callback,
javax.security.auth.login,
org.apache.cxf.security,
org.apache.cxf.service.model,
javax.security.auth,
org.w3c.dom,
org.apache.cxf.message,
org.apache.cxf.phase,
org.apache.cxf.common.security",
org.apache.cxf.interceptor.transform;uses:="javax.xml.stream,org.apache.cxf.message,org.apache.cxf.phase",
org.apache.cxf.internal;uses:="org.apache.aries.blueprint,org.osgi.service.blueprint.reflect,org.w3c.dom",
org.apache.cxf.io;
uses:="javax.xml.stream,
org.apache.cxf.helpers,
org.apache.cxf.service.model,
javax.crypto",
org.apache.cxf.jaxrs;
uses:="org.apache.cxf.service.factory,
org.apache.cxf.jaxrs.ext,
org.apache.cxf.jaxrs.provider,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.service.model,
org.apache.cxf.databinding,
org.apache.cxf.binding,
org.apache.cxf.message,
javax.xml.namespace,
org.apache.cxf.service.invoker,
org.apache.cxf.jaxrs.lifecycle,
org.apache.cxf.configuration,
org.apache.cxf.jaxrs.model,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor,
javax.ws.rs.core",
org.apache.cxf.jaxrs.blueprint;
uses:="org.apache.aries.blueprint,
org.apache.cxf.jaxrs.lifecycle,
org.osgi.service.blueprint.reflect,
org.apache.cxf.configuration.blueprint,
org.osgi.service.blueprint.container,
org.apache.aries.blueprint.mutable,
org.w3c.dom,
org.apache.cxf.message",
org.apache.cxf.jaxrs.client;
uses:="org.apache.cxf.transport.http,
javax.ws.rs,
org.apache.cxf,
org.apache.cxf.service.model,
org.apache.cxf.jaxrs.ext.form,
org.apache.cxf.jaxrs,
org.apache.cxf.message,
javax.xml.namespace,
org.apache.cxf.phase,
org.apache.cxf.jaxrs.model,
javax.ws.rs.client,
org.apache.cxf.transport,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor,
javax.ws.rs.core",
org.apache.cxf.jaxrs.client.spec;
uses:="org.apache.cxf.jaxrs.impl,
javax.ws.rs.client,
org.apache.cxf.message,
org.apache.cxf.interceptor,
javax.ws.rs.core",
org.apache.cxf.jaxrs.ext;
uses:="javax.servlet,
org.apache.cxf.jaxrs.model,
javax.ws.rs.ext,
org.apache.cxf.message,
javax.servlet.http,
javax.ws.rs.core",
org.apache.cxf.jaxrs.ext.form;uses:="javax.ws.rs.core",
org.apache.cxf.jaxrs.ext.multipart;
uses:="javax.activation,
javax.ws.rs.ext,
org.apache.cxf.message,
javax.ws.rs.core",
org.apache.cxf.jaxrs.ext.xml,
org.apache.cxf.jaxrs.impl;
uses:="javax.ws.rs,
javax.ws.rs.container,
javax.ws.rs.ext,
org.apache.cxf.message,
javax.servlet,
org.apache.cxf.jaxrs.model,
org.apache.cxf.continuations,
javax.servlet.http,
javax.ws.rs.core",
org.apache.cxf.jaxrs.impl.tl;
uses:="org.apache.cxf.jaxrs.ext,
javax.ws.rs.ext,
javax.servlet,
javax.servlet.descriptor,
javax.ws.rs.core,
javax.servlet.http",
org.apache.cxf.jaxrs.interceptor;uses:="org.apache.cxf.message,org.apache.cxf.phase,org.apache.cxf.interceptor",
org.apache.cxf.jaxrs.lifecycle;uses:="org.apache.cxf.message",
org.apache.cxf.jaxrs.model;
uses:="org.apache.cxf.jaxrs.impl.tl,
javax.ws.rs,
org.apache.cxf.jaxrs.lifecycle,
org.apache.cxf,
org.apache.cxf.message,
javax.ws.rs.core",
org.apache.cxf.jaxrs.model.wadl;
uses:="org.apache.cxf.jaxrs.ext,
org.apache.cxf.message,
org.w3c.dom,
javax.xml.namespace,
org.apache.cxf.common.jaxb,
org.apache.cxf.common.xmlschema,
org.apache.cxf.jaxrs.model,
javax.xml.bind,
javax.ws.rs.core",
org.apache.cxf.jaxrs.provider;
uses:="org.apache.cxf.staxutils,
org.apache.cxf.jaxrs.ext,
org.apache.cxf.message,
javax.xml.namespace,
javax.servlet,
javax.xml.stream,
org.apache.cxf.jaxrs.model,
javax.ws.rs.core,
org.apache.cxf.jaxrs.client,
org.apache.cxf,
org.apache.cxf.service,
javax.xml.bind.annotation.adapters,
org.apache.cxf.databinding,
org.apache.cxf.jaxrs.impl,
javax.ws.rs.ext,
javax.activation,
javax.xml.bind.attachment,
javax.xml.transform,
org.apache.cxf.jaxrs.utils.schemas,
javax.xml.validation,
javax.xml.bind,
javax.servlet.http",
org.apache.cxf.jaxrs.security;
uses:="javax.security.auth.callback,
org.apache.cxf.jaxrs.ext,
org.apache.cxf.interceptor.security,
javax.security.auth.login,
javax.security.auth,
org.ietf.jgss,
org.apache.cxf.message,
org.apache.cxf.phase,
org.apache.cxf.configuration.security,
org.apache.cxf.jaxrs.model,
org.apache.cxf.transport.http.auth,
org.apache.cxf.common.security,
javax.ws.rs.core",
org.apache.cxf.jaxrs.servlet;uses:="javax.servlet,org.apache.cxf.transport.servlet,org.apache.cxf.jaxrs",
org.apache.cxf.jaxrs.spring;
uses:="org.apache.cxf.jaxrs.client,
org.springframework.beans.factory.support,
org.apache.cxf.jaxrs.lifecycle,
org.springframework.context,
org.springframework.beans.factory.xml,
org.apache.cxf.configuration.spring,
org.apache.cxf.message,
org.apache.cxf.jaxrs,
org.w3c.dom",
org.apache.cxf.jaxrs.utils;
uses:="org.apache.cxf.jaxrs.impl.tl,
javax.ws.rs,
org.apache.cxf.jaxrs.provider,
org.apache.cxf.jaxrs.ext.multipart,
org.apache.cxf,
javax.xml.bind.annotation.adapters,
javax.ws.rs.ext,
org.apache.cxf.jaxrs,
org.w3c.dom,
org.apache.cxf.jaxrs.ext.form,
org.apache.cxf.message,
javax.xml.namespace,
org.apache.cxf.jaxrs.model,
javax.xml.bind,
javax.servlet.http,
javax.ws.rs.core",
org.apache.cxf.jaxrs.utils.multipart;uses:="org.apache.cxf.jaxrs.ext,org.apache.cxf.jaxrs.ext.multipart,javax.ws.rs.core",
org.apache.cxf.jaxrs.utils.schemas;
uses:="org.w3c.dom.ls,
org.apache.cxf.catalog,
org.apache.cxf,
javax.xml.validation",
org.apache.cxf.logging;uses:="org.apache.cxf.message",
org.apache.cxf.management;uses:="javax.management",
org.apache.cxf.management.annotation,
org.apache.cxf.message;
uses:="javax.activation,
org.apache.cxf.service,
org.apache.cxf,
org.apache.cxf.service.model,
org.apache.cxf.transport,
org.apache.cxf.binding,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor",
org.apache.cxf.phase;uses:="org.apache.cxf.transport,org.apache.cxf.message,org.apache.cxf.interceptor",
org.apache.cxf.policy;
uses:="org.apache.cxf.service.model,
org.apache.cxf.transport,
org.apache.cxf.message,
javax.xml.namespace",
org.apache.cxf.resource;uses:="org.xml.sax",
org.apache.cxf.security;uses:="javax.security.auth",
org.apache.cxf.security.claims.authorization,
org.apache.cxf.security.transport;uses:="javax.net.ssl",
org.apache.cxf.service;
uses:="org.apache.cxf.service.invoker,
org.apache.cxf.configuration,
org.apache.cxf,
org.apache.cxf.databinding,
org.apache.cxf.service.model,
org.apache.cxf.interceptor,
javax.xml.namespace",
org.apache.cxf.service.factory;
uses:="org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.databinding,
org.apache.cxf.service.model,
org.w3c.dom,
javax.xml.namespace,
org.apache.cxf.service.invoker,
org.apache.cxf.common.i18n,
org.apache.cxf.endpoint",
org.apache.cxf.service.invoker;
uses:="org.springframework.context,
org.apache.cxf.service.model,
org.apache.cxf.endpoint,
org.apache.cxf.message,
org.apache.cxf.interceptor",
org.apache.cxf.service.model;
uses:="org.apache.ws.commons.schema,
org.apache.cxf.common.xmlschema,
org.apache.cxf.service,
org.apache.cxf.ws.addressing,
org.w3c.dom,
org.apache.cxf.message,
javax.xml.namespace",
org.apache.cxf.staxutils;
uses:="javax.xml.stream,
org.xml.sax.ext,
javax.xml.transform,
javax.xml.parsers,
javax.xml.transform.sax,
javax.xml.stream.events,
org.w3c.dom,
org.xml.sax,
javax.xml.namespace",
org.apache.cxf.staxutils.transform;uses:="javax.xml.stream,org.apache.cxf.staxutils,javax.xml.namespace",
org.apache.cxf.test;
uses:="org.springframework.context.support,
org.apache.cxf,
org.springframework.context,
org.springframework.beans.factory.xml,
org.junit,
org.apache.cxf.message,
org.w3c.dom,
javax.wsdl,
javax.xml.namespace,
javax.xml.xpath,
javax.xml.stream,
org.apache.cxf.transport,
org.apache.cxf.endpoint",
org.apache.cxf.transport;
uses:="org.apache.cxf,
org.apache.cxf.ws.addressing,
org.apache.cxf.resource,
org.apache.cxf.service.model,
org.apache.cxf.message,
org.apache.cxf.binding,
org.apache.cxf.phase,
org.xml.sax,
javax.xml.namespace,
org.apache.cxf.configuration,
org.apache.cxf.endpoint",
org.apache.cxf.transport.common.gzip;
uses:="org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.io,
org.apache.cxf.message,
org.apache.cxf.interceptor,
org.apache.cxf.phase",
org.apache.cxf.transport.http;
uses:="org.apache.cxf.wsdl,
org.apache.cxf.ws.addressing,
org.apache.cxf.message,
javax.xml.namespace,
org.apache.cxf.transport.https,
javax.servlet,
org.apache.cxf.configuration,
org.apache.cxf.transports.http.configuration,
org.apache.cxf.transport,
org.apache.cxf.service,
org.apache.cxf,
org.apache.cxf.configuration.jsse,
org.apache.cxf.io,
org.apache.cxf.security,
org.apache.cxf.service.model,
org.apache.cxf.configuration.security,
org.apache.cxf.wsdl11,
org.apache.cxf.transport.http.auth,
org.apache.cxf.continuations,
javax.servlet.http",
org.apache.cxf.transport.http.auth;
uses:="javax.security.auth.callback,
org.apache.cxf.configuration.security,
javax.security.auth.login,
org.apache.cxf.message",
org.apache.cxf.transport.http.blueprint;
uses:="org.apache.aries.blueprint,
org.osgi.service.blueprint.reflect,
org.apache.cxf.configuration.blueprint,
org.apache.aries.blueprint.mutable,
org.w3c.dom",
org.apache.cxf.transport.http.osgi;
uses:="org.apache.cxf.transport.http,
org.osgi.util.tracker,
org.osgi.framework,
org.osgi.service.cm",
org.apache.cxf.transport.http.policy;uses:="org.apache.cxf.ws.policy,org.apache.neethi,org.apache.cxf.ws.policy.builder.jaxb",
org.apache.cxf.transport.http.policy.impl;
uses:="org.apache.cxf.policy,
org.apache.cxf.transports.http.configuration,
org.apache.cxf.message,
javax.xml.namespace",
org.apache.cxf.transport.http.spring;
uses:="org.springframework.beans.factory.support,
org.springframework.beans.factory.xml,
org.apache.cxf.configuration.spring,
org.w3c.dom",
org.apache.cxf.transport.https;
uses:="org.apache.cxf.transport.http,
org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.configuration.jsse,
org.apache.cxf.message,
org.apache.cxf.phase,
org.apache.cxf.configuration.security,
org.apache.cxf.common.util,
javax.net.ssl,
org.apache.cxf.endpoint,
org.apache.cxf.interceptor",
org.apache.cxf.transport.servlet;
uses:="org.apache.cxf.transport.http,
org.springframework.context.support,
org.apache.cxf,
org.springframework.context,
org.apache.cxf.transports.http,
org.apache.cxf.resource,
org.apache.cxf.service.model,
org.springframework.context.event,
javax.servlet,
org.apache.cxf.transport,
javax.servlet.http",
org.apache.cxf.transport.servlet.servicelist;
uses:="javax.servlet,
org.apache.cxf.transport.http,
org.apache.cxf,
org.apache.cxf.transport,
javax.servlet.http",
org.apache.cxf.transports.http;uses:="org.apache.cxf.service.model",
org.apache.cxf.transports.http.configuration;uses:="org.apache.cxf.wsdl,javax.xml.bind",
org.apache.cxf.transports.http.internal;uses:="org.apache.cxf,org.apache.cxf.transports.http",
org.apache.cxf.version,
org.apache.cxf.workqueue,
org.apache.cxf.ws.addressing;
uses:="org.apache.cxf.ws.addressing.v200403,
org.apache.cxf.ws.addressing.v200408,
org.apache.cxf.feature,
org.apache.cxf,
org.apache.cxf.service.model,
org.w3c.dom,
org.apache.cxf.message,
org.apache.cxf.phase,
javax.xml.namespace,
org.apache.cxf.transport,
javax.xml.bind,
new org.apache.cxf.ws.addressing,
org.apache.cxf.interceptor",
org.apache.cxf.ws.addressing.v200403;uses:="javax.xml.bind,javax.xml.namespace",
org.apache.cxf.ws.addressing.v200408;uses:="javax.xml.bind,javax.xml.namespace",
org.apache.cxf.ws.addressing.wsdl;uses:="org.apache.cxf.wsdl,javax.xml.bind,javax.xml.namespace",
org.apache.cxf.wsdl;
uses:="javax.wsdl.factory,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.ws.addressing,
org.apache.cxf.service.model,
org.w3c.dom,
javax.xml.namespace,
javax.wsdl,
javax.xml.stream,
javax.xml.stream.util,
javax.xml.transform,
javax.wsdl.extensions,
javax.xml.validation,
org.apache.cxf.common.i18n,
javax.xml.bind",
org.apache.cxf.wsdl.http;uses:="org.apache.cxf.wsdl,javax.xml.bind",
org.apache.cxf.wsdl11;
uses:="org.apache.cxf.wsdl,
javax.wsdl.factory,
org.apache.cxf.service.factory,
javax.wsdl.extensions.soap,
org.apache.cxf,
org.apache.cxf.service,
org.apache.cxf.service.model,
org.w3c.dom,
org.apache.cxf.binding,
org.xml.sax,
javax.xml.namespace,
javax.wsdl,
org.apache.cxf.common.xmlschema,
javax.wsdl.xml,
javax.wsdl.extensions,
org.apache.cxf.common.i18n"
Require-Bundle: javax.wsdl;bundle-version="1.6.2"

View File

@@ -1,3 +1,17 @@
output.. = bin/
bin.includes = META-INF/,\
lib/
.,\
lib/cxf-api-2.7.5.jar,\
lib/cxf-rt-bindings-xml-2.7.5.jar,\
lib/cxf-rt-core-2.7.5.jar,\
lib/cxf-rt-frontend-jaxrs-2.7.5.jar,\
lib/cxf-rt-transports-http-2.7.5.jar,\
plugin.xml,\
lib/neethi-3.0.1.jar,\
lib/cxf-2.7.5-modified.jar,\
lib/cxf-xjc-boolean-2.6.1.jar,\
lib/cxf-xjc-bug671-2.6.1.jar,\
lib/cxf-xjc-dv-2.6.1.jar,\
lib/cxf-xjc-runtime-2.6.1.jar,\
lib/cxf-xjc-ts-2.6.1.jar
source.. = src/

Binary file not shown.

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension point="org.talend.core.runtime.librariesNeeded">
<libraryNeeded
context="plugin:org.talend.libraries.apache.cxf"
language="java"
message="Needed for the cxf dependencies"
name="javax.ws.rs-api-2.0-m10.jar"
required="true">
</libraryNeeded>
</extension>
</plugin>

View File

@@ -3,4 +3,5 @@ output.. = class/
bin.includes = META-INF/,\
.,\
lib/lucene-core-3.0.1.jar,\
lib/lucene-core-2.9.3.jar
lib/lucene-core-2.9.3.jar,\
lib/lucene-core-3.0.3.jar

View File

@@ -11,7 +11,6 @@ Bundle-ClassPath: .,
lib/xerces-2.6.2.jar,
lib/xmlbeans-2.3.0.jar
Bundle-Vendor: .Talend SA.
Eclipse-BuddyPolicy: dependent
Require-Bundle: org.apache.log4j;resolution:=optional,
org.talend.libraries.apache.common;visibility:=reexport
Export-Package:

View File

@@ -21,7 +21,8 @@ Require-Bundle: org.apache.log4j,
org.talend.libraries.jdbc.hsql;resolution:=optional,
org.apache.xerces,
org.talend.libraries.dom4j-jaxen;visibility:=reexport,
org.talend.libraries.jdbc.postgresql;resolution:=optional;visibility:=reexport
org.talend.libraries.jdbc.postgresql;resolution:=optional;visibility:=reexport,
org.apache.commons.collections
Export-Package: antlr,
antlr.ASdebug,
antlr.actions.cpp,

View File

@@ -15,5 +15,8 @@ bin.includes = META-INF/,\
lib/hibernate-search-3.2.1.Final.jar,\
lib/xerces-2.6.2.jar,\
lib/commons-logging-1.0.4.jar,\
lib/hibernate-3.2-patched1.7.jar
lib/hibernate-3.2-patched1.7.jar,\
lib/hibernate-search-3.3.0.Final.jar,\
lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,\
lib/hibernate-core-3.6.10.Final.jar

View File

@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: .Talend SA.
Bundle-ClassPath: .,
lib/jakarta-bcel-20050813.jar,
lib/jdt-compiler-3.1.1.jar,
lib/jxl-2.6.10.jar,
lib/png-encoder-1.5.jar,
lib/xalan.jar,

View File

@@ -13,4 +13,3 @@ Export-Package: ca.ingres.jdbc,
com.ingres.jdbc
Bundle-Vendor: .Talend SA.
Bundle-ActivationPolicy: lazy
Require-Bundle: org.talend.core.runtime

Some files were not shown because too many files have changed in this diff Show More