Compare commits
38 Commits
release/8.
...
release/8.
| Author | SHA1 | Date | |
|---|---|---|---|
|
e0c4d177e1 | ||
|
|
29d3ce507f | ||
|
|
503077af62 | ||
|
|
155beefd6b | ||
|
|
a068fcdf66 | ||
|
|
81ec0e7368 | ||
|
|
f30930d483 | ||
|
|
c4abb4e764 | ||
|
|
c66b0b1101 | ||
|
|
287d7733bc | ||
|
|
5bcbdc1ca9 | ||
|
|
74f6189a58 | ||
|
|
dc66db4b77 | ||
|
|
52224ab37c | ||
|
|
a0423027d2 | ||
|
|
c0359b5b78 | ||
|
|
239b697b01 | ||
|
|
0142e33068 | ||
|
|
0451c982ab | ||
|
|
a221cab814 | ||
|
|
f649cdaa0d | ||
|
|
f6f1ff0c8e | ||
|
|
85e0d731ec | ||
|
|
8d0e77ffd7 | ||
|
|
d2ce5eb839 | ||
|
|
cac1899508 | ||
|
|
c3710b0199 | ||
|
|
48baa99ee7 | ||
|
|
a2a2fdc4c1 | ||
|
|
73375cda48 | ||
|
|
c49e6af190 | ||
|
|
a2c9fb3308 | ||
|
|
812a94119c | ||
|
|
f26a582453 | ||
|
|
7228acdfaf | ||
|
|
09c48442c1 | ||
|
|
af128c8734 | ||
|
|
a7bfec2ca6 |
BIN
main/plugins/org.talend.common.ui.runtime/icons/help.png
Normal file
BIN
main/plugins/org.talend.common.ui.runtime/icons/help.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 600 B |
@@ -121,7 +121,7 @@ ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u3
|
||||
ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
|
||||
ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
|
||||
ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
|
||||
ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
|
||||
ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
|
||||
SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
SSLConfirmDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
|
||||
@@ -41,6 +41,8 @@ public enum EImage implements IImage {
|
||||
|
||||
QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
|
||||
|
||||
HELP_ICON("/icons/help.png"), //$NON-NLS-1$
|
||||
|
||||
CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$
|
||||
|
||||
RESET_DBTYPES_ICON("/icons/reset_dbtypes.jpg"), //$NON-NLS-1$
|
||||
|
||||
@@ -46,7 +46,11 @@ public interface ITaCoKitService {
|
||||
|
||||
boolean isTaCoKitType(Object repoType);
|
||||
|
||||
Map<String, String> getParameterSuggestionValues(Object parameter, int rowNumber);
|
||||
Object getDatastoreFromDataset(Object repositoryViewObject);
|
||||
|
||||
String getParentItemIdFromItem(Object Item);
|
||||
|
||||
boolean isValueSelectionParameter(Object parameter);
|
||||
|
||||
public static ITaCoKitService getInstance() {
|
||||
BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
|
||||
|
||||
@@ -116,7 +116,7 @@ ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
|
||||
ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
|
||||
ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
|
||||
ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
|
||||
ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
|
||||
ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
|
||||
FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
|
||||
StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u3092\u5165\u529B
|
||||
StateComposite.HELP_MESSAGE=\u30D8\u30EB\u30D7\u30E1\u30C3\u30BB\u30FC\u30B8
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="BOX" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
|
||||
<dbType type="CHARACTER" defaultLength="50" ignorePre="true"/>
|
||||
<dbType type="CID" ignoreLen="true" ignorePre="true" />
|
||||
@@ -36,7 +36,7 @@
|
||||
<dbType type="LINE" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="NAME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
|
||||
<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10"/>
|
||||
@@ -46,7 +46,7 @@
|
||||
<dbType type="POINT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
|
||||
<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
|
||||
@@ -60,12 +60,14 @@
|
||||
<dbType type="TIME" ignorePre="true" />
|
||||
<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIMESTAMP WITH TIME ZONE" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIMESTAMP" ignorePre="true" />
|
||||
<dbType type="TIMETZ" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="VARBIT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIME WITH TIME ZONE" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="VARBIT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
|
||||
<dbType type="XID" ignoreLen="true" ignorePre="true" />
|
||||
|
||||
|
||||
<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
|
||||
@@ -119,38 +121,40 @@
|
||||
<language name="java">
|
||||
<talendToDbTypes><!-- Adviced mappings -->
|
||||
<talendType type="id_List"/>
|
||||
<talendType type="id_Boolean">
|
||||
<talendType type="id_Boolean">
|
||||
<dbType type="BOOL" default="true" />
|
||||
<dbType type="BOOLEAN" />
|
||||
<dbType type="BOOLEAN" />
|
||||
</talendType>
|
||||
<talendType type="id_Byte">
|
||||
<talendType type="id_Byte">
|
||||
</talendType>
|
||||
<talendType type="id_byte[]">
|
||||
<dbType type="BIT" default="true" />
|
||||
<dbType type="VARBIT" />
|
||||
<dbType type="BIT VARYING" />
|
||||
<dbType type="BIT VARYING" />
|
||||
</talendType>
|
||||
<talendType type="id_Character">
|
||||
<dbType type="CHAR" default="true" />
|
||||
<dbType type="CHARACTER" />
|
||||
<dbType type="BPCHAR" />
|
||||
<dbType type="VARCHAR" />
|
||||
<dbType type="TEXT" />
|
||||
<dbType type="TEXT" />
|
||||
</talendType>
|
||||
<talendType type="id_Date">
|
||||
<dbType type="DATE" default="true" />
|
||||
<dbType type="DATE" default="true" />
|
||||
<dbType type="ABSTIME" />
|
||||
<dbType type="TIMETZ" />
|
||||
<dbType type="TIME WITH TIME ZONE" />
|
||||
<dbType type="TIME" />
|
||||
<dbType type="TIMESTAMPTZ" />
|
||||
<dbType type="TIMESTAMP WITH TIME ZONE" />
|
||||
<dbType type="TIMESTAMP" />
|
||||
<dbType type="INTERVAL" />
|
||||
<dbType type="TINTERVAL" />
|
||||
<dbType type="RELTIME" />
|
||||
<dbType type="RELTIME" />
|
||||
</talendType>
|
||||
<talendType type="id_BigDecimal">
|
||||
<dbType type="NUMERIC" default="true" />
|
||||
<dbType type="DECIMAL" />
|
||||
<dbType type="DECIMAL" />
|
||||
<dbType type="FLOAT4" />
|
||||
<dbType type="REAL" />
|
||||
<dbType type="FLOAT8"/>
|
||||
@@ -161,8 +165,8 @@
|
||||
<dbType type="REAL" />
|
||||
<dbType type="FLOAT8" default="true" />
|
||||
<dbType type="NUMERIC" />
|
||||
<dbType type="DECIMAL" />
|
||||
<dbType type="DOUBLE PRECISION"/>
|
||||
<dbType type="DECIMAL" />
|
||||
<dbType type="DOUBLE PRECISION"/>
|
||||
</talendType>
|
||||
<talendType type="id_Float">
|
||||
<dbType type="FLOAT4" default="true" />
|
||||
@@ -170,7 +174,7 @@
|
||||
<dbType type="REAL" />
|
||||
<dbType type="NUMERIC" />
|
||||
<dbType type="DECIMAL" />
|
||||
<dbType type="DOUBLE PRECISION"/>
|
||||
<dbType type="DOUBLE PRECISION"/>
|
||||
</talendType>
|
||||
<talendType type="id_Integer">
|
||||
<dbType type="INT2" />
|
||||
@@ -180,7 +184,7 @@
|
||||
<dbType type="INT8" />
|
||||
<dbType type="BIGINT" />
|
||||
<dbType type="BIGSERIAL" />
|
||||
<dbType type="INTEGER" />
|
||||
<dbType type="INTEGER" />
|
||||
</talendType>
|
||||
<talendType type="id_Long">
|
||||
<dbType type="INT2" />
|
||||
@@ -188,8 +192,8 @@
|
||||
<dbType type="SERIAL" />
|
||||
<dbType type="INT8" default="true" />
|
||||
<dbType type="BIGINT" />
|
||||
<dbType type="BIGSERIAL" />
|
||||
<dbType type="SMALLINT" />
|
||||
<dbType type="BIGSERIAL" />
|
||||
<dbType type="SMALLINT" />
|
||||
</talendType>
|
||||
<talendType type="id_Object">
|
||||
<dbType type="_POINT" />
|
||||
@@ -210,26 +214,26 @@
|
||||
<dbType type="_TIMESTAMPTZ" />
|
||||
<dbType type="_TIMESTAMP" />
|
||||
<dbType type="_TINTERVAL" />
|
||||
<dbType type="_XID" />
|
||||
<dbType type="ACLITEM" />
|
||||
<dbType type="BYTEA" />
|
||||
<dbType type="_XID" />
|
||||
<dbType type="ACLITEM" />
|
||||
<dbType type="BYTEA" />
|
||||
<dbType type="CID" />
|
||||
<dbType type="CIDR" />
|
||||
<dbType type="CIRCLE" />
|
||||
<dbType type="INET" />
|
||||
<dbType type="CIRCLE" />
|
||||
<dbType type="INET" />
|
||||
<dbType type="MACADDR" />
|
||||
<dbType type="MONEY" />
|
||||
<dbType type="MONEY" />
|
||||
<dbType type="OID" />
|
||||
<dbType type="PATH" />
|
||||
<dbType type="POLYGON" />
|
||||
<dbType type="POLYGON" />
|
||||
<dbType type="REFCURSOR" />
|
||||
<dbType type="REGCLASS" />
|
||||
<dbType type="REGOPER" />
|
||||
<dbType type="REGOPERATOR" />
|
||||
<dbType type="REGPROC" />
|
||||
<dbType type="REGPROCEDURE" />
|
||||
<dbType type="REGTYPE" />
|
||||
<dbType type="SMGR" />
|
||||
<dbType type="REGTYPE" />
|
||||
<dbType type="SMGR" />
|
||||
<dbType type="TID" />
|
||||
<dbType type="XID" />
|
||||
<dbType type="_CHAR" />
|
||||
@@ -239,7 +243,7 @@
|
||||
<dbType type="BIGINT" />
|
||||
<dbType type="BIT VARYING" />
|
||||
<dbType type="_VARBIT" />
|
||||
<dbType type="_BIT" />
|
||||
<dbType type="_BIT" />
|
||||
<dbType type="_BOOL" />
|
||||
<dbType type="BOOLEAN" />
|
||||
<dbType type="BOX" />
|
||||
@@ -276,7 +280,7 @@
|
||||
<dbType type="OIDVECTOR" />
|
||||
<dbType type="_OIDVECTOR" />
|
||||
<dbType type="_PATH" />
|
||||
<dbType type="POINT" default="true" />
|
||||
<dbType type="POINT" default="true" />
|
||||
</talendType>
|
||||
<talendType type="id_Short">
|
||||
<dbType type="INT2" default="true" />
|
||||
@@ -285,22 +289,22 @@
|
||||
<dbType type="INT8" />
|
||||
<dbType type="BIGINT" />
|
||||
<dbType type="BIGSERIAL" />
|
||||
<dbType type="SMALLINT" />
|
||||
<dbType type="SMALLINT" />
|
||||
</talendType>
|
||||
<talendType type="id_String">
|
||||
<dbType type="BPCHAR" />
|
||||
<dbType type="VARCHAR" default="true" />
|
||||
<dbType type="CHARACTER VARYING" />
|
||||
<dbType type="TEXT" />
|
||||
<dbType type="TEXT" />
|
||||
</talendType>
|
||||
</talendToDbTypes>
|
||||
<dbToTalendTypes>
|
||||
<dbType type="INT2" >
|
||||
<talendType type="id_Short" default="true" />
|
||||
<talendType type="id_Short" default="true" />
|
||||
</dbType>
|
||||
<dbType type="SMALLINT" >
|
||||
<talendType type="id_Short" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Short" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INT4" >
|
||||
<talendType type="id_Integer" default="true" />
|
||||
</dbType>
|
||||
@@ -308,330 +312,336 @@
|
||||
<talendType type="id_Integer" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CHARACTER VARYING" >
|
||||
<talendType type="id_String" default="true" />
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BOOLEAN" >
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<dbType type="SERIAL" >
|
||||
<talendType type="id_Integer" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Integer" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INT8" >
|
||||
<talendType type="id_Long" default="true" />
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIGINT" >
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIGSERIAL" >
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<dbType type="FLOAT4" >
|
||||
<talendType type="id_Float" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
<talendType type="id_Float" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="REAL" >
|
||||
<talendType type="id_Float" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<talendType type="id_Float" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="FLOAT8" >
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="DOUBLE PRECISION" >
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="NUMERIC">
|
||||
<talendType type="id_Double"/>
|
||||
<talendType type="id_BigDecimal" default="true" />
|
||||
<talendType type="id_BigDecimal" default="true" />
|
||||
</dbType>
|
||||
<dbType type="DECIMAL">
|
||||
<talendType type="id_Double"/>
|
||||
<talendType type="id_BigDecimal" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_BigDecimal" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BOOL" >
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIT" >
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<dbType type="VARBIT" >
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIT VARYING" >
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_byte[]" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CHAR" >
|
||||
<talendType type="id_String" default="true" />
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CHARACTER" >
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BPCHAR" >
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="VARCHAR" >
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TEXT" >
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="DATE" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="ABSTIME" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIMETZ" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIME WITH TIME ZONE" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIME" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIMESTAMPTZ" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIMESTAMP WITH TIME ZONE" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIMESTAMP" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INTERVAL" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TINTERVAL" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="RELTIME" >
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="ACLITEM" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BYTEA" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CIDR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CIRCLE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INET" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MACADDR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MONEY" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="OID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="PATH" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="POLYGON" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REFCURSOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGCLASS" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGOPER" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGOPERATOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGPROC" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGPROCEDURE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="REGTYPE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="SMGR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="XID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BOX" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INT2VECTOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="LINE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="LSEG" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="NAME" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="OIDVECTOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="POINT" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<!-- object -->
|
||||
<dbType type="_OIDVECTOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_PATH" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_NAME" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_NUMERIC" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_OID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_LSEG" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_MACADDR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_MONEY" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_LINE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_INT2VECTOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_INT4" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_INTERVAL" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_BOX" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_BYTEA" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_VARCHAR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_BPCHAR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_CID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_CIDR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_CIRCLE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_DATE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_FLOAT8" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_INET" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_CHAR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_ABSTIME" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_ACLITEM" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_INT8" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_VARBIT" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_BIT" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_BOOL" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_POINT" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_POLYGON" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_FLOAT4" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REFCURSOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGCLASS" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGOPER" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGOPERATOR" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGPROC" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGPROCEDURE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_REGTYPE" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_RELTIME" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TEXT" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TIMETZ" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TIME" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TIMESTAMPTZ" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TIMESTAMP" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_TINTERVAL" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="_XID" >
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
</dbToTalendTypes>
|
||||
</language>
|
||||
</dbms>
|
||||
|
||||
@@ -21,6 +21,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.talend.core.model.general.ModuleNeeded;
|
||||
import org.talend.core.model.general.RetrieveResult;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.core.nexus.ArtifactRepositoryBean;
|
||||
import org.talend.core.nexus.TalendLibsServerManager;
|
||||
@@ -109,6 +110,8 @@ public interface ILibraryManagerService extends IService {
|
||||
|
||||
public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
|
||||
|
||||
RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
|
||||
boolean showDialog, IProgressMonitor... monitorWrap);
|
||||
/**
|
||||
*
|
||||
* Resolve the jar from custom nexus
|
||||
|
||||
@@ -383,6 +383,12 @@ public class ConnParameterKeys {
|
||||
public static final String CONN_PARA_KEY_CDE_WORKLOAD_USER="CONN_PARA_KEY_CDE_WORKLOAD_USER";
|
||||
public static final String CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD = "CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD";
|
||||
|
||||
// STANDALONE
|
||||
public static final String CONN_PARA_KEY_UNIV_STANDALONE_MASTER="CONN_PARA_KEY_UNIV_STANDALONE_MASTER";
|
||||
public static final String CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC="CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC";
|
||||
public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY";
|
||||
public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE";
|
||||
|
||||
/**
|
||||
* Redshift
|
||||
*/
|
||||
|
||||
@@ -69,9 +69,9 @@ public enum EDatabaseVersion4Drivers {
|
||||
INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
|
||||
|
||||
SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
|
||||
"sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
|
||||
"SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
|
||||
// MYSQL, add for 9594
|
||||
MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
@@ -84,7 +84,7 @@ public enum EDatabaseVersion4Drivers {
|
||||
MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
|
||||
"Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
|
||||
"oauth2-oidc-sdk-9.7.jar", "log4j-1.2.17.jar", "jackson-core-2.13.2.jar",
|
||||
"oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.19.jar", "jackson-core-2.13.2.jar",
|
||||
"jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
|
||||
"json-smart-2.4.7.jar", "nimbus-jose-jwt-9.9.3.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
|
||||
"content-type-2.1.jar", "lang-tag-1.5.jar" })),
|
||||
@@ -95,19 +95,19 @@ public enum EDatabaseVersion4Drivers {
|
||||
GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
|
||||
GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
|
||||
// PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
|
||||
PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
|
||||
"Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
|
||||
IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
|
||||
SYBASEASE(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 12/15", "SYBSEIQ_12_15", "jconn3.jar")), //$NON-NLS-1$
|
||||
SYBASEIQ_16(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16", "SYBSEIQ_16", "jconn4.jar")), //$NON-NLS-1$
|
||||
SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
|
||||
SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere) and above", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
|
||||
SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$
|
||||
|
||||
EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
|
||||
|
||||
@@ -148,7 +148,13 @@ public enum EHadoopProperties {
|
||||
|
||||
DATABRICKS_TOKEN,
|
||||
|
||||
DATABRICKS_DBFS_DEP_FOLDER;
|
||||
DATABRICKS_DBFS_DEP_FOLDER,
|
||||
|
||||
UNIV_STANDALONE_MASTER,
|
||||
|
||||
UNIV_STANDALONE_EXEC_MEMORY,
|
||||
|
||||
UNIV_STANDALONE_EXEC_CORE;
|
||||
|
||||
public String getName() {
|
||||
return this.name();
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2022 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.general;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class RetrieveResult {
|
||||
|
||||
private boolean allResolved;
|
||||
|
||||
private Set<ModuleNeeded> resovledModules = new HashSet<>();
|
||||
|
||||
private Set<ModuleNeeded> unresolvedModules = new HashSet<>();
|
||||
|
||||
public boolean isAllResolved() {
|
||||
return allResolved;
|
||||
}
|
||||
|
||||
public void setAllResolved(boolean allResolved) {
|
||||
this.allResolved = allResolved;
|
||||
}
|
||||
|
||||
public Set<ModuleNeeded> getResovledModules() {
|
||||
return resovledModules;
|
||||
}
|
||||
|
||||
public Set<ModuleNeeded> getUnresolvedModules() {
|
||||
return unresolvedModules;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -17,7 +17,6 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
import org.eclipse.core.runtime.preferences.InstanceScope;
|
||||
import org.eclipse.emf.common.util.EList;
|
||||
import org.eclipse.emf.ecore.util.EcoreUtil;
|
||||
@@ -128,7 +127,7 @@ public final class ElementParameterParser {
|
||||
if (canEncryptValue(value)) {
|
||||
try {
|
||||
String removeQuotes = TalendQuoteUtils.removeQuotes(value);
|
||||
removeQuotes = StringEscapeUtils.unescapeJava(removeQuotes);
|
||||
removeQuotes = TalendQuoteUtils.checkSlashAndRemoveQuotation(removeQuotes);
|
||||
return TalendQuoteUtils.addQuotes(PasswordEncryptUtil.encryptPasswordHex(removeQuotes),
|
||||
TalendQuoteUtils.QUOTATION_MARK);
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2022 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.prefs;
|
||||
|
||||
|
||||
/**
|
||||
* created by hcyi on May 17, 2022
|
||||
* Detailled comment
|
||||
*
|
||||
*/
|
||||
public class SecurityPreferenceConstants {
|
||||
|
||||
public static final String SIGNER_PATH = "signer.path"; //$NON-NLS-1$
|
||||
|
||||
public static final String SIGNER_KEYSTORE_PASSWORD = "signer.keystore.password"; //$NON-NLS-1$
|
||||
|
||||
public static final String SIGNER_KEY_PASSWORD = "signer.key.password"; //$NON-NLS-1$
|
||||
|
||||
public static final String SIGNER_KEY_ALIAS = "signer.key.alias"; //$NON-NLS-1$
|
||||
|
||||
}
|
||||
@@ -305,13 +305,13 @@ RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
|
||||
RepositoryUpdateManager.Messages=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.MessagesForTDQ=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B?\n\u307E\u305F\u3001\u4E00\u90E8\u306E\u5206\u6790\u4F9D\u5B58\u9805\u76EE\u3067\u60C5\u5831\u304C\u5931\u308F\u308C\u307E\u3059\u3002\n\u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
|
||||
RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
|
||||
RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u66F4\u65B0\u4E2D...
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u4E2D...
|
||||
RoutinesFunctionProposal.CreatedBy=\u4F5C\u6210\u8005:
|
||||
RoutinesFunctionProposal.Description=\u8AAC\u660E:
|
||||
RoutinesFunctionProposal.Example=\u4F8B:
|
||||
@@ -483,11 +483,11 @@ EUpdateItemType.Name=\u540D\u524D
|
||||
EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
EUpdateItemType.ValidationRule=\u691C\u8A3C\u30EB\u30FC\u30EB
|
||||
EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
|
||||
EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
|
||||
EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u66F4\u65B0
|
||||
EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u66F4\u65B0
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
|
||||
EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
|
||||
EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2014, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2014, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
|
||||
AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
|
||||
AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
|
||||
|
||||
@@ -42,7 +42,9 @@ public interface IMetadataManagmentUiService extends IService {
|
||||
|
||||
public boolean promptConfirmLauch(Shell shell, Connection connection, ContextItem contextItem);
|
||||
|
||||
public IContext promptConfirmLauch(Shell shell, List<IContext> contexts);
|
||||
public IContext promptConfirmLauch(Shell shell, List<IContext> contexts, IContext defaultContext);
|
||||
|
||||
public boolean promptConfirmLauch(Shell shell, IContext context);
|
||||
|
||||
public boolean isPromptNeeded(List<IContext> contexts);
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ package org.talend.core.service;
|
||||
import java.net.URI;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.core.resources.IProject;
|
||||
@@ -25,7 +26,7 @@ import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.update.IStudioUpdateConfig;
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
* DON'T remove/change existing API for patch!
|
||||
*/
|
||||
public interface IStudioLiteP2Service extends IService {
|
||||
|
||||
@@ -123,6 +124,8 @@ public interface IStudioLiteP2Service extends IService {
|
||||
|
||||
boolean checkProjectCompatibility(IProgressMonitor monitor, Project proj) throws Exception;
|
||||
|
||||
boolean adaptNewProjectVersion(IProgressMonitor monitor, Map<String, String> props) throws Exception;
|
||||
|
||||
void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
|
||||
|
||||
public static IStudioLiteP2Service get() {
|
||||
|
||||
@@ -45,6 +45,8 @@ public interface ICamelDesignerCoreService extends IService {
|
||||
|
||||
boolean isInstanceofCamelBeansJar(Item item);
|
||||
|
||||
boolean isRouteletProcess(Item item);
|
||||
|
||||
/**
|
||||
* Synchronized Route resource
|
||||
*
|
||||
|
||||
@@ -202,4 +202,8 @@ public interface IDesignerCoreService extends IService {
|
||||
|
||||
public String[] getNeedRemoveModulesForLog4j();
|
||||
|
||||
public void openComponentOnlineHelp(String componentName);
|
||||
|
||||
public IProcess getJobletProcessByItem(Item item);
|
||||
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ public interface IRunProcessService extends IService {
|
||||
public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process, Set<ModuleNeeded> alreadyRetrievedModules)
|
||||
throws ProcessorException;
|
||||
|
||||
public void updateLibraries(Item routineItem);
|
||||
public boolean updateLibraries(Item routineItem);
|
||||
|
||||
public void refreshView();
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.eclipse.core.runtime.IPath;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
@@ -27,6 +28,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.service.ITaCoKitService;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.hadoop.IHadoopClusterService;
|
||||
@@ -377,7 +379,7 @@ public class RepositoryNodeUtilities {
|
||||
return node;
|
||||
} else {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
|
||||
ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
|
||||
ITestContainerProviderService testContainerService = GlobalServiceRegister
|
||||
.getDefault().getService(ITestContainerProviderService.class);
|
||||
if (testContainerService != null) {
|
||||
String originalID = testContainerService.getOriginalID(curNode);
|
||||
@@ -710,7 +712,7 @@ public class RepositoryNodeUtilities {
|
||||
ERepositoryObjectType type = connection.getObject().getRepositoryObjectType();
|
||||
IGenericWizardService wizardService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
|
||||
wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
|
||||
wizardService = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
|
||||
}
|
||||
if (wizardService != null && wizardService.isGenericType(type)) {
|
||||
return getGenericSchemaNode(connection, tableName);
|
||||
@@ -870,6 +872,7 @@ public class RepositoryNodeUtilities {
|
||||
// RelationshipItemBuilder
|
||||
if (item instanceof ConnectionItem) {
|
||||
ConnectionItem connectionItem = (ConnectionItem) item;
|
||||
|
||||
if (connectionItem.getConnection().isContextMode()) {
|
||||
String id = connectionItem.getConnection().getContextId();
|
||||
if (id != null) {
|
||||
@@ -882,7 +885,31 @@ public class RepositoryNodeUtilities {
|
||||
checkItemDependencies(object, repositoryObjects, includeSystemItems, includeReferenceProjectItems,
|
||||
needRebuild);
|
||||
}
|
||||
} else {
|
||||
ITaCoKitService coKitService = ITaCoKitService.getInstance();
|
||||
String parentItemId = null;
|
||||
IRepositoryViewObject obj = null;
|
||||
if (coKitService != null) {
|
||||
parentItemId = coKitService.getParentItemIdFromItem(item);
|
||||
}
|
||||
if (StringUtils.isNotBlank(parentItemId)) {
|
||||
|
||||
if (includeReferenceProjectItems) {
|
||||
obj = factory.getLastVersion(parentItemId);
|
||||
} else {
|
||||
obj = factory.getLastVersion(ProjectManager.getInstance().getCurrentProject(),
|
||||
parentItemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (obj != null) {
|
||||
if (obj instanceof IRepositoryViewObject && !repositoryObjects.contains(obj)) {
|
||||
|
||||
repositoryObjects.add(obj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
} catch (PersistenceException et) {
|
||||
ExceptionHandler.process(et);
|
||||
@@ -890,10 +917,30 @@ public class RepositoryNodeUtilities {
|
||||
|
||||
}
|
||||
|
||||
private static void checkParentItemForTacokit(IRepositoryViewObject obj,
|
||||
List<IRepositoryViewObject> repositoryObjects) {
|
||||
|
||||
ITaCoKitService coKitService = ITaCoKitService.getInstance();
|
||||
|
||||
if (coKitService == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Object datastoreFromDataset = coKitService.getDatastoreFromDataset(obj);
|
||||
|
||||
if (datastoreFromDataset instanceof IRepositoryViewObject
|
||||
&& !repositoryObjects.contains(datastoreFromDataset)) {
|
||||
|
||||
repositoryObjects.add((IRepositoryViewObject) datastoreFromDataset);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static void checkItemDependencies(IRepositoryViewObject obj, List<IRepositoryViewObject> repositoryObjects,
|
||||
boolean includeSystemItems, boolean includeReferenceProjectItems, boolean needRebuild) {
|
||||
if (obj != null && !repositoryObjects.contains(obj)) {
|
||||
repositoryObjects.add(obj);
|
||||
checkParentItemForTacokit(obj, repositoryObjects);
|
||||
checkAllVersionLatest(repositoryObjects, obj, includeSystemItems, includeReferenceProjectItems);
|
||||
checkItemDependencies(obj.getProperty().getItem(), repositoryObjects, includeSystemItems,
|
||||
includeReferenceProjectItems, needRebuild);
|
||||
@@ -961,7 +1008,7 @@ public class RepositoryNodeUtilities {
|
||||
List<ERepositoryObjectType> extraTypes = new ArrayList<ERepositoryObjectType>();
|
||||
IGenericDBService dbService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
|
||||
dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(IGenericDBService.class);
|
||||
dbService = GlobalServiceRegister.getDefault().getService(IGenericDBService.class);
|
||||
}
|
||||
if (dbService != null) {
|
||||
extraTypes.addAll(dbService.getExtraTypes());
|
||||
|
||||
@@ -581,3 +581,4 @@ I18nPreferencePage.restoreDefault=Restore default
|
||||
I18nPreferencePage.wait_process=The process will hold for several minutes, please wait...
|
||||
MetadataPreferencePage.EnableBasic.name=Enable Basic Authentication Header
|
||||
MetadataPreferencePage.MessageDialog.Restart=The Studio needs to restart for this setting to take effect.\nAre you sure?
|
||||
TalendTabbedPropertyTitle.componentHelpTooltip=Open online help
|
||||
|
||||
@@ -231,12 +231,12 @@ RepositoryUpdateManager.Title=\u5909\u66F4
|
||||
RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
|
||||
RepositoryUpdateManager.Messages=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
|
||||
RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
|
||||
RepositoryUpdateManager.RenameContextMessages=\u5909\u6570\u306E\u540D\u524D\u5909\u66F4\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextMessages=\u5909\u6570\u306E\u540D\u524D\u5909\u66F4\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RuleOperationChoiceDialog.editRules=\u30EB\u30FC\u30EB\u3092\u7DE8\u96C6
|
||||
RuleOperationChoiceDialog.rule=\u30EB\u30FC\u30EB:
|
||||
RuleOperationChoiceDialog.selectRulesFile=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EB\u30FC\u30EB\u3092\u9078\u629E
|
||||
@@ -363,8 +363,8 @@ EUpdateItemType.Components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
|
||||
EUpdateItemType.Name=\u540D\u524D
|
||||
EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
|
||||
EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
|
||||
EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
|
||||
@@ -581,3 +581,4 @@ I18nPreferencePage.restoreDefault=\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u5FA9\u51
|
||||
I18nPreferencePage.wait_process=\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...
|
||||
MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3059\u308B
|
||||
MetadataPreferencePage.MessageDialog.Restart=\u3053\u306E\u8A2D\u5B9A\u304C\u6709\u52B9\u306B\u306A\u308B\u3088\u3046\u3001Studio\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
TalendTabbedPropertyTitle.componentHelpTooltip=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u958B\u304F
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content=\u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content=\u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
|
||||
AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
|
||||
AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316:
|
||||
|
||||
@@ -636,6 +636,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
|
||||
visibleItemCount = 20;
|
||||
}
|
||||
contextsCombo.setVisibleItemCount(visibleItemCount);
|
||||
contextsCombo.getParent().getParent().pack();
|
||||
}
|
||||
|
||||
private void checkContextGroupSource() {
|
||||
|
||||
@@ -19,6 +19,9 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.dom4j.Element;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.model.components.EComponentType;
|
||||
import org.talend.core.model.genhtml.HTMLDocUtils;
|
||||
import org.talend.core.model.genhtml.IHTMLDocConstants;
|
||||
import org.talend.core.model.process.EComponentCategory;
|
||||
@@ -27,7 +30,9 @@ import org.talend.core.model.process.IComponentDocumentation;
|
||||
import org.talend.core.model.process.IElementParameter;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.properties.ConnectionItem;
|
||||
import org.talend.core.model.repository.IRepositoryViewObject;
|
||||
import org.talend.core.model.utils.ParameterValueUtil;
|
||||
import org.talend.core.repository.model.ProxyRepositoryFactory;
|
||||
import org.talend.designer.core.IDesignerCoreService;
|
||||
|
||||
/**
|
||||
@@ -103,13 +108,64 @@ public class ExternalNodeComponentHandler extends AbstractComponentHandler {
|
||||
|
||||
for (INode externalNode : this.componentsList) {
|
||||
Element componentElement = generateComponentDetailsInfo(true, externalNode, this.externalNodeElement,
|
||||
this.picFilePathMap, this.sourceConnectionMap, this.targetConnectionMap, this.repositoryDBIdAndNameMap);
|
||||
this.picFilePathMap, this.sourceConnectionMap, this.targetConnectionMap,
|
||||
this.repositoryDBIdAndNameMap);
|
||||
|
||||
String componentName = externalNode.getUniqueName();
|
||||
IComponentDocumentation componentDocumentation = externalNode.getExternalNode().getComponentDocumentation(
|
||||
componentName, HTMLDocUtils.getTmpFolder() /* checkExternalPathIsExists(tempFolderPath) */);
|
||||
|
||||
// Checks if generating html file for external node failed, generating the same information as internal node
|
||||
if (EComponentType.JOBLET == externalNode.getComponent().getComponentType()) {
|
||||
String jobletName = externalNode.getComponent().getProcess().getName();
|
||||
String version = externalNode.getComponent().getProcess().getVersion();
|
||||
componentElement.addAttribute("joblet", HTMLDocUtils.checkString(jobletName));
|
||||
// ../b/b_0.1.html
|
||||
String href = "../" + jobletName + "/" + jobletName + "_" + version + ".html";
|
||||
componentElement.addAttribute("href", HTMLDocUtils.checkString(href));
|
||||
}
|
||||
|
||||
if (EComponentType.EMF == externalNode.getComponent().getComponentType()
|
||||
&& externalNode.getElementParameter("SELECTED_JOB_NAME") != null) {
|
||||
|
||||
IElementParameter elp = externalNode.getElementParameter("SELECTED_JOB_NAME");
|
||||
String cjobName = (String) elp.getValue();
|
||||
componentElement.addAttribute("joblet", HTMLDocUtils.checkString(cjobName));
|
||||
|
||||
Map<String, IElementParameter> childParameters = elp.getChildParameters();
|
||||
String version = null;
|
||||
String processId = null;
|
||||
if (childParameters != null) {
|
||||
IElementParameter processElementId = childParameters.get("PROCESS_TYPE_PROCESS");
|
||||
if (processElementId != null) {
|
||||
processId = (String) processElementId.getValue();
|
||||
}
|
||||
IElementParameter versionElement = childParameters.get("PROCESS_TYPE_VERSION");
|
||||
if (versionElement != null) {
|
||||
version = (String) versionElement.getValue();
|
||||
if ("Latest".equals(version) && processId != null) {
|
||||
try {
|
||||
IRepositoryViewObject rep = ProxyRepositoryFactory.getInstance()
|
||||
.getLastVersion(processId);
|
||||
if (rep != null) {
|
||||
version = rep.getProperty().getVersion();
|
||||
}
|
||||
} catch (PersistenceException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (version == null) {
|
||||
version = "0.1";
|
||||
ExceptionHandler.log("The property of sbujob is missing");
|
||||
}
|
||||
|
||||
String href = "../" + cjobName + "/" + cjobName + "_" + version + ".html";
|
||||
componentElement.addAttribute("href", HTMLDocUtils.checkString(href));
|
||||
}
|
||||
|
||||
// Checks if generating html file for external node failed, generating the same
|
||||
// information as internal node
|
||||
// instead.
|
||||
if (componentDocumentation == null) {
|
||||
Element parametersElement = componentElement.addElement("parameters"); //$NON-NLS-1$
|
||||
|
||||
@@ -18,13 +18,17 @@ import java.util.Map;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.dom4j.Element;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.model.genhtml.HTMLDocUtils;
|
||||
import org.talend.core.model.genhtml.IHTMLDocConstants;
|
||||
import org.talend.core.model.process.EParameterFieldType;
|
||||
import org.talend.core.model.process.IElementParameter;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.properties.ConnectionItem;
|
||||
import org.talend.core.model.repository.IRepositoryViewObject;
|
||||
import org.talend.core.model.utils.ParameterValueUtil;
|
||||
import org.talend.core.repository.model.ProxyRepositoryFactory;
|
||||
import org.talend.core.runtime.CoreRuntimePlugin;
|
||||
import org.talend.designer.core.IDesignerCoreService;
|
||||
|
||||
@@ -88,11 +92,58 @@ public class InternalNodeComponentHandler extends AbstractComponentHandler {
|
||||
*/
|
||||
@Override
|
||||
public void generateComponentInfo() {
|
||||
|
||||
for (INode node : this.componentsList) {
|
||||
Element componentElement = generateComponentDetailsInfo(false, node, this.internalNodeElement, this.picFilePathMap,
|
||||
this.sourceConnectionMap, this.targetConnectionMap, this.repositoryDBIdAndNameMap);
|
||||
Element componentElement = generateComponentDetailsInfo(false, node, this.internalNodeElement,
|
||||
this.picFilePathMap, this.sourceConnectionMap, this.targetConnectionMap,
|
||||
this.repositoryDBIdAndNameMap);
|
||||
|
||||
CoreRuntimePlugin.getInstance().getRepositoryService().setInternalNodeHTMLMap(node, internalNodeHTMLMap);
|
||||
boolean istRunJob = node.getComponent().getName().equals("tRunJob"); //$NON-NLS-1$
|
||||
if (istRunJob) {
|
||||
|
||||
String version = null;
|
||||
String processId = null;
|
||||
IElementParameter processElement = node.getElementParameter("PROCESS");
|
||||
if (processElement != null) {
|
||||
Map<String, IElementParameter> childParameters = processElement.getChildParameters();
|
||||
if (childParameters != null) {
|
||||
|
||||
IElementParameter processElementId = childParameters.get("PROCESS_TYPE_PROCESS");
|
||||
if (processElementId != null) {
|
||||
processId = (String) processElementId.getValue();
|
||||
}
|
||||
IElementParameter versionElement = childParameters.get("PROCESS_TYPE_VERSION");
|
||||
if (versionElement != null) {
|
||||
version = (String) versionElement.getValue();
|
||||
if ("Latest".equals(version) && processId != null) {
|
||||
try {
|
||||
IRepositoryViewObject rep = ProxyRepositoryFactory.getInstance()
|
||||
.getLastVersion(processId);
|
||||
if (rep != null) {
|
||||
version = rep.getProperty().getVersion();
|
||||
}
|
||||
} catch (PersistenceException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (version == null) {
|
||||
version = "0.1";
|
||||
ExceptionHandler.log("The property of sbujob is missing");
|
||||
}
|
||||
componentElement.addAttribute("job", HTMLDocUtils.checkString(node.getLabel()));
|
||||
// ../b/b_0.1.html
|
||||
if (processElement != null && processElement.getValue() != null) {
|
||||
String processName = processElement.getValue().toString();
|
||||
String href = "../" + processName + "/" + processName + "_" + version + ".html";
|
||||
componentElement.addAttribute("href", HTMLDocUtils.checkString(href));
|
||||
}
|
||||
|
||||
}
|
||||
generateComponentElemParamters(node, componentElement);
|
||||
}
|
||||
}
|
||||
@@ -105,10 +156,9 @@ public class InternalNodeComponentHandler extends AbstractComponentHandler {
|
||||
*/
|
||||
protected void generateComponentElemParamters(INode node, Element componentElement) {
|
||||
Element parametersElement = componentElement.addElement("parameters"); //$NON-NLS-1$
|
||||
|
||||
List elementParameterList = node.getElementParameters();
|
||||
|
||||
boolean istRunJob = node.getComponent().getName().equals("tRunJob"); //$NON-NLS-1$
|
||||
|
||||
generateComponentElementParamInfo(istRunJob, parametersElement, elementParameterList, node);
|
||||
|
||||
generateComponentSchemaInfo(node, componentElement);
|
||||
|
||||
@@ -24,7 +24,6 @@ import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.layout.FormAttachment;
|
||||
import org.eclipse.swt.layout.FormData;
|
||||
import org.eclipse.swt.layout.FormLayout;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.ui.views.properties.tabbed.ITabItem;
|
||||
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
|
||||
@@ -129,6 +128,14 @@ public class HorizontalTabFactory {
|
||||
title.setTitleImage(image);
|
||||
}
|
||||
|
||||
public void setHelpComponentName(String componentName) {
|
||||
title.setComponentName(componentName);
|
||||
}
|
||||
|
||||
public TalendTabbedPropertyTitle getTabbedPropertyTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
/**
|
||||
* yzhang HorizontalTabFactory class global comment. Detailled comment <br/>
|
||||
*
|
||||
|
||||
@@ -12,11 +12,14 @@
|
||||
// ============================================================================
|
||||
package org.talend.core.ui.properties.tab;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.custom.CLabel;
|
||||
import org.eclipse.swt.events.PaintEvent;
|
||||
import org.eclipse.swt.events.PaintListener;
|
||||
import org.eclipse.swt.events.SelectionAdapter;
|
||||
import org.eclipse.swt.events.SelectionEvent;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
import org.eclipse.swt.graphics.Font;
|
||||
import org.eclipse.swt.graphics.FontData;
|
||||
@@ -27,9 +30,16 @@ import org.eclipse.swt.layout.FormAttachment;
|
||||
import org.eclipse.swt.layout.FormData;
|
||||
import org.eclipse.swt.layout.FormLayout;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.ToolBar;
|
||||
import org.eclipse.swt.widgets.ToolItem;
|
||||
import org.eclipse.ui.forms.IFormColors;
|
||||
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
|
||||
import org.talend.commons.ui.runtime.image.EImage;
|
||||
import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ui.CoreUIPlugin;
|
||||
import org.talend.core.ui.i18n.Messages;
|
||||
import org.talend.designer.core.IDesignerCoreService;
|
||||
import org.talend.themes.core.elements.stylesettings.TalendTabbedPropertyColorHelper;
|
||||
import org.talend.themes.core.elements.widgets.ITalendTabbedPropertyTitleWidget;
|
||||
|
||||
@@ -44,6 +54,16 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
private Image image = null;
|
||||
|
||||
private String text = null;
|
||||
|
||||
private ToolItem helpLabel;
|
||||
|
||||
private String componentName;
|
||||
|
||||
private Composite titleLabelComp;
|
||||
|
||||
private Composite helpComp;
|
||||
|
||||
private boolean isComponentTitle;
|
||||
|
||||
private static final String BLANK = ""; //$NON-NLS-1$
|
||||
|
||||
@@ -71,8 +91,10 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
public void paintControl(PaintEvent e) {
|
||||
if (image == null && (text == null || text.equals(BLANK))) {
|
||||
label.setVisible(false);
|
||||
helpComp.setVisible(false);
|
||||
} else {
|
||||
label.setVisible(true);
|
||||
helpComp.setVisible(isComponentTitle && StringUtils.isNotBlank(componentName));
|
||||
drawTitleBackground(e);
|
||||
}
|
||||
}
|
||||
@@ -96,25 +118,70 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
}
|
||||
font = JFaceResources.getFont(TITLE_FONT);
|
||||
|
||||
label = factory.createCLabel(this, BLANK);
|
||||
if (colorHelper.getTitleBackground() == null) {
|
||||
label.setBackground(new Color[] { factory.getColors().getColor(IFormColors.H_GRADIENT_END),
|
||||
factory.getColors().getColor(IFormColors.H_GRADIENT_START) }, new int[] { 100 }, true);
|
||||
} else {
|
||||
label.setBackground(colorHelper.getTitleBackground());
|
||||
}
|
||||
titleLabelComp = new Composite(this, SWT.None);
|
||||
FormData compData = new FormData();
|
||||
compData.left = new FormAttachment(0, 0);
|
||||
compData.top = new FormAttachment(0, 0);
|
||||
compData.right = new FormAttachment(100, 0);
|
||||
compData.bottom = new FormAttachment(100, 0);
|
||||
titleLabelComp.setLayoutData(compData);
|
||||
titleLabelComp.setLayout(new FormLayout());
|
||||
|
||||
label = factory.createCLabel(titleLabelComp, BLANK);
|
||||
label.setFont(font);
|
||||
label.setForeground(colorHelper.getTitleForeground());
|
||||
FormData data = new FormData();
|
||||
data.left = new FormAttachment(0, 0);
|
||||
data.top = new FormAttachment(0, 0);
|
||||
data.right = new FormAttachment(100, 0);
|
||||
data.right = new FormAttachment(100, -25);
|
||||
data.bottom = new FormAttachment(100, 0);
|
||||
label.setLayoutData(data);
|
||||
|
||||
/*
|
||||
* setImage(PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJ_ELEMENT));
|
||||
*/
|
||||
helpComp = new Composite(titleLabelComp, SWT.None);
|
||||
FormData helpFormData = new FormData();
|
||||
helpFormData.top = new FormAttachment(50, -12);
|
||||
helpFormData.right = new FormAttachment(100, 0);
|
||||
helpFormData.bottom = new FormAttachment(50, 12);
|
||||
helpFormData.left = new FormAttachment(100, -25);
|
||||
helpComp.setLayoutData(helpFormData);
|
||||
helpComp.setLayout(new FormLayout());
|
||||
|
||||
ToolBar toolBar = new ToolBar(helpComp, SWT.CENTER | SWT.NO_FOCUS);
|
||||
FormData toolBarData = new FormData();
|
||||
toolBarData.left = new FormAttachment(0, 0);
|
||||
toolBarData.top = new FormAttachment(0, 0);
|
||||
toolBarData.right = new FormAttachment(100, 0);
|
||||
toolBarData.bottom = new FormAttachment(100, 0);
|
||||
helpLabel = new ToolItem(toolBar, SWT.CHECK | SWT.CENTER);
|
||||
helpLabel.setImage(ImageProvider.getImage(EImage.HELP_ICON));
|
||||
helpLabel.setToolTipText(Messages.getString("TalendTabbedPropertyTitle.componentHelpTooltip"));
|
||||
helpLabel.setSelection(false);
|
||||
helpLabel.addSelectionListener(new SelectionAdapter() {
|
||||
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
if (StringUtils.isNotBlank(componentName)
|
||||
&& GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
|
||||
IDesignerCoreService service = GlobalServiceRegister.getDefault().getService(IDesignerCoreService.class);
|
||||
if (service != null) {
|
||||
service.openComponentOnlineHelp(componentName);
|
||||
}
|
||||
}
|
||||
helpLabel.setSelection(false);
|
||||
}
|
||||
});
|
||||
helpComp.setVisible(false);
|
||||
|
||||
if (colorHelper.getTitleBackground() == null) {
|
||||
label.setBackground(new Color[] { factory.getColors().getColor(IFormColors.H_GRADIENT_END),
|
||||
factory.getColors().getColor(IFormColors.H_GRADIENT_START) }, new int[] { 100 }, true);
|
||||
titleLabelComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
|
||||
helpComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
|
||||
} else {
|
||||
label.setBackground(colorHelper.getTitleBackground());
|
||||
titleLabelComp.setBackground(colorHelper.getTitleBackground());
|
||||
helpComp.setBackground(colorHelper.getTitleBackground());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -125,8 +192,12 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
if (colorHelper.getTitleBackground() == null) {
|
||||
label.setBackground(new Color[] { factory.getColors().getColor(IFormColors.H_GRADIENT_END),
|
||||
factory.getColors().getColor(IFormColors.H_GRADIENT_START) }, new int[] { 100 }, true);
|
||||
titleLabelComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
|
||||
helpComp.setBackground(factory.getColors().getColor(IFormColors.H_GRADIENT_START));
|
||||
} else {
|
||||
label.setBackground(colorHelper.getTitleBackground());
|
||||
titleLabelComp.setBackground(colorHelper.getTitleBackground());
|
||||
helpComp.setBackground(colorHelper.getTitleBackground());
|
||||
}
|
||||
Color bg = factory.getColors().getColor(IFormColors.H_GRADIENT_END);
|
||||
Color gbg = factory.getColors().getColor(IFormColors.H_GRADIENT_START);
|
||||
@@ -158,6 +229,7 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
label.setText(text);
|
||||
} else {
|
||||
label.setText(BLANK);
|
||||
componentName = null;
|
||||
}
|
||||
label.setImage(image);
|
||||
redraw();
|
||||
@@ -169,6 +241,14 @@ public class TalendTabbedPropertyTitle extends Composite implements ITalendTabbe
|
||||
redraw();
|
||||
}
|
||||
|
||||
public void setComponentName(String componentName) {
|
||||
this.componentName = componentName;
|
||||
}
|
||||
|
||||
public void setIsComponentTitle(boolean isComponentTitle) {
|
||||
this.isComponentTitle = isComponentTitle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TalendTabbedPropertyColorHelper getColorHelper() {
|
||||
return this.colorHelper;
|
||||
|
||||
@@ -152,12 +152,12 @@ RepositoryUpdateManager.Title=\u5909\u66F4
|
||||
RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
|
||||
RepositoryUpdateManager.Messages=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u3067\u884C\u308F\u308C\u308B\u5909\u66F4\u306B\u5F71\u97FF\u3055\u308C\u308B\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u691C\u51FA\u3057\u307E\u3059\u304B? \u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
|
||||
RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
|
||||
RepositoryUpdateManager.RenameContextMessages=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextMessages=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RuleOperationChoiceDialog.editRules=\u30EB\u30FC\u30EB\u3092\u7DE8\u96C6
|
||||
RuleOperationChoiceDialog.rule=\u30EB\u30FC\u30EB:
|
||||
RuleOperationChoiceDialog.selectRulesFile=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EB\u30FC\u30EB\u3092\u9078\u629E
|
||||
@@ -192,8 +192,8 @@ EUpdateItemType.Components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
|
||||
EUpdateItemType.Name=\u540D\u524D
|
||||
EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
|
||||
EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
|
||||
EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u8FFD\u52A0
|
||||
|
||||
@@ -694,6 +694,8 @@ public class ProcessorUtilities {
|
||||
|
||||
processor.setArguments(argumentsMap);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
|
||||
// generate the code of the father after the childrens
|
||||
// so the code won't have any error during the check, and it will help to check
|
||||
// if the generation is really needed.
|
||||
@@ -709,7 +711,7 @@ public class ProcessorUtilities {
|
||||
*/
|
||||
generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
checkNeedExportItemsForDQ(currentProcess);
|
||||
|
||||
copyDependenciedResources(currentProcess);
|
||||
|
||||
@@ -1239,6 +1241,8 @@ public class ProcessorUtilities {
|
||||
|
||||
processor.setArguments(argumentsMap);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
|
||||
generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor,
|
||||
currentProcess, currentJobName, processor, isMainJob, codeGenerationNeeded);
|
||||
|
||||
@@ -1254,7 +1258,7 @@ public class ProcessorUtilities {
|
||||
generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
|
||||
TimeMeasure.step(idTimer, "generateBuildInfo");
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
checkNeedExportItemsForDQ(currentProcess);
|
||||
|
||||
copyDependenciedResources(currentProcess);
|
||||
|
||||
@@ -1355,11 +1359,34 @@ public class ProcessorUtilities {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* if the job includes tdqReportRun, set 'needExportItemsForDQ'to true so as the item folder can be exported
|
||||
*
|
||||
* @param processItem
|
||||
* @param currentProcess
|
||||
*/
|
||||
private static void checkNeedExportItemsForDQ(IProcess currentProcess) {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQItemService.class)) {
|
||||
ITDQItemService tdqItemService =
|
||||
GlobalServiceRegister.getDefault().getService(ITDQItemService.class);
|
||||
// TDQ-19637 if it includes 'tDqReportRun',must export item folder
|
||||
if (tdqItemService != null && !needExportItemsForDQ) {
|
||||
for (INode node : currentProcess.getGeneratingNodes()) {
|
||||
String componentName = node.getComponent().getName();
|
||||
if ("tDqReportRun".equals(componentName)) {
|
||||
needExportItemsForDQ = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Specail operation for DQ components:
|
||||
* - For tdqReportRun, set 'needExportItemsForDQ'to true so as the item folder can be exported
|
||||
* - For tRuleSurvivorship, copy the current item's drools file from 'workspace/metadata/survivorship' to '.Java/src/resources'
|
||||
* - For tRuleSurvivorship, copy the current item's drools file from 'workspace/metadata/survivorship' to
|
||||
* '.Java/src/resources'
|
||||
*
|
||||
* @param processItem
|
||||
*/
|
||||
@@ -1371,16 +1398,6 @@ public class ProcessorUtilities {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
// TDQ-19637 if it includes 'tDqReportRun',must export item folder
|
||||
if (!needExportItemsForDQ) {
|
||||
for (INode node : currentProcess.getGeneratingNodes()) {
|
||||
String componentName = node.getComponent().getName();
|
||||
if ("tDqReportRun".equals(componentName)) {
|
||||
needExportItemsForDQ = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* 1.TDQ-12474 copy the "metadata/survivorship/rulePackage" to ".Java/src/main/resources/". so that it will be
|
||||
used by maven command 'include-survivorship-rules' to export.
|
||||
2.TDQ-14308 current drools file in 'src/resourcesmetadata/survivorship/' should be included to job jar.
|
||||
|
||||
@@ -89,7 +89,7 @@ _UI_Column_type=\u30AB\u30E9\u30E0
|
||||
_UI_Procedure_type=\u30D7\u30ED\u30B7\u30FC\u30B8\u30E3\u30FC
|
||||
_UI_Trigger_type=\u30C8\u30EA\u30AC\u30FC
|
||||
_UI_SQLIndex_type=SQL\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
|
||||
_UI_UniqueConstraint_type=\u4E00\u610F\u306E\u5236\u7D04
|
||||
_UI_UniqueConstraint_type=\u4E00\u610F\u5236\u7D04
|
||||
_UI_SQLIndexColumn_type=SQL\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30AB\u30E9\u30E0
|
||||
_UI_PrimaryKey_type=\u30D7\u30E9\u30A4\u30DE\u30EA\u30AD\u30FC
|
||||
_UI_Row_type=\u884C
|
||||
@@ -566,10 +566,10 @@ _UI_Trigger_usedColumnSet_feature=\u4F7F\u7528\u3055\u308C\u308B\u30AB\u30E9\u30
|
||||
_UI_Trigger_table_feature=\u30C6\u30FC\u30D6\u30EB
|
||||
_UI_SQLIndex_filterCondition_feature=\u30D5\u30A3\u30EB\u30BF\u30FC\u6761\u4EF6
|
||||
_UI_SQLIndex_isNullable_feature=NULL\u53EF\u80FD
|
||||
_UI_SQLIndex_autoUpdate_feature=\u81EA\u52D5\u66F4\u65B0
|
||||
_UI_SQLIndex_autoUpdate_feature=\u81EA\u52D5\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
_UI_UniqueConstraint_deferrability_feature=\u9045\u5EF6\u53EF\u80FD\u6027
|
||||
_UI_ForeignKey_deleteRule_feature=\u524A\u9664\u30EB\u30FC\u30EB
|
||||
_UI_ForeignKey_updateRule_feature=\u66F4\u65B0\u30EB\u30FC\u30EB
|
||||
_UI_ForeignKey_updateRule_feature=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30EB\u30FC\u30EB
|
||||
_UI_ForeignKey_deferrability_feature=\u9045\u5EF6\u53EF\u80FD\u6027
|
||||
_UI_CheckConstraint_deferrability_feature=\u9045\u5EF6\u53EF\u80FD\u6027
|
||||
_UI_Field_length_feature=\u9577\u3055
|
||||
@@ -845,7 +845,7 @@ _UI_Domain_default_feature=\u30C7\u30D5\u30A9\u30EB\u30C8
|
||||
_UI_Domain_validationRule_feature=\u691C\u8A3C\u30EB\u30FC\u30EB
|
||||
_UI_Domain_baseType_feature=\u30D9\u30FC\u30B9\u30BF\u30A4\u30D7
|
||||
_UI_RelationshipEnd_delete_feature=\u524A\u9664
|
||||
_UI_RelationshipEnd_update_feature=\u66F4\u65B0
|
||||
_UI_RelationshipEnd_update_feature=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
_UI_RelationshipEnd_insert_feature=\u633F\u5165
|
||||
_UI_RelationshipEnd_foreignKey_feature=\u5916\u90E8\u30AD\u30FC
|
||||
_UI_COBOLFD_organization_feature=\u7D44\u7E54
|
||||
@@ -1252,7 +1252,7 @@ _UI_DeferrabilityType_initiallyImmediate_literal=initiallyImmediate
|
||||
_UI_DeferrabilityType_notDeferrable_literal=notDeferrable
|
||||
_UI_EventManipulationType_insert_literal=\u633F\u5165
|
||||
_UI_EventManipulationType_delete_literal=\u524A\u9664
|
||||
_UI_EventManipulationType_update_literal=\u66F4\u65B0
|
||||
_UI_EventManipulationType_update_literal=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
_UI_NullableType_columnNoNulls_literal=columnNoNulls
|
||||
_UI_NullableType_columnNullable_literal=columnNullable
|
||||
_UI_NullableType_columnNullableUnknown_literal=columnNullableUnknown
|
||||
|
||||
@@ -10,9 +10,10 @@
|
||||
<artifactId>org.talend.designer.maven.repo.tck</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
<properties>
|
||||
<jackson.version>2.12.1</jackson.version>
|
||||
<jackson.version>2.13.2</jackson.version>
|
||||
<jackson-databind.version>2.13.2.2</jackson-databind.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -62,7 +63,7 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
<version>${jackson-databind.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -13,18 +13,17 @@
|
||||
<tcomp.version>${component-runtime.version}</tcomp.version>
|
||||
<cxf.version>3.5.1</cxf.version>
|
||||
<geronimo.version>1.0.2</geronimo.version>
|
||||
<jackson.version>2.12.1</jackson.version>
|
||||
<jcache.version>1.0.5</jcache.version>
|
||||
<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
|
||||
<johnzon.version>1.2.16</johnzon.version>
|
||||
<meecrowave.version>1.2.13</meecrowave.version>
|
||||
<microprofile.version>1.2.1</microprofile.version>
|
||||
<owb.version>2.0.26</owb.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<tomcat.version>9.0.59</tomcat.version>
|
||||
<slf4j.version>1.7.33</slf4j.version>
|
||||
<tomcat.version>9.0.62</tomcat.version>
|
||||
<xbean.version>4.20</xbean.version>
|
||||
<reload4j.version>1.2.19</reload4j.version>
|
||||
<log4j2.version>2.17.1</log4j2.version>
|
||||
<log4j2.version>2.17.2</log4j2.version>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<tcomp.version>1.43.1</tcomp.version>
|
||||
<tcomp.version>1.45.2</tcomp.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<reload4j.version>1.2.19</reload4j.version>
|
||||
</properties>
|
||||
|
||||
@@ -6,11 +6,11 @@ FolderMavenSettingPage_CreatingMavenSettingErrorTitle=\u30A8\u30E9\u30FC
|
||||
FolderMavenSettingPage_CreatingMavenSettingErrorMessage=\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306BMaven\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093:
|
||||
ProjectPomProjectSettingPage_Titile=\u6CE8: \u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u4F9D\u5B58\u9805\u76EE\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
|
||||
ProjectPomProjectSettingPage_ConfirmTitle=\u78BA\u8A8D
|
||||
ProjectPomProjectSettingPage_ConfirmMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8POM\u306B\u5909\u66F4\u3092\u9069\u7528\u3057\u3066\u76F4\u3061\u306B\u66F4\u65B0\u3057\u307E\u3059\u3002
|
||||
ProjectPomProjectSettingPage_ConfirmMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8POM\u306B\u5909\u66F4\u3092\u9069\u7528\u3057\u3066\u76F4\u3061\u306B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
|
||||
ProjectPomProjectSettingPage_FilterPomLabel=POM\u306E\u751F\u6210\u306B\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30EB\u30BF\u30FC:
|
||||
ProjectPomProjectSettingPage_FilterErrorMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u304C\u7121\u52B9\u3067\u3059\u3002
|
||||
ProjectPomProjectSettingPage.syncAllPomsButtonText=\u5B8C\u5168\u306A\u518D\u540C\u671FPOM\u3092\u5F37\u5236
|
||||
AbstractPersistentProjectSettingPage.syncAllPoms=POM\u3092\u3059\u3079\u3066\u66F4\u65B0\u3057\u307E\u3059\u304B? \n \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3053\u306E\u64CD\u4F5C\u3067\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
AbstractPersistentProjectSettingPage.syncAllPoms=POM\u3092\u3059\u3079\u3066\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3053\u306E\u64CD\u4F5C\u3067\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
MavenProjectSettingPage.filterExampleMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u306E\u4F8B:\nlabel=myJob \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3060\u3051\u3092\u751F\u6210\n!(label=myJob) \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2) \t\t\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A3\u30EB\u30C0\u30FC\u306B\u3042\u308B\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2)or(label=myJob)\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u3042\u308B\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u3001\u307E\u305F\u306F"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3092\u751F\u6210\n(label=myJob)and(version=0.2)\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.2\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u306E\u307F\u751F\u6210\n!((label=myJob)and(version=0.1))\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.1\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210
|
||||
MavenProjectSettingPage.refModuleText=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3067\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A
|
||||
MavenProjectSettingPage.excludeDeletedItems=\u524A\u9664\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u9664\u5916
|
||||
|
||||
@@ -36,3 +36,4 @@ Export-Package: org.talend.designer.maven,
|
||||
org.talend.designer.maven.tools.creator,
|
||||
org.talend.designer.maven.tools.extension,
|
||||
org.talend.designer.maven.utils
|
||||
Import-Package: org.slf4j
|
||||
|
||||
@@ -70,6 +70,11 @@
|
||||
<artifactId>maven-core</artifactId>
|
||||
<version>3.8.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>30.0-jre</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -97,6 +102,11 @@
|
||||
<artifactId>maven-core</artifactId>
|
||||
<version>3.8.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>30.0-jre</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -139,6 +149,11 @@
|
||||
<artifactId>maven-core</artifactId>
|
||||
<version>3.8.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>30.0-jre</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<archive>
|
||||
@@ -191,6 +206,11 @@
|
||||
<artifactId>maven-core</artifactId>
|
||||
<version>3.8.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>30.0-jre</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -52,7 +52,6 @@ import org.eclipse.m2e.core.internal.IMavenConstants;
|
||||
import org.eclipse.m2e.core.project.IMavenProjectFacade;
|
||||
import org.eclipse.m2e.core.project.IMavenProjectRegistry;
|
||||
import org.eclipse.m2e.core.project.ResolverConfiguration;
|
||||
import org.eclipse.m2e.internal.launch.MavenLaunchDelegate;
|
||||
import org.eclipse.m2e.internal.launch.MavenLaunchUtils;
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
import org.talend.commons.CommonsPlugin;
|
||||
@@ -292,7 +291,7 @@ public abstract class MavenCommandLauncher {
|
||||
|
||||
protected File getLicenseFile() {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
|
||||
ICoreTisService coreTisService = (ICoreTisService) GlobalServiceRegister.getDefault()
|
||||
ICoreTisService coreTisService = GlobalServiceRegister.getDefault()
|
||||
.getService(ICoreTisService.class);
|
||||
File licenseFile = coreTisService.getLicenseFile();
|
||||
if (licenseFile.exists() && !coreTisService.isLicenseExpired()) {
|
||||
@@ -304,7 +303,7 @@ public abstract class MavenCommandLauncher {
|
||||
|
||||
private String getSessionId() {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
|
||||
ICoreTisService coreTisService = (ICoreTisService) GlobalServiceRegister.getDefault()
|
||||
ICoreTisService coreTisService = GlobalServiceRegister.getDefault()
|
||||
.getService(ICoreTisService.class);
|
||||
return coreTisService.generateSignerSessionId();
|
||||
}
|
||||
@@ -411,7 +410,7 @@ public abstract class MavenCommandLauncher {
|
||||
}
|
||||
monitor.beginTask("", 1); //$NON-NLS-1$
|
||||
try {
|
||||
MavenLaunchDelegate mvld = new TalendMavenLaunchDelegate();
|
||||
TalendMavenLaunchDelegate mvld = new TalendMavenLaunchDelegate();
|
||||
ILaunch launch = new Launch(configuration, mode, null);
|
||||
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
|
||||
launch.setAttribute(DebugPlugin.ATTR_LAUNCH_TIMESTAMP, Long.toString(System.currentTimeMillis()));
|
||||
|
||||
@@ -12,14 +12,28 @@
|
||||
// ============================================================================
|
||||
package org.talend.designer.maven.launch;
|
||||
|
||||
import static org.eclipse.m2e.internal.launch.MavenLaunchUtils.quote;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
||||
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
|
||||
import org.apache.maven.artifact.versioning.VersionRange;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.core.resources.IResource;
|
||||
import org.eclipse.core.resources.ResourcesPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.debug.core.DebugEvent;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.IDebugEventSetListener;
|
||||
@@ -30,34 +44,95 @@ import org.eclipse.debug.core.model.IProcess;
|
||||
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
|
||||
import org.eclipse.jdt.launching.IVMInstall;
|
||||
import org.eclipse.jdt.launching.IVMRunner;
|
||||
import org.eclipse.jdt.launching.JavaLaunchDelegate;
|
||||
import org.eclipse.jdt.launching.VMRunnerConfiguration;
|
||||
import org.eclipse.m2e.internal.launch.MavenLaunchDelegate;
|
||||
import org.eclipse.jface.preference.IPreferenceStore;
|
||||
import org.eclipse.m2e.actions.MavenLaunchConstants;
|
||||
import org.eclipse.m2e.core.MavenPlugin;
|
||||
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
|
||||
import org.eclipse.m2e.core.internal.IMavenConstants;
|
||||
import org.eclipse.m2e.core.internal.launch.AbstractMavenRuntime;
|
||||
import org.eclipse.m2e.internal.launch.LaunchingUtils;
|
||||
import org.eclipse.m2e.internal.launch.MavenLaunchExtensionsSupport;
|
||||
import org.eclipse.m2e.internal.launch.MavenLaunchUtils;
|
||||
import org.eclipse.m2e.internal.launch.MavenRuntimeLaunchSupport;
|
||||
import org.eclipse.m2e.internal.launch.MavenRuntimeLaunchSupport.VMArguments;
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
import org.talend.commons.CommonsPlugin;
|
||||
import org.talend.core.prefs.SecurityPreferenceConstants;
|
||||
import org.talend.core.runtime.CoreRuntimePlugin;
|
||||
import org.talend.utils.security.StudioEncryption;
|
||||
|
||||
/**
|
||||
* created by ycbai on 2015年5月27日 Detailled comment
|
||||
*
|
||||
* Copied from MavenLaunchDelegate
|
||||
*
|
||||
*/
|
||||
@SuppressWarnings("restriction")
|
||||
public class TalendMavenLaunchDelegate extends MavenLaunchDelegate {
|
||||
public class TalendMavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaunchConstants {
|
||||
|
||||
static final Logger log = Logger.getLogger(TalendMavenLaunchDelegate.class);
|
||||
|
||||
private static final String LAUNCHER_TYPE = "org.codehaus.classworlds.Launcher"; //$NON-NLS-1$
|
||||
|
||||
// classworlds 2.0
|
||||
private static final String LAUNCHER_TYPE3 = "org.codehaus.plexus.classworlds.launcher.Launcher"; //$NON-NLS-1$
|
||||
|
||||
private static final VersionRange MAVEN_33PLUS_RUNTIMES;
|
||||
|
||||
/*
|
||||
* FIXME, enable refresh in main thread, so set false for bug TUP-2987.
|
||||
*/
|
||||
public static final boolean FLAG_REFRESH_BACKGROUND = false;
|
||||
|
||||
@Override
|
||||
public String getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
|
||||
String programArguments = super.getProgramArguments(configuration);
|
||||
String arguments = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
|
||||
if (StringUtils.isNotEmpty(arguments)) {
|
||||
programArguments += " " + arguments; //$NON-NLS-1$
|
||||
}
|
||||
private final static String[] hidePasswordKeys = { SecurityPreferenceConstants.SIGNER_KEYSTORE_PASSWORD,
|
||||
SecurityPreferenceConstants.SIGNER_KEY_PASSWORD };
|
||||
|
||||
return programArguments;
|
||||
static {
|
||||
VersionRange mvn33PlusRange;
|
||||
try {
|
||||
mvn33PlusRange = VersionRange.createFromVersionSpec("[3.3,)");
|
||||
} catch (InvalidVersionSpecificationException O_o) {
|
||||
mvn33PlusRange = null;
|
||||
}
|
||||
MAVEN_33PLUS_RUNTIMES = mvn33PlusRange;
|
||||
}
|
||||
|
||||
private ILaunch launch;
|
||||
|
||||
private IProgressMonitor monitor;
|
||||
|
||||
private String programArguments;
|
||||
|
||||
private MavenRuntimeLaunchSupport launchSupport;
|
||||
|
||||
private MavenLaunchExtensionsSupport extensionsSupport;
|
||||
|
||||
public TalendMavenLaunchDelegate() {
|
||||
allowAdvancedSourcelookup();
|
||||
}
|
||||
|
||||
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
|
||||
throws CoreException {
|
||||
this.launch = launch;
|
||||
this.monitor = monitor;
|
||||
this.programArguments = null;
|
||||
|
||||
try {
|
||||
this.launchSupport = MavenRuntimeLaunchSupport.create(configuration, launch, monitor);
|
||||
this.extensionsSupport = MavenLaunchExtensionsSupport.create(configuration, launch);
|
||||
|
||||
log.info("" + getWorkingDirectory(configuration)); //$NON-NLS-1$
|
||||
log.info(" mvn" + getProgramArguments(configuration, true)); //$NON-NLS-1$
|
||||
this.programArguments = null;
|
||||
|
||||
extensionsSupport.configureSourceLookup(configuration, launch, monitor);
|
||||
|
||||
super.launch(configuration, mode, launch, monitor);
|
||||
} finally {
|
||||
this.launch = null;
|
||||
this.monitor = null;
|
||||
this.launchSupport = null;
|
||||
this.extensionsSupport = null;
|
||||
}
|
||||
}
|
||||
|
||||
public IVMRunner getVMRunner(final ILaunchConfiguration configuration, String mode) throws CoreException {
|
||||
@@ -105,6 +180,255 @@ public class TalendMavenLaunchDelegate extends MavenLaunchDelegate {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public String getMainTypeName(ILaunchConfiguration configuration) {
|
||||
return launchSupport.getVersion().startsWith("3.") ? LAUNCHER_TYPE3 : LAUNCHER_TYPE; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
public String[] getClasspath(ILaunchConfiguration configuration) {
|
||||
List<String> cp = launchSupport.getBootClasspath();
|
||||
return cp.toArray(new String[cp.size()]);
|
||||
}
|
||||
|
||||
public String[][] getClasspathAndModulepath(ILaunchConfiguration configuration) {
|
||||
String[][] paths = new String[2][];
|
||||
paths[0] = getClasspath(configuration);
|
||||
return paths;
|
||||
}
|
||||
|
||||
@SuppressWarnings("restriction")
|
||||
public String getVMArguments(ILaunchConfiguration configuration) throws CoreException {
|
||||
VMArguments arguments = launchSupport.getVMArguments();
|
||||
|
||||
AbstractMavenRuntime runtime = MavenLaunchUtils.getMavenRuntime(configuration);
|
||||
appendRuntimeSpecificArguments(runtime.getVersion(), arguments, configuration);
|
||||
|
||||
extensionsSupport.appendVMArguments(arguments, configuration, launch, monitor);
|
||||
|
||||
// user configured entries
|
||||
arguments.append(super.getVMArguments(configuration));
|
||||
|
||||
return arguments.toString();
|
||||
}
|
||||
|
||||
protected String getGoals(ILaunchConfiguration configuration) throws CoreException {
|
||||
return configuration.getAttribute(MavenLaunchConstants.ATTR_GOALS, ""); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct string with properties to pass to JVM as system properties
|
||||
*/
|
||||
private void getProperties(StringBuilder sb, ILaunchConfiguration configuration) throws CoreException {
|
||||
|
||||
try {
|
||||
List<String> properties = configuration.getAttribute(ATTR_PROPERTIES, Collections.emptyList());
|
||||
for (String property : properties) {
|
||||
int n = property.indexOf('=');
|
||||
String name = property;
|
||||
String value = null;
|
||||
|
||||
if (n > -1) {
|
||||
name = property.substring(0, n);
|
||||
if (n > 1) {
|
||||
value = LaunchingUtils.substituteVar(property.substring(n + 1));
|
||||
}
|
||||
}
|
||||
|
||||
sb.append(" -D").append(name); //$NON-NLS-1$
|
||||
if (value != null) {
|
||||
sb.append('=').append(quote(value));
|
||||
}
|
||||
}
|
||||
} catch (CoreException e) {
|
||||
String msg = "Exception while getting configuration attribute " + ATTR_PROPERTIES;
|
||||
log.error(msg, e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
try {
|
||||
String profiles = configuration.getAttribute(ATTR_PROFILES, (String) null);
|
||||
if (profiles != null && profiles.trim().length() > 0) {
|
||||
sb.append(" -P").append(profiles.replaceAll("\\s+", ",")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
}
|
||||
} catch (CoreException ex) {
|
||||
String msg = "Exception while getting configuration attribute " + ATTR_PROFILES;
|
||||
log.error(msg, ex);
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct string with preferences to pass to JVM as system properties
|
||||
*/
|
||||
private void getPreferences(StringBuilder sb, ILaunchConfiguration configuration, String goals) throws CoreException {
|
||||
IMavenConfiguration mavenConfiguration = MavenPlugin.getMavenConfiguration();
|
||||
|
||||
sb.append(" -B"); //$NON-NLS-1$
|
||||
|
||||
if (configuration.getAttribute(MavenLaunchConstants.ATTR_DEBUG_OUTPUT, mavenConfiguration.isDebugOutput())) {
|
||||
sb.append(" -X").append(" -e"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
// sb.append(" -D").append(MavenPreferenceConstants.P_DEBUG_OUTPUT).append("=").append(debugOutput);
|
||||
|
||||
if (configuration.getAttribute(MavenLaunchConstants.ATTR_OFFLINE, mavenConfiguration.isOffline())) {
|
||||
sb.append(" -o"); //$NON-NLS-1$
|
||||
}
|
||||
// sb.append(" -D").append(MavenPreferenceConstants.P_OFFLINE).append("=").append(offline);
|
||||
|
||||
if (configuration.getAttribute(MavenLaunchConstants.ATTR_UPDATE_SNAPSHOTS, false)) {
|
||||
sb.append(" -U"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if (configuration.getAttribute(MavenLaunchConstants.ATTR_NON_RECURSIVE, false)) {
|
||||
sb.append(" -N"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if (configuration.getAttribute(MavenLaunchConstants.ATTR_SKIP_TESTS, false)) {
|
||||
sb.append(" -Dmaven.test.skip=true -DskipTests"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
int threads = configuration.getAttribute(MavenLaunchConstants.ATTR_THREADS, 1);
|
||||
if (threads > 1) {
|
||||
sb.append(" --threads ").append(threads);
|
||||
}
|
||||
|
||||
if (!goals.contains("-gs ")) { //$NON-NLS-1$
|
||||
String globalSettings = launchSupport.getSettings();
|
||||
if (globalSettings != null && !globalSettings.trim().isEmpty() && !new File(globalSettings.trim()).exists()) {
|
||||
globalSettings = null;
|
||||
}
|
||||
if (globalSettings != null && !globalSettings.trim().isEmpty()) {
|
||||
sb.append(" -gs ").append(quote(globalSettings)); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
||||
String settings = configuration.getAttribute(MavenLaunchConstants.ATTR_USER_SETTINGS, (String) null);
|
||||
settings = LaunchingUtils.substituteVar(settings);
|
||||
if (settings == null || settings.trim().isEmpty()) {
|
||||
settings = mavenConfiguration.getUserSettingsFile();
|
||||
if (settings != null && !settings.trim().isEmpty() && !new File(settings.trim()).exists()) {
|
||||
settings = null;
|
||||
}
|
||||
}
|
||||
if (settings != null && !settings.trim().isEmpty()) {
|
||||
sb.append(" -s ").append(quote(settings)); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
// boolean b = preferenceStore.getBoolean(MavenPreferenceConstants.P_CHECK_LATEST_PLUGIN_VERSION);
|
||||
// sb.append(" -D").append(MavenPreferenceConstants.P_CHECK_LATEST_PLUGIN_VERSION).append("=").append(b);
|
||||
|
||||
// b = preferenceStore.getBoolean(MavenPreferenceConstants.P_UPDATE_SNAPSHOTS);
|
||||
// sb.append(" -D").append(MavenPreferenceConstants.P_UPDATE_SNAPSHOTS).append("=").append(b);
|
||||
|
||||
// String s = preferenceStore.getString(MavenPreferenceConstants.P_GLOBAL_CHECKSUM_POLICY);
|
||||
// if(s != null && s.trim().length() > 0) {
|
||||
// sb.append(" -D").append(MavenPreferenceConstants.P_GLOBAL_CHECKSUM_POLICY).append("=").append(s);
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
* Not API. Made public for testing purposes.
|
||||
*/
|
||||
public void appendRuntimeSpecificArguments(String runtimeVersion, VMArguments arguments, ILaunchConfiguration configuration)
|
||||
throws CoreException {
|
||||
if (applies(runtimeVersion)) {
|
||||
getArgsFromMvnDir(arguments, configuration);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("restriction")
|
||||
private void getArgsFromMvnDir(VMArguments arguments, ILaunchConfiguration configuration) throws CoreException {
|
||||
String pomDir = LaunchingUtils.substituteVar(configuration.getAttribute(MavenLaunchConstants.ATTR_POM_DIR, ""));
|
||||
if (pomDir.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
File baseDir = findMavenProjectBasedir(new File(pomDir));
|
||||
File mvnDir = new File(baseDir, ".mvn");
|
||||
File jvmConfig = new File(mvnDir, "jvm.config");
|
||||
if (jvmConfig.isFile()) {
|
||||
try {
|
||||
for (String line : Files.readAllLines(jvmConfig.toPath(), StandardCharsets.UTF_8)) {
|
||||
arguments.append(line);
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
IStatus error = new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID,
|
||||
NLS.bind(org.eclipse.m2e.internal.launch.Messages.MavenLaunchDelegate_error_cannot_read_jvmConfig,
|
||||
jvmConfig.getAbsolutePath()),
|
||||
ex);
|
||||
throw new CoreException(error);
|
||||
}
|
||||
}
|
||||
arguments.appendProperty("maven.multiModuleProjectDirectory", MavenLaunchUtils.quote(baseDir.getAbsolutePath()));
|
||||
}
|
||||
|
||||
// This will likely move to core when we need it
|
||||
private File findMavenProjectBasedir(File dir) {
|
||||
File folder = dir;
|
||||
// loop upwards but stop if root
|
||||
while (folder != null && folder.getParentFile() != null) {
|
||||
// see if /.mvn exists
|
||||
if (new File(folder, ".mvn").isDirectory()) {
|
||||
return folder;
|
||||
}
|
||||
folder = folder.getParentFile();
|
||||
}
|
||||
return dir;
|
||||
}
|
||||
|
||||
private boolean applies(String runtimeVersion) {
|
||||
return MAVEN_33PLUS_RUNTIMES.containsVersion(new DefaultArtifactVersion(runtimeVersion));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
|
||||
return getProgramArguments(configuration, false);
|
||||
}
|
||||
|
||||
public String getProgramArguments(ILaunchConfiguration configuration, boolean isHidePassword) throws CoreException {
|
||||
if (programArguments == null) {
|
||||
String goals = getGoals(configuration);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
getProperties(sb, configuration);
|
||||
getPreferences(sb, configuration, goals);
|
||||
sb.append(" ").append(goals);
|
||||
|
||||
extensionsSupport.appendProgramArguments(sb, configuration, launch, monitor);
|
||||
|
||||
programArguments = sb.toString();
|
||||
String arguments = getAttrProgramArguments(configuration, isHidePassword);
|
||||
if (StringUtils.isNotEmpty(arguments)) {
|
||||
programArguments += " " + arguments; //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
return programArguments;
|
||||
}
|
||||
|
||||
public String getAttrProgramArguments(ILaunchConfiguration configuration, boolean isHidePassword) throws CoreException {
|
||||
String arguments = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
|
||||
if (isHidePassword && StringUtils.isNotBlank(arguments)) {
|
||||
IPreferenceStore preStore = CoreRuntimePlugin.getInstance().getCoreService().getPreferenceStore();
|
||||
for (String key : hidePasswordKeys) {
|
||||
if (arguments.contains(key)) {
|
||||
String value = preStore.getString(key);
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
value = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(value);
|
||||
String oldArgument = "-D" + key + "=" + value;//$NON-NLS-1$//$NON-NLS-2$
|
||||
String newArgument = "-D" + key + "=******";//$NON-NLS-1$//$NON-NLS-2$
|
||||
if (arguments.contains(oldArgument)) {
|
||||
arguments = arguments.replace(oldArgument, newArgument);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return arguments;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -140,8 +464,7 @@ class ForegroundResourceRefresher implements IDebugEventSetListener {
|
||||
}
|
||||
|
||||
public void handleDebugEvents(DebugEvent[] events) {
|
||||
for (int i = 0; i < events.length; i++) {
|
||||
DebugEvent event = events[i];
|
||||
for (DebugEvent event : events) {
|
||||
if (event.getSource() == process && event.getKind() == DebugEvent.TERMINATE) {
|
||||
DebugPlugin.getDefault().removeDebugEventListener(this);
|
||||
processResources();
|
||||
|
||||
@@ -15,6 +15,9 @@ package org.talend.designer.maven.tools;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
@@ -46,6 +49,8 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
|
||||
import org.eclipse.jface.operation.IRunnableWithProgress;
|
||||
import org.eclipse.m2e.core.MavenPlugin;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.utils.MojoType;
|
||||
@@ -98,6 +103,8 @@ import org.talend.repository.ProjectManager;
|
||||
* DOC zwxue class global comment. Detailled comment
|
||||
*/
|
||||
public class AggregatorPomsHelper {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(AggregatorPomsHelper.class);
|
||||
|
||||
private String projectTechName;
|
||||
|
||||
@@ -204,27 +211,32 @@ public class AggregatorPomsHelper {
|
||||
}
|
||||
|
||||
public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild, boolean buildIfNoUpdate) {
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
try {
|
||||
for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
|
||||
ITalendProcessJavaProject codeProject = getCodesProject(codeType);
|
||||
if (ERepositoryObjectType.ROUTINES == codeType) {
|
||||
PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
|
||||
}
|
||||
if (forceBuild || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
|
||||
updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
|
||||
MavenProjectUtils.updateMavenProject(monitor, codeProject.getProject());
|
||||
build(codeType, true, monitor);
|
||||
CodeM2CacheManager.updateCacheStatus(currentProject.getTechnicalLabel(), codeType, true);
|
||||
} else if (buildIfNoUpdate) {
|
||||
build(codeType, false, monitor);
|
||||
}
|
||||
updateCodeProject(monitor, codeType, forceBuild, buildIfNoUpdate);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateCodeProject(IProgressMonitor monitor, ERepositoryObjectType codeType, boolean forceBuild,
|
||||
boolean buildIfNoUpdate) throws Exception {
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
ITalendProcessJavaProject codeProject = getCodesProject(codeType);
|
||||
if (ERepositoryObjectType.ROUTINES == codeType) {
|
||||
PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
|
||||
}
|
||||
if (forceBuild || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
|
||||
updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
|
||||
MavenProjectUtils.updateMavenProject(monitor, codeProject.getProject());
|
||||
build(codeType, true, monitor);
|
||||
CodeM2CacheManager.updateCacheStatus(currentProject.getTechnicalLabel(), codeType, true);
|
||||
} else if (buildIfNoUpdate) {
|
||||
build(codeType, false, monitor);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateCodeProjectPom(IProgressMonitor monitor, ERepositoryObjectType type, IFile pomFile)
|
||||
throws Exception {
|
||||
if (type != null) {
|
||||
@@ -440,6 +452,44 @@ public class AggregatorPomsHelper {
|
||||
}
|
||||
return jobFolder;
|
||||
}
|
||||
|
||||
public static void updateProjectPomFile(Set<String> visistedProjects, Project prj, Set<String> removedTechLabels) {
|
||||
if (visistedProjects.contains(prj.getTechnicalLabel())) {
|
||||
return;
|
||||
}
|
||||
|
||||
visistedProjects.add(prj.getTechnicalLabel());
|
||||
|
||||
IFile pomFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(prj.getTechnicalLabel() + "/" + DIR_POMS + "/" + TalendMavenConstants.POM_FILE_NAME));
|
||||
// read project pom
|
||||
try (InputStream is = new BufferedInputStream(new FileInputStream(pomFile.getLocation().toFile()))) {
|
||||
Model projectModel = MavenPlugin.getMavenModelManager().readMavenModel(is);
|
||||
|
||||
Set<String> newMods = projectModel.getModules().stream().filter(mod -> {
|
||||
String techLabel = getTechnicalLabelFromRefModule(mod);
|
||||
return !removedTechLabels.contains(techLabel);
|
||||
}).collect(Collectors.toSet());
|
||||
|
||||
// remove the ref mods
|
||||
if (newMods.size() != projectModel.getModules().size()) {
|
||||
LOGGER.info("project: " + prj.getTechnicalLabel() + " removed number of ref mods: " + (projectModel.getModules().size() - newMods.size()));
|
||||
projectModel.getModules().clear();
|
||||
projectModel.getModules().addAll(newMods);
|
||||
|
||||
// update the pom file.
|
||||
PomUtil.savePom(null, projectModel, pomFile);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOGGER.error(e.getMessage(), e);
|
||||
}
|
||||
|
||||
List<ProjectReference> prjRefs = prj.getProjectReferenceList();
|
||||
if (!prjRefs.isEmpty()) {
|
||||
for (ProjectReference pr : prjRefs) {
|
||||
updateProjectPomFile(visistedProjects, new Project(pr.getReferencedProject()), removedTechLabels);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static IFolder getItemPomFolder(Property property, String realVersion) {
|
||||
return getItemPomFolder(property, realVersion, p -> ItemResourceUtil.getItemRelativePath(p));
|
||||
@@ -574,6 +624,7 @@ public class AggregatorPomsHelper {
|
||||
}
|
||||
|
||||
public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter) throws Exception {
|
||||
LOGGER.info("syncAllPomsWithoutProgress, pomFilter: " + pomFilter);
|
||||
IRunProcessService runProcessService = IRunProcessService.get();
|
||||
if (runProcessService == null) {
|
||||
return;
|
||||
@@ -593,7 +644,7 @@ public class AggregatorPomsHelper {
|
||||
// project pom
|
||||
monitor.subTask("Synchronize project pom"); //$NON-NLS-1$
|
||||
Model model = getCodeProjectTemplateModel();
|
||||
|
||||
LOGGER.info("syncAllPomsWithoutProgress, isCIMode: " + isCIMode + ", useProfileMode: " + PomIdsHelper.useProfileModule());
|
||||
if (isCIMode) {
|
||||
if (PomIdsHelper.useProfileModule()) {
|
||||
model.getProfiles().addAll(collectRefProjectProfiles(null));
|
||||
@@ -686,8 +737,22 @@ public class AggregatorPomsHelper {
|
||||
}
|
||||
CodesJarResourceCache.getAllCodesJars().stream().filter(CodesJarInfo::isInCurrentMainProject)
|
||||
.forEach(info -> CodesJarM2CacheManager.updateCodesJarProjectPom(monitor, info));
|
||||
|
||||
if (!PomIdsHelper.useProfileModule()) {
|
||||
// remove ref mods
|
||||
Set<String> visitedProjectLabels = new HashSet<String>();
|
||||
Map<String, ReferenceCount> rcs = new HashMap<String, ReferenceCount>();
|
||||
findReferenceCount(visitedProjectLabels, ProjectManager.getInstance().getCurrentProject(), rcs);
|
||||
|
||||
visitedProjectLabels = new HashSet<String>();
|
||||
Set<String> removedTechLabels = rcs.values().stream().filter(rc -> rc.referenceCount > 1).map(rc -> rc.getTalendProject().getTechnicalLabel()).collect(Collectors.toSet());
|
||||
if (!removedTechLabels.isEmpty()) {
|
||||
LOGGER.info("Need to remove duplicated mods: " + removedTechLabels);
|
||||
updateProjectPomFile(visitedProjectLabels, ProjectManager.getInstance().getCurrentProject(), removedTechLabels);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LOGGER.info("syncAllPomsWithoutProgress, done");
|
||||
monitor.done();
|
||||
}
|
||||
|
||||
@@ -774,5 +839,74 @@ public class AggregatorPomsHelper {
|
||||
List<String> otherProfiles = Arrays.asList("docker", "cloud-publisher", "nexus"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
return !otherProfiles.contains(profileId) && StringUtils.startsWithIgnoreCase(profileId, projectTechName + "_");
|
||||
}
|
||||
|
||||
public static String getTechnicalLabelFromRefModule(String refMod) {
|
||||
String[] modPaths= refMod.split("/");
|
||||
return modPaths[modPaths.length-2];
|
||||
}
|
||||
|
||||
protected void findReferenceCount(Set<String> visitedProjects, Project projectTree, Map<String, ReferenceCount> rcs) {
|
||||
if (visitedProjects.contains(projectTree.getTechnicalLabel()) || projectTree == null || projectTree.getProjectReferenceList().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
visitedProjects.add(projectTree.getTechnicalLabel());
|
||||
|
||||
for (ProjectReference refPrj : projectTree.getProjectReferenceList()) {
|
||||
ReferenceCount rc = rcs.get(refPrj.getReferencedProject().getTechnicalLabel());
|
||||
if (rc == null) {
|
||||
rc = new ReferenceCount(new Project(refPrj.getReferencedProject()));
|
||||
rcs.put(refPrj.getReferencedProject().getTechnicalLabel(), rc);
|
||||
}
|
||||
if (StringUtils.equals(refPrj.getReferencedProject().getTechnicalLabel(), rc.getTalendProject().getTechnicalLabel())) {
|
||||
rc.increaseReferenceCount();
|
||||
}
|
||||
rc.increaseReferenceLevel();
|
||||
findReferenceCount(visitedProjects, new Project(refPrj.getReferencedProject()), rcs);
|
||||
}
|
||||
}
|
||||
|
||||
static class ReferenceCount {
|
||||
|
||||
private Project talendProject;
|
||||
|
||||
private int referenceCount;
|
||||
|
||||
private int referenceLevel;
|
||||
|
||||
|
||||
/**
|
||||
* @return the referenceLevel
|
||||
*/
|
||||
public int getReferenceLevel() {
|
||||
return referenceLevel;
|
||||
}
|
||||
|
||||
public void increaseReferenceLevel() {
|
||||
referenceLevel++;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the talendProject
|
||||
*/
|
||||
public Project getTalendProject() {
|
||||
return talendProject;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the referenceCount
|
||||
*/
|
||||
public int getReferenceCount() {
|
||||
return referenceCount;
|
||||
}
|
||||
|
||||
public void increaseReferenceCount() {
|
||||
referenceCount++;
|
||||
}
|
||||
|
||||
public ReferenceCount(Project project) {
|
||||
talendProject = project;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-3.1.0.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
|
||||
@@ -22,9 +22,6 @@ Export-Package: org.apache.xmlbeans,
|
||||
org.apache.xmlbeans.impl.jam.provider,
|
||||
org.apache.xmlbeans.impl.jam.visitor,
|
||||
org.apache.xmlbeans.impl.jam.xml,
|
||||
org.apache.xmlbeans.impl.piccolo.io,
|
||||
org.apache.xmlbeans.impl.piccolo.util,
|
||||
org.apache.xmlbeans.impl.piccolo.xml,
|
||||
org.apache.xmlbeans.impl.regex,
|
||||
org.apache.xmlbeans.impl.richParser,
|
||||
org.apache.xmlbeans.impl.schema,
|
||||
@@ -51,7 +48,6 @@ Export-Package: org.apache.xmlbeans,
|
||||
org.apache.xmlbeans.xml.stream,
|
||||
org.apache.xmlbeans.xml.stream.events,
|
||||
org.apache.xmlbeans.xml.stream.utils,
|
||||
repackage,
|
||||
schemaorg_apache_xmlbeans.system.sXMLCONFIG,
|
||||
schemaorg_apache_xmlbeans.system.sXMLLANG,
|
||||
schemaorg_apache_xmlbeans.system.sXMLSCHEMA,
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
xmlschema-core-2.0.1.jar
|
||||
xmlbeans-2.3.0.jar
|
||||
xmlbeans-2.6.0.jar
|
||||
xmlbeans-3.1.0.jar
|
||||
xercesImpl-2.12.0.jar
|
||||
@@ -26,16 +26,6 @@
|
||||
<configuration>
|
||||
<outputDirectory>${project.basedir}/lib</outputDirectory>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.apache.xmlbeans</groupId>
|
||||
<artifactId>xmlbeans</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.apache.xmlbeans</groupId>
|
||||
<artifactId>xmlbeans</artifactId>
|
||||
<version>2.6.0</version>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.apache.xmlbeans</groupId>
|
||||
<artifactId>xmlbeans</artifactId>
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
context="plugin:org.talend.libraries.jfreechart"
|
||||
language="java"
|
||||
message="Needed for jfreechart plugin"
|
||||
name="jcommon-1.0.15.jar" mvn_uri="mvn:jfree/jcommon/1.0.15"
|
||||
name="jcommon-1.0.15.jar" mvn_uri="mvn:org.talend.libraries/jcommon-1.0.15/6.0.0"
|
||||
required="true">
|
||||
</libraryNeeded>
|
||||
<libraryNeeded
|
||||
context="plugin:org.talend.libraries.jfreechart"
|
||||
language="java"
|
||||
message="Needed for jfreechart plugin"
|
||||
name="jfreechart-1.0.12.jar" mvn_uri="mvn:jfree/jfreechart/1.0.12"
|
||||
name="jfreechart-1.0.12.jar" mvn_uri="mvn:org.talend.libraries/jfreechart-1.0.12/6.0.0"
|
||||
required="true">
|
||||
</libraryNeeded>
|
||||
<libraryNeeded
|
||||
@@ -38,4 +38,5 @@
|
||||
required="true">
|
||||
</libraryNeeded>
|
||||
</extension>
|
||||
|
||||
</plugin>
|
||||
|
||||
@@ -19,3 +19,4 @@ bin.includes = META-INF/,\
|
||||
plugin_slk.properties,\
|
||||
plugin_swtbot.properties,\
|
||||
plugin_zh_CN.properties,\
|
||||
lib/jboss-marshalling-2.0.12.Final.jar
|
||||
|
||||
@@ -67,6 +67,7 @@ import org.talend.core.model.general.ILibrariesService.IChangedLibrariesListener
|
||||
import org.talend.core.model.general.ModuleNeeded;
|
||||
import org.talend.core.model.general.ModuleNeeded.ELibraryInstallStatus;
|
||||
import org.talend.core.model.general.ModuleStatusProvider;
|
||||
import org.talend.core.model.general.RetrieveResult;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.core.nexus.ArtifactRepositoryBean;
|
||||
import org.talend.core.nexus.NexusConstants;
|
||||
@@ -376,6 +377,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
|
||||
.process(new Exception(getClass().getSimpleName() + " resolve " + module.getModuleName() + " failed !"));
|
||||
}
|
||||
try {
|
||||
// try maven uri first
|
||||
if (jarFile == null) {
|
||||
jarFile = getJarFile(module.getMavenUri());
|
||||
}
|
||||
// try the jar name if can't get jar with uri.
|
||||
if (jarFile == null) {
|
||||
jarFile = getJarFile(jarNeeded);
|
||||
@@ -387,7 +392,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
|
||||
ILibraryManagerUIService libUiService = GlobalServiceRegister.getDefault()
|
||||
.getService(ILibraryManagerUIService.class);
|
||||
|
||||
libUiService.installModules(new String[] { jarNeeded });
|
||||
// libUiService.installModules(new String[] { jarNeeded });
|
||||
List<ModuleNeeded> moduleList = new ArrayList<ModuleNeeded>();
|
||||
moduleList.add(module);
|
||||
libUiService.installModules(moduleList);
|
||||
}
|
||||
jarFile = retrieveJarFromLocal(module);
|
||||
if (jarFile == null) {
|
||||
@@ -717,8 +725,15 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
|
||||
@Override
|
||||
public boolean retrieve(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
|
||||
boolean showDialog, IProgressMonitor... monitorWrap) {
|
||||
return retrieveModules(codeType, modulesNeeded, pathToStore, showDialog, monitorWrap).isAllResolved();
|
||||
}
|
||||
|
||||
@Override
|
||||
public RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
|
||||
boolean showDialog, IProgressMonitor... monitorWrap) {
|
||||
RetrieveResult result = new RetrieveResult();
|
||||
if (modulesNeeded == null || modulesNeeded.size() == 0) {
|
||||
return false;
|
||||
return result;
|
||||
}
|
||||
|
||||
// install local platform jars.
|
||||
@@ -745,8 +760,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
|
||||
if (!retrieve(jar, pathToStore, false, false)) {
|
||||
jarNotFound.add(jar);
|
||||
allIsOK = false;
|
||||
result.getUnresolvedModules().add(jar);
|
||||
} else {
|
||||
needResetModulesNeeded = true;
|
||||
result.getResovledModules().add(jar);
|
||||
}
|
||||
}
|
||||
if (needResetModulesNeeded) {
|
||||
@@ -763,8 +780,8 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return allIsOK;
|
||||
result.setAllResolved(allIsOK);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -548,3 +548,6 @@ MetadataTalendTypeEditor.confirmTitle=Avertissement
|
||||
MetadataTalendTypeEditor.confirmMessage=Voulez-vous remplacer les param\u00E8tres actuels par ceux par d\u00E9faut du syst\u00E8me ?
|
||||
PromptDialog.title=Ex\u00E9cuter le contexte {0} avec les param\u00E8tres\u00A0:
|
||||
PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 par des guillemets.
|
||||
PromptDialog.choose.title=Choisissez un contexte
|
||||
PromptDialog.promptGroup.name=Variables \u00E0 compl\u00E9ter
|
||||
PromptDialog.context.environments.name=Environnement
|
||||
|
||||
@@ -36,8 +36,8 @@ AbstractSalesforceStepForm.fetchModule=Salesforce\u30B5\u30FC\u30D3\u30B9\u306B\
|
||||
ConnectionContextHelper.ContextTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9
|
||||
ConnectionContextHelper.InConextMessages=\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u3057\u305F\u3002
|
||||
ConnectionContextHelper.OutConextMessages=\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
ConnectionContextHelper.UpdateMessages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B?
|
||||
ConnectionContextHelper.UpdateTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u66F4\u65B0
|
||||
ConnectionContextHelper.UpdateMessages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B?
|
||||
ConnectionContextHelper.UpdateTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
ContextSetsSelectionDialog.ContextSets=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30BB\u30C3\u30C8
|
||||
ContextSetsSelectionDialog.Messages=\u73FE\u5728\u306E\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u3059\u3002
|
||||
ContextSetsSelectionDialog.ReportMessages=\u73FE\u5728\u306E\u30EC\u30DD\u30FC\u30C8\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u3059\u3002
|
||||
@@ -137,7 +137,7 @@ DatabaseTableForm.no_such_table=\u305D\u306E\u3088\u3046\u306A\u30C6\u30FC\u30D6
|
||||
DatabaseTableForm.refresh.text=\u3053\u306E\u30DC\u30BF\u30F3\u3092\u62BC\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u3092\u3059\u3079\u3066\u53D6\u5F97\u3057\u307E\u3059
|
||||
DatabaseTableForm.retreiveButtonAlert= [\u30B9\u30AD\u30FC\u30DE\u3092\u53D6\u5F97]\u30DC\u30BF\u30F3\u3092\u6709\u52B9\u5316\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002
|
||||
DatabaseTableForm.retreiveButtonConfirmation=\u5909\u66F4\u3092\u78BA\u5B9A\u3057\u307E\u3059\u304B?
|
||||
DatabaseTableForm.retreiveButtonConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u3068\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u306E\u66F4\u65B0\u306F\u3059\u3079\u3066\u306E\u30AB\u30EC\u30F3\u30C8\u30C7\u30FC\u30BF\u306B\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u7D99\u7D9A\u3057\u307E\u3059\u304B\uFF1F
|
||||
DatabaseTableForm.retreiveButtonConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u3068\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306F\u3059\u3079\u3066\u306E\u30AB\u30EC\u30F3\u30C8\u30C7\u30FC\u30BF\u306B\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u7D99\u7D9A\u3057\u307E\u3059\u304B\uFF1F
|
||||
DatabaseTableForm.retreiveButtonIsAccessible=[Retrieve] (\u53D6\u5F97)\u30DC\u30BF\u30F3\u304C\u5229\u7528\u53EF\u80FD\u306B\u306A\u308A\u307E\u3057\u305F\u3002
|
||||
DatabaseTableForm.retreiveButtonTip=\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300C\u30B9\u30AD\u30FC\u30DE\u60C5\u5831\u3092\u53D6\u5F97\u300D\u304C\u4F7F\u7528\u3067\u304D\u307E\u3059!
|
||||
DatabaseTableForm.retreiveButtonUse=[\u30B9\u30AD\u30FC\u30DE\u3092\u53D6\u5F97]\u30DC\u30BF\u30F3\u3092\u4F7F\u3063\u3066\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30C6\u30FC\u30D6\u30EB\u30D9\u30FC\u30B9\u30B9\u30AD\u30FC\u30DE\u306B\u7F6E\u63DB
|
||||
@@ -154,15 +154,15 @@ DatabaseTableForm.typeTable=\u30BF\u30A4\u30D7: TABLE
|
||||
DatabaseTableWizard.description=\u30C6\u30FC\u30D6\u30EB\u7528\u30D5\u30A3\u30EB\u30BF\u30FC\u3002
|
||||
DatabaseWizard.windowTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A
|
||||
DatabaseWizard.ReloadTitle=\u30EA\u30ED\u30FC\u30C9\u3092\u78BA\u8A8D
|
||||
DatabaseWizard.ReloadMessages=\u63A5\u7D9A\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F\u3002\u5206\u6790\u304C\u4F9D\u5B58\u3057\u3066\u3044\u308B\u3053\u306E\u63A5\u7D9A\u306E\u5206\u6790\u6E08\u307F\u30A8\u30EC\u30E1\u30F3\u30C8\u304C\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
DatabaseWizard.ReloadMessages=\u63A5\u7D9A\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u307E\u3057\u305F\u3002\u5206\u6790\u304C\u4F9D\u5B58\u3057\u3066\u3044\u308B\u3053\u306E\u63A5\u7D9A\u306E\u5206\u6790\u6E08\u307F\u30A8\u30EC\u30E1\u30F3\u30C8\u304C\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
DatabaseWizardPage.descriptionCreate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5B9A\u7FA9
|
||||
DatabaseWizardPage.descriptionCreate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u5B9A\u7FA9
|
||||
DatabaseWizardPage.descriptionUpdate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0
|
||||
DatabaseWizardPage.descriptionUpdate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u66F4\u65B0
|
||||
DatabaseWizardPage.descriptionUpdate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DatabaseWizardPage.descriptionUpdate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DatabaseWizardPage.titleCreate.Step1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u4E0A\u306E\u65B0\u898F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A - \u30B9\u30C6\u30C3\u30D7 1/2
|
||||
DatabaseWizardPage.titleCreate.Step2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u4E0A\u306E\u65B0\u898F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A - \u30B9\u30C6\u30C3\u30D7 2/2
|
||||
DatabaseWizardPage.titleUpdate.Step1=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u66F4\u65B0 - \u30B9\u30C6\u30C3\u30D71/2
|
||||
DatabaseWizardPage.titleUpdate.Step2=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u66F4\u65B0 - \u30B9\u30C6\u30C3\u30D72/2
|
||||
DatabaseWizardPage.titleUpdate.Step1=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 - \u30B9\u30C6\u30C3\u30D71/2
|
||||
DatabaseWizardPage.titleUpdate.Step2=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 - \u30B9\u30C6\u30C3\u30D72/2
|
||||
DelimitedFilePreview.column=\u30AB\u30E9\u30E0
|
||||
DelimitedFileStep2Form.14=\u6570\u5024\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002
|
||||
DelimitedFileStep2Form.onlyNumber=\u6570\u5024\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002
|
||||
@@ -180,8 +180,8 @@ DocumentationPage.originalNameLabText.orgName=\u5143\u306E\u540D\u524D
|
||||
DocumentationPage.sourceDocDoNotExist=\u30BD\u30FC\u30B9\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
|
||||
DocumentationPage.sourceDocIsNotSet=\u30BD\u30FC\u30B9\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u672A\u8A2D\u5B9A\u3067\u3059\u3002
|
||||
DocumentationPage.thisTitle.document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
|
||||
DocumentationUpdateWizard.mainPageDescription=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0
|
||||
DocumentationUpdateWizard.windowTitle=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0
|
||||
DocumentationUpdateWizard.mainPageDescription=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DocumentationUpdateWizard.windowTitle=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EditProcessPropertiesWizardPage.convert.button.name=\u30D3\u30C3\u30B0\u30C7\u30FC\u30BF\u30D0\u30C3\u30C1\u30B8\u30E7\u30D6\u306B\u5909\u63DB
|
||||
EditProcessPropertiesWizard.pageName=\u30D7\u30ED\u30BB\u30B9\u30A6\u30A3\u30B6\u30FC\u30C9
|
||||
EditProcessPropertiesWizard.wizardTitle=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u7DE8\u96C6
|
||||
@@ -292,38 +292,38 @@ FileStep3.fileNotExist=\u30D5\u30A1\u30A4\u30EB{0}\u304C\u5B58\u5728\u3057\u307E
|
||||
FileStep3.groupMetadata=\u30B9\u30AD\u30FC\u30DE
|
||||
FileStep3.guess=\u63A8\u5B9A
|
||||
FileStep3.guessConfirmation=\u5909\u66F4\u3092\u78BA\u5B9A\u3057\u307E\u3059\u304B?
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u3068\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u9078\u629E\u3057\u305F\u5834\u5408\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u7D9A\u3051\u307E\u3059\u304B\uFF1F,
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u3068\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u9078\u629E\u3057\u305F\u5834\u5408\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u7D9A\u3051\u307E\u3059\u304B\uFF1F,
|
||||
FileStep3.guessFailure=\u63A8\u5B9A\u306E\u5931\u6557
|
||||
FileStep3.guessFailureTip=\u63A8\u5B9A\u306E\u5931\u6557
|
||||
FileStep3.guessFailureTip2=\u30B9\u30C6\u30C3\u30D72\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u306B\u57FA\u3065\u304F\u63A8\u5B9A
|
||||
FileStep3.guessIsDone=\u63A8\u5B9A\u306E\u6210\u529F
|
||||
FileStep3.guessProgress=\u63A8\u5B9A\u3092\u5B9F\u884C\u4E2D...
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B[\u63A8\u6E2C]\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B[\u63A8\u6E2C]\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF
|
||||
FileStep3.itemAlert=\u5C11\u306A\u304F\u3066\u30821\u3064\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u30B9\u30AD\u30FC\u30DE\u306B\u5FC5\u8981\u3067\u3059
|
||||
FileStep3.metadataComment=\u30B3\u30E1\u30F3\u30C8
|
||||
FileStep3.metadataDescription=\u30B9\u30AD\u30FC\u30DE\u306E\u8AAC\u660E
|
||||
FileStep3.metadataName=\u540D\u524D
|
||||
FileTableWizardPage.descriptionCreate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0
|
||||
FileTableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u3042\u308B\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3057\u307E\u3059
|
||||
FileTableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u3042\u308B\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
|
||||
FileTableWizardPage.titleCreate="{0}"\u4E0A\u306E\u65B0\u3057\u3044\u30B9\u30AD\u30FC\u30DE
|
||||
FileTableWizardPage.titleUpdate="{0}"\u3068\u3044\u3046\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
FileTableWizardPage.titleUpdate="{0}"\u3068\u3044\u3046\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizard.windowTitleCreate=\u65B0\u898F\u306E\u56FA\u5B9A\u9577\u30D5\u30A1\u30A4\u30EB
|
||||
FileWizard.windowTitleUpdate=\u65E2\u5B58\u306E\u56FA\u5B9A\u9577\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6
|
||||
FileWizardPage.descriptionCreateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep3=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0\n\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionUpdateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0
|
||||
FileWizardPage.descriptionUpdateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u66F4\u65B0
|
||||
FileWizardPage.descriptionUpdateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u66F4\u65B0\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionUpdateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizardPage.descriptionUpdateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizardPage.descriptionUpdateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.of=of
|
||||
FileWizardPage.titleCreate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
|
||||
FileWizardPage.titleUpdate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
|
||||
GenericSchemaStep2Form.SelectDatabaseType=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u30BF\u30A4\u30D7\u3092\u9078\u629E
|
||||
GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
GenericSchemaWizard.SaveAsGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
|
||||
GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
ImportSchemaFileWizard.WizardTitle=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
LDAPSchemaStep1Form.CheckConnection= \u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u305F\u3081\u306B\u4E0B\u8A18\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
LDAPSchemaStep1Form.CheckNetWorkParameter=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
@@ -359,7 +359,7 @@ LDAPSchemaStep3Form.selectAllTipText=\u30B9\u30AD\u30FC\u30DE\u5C5E\u6027\u3092\
|
||||
LDAPSchemaStep3Form.selectNoneText=\u4F55\u3082\u9078\u629E\u3057\u306A\u3044
|
||||
LDAPSchemaStep3Form.selectNoneTipText=\u30B9\u30AD\u30FC\u30DE\u5C5E\u6027\u3092\u9078\u629E\u3057\u306A\u3044
|
||||
LDAPSchemaWizard.CreateNewLdapSchema=\u65B0\u3057\u3044LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
LDAPSchemaWizard.UpdateLdapSchema=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
LDAPSchemaWizard.UpdateLdapSchema=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
LDIFReader.ioException.cannotConstrauctURL=: URL\u3092\u69CB\u6210\u3067\u304D\u307E\u305B\u3093
|
||||
LDIFReader.ioException.protocolNotSupported=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30D7\u30ED\u30C8\u30B3\u30EB :
|
||||
LDIFReader.ioException.unknow=\u672A\u77E5\u306E\u30BF\u30A4\u30D7\u3002
|
||||
@@ -445,9 +445,9 @@ ShowAddedContextdialog.Variables=\u5909\u6570
|
||||
StoppablePreviewLoader.inforLabelText.previewInterrupted=\u4E2D\u65AD\u3055\u308C\u305F\u30D7\u30EC\u30D3\u30E5\u30FC
|
||||
TableWizard.windowTitle=\u30B9\u30AD\u30FC\u30DE
|
||||
TableWizardPage.descriptionCreate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0
|
||||
TableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306E\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
TableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306E\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
TableWizardPage.titleCreate=\u63A5\u7D9A\u5185\u306E\u65B0\u3057\u3044\u30B9\u30AD\u30FC\u30DE
|
||||
TableWizardPage.titleUpdate=\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
TableWizardPage.titleUpdate=\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
WSDLSchemaStep1Form.ENDPOINTURI=\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8URI
|
||||
WSDLSchemaStep1Form.MethodName=\u30E1\u30BD\u30C3\u30C9
|
||||
WSDLSchemaStep1Form.NeedAuth=\u8A8D\u8A3C\u304C\u5FC5\u8981\u3067\u3059\u304B?
|
||||
@@ -470,7 +470,7 @@ WSDLSchemaStep1Form.preview=\u30D7\u30EC\u30D3\u30E5\u30FC
|
||||
WSDLSchemaStep1Form.TimeOutTitle=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u79D2)
|
||||
WSDLSchemaWizard.CreateNewWSDLSchema=\u65B0\u3057\u3044WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
WSDLSchemaWizard.SaveAsWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
|
||||
WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
|
||||
XmlFileStep1.filepathXml=XML
|
||||
XmlFileStep1.groupFileViewer=\u30B9\u30AD\u30FC\u30DE\u30D3\u30E5\u30FC\u30A2\u30FC
|
||||
@@ -482,7 +482,7 @@ XmlFileStep2Form.previewNotAvailable=XSD\u30D5\u30A1\u30A4\u30EB\u306B\u5229\u75
|
||||
XmlFileWizard.windowTitleCreate=\u65B0\u3057\u3044XML\u30D5\u30A1\u30A4\u30EB
|
||||
XmlFileWizard.windowTitleUpdate=\u65E2\u5B58\u306EXML\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6
|
||||
XmlFileWizard.newColumnsDectect.title=\u65B0\u3057\u3044\u30AB\u30E9\u30E0\u3092\u691C\u51FA
|
||||
XmlFileWizard.newColumnsDectect.desc=\u65B0\u898F\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u62BD\u51FA\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u66F4\u65B0\u3092\u53CD\u6620\u3055\u305B\u308B\u305F\u3081\u306B\u306F\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u306A\u304A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
XmlFileWizard.newColumnsDectect.desc=\u65B0\u898F\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u62BD\u51FA\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u53CD\u6620\u3055\u305B\u308B\u305F\u3081\u306B\u306F\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u306A\u304A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
XmlToXPathLinker.Loop=\u30EB\u30FC\u30D7\u30EA\u30F3\u30AF\u3092\u4F5C\u6210...
|
||||
XmlToXPathLinker.beginTask.fieldLinksCreation=\u30D5\u30A3\u30FC\u30EB\u30C9\u30EA\u30F3\u30AF\u306E\u4F5C\u6210...
|
||||
XmlToXPathLinker.exceptionReturn.xPathInvalid=\u73FE\u5728\u306EXpath\u5F0F\u304C\u7121\u52B9\u3067\u3059
|
||||
@@ -548,3 +548,6 @@ MetadataTalendTypeEditor.confirmTitle=\u8B66\u544A
|
||||
MetadataTalendTypeEditor.confirmMessage=\u73FE\u5728\u306E\u8A2D\u5B9A\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A\u306B\u7F6E\u63DB\u3057\u307E\u3059\u304B?
|
||||
PromptDialog.title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8{0}\u306E\u5B9F\u884C\u3002\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC:
|
||||
PromptDialog.stringTip=\u5165\u529B\u30C6\u30AD\u30B9\u30C8\u3092\u4E00\u91CD\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
PromptDialog.choose.title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u9078\u629E
|
||||
PromptDialog.promptGroup.name=\u30D7\u30ED\u30F3\u30D7\u30C8\u5909\u6570
|
||||
PromptDialog.context.environments.name=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
|
||||
|
||||
@@ -548,3 +548,6 @@ MetadataTalendTypeEditor.confirmTitle=\u8B66\u544A
|
||||
MetadataTalendTypeEditor.confirmMessage=\u662F\u5426\u786E\u5B9A\u8981\u5C06\u5F53\u524D\u8BBE\u7F6E\u66FF\u6362\u4E3A\u9ED8\u8BA4\u7CFB\u7EDF\u8BBE\u7F6E\uFF1F
|
||||
PromptDialog.title=\u4F7F\u7528\u4EE5\u4E0B\u53C2\u6570\u8FD0\u884C\u4E0A\u4E0B\u6587 {0}:
|
||||
PromptDialog.stringTip=\u8F93\u5165\u6587\u5B57\u5FC5\u987B\u7F6E\u4E8E\u5355\u5F15\u53F7\u5185\u3002
|
||||
PromptDialog.choose.title=\u9009\u62E9\u4E0A\u4E0B\u6587
|
||||
PromptDialog.promptGroup.name=\u63D0\u793A\u53D8\u91CF
|
||||
PromptDialog.context.environments.name=\u4E0A\u4E0B\u6587\u73AF\u5883
|
||||
|
||||
@@ -82,8 +82,13 @@ public class MetadataManagmentUiService implements IMetadataManagmentUiService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IContext promptConfirmLauch(Shell shell, List<IContext> contexts) {
|
||||
return ConnectionContextHelper.promptConfirmLauch(shell, contexts);
|
||||
public IContext promptConfirmLauch(Shell shell, List<IContext> contexts, IContext defaultContext) {
|
||||
return ConnectionContextHelper.promptConfirmLauch(shell, contexts, defaultContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean promptConfirmLauch(Shell shell, IContext context) {
|
||||
return ConnectionContextHelper.promptConfirmLauch(shell, context);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -70,7 +70,7 @@ public class PromptDialog extends SelectionDialog {
|
||||
|
||||
private static final int MINIMUM_WIDTH = 50;
|
||||
|
||||
private static final String DEFAULT_FLAG = "(default)"; //$NON-NLS-1$
|
||||
private static final String DEFAULT_FLAG = "(Default)"; //$NON-NLS-1$
|
||||
|
||||
private static final String TITLE = Messages.getString("ContextSetsSelectionDialog.Title"); //$NON-NLS-1$
|
||||
|
||||
@@ -92,15 +92,24 @@ public class PromptDialog extends SelectionDialog {
|
||||
|
||||
private Composite child;
|
||||
|
||||
public PromptDialog(Shell parentShell, IContext context) {
|
||||
super(parentShell);
|
||||
initDialog(context, canCancel, Messages.getString("ContextSetsSelectionDialog.Messages")); //$NON-NLS-1$
|
||||
initSets();
|
||||
}
|
||||
|
||||
public PromptDialog(Shell parentShell, ContextItem contextItem) {
|
||||
super(parentShell);
|
||||
initDialog(contextItem, canCancel, Messages.getString("ContextSetsSelectionDialog.Messages")); //$NON-NLS-1$
|
||||
initSets();
|
||||
}
|
||||
|
||||
public PromptDialog(Shell parentShell, List<IContext> contexts) {
|
||||
public PromptDialog(Shell parentShell, List<IContext> contexts, IContext defaultIContext) {
|
||||
super(parentShell);
|
||||
initDialog(contexts, canCancel, Messages.getString("ContextSetsSelectionDialog.Messages")); //$NON-NLS-1$
|
||||
if (defaultIContext != null) {
|
||||
defalutContext = defaultIContext.getName();
|
||||
}
|
||||
initSets();
|
||||
}
|
||||
|
||||
@@ -121,7 +130,7 @@ public class PromptDialog extends SelectionDialog {
|
||||
defalutContext = contextItem.getDefaultContext();
|
||||
for (ContextType contextType : contexts) {
|
||||
String name = contextType.getName();
|
||||
if (name.equals(defalutContext)) {
|
||||
if (name.equalsIgnoreCase(defalutContext)) {
|
||||
name = name + DEFAULT_FLAG;
|
||||
selectedContext = name;
|
||||
currentContext = ContextUtils.convert2IContext(contextType, repositoryContextId).clone();
|
||||
@@ -130,16 +139,17 @@ public class PromptDialog extends SelectionDialog {
|
||||
}
|
||||
} else if (source instanceof List) {
|
||||
List<IContext> contexts = (List<IContext>) source;
|
||||
defalutContext = "Default"; //$NON-NLS-1$
|
||||
for (IContext context : contexts) {
|
||||
String name = context.getName();
|
||||
if (name.equals(defalutContext)) {
|
||||
if (name.equalsIgnoreCase(defalutContext)) {
|
||||
name = name + DEFAULT_FLAG;
|
||||
selectedContext = name;
|
||||
currentContext = context.clone();
|
||||
}
|
||||
contextSetsList.add(name);
|
||||
}
|
||||
} else if (source instanceof IContext) {
|
||||
currentContext = (IContext) source;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,21 +210,21 @@ public class PromptDialog extends SelectionDialog {
|
||||
}
|
||||
}
|
||||
|
||||
private Control createSelectionArea(Composite parent) {
|
||||
Composite inner = new Composite(parent, SWT.NONE);
|
||||
GridLayout gridLayout = new GridLayout();
|
||||
gridLayout.marginHeight = 0;
|
||||
inner.setLayout(gridLayout);
|
||||
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
|
||||
gridData.minimumWidth = 220;
|
||||
gridData.minimumHeight = 100;
|
||||
inner.setLayoutData(gridData);
|
||||
private void createSelectionArea(Composite parent) {
|
||||
if (source != null && (source instanceof ContextItem || source instanceof List)) {
|
||||
Composite inner = new Composite(parent, SWT.NONE);
|
||||
GridLayout gridLayout = new GridLayout();
|
||||
gridLayout.marginHeight = 0;
|
||||
inner.setLayout(gridLayout);
|
||||
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
|
||||
gridData.minimumWidth = 220;
|
||||
gridData.minimumHeight = 100;
|
||||
inner.setLayoutData(gridData);
|
||||
|
||||
contextCombo = new LabelledCombo(inner, Messages.getString("PromptDialog.context.environments.name"), null, //$NON-NLS-1$
|
||||
contextSetsList, true);
|
||||
contextCombo.setText(defalutContext + DEFAULT_FLAG);
|
||||
|
||||
return inner;
|
||||
contextCombo = new LabelledCombo(inner, Messages.getString("PromptDialog.context.environments.name"), null, //$NON-NLS-1$
|
||||
contextSetsList, true);
|
||||
contextCombo.setText(defalutContext + DEFAULT_FLAG);
|
||||
}
|
||||
}
|
||||
|
||||
private void createContextArea(IContext currentContext, Composite parent) {
|
||||
@@ -436,21 +446,23 @@ public class PromptDialog extends SelectionDialog {
|
||||
}
|
||||
|
||||
protected void addFieldsListeners() {
|
||||
contextCombo.addModifyListener(new ModifyListener() {
|
||||
if (contextCombo != null) {
|
||||
contextCombo.addModifyListener(new ModifyListener() {
|
||||
|
||||
@Override
|
||||
public void modifyText(final ModifyEvent e) {
|
||||
selectedContext = contextCombo.getItem(contextCombo.getSelectionIndex());
|
||||
contextComp.dispose();
|
||||
contextComp = new Composite(child, SWT.NONE);
|
||||
contextComp.setLayout(new GridLayout(1, false));
|
||||
contextComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
createContextArea(getCloneContext(), contextComp);
|
||||
child.layout();
|
||||
child.getParent().layout();
|
||||
contextComp.layout();
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void modifyText(final ModifyEvent e) {
|
||||
selectedContext = contextCombo.getItem(contextCombo.getSelectionIndex());
|
||||
contextComp.dispose();
|
||||
contextComp = new Composite(child, SWT.NONE);
|
||||
contextComp.setLayout(new GridLayout(1, false));
|
||||
contextComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
createContextArea(getCloneContext(), contextComp);
|
||||
child.layout();
|
||||
child.getParent().layout();
|
||||
contextComp.layout();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -485,7 +497,11 @@ public class PromptDialog extends SelectionDialog {
|
||||
Point dialogSize = new Point(X_POSITION, Math.min((height * nbParams) + Y_POSITION, 400));
|
||||
setSize(newShell, dialogSize);
|
||||
|
||||
newShell.setText(Messages.getString("PromptDialog.choose.title")); //$NON-NLS-1$
|
||||
if (source != null && source instanceof IContext) {
|
||||
newShell.setText(Messages.getString("PromptDialog.title", currentContext.getName())); //$NON-NLS-1$
|
||||
} else {
|
||||
newShell.setText(Messages.getString("PromptDialog.choose.title")); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
||||
public IContext getCloneContext() {
|
||||
@@ -496,7 +512,7 @@ public class PromptDialog extends SelectionDialog {
|
||||
String repositoryContextId = contextItem.getProperty().getId();
|
||||
for (ContextType contextType : contexts) {
|
||||
String name = contextType.getName();
|
||||
if (name.equals(selectedContext) || (name + DEFAULT_FLAG).equals(selectedContext)) {
|
||||
if (name.equalsIgnoreCase(selectedContext) || (name + DEFAULT_FLAG).equalsIgnoreCase(selectedContext)) {
|
||||
currentContext = ContextUtils.convert2IContext(contextType, repositoryContextId).clone();
|
||||
return currentContext;
|
||||
}
|
||||
@@ -505,7 +521,7 @@ public class PromptDialog extends SelectionDialog {
|
||||
List<IContext> contexts = (List<IContext>) source;
|
||||
for (IContext context : contexts) {
|
||||
String name = context.getName();
|
||||
if (name.equals(selectedContext) || (name + DEFAULT_FLAG).equals(selectedContext)) {
|
||||
if (name.equalsIgnoreCase(selectedContext) || (name + DEFAULT_FLAG).equalsIgnoreCase(selectedContext)) {
|
||||
currentContext = context.clone();
|
||||
return currentContext;
|
||||
}
|
||||
|
||||
@@ -2169,7 +2169,7 @@ public final class ConnectionContextHelper {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static IContext promptConfirmLauch(Shell shell, List<IContext> contexts) {
|
||||
public static IContext promptConfirmLauch(Shell shell, List<IContext> contexts, IContext defaultContext) {
|
||||
int nbValues = 0;
|
||||
Assert.isNotNull(contexts);
|
||||
// Prompt for context values ?
|
||||
@@ -2182,7 +2182,7 @@ public final class ConnectionContextHelper {
|
||||
}
|
||||
}
|
||||
if (nbValues > 0 || (contexts != null && contexts.size() > 1)) {
|
||||
PromptDialog promptDialog = new PromptDialog(shell, contexts);
|
||||
PromptDialog promptDialog = new PromptDialog(shell, contexts, defaultContext);
|
||||
if (promptDialog.open() == PromptDialog.OK) {
|
||||
return promptDialog.getCurrentContext();
|
||||
}
|
||||
@@ -2225,4 +2225,38 @@ public final class ConnectionContextHelper {
|
||||
}
|
||||
return continueLaunch;
|
||||
}
|
||||
|
||||
public static boolean promptConfirmLauch(Shell shell, IContext context) {
|
||||
boolean continueLaunch = true;
|
||||
|
||||
int nbValues = 0;
|
||||
Assert.isNotNull(context);
|
||||
// Prompt for context values ?
|
||||
for (IContextParameter parameter : context.getContextParameterList()) {
|
||||
if (parameter.isPromptNeeded()) {
|
||||
nbValues++;
|
||||
}
|
||||
}
|
||||
if (nbValues > 0) {
|
||||
IContext contextCopy = context.clone();
|
||||
PromptDialog promptDialog = new PromptDialog(shell, contextCopy);
|
||||
if (promptDialog.open() == PromptDialog.OK) {
|
||||
for (IContextParameter param : context.getContextParameterList()) {
|
||||
boolean found = false;
|
||||
IContextParameter paramCopy = null;
|
||||
for (int i = 0; i < contextCopy.getContextParameterList().size() & !found; i++) {
|
||||
paramCopy = contextCopy.getContextParameterList().get(i);
|
||||
if (param.getName().equals(paramCopy.getName())) {
|
||||
// param.setValueList(paramCopy.getValueList());
|
||||
param.setInternalValue(paramCopy.getValue());
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
continueLaunch = false;
|
||||
}
|
||||
}
|
||||
return continueLaunch;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,7 +175,13 @@ public class ExtendedNodeConnectionContextUtils {
|
||||
CdeToken,
|
||||
CdeTokenEndpoint,
|
||||
CdeWorkloadUser,
|
||||
CdeWorkloadPassword
|
||||
CdeWorkloadPassword,
|
||||
|
||||
//Standalone
|
||||
StandaloneMaster,
|
||||
StandaloneConfigureExecutors,
|
||||
StandaloneExecutorMemory,
|
||||
StandaloneExecutorCore
|
||||
}
|
||||
|
||||
static List<IContextParameter> getContextVariables(final String prefixName, Connection conn, Set<IConnParamName> paramSet) {
|
||||
|
||||
@@ -104,8 +104,16 @@
|
||||
context="PostgresPlus wizard"
|
||||
language="java"
|
||||
message="wizard for PostgresPlus"
|
||||
mvn_uri="mvn:org.postgresql/postgresql/42.2.14"
|
||||
name="postgresql-42.2.14.jar"
|
||||
mvn_uri="mvn:org.postgresql/postgresql/42.2.25"
|
||||
name="postgresql-42.2.25.jar"
|
||||
required="true">
|
||||
</libraryNeeded>
|
||||
<libraryNeeded
|
||||
context="Sybase wizard"
|
||||
language="java"
|
||||
message="Needed for create Sybase connection"
|
||||
mvn_uri="mvn:sap.jdbc4.sqlanywhere/sajdbc4/17.0.0"
|
||||
name="sajdbc4-17.0.0.jar"
|
||||
required="true">
|
||||
</libraryNeeded>
|
||||
<libraryNeeded
|
||||
|
||||
@@ -284,12 +284,12 @@ RepositoryUpdateManager.Title=\u5909\u66F4
|
||||
RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
|
||||
RepositoryUpdateManager.Messages=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
|
||||
RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
|
||||
RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
|
||||
RepositoryUpdateManager.RenameContextMessages=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextMessages=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n\n [\u3044\u3044\u3048]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u53E4\u3044\u5909\u6570\u304C\u30B8\u30E7\u30D6\u5185\u3067\u7D44\u307F\u8FBC\u307F\u306B\u5909\u308F\u308A\u307E\u3059\u3002
|
||||
RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
RoutinesFunctionProposal.CreatedBy=\u4F5C\u6210\u8005:
|
||||
RoutinesFunctionProposal.Description=\u8AAC\u660E:
|
||||
RoutinesFunctionProposal.Example=\u4F8B:
|
||||
@@ -356,8 +356,8 @@ EUpdateItemType.Components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
|
||||
EUpdateItemType.Name=\u540D\u524D
|
||||
EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
|
||||
EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
|
||||
EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
|
||||
EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content=\u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
|
||||
AbstractBrandingService.routines_license_header_content=\u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
|
||||
AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
|
||||
AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
|
||||
AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
|
||||
|
||||
@@ -1071,8 +1071,10 @@ public class ExtractMetaDataUtils {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (driverJarPathArg.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
|
||||
setDriverPath(librairesManagerService, jarPathList, driverJarPathArg);
|
||||
if (TalendQuoteUtils.removeQuotesIfExist(driverJarPathArg)
|
||||
.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
|
||||
setDriverPath(librairesManagerService, jarPathList,
|
||||
TalendQuoteUtils.removeQuotesIfExist(driverJarPathArg));
|
||||
} else {
|
||||
String jarName = librairesManagerService.getJarNameFromMavenuri(driverJarPathArg);
|
||||
if (jarName == null) {
|
||||
|
||||
@@ -42,6 +42,8 @@ public class JDBCDriverLoader {
|
||||
private static MultiKeyMap classLoadersMap = new MultiKeyMap();
|
||||
|
||||
private static Map<String, HotClassLoader> classLoadersMapBasedOnLibraries = new HashMap<String, HotClassLoader>();
|
||||
|
||||
private static MultiKeyMap driverShimCacheMap = new MultiKeyMap();
|
||||
|
||||
/**
|
||||
* Loads the jars for hive embedded mode required, I do not think it is the better method to do this here. Due to
|
||||
@@ -145,8 +147,14 @@ public class JDBCDriverLoader {
|
||||
DriverShim wapperDriver = null;
|
||||
Connection connection = null;
|
||||
try {
|
||||
HotClassLoader loader = getHotClassLoader(jarPath, dbType, dbVersion);
|
||||
wapperDriver = new DriverShim((getDriver(loader, jarPath, driverClassName, dbType, dbVersion)));
|
||||
HotClassLoader loader = (HotClassLoader) classLoadersMap.get(dbType, dbVersion);
|
||||
if(driverShimCacheMap.containsKey(driverClassName, dbType, dbVersion)) {
|
||||
wapperDriver = (DriverShim) driverShimCacheMap.get(driverClassName, dbType, dbVersion);
|
||||
} else {
|
||||
loader = getHotClassLoader(jarPath, dbType, dbVersion);
|
||||
wapperDriver = new DriverShim((getDriver(loader, jarPath, driverClassName, dbType, dbVersion)));
|
||||
driverShimCacheMap.put(driverClassName, dbType, dbVersion, wapperDriver);
|
||||
}
|
||||
// Object driver = loader.loadClass(driverClassName).newInstance();
|
||||
// wapperDriver = new DriverShim((Driver) (driver));
|
||||
Properties info = new Properties();
|
||||
|
||||
@@ -37,6 +37,7 @@ import org.apache.log4j.Logger;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.emf.ecore.EObject;
|
||||
import org.eclipse.emf.ecore.util.EcoreUtil;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
import org.talend.commons.exception.CommonExceptionHandler;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
@@ -1410,16 +1411,20 @@ public class MetadataConnectionUtils {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static IContext promptConfirmLauch(List<IContext> contexts) {
|
||||
public static IContext promptConfirmLauch(List<IContext> contexts, IContext defaultContext) {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
|
||||
IMetadataManagmentUiService mmUIService = GlobalServiceRegister.getDefault()
|
||||
.getService(IMetadataManagmentUiService.class);
|
||||
return mmUIService.promptConfirmLauch(PlatformUI.getWorkbench().getDisplay().getActiveShell(), contexts);
|
||||
return mmUIService.promptConfirmLauch(PlatformUI.getWorkbench().getDisplay().getActiveShell(), contexts, defaultContext);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static Connection prepareConection(Connection connection) {
|
||||
return prepareConection(connection, false);
|
||||
}
|
||||
|
||||
public static Connection prepareConection(Connection connection, boolean isDefaultContext) {
|
||||
// TDQ-19889 msjian: check whether context confirmation needed popup,
|
||||
// Enabling the prompt to context variables
|
||||
if (!Platform.isRunning() || !connection.isContextMode()) {
|
||||
@@ -1438,14 +1443,26 @@ public class MetadataConnectionUtils {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
|
||||
IMetadataManagmentUiService mmUIService = GlobalServiceRegister.getDefault()
|
||||
.getService(IMetadataManagmentUiService.class);
|
||||
promptConfirmLauch = mmUIService.promptConfirmLauch(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
|
||||
copyConnection , contextItem);
|
||||
Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
|
||||
if (isDefaultContext) {
|
||||
promptConfirmLauch = mmUIService.promptConfirmLauch(shell, jobContext);
|
||||
} else {
|
||||
promptConfirmLauch = mmUIService.promptConfirmLauch(shell, copyConnection, contextItem);
|
||||
}
|
||||
}
|
||||
if (!promptConfirmLauch) {
|
||||
return null;
|
||||
} else {
|
||||
if (isDefaultContext) {
|
||||
// save the input prompt context values to cache
|
||||
for (IContextParameter param : jobContext.getContextParameterList()) {
|
||||
JavaSqlFactory.savePromptConVars2Cache(connection, param);
|
||||
}
|
||||
// set the input values to connection
|
||||
JavaSqlFactory.setPromptContextValues(copyConnection);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
JavaSqlFactory.haveSetPromptContextVars = true;
|
||||
return copyConnection;
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ _UI_FolderItem_type_feature=\u30BF\u30A4\u30D7
|
||||
_UI_Component_id_feature=Id
|
||||
_UI_Component_label_feature=\u30E9\u30D9\u30EB
|
||||
_UI_Component_version_feature=\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
_UI_Component_lastUpdateDate_feature=\u6700\u7D42\u66F4\u65B0\u65E5
|
||||
_UI_Component_lastUpdateDate_feature=\u6700\u7D42\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u65E5
|
||||
_UI_Component_author_feature=\u4F5C\u6210\u8005
|
||||
_UI_Component_creationDate_feature=\u4F5C\u6210\u65E5
|
||||
_UI_Component_deleteDate_feature=\u524A\u9664\u65E5
|
||||
@@ -455,7 +455,7 @@ _UI_TalendTrigger_endTime_feature=\u7D42\u4E86\u6642\u9593
|
||||
_UI_TalendTrigger_previousFireTime_feature=\u4EE5\u524D\u306E\u30D5\u30A1\u30A4\u30E4\u30FC\u6642\u9593
|
||||
_UI_TalendTrigger_finalFireTime_feature=\u6700\u7D42\u30D5\u30A1\u30A4\u30E4\u30FC\u6642\u9593
|
||||
_UI_TalendTrigger_idQuartzTrigger_feature=ID Quartz\u30C8\u30EA\u30AC\u30FC
|
||||
_UI_TalendTrigger_resumePauseUpdated_feature=\u66F4\u65B0\u3055\u308C\u305F\u4E00\u6642\u505C\u6B62\u306E\u518D\u958B
|
||||
_UI_TalendTrigger_resumePauseUpdated_feature=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u4E00\u6642\u505C\u6B62\u306E\u518D\u958B
|
||||
_UI_TalendTrigger_previouslyPaused_feature=\u524D\u3082\u3063\u3066\u4E00\u6642\u505C\u6B62
|
||||
_UI_CronTalendTrigger_cronExpression_feature=Cron\u5F0F
|
||||
_UI_CronUITalendTrigger_listDaysOfWeek_feature=\u9031\u6B21\u30EA\u30B9\u30C8
|
||||
@@ -1048,7 +1048,7 @@ _UI_ConditionType_operator_feature=\u6F14\u7B97\u5B50
|
||||
_UI_ConditionType_value_feature=\u5024
|
||||
_UI_ValidationRulesConnection_isSelect_feature=\u9078\u629E
|
||||
_UI_ValidationRulesConnection_isInsert_feature=\u633F\u5165
|
||||
_UI_ValidationRulesConnection_isUpdate_feature=\u66F4\u65B0
|
||||
_UI_ValidationRulesConnection_isUpdate_feature=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
_UI_ValidationRulesConnection_isDelete_feature=\u524A\u9664
|
||||
_UI_ValidationRulesConnection_type_feature=\u30BF\u30A4\u30D7
|
||||
_UI_ValidationRulesConnection_baseSchema_feature=\u30D9\u30FC\u30B9\u30B9\u30AD\u30FC\u30DE
|
||||
|
||||
@@ -219,6 +219,10 @@
|
||||
<activity
|
||||
id="org.talend.rcp.branding.activity.hideImportMenus"
|
||||
name="hideImportMenus">
|
||||
</activity>
|
||||
<activity
|
||||
id="org.talend.rcp.branding.activity.hideDebugModules"
|
||||
name="hideDebugModules">
|
||||
</activity>
|
||||
<activity
|
||||
id="org.talend.rcp.branding.activity.hideMenuForTOS"
|
||||
@@ -342,6 +346,11 @@
|
||||
activityId="org.talend.rcp.branding.activity.hideImportMenus"
|
||||
pattern="org.eclipse.ui.ide/org.eclipse.ui.wizards.import.ZipFile">
|
||||
</activityPatternBinding>
|
||||
<activityPatternBinding
|
||||
activityId="org.talend.rcp.branding.activity.hideDebugModules"
|
||||
pattern="org.eclipse.debug.ui/org.eclipse.debug.ui.ModuleView">
|
||||
</activityPatternBinding>
|
||||
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.core.expressions.propertyTesters">
|
||||
|
||||
@@ -24,7 +24,7 @@ RegisterWizardPage.legalbottominformations=\u65E2\u306B\u767B\u9332\u304C\u304A\
|
||||
RegisterWizardPage.logininfosPage2Yes1=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u3042\u306A\u305F\u306E\u30ED\u30B0\u30A4\u30F3\u304C\u65E2\u306B\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u3059\u3002
|
||||
RegisterWizardPage.logininfosPage2Yes2=\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u767B\u9332\u3092\u5B8C\u4E86\u3057\u3066\u304F\u3060\u3055\u3044\u3002\nForum\u3001Bugtracker\u3001Exchange\u306A\u3069\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3054\u3068\u306B\u7570\u306A\u308B\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u5834\u5408\u3001\n\u4EE5\u4E0B\u306B\u5165\u529B\u3057\u305F\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u6A19\u6E96\u30D1\u30B9\u30EF\u30FC\u30C9\u306B\n\u306A\u308A\u307E\u3059\u3002
|
||||
RegisterWizardPage.legalthanks1=\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059!
|
||||
RegisterWizardPage.legalthanks2=\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F\u3002
|
||||
RegisterWizardPage.legalthanks2=\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u304C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u307E\u3057\u305F\u3002
|
||||
RegisterWizardPage.legalconfirm=\u63A5\u7D9A\u60C5\u5831\u306E\u78BA\u8A8D\u30E1\u30FC\u30EB\u3092\u3059\u3050\u306B\u53D7\u4FE1\u3059\u308B\u3067\u3057\u3087\u3046\u3002
|
||||
RegisterWizardPage.logininfosPage2Not1=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u3042\u306A\u305F\u306E\u30ED\u30B0\u30A4\u30F3\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
|
||||
RegisterWizardPage.logininfosPage2Not2=\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u767B\u9332\u3092\u5B8C\u4E86\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
|
||||
@@ -77,6 +77,7 @@ import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.emf.provider.EmfResourcesFactoryReader;
|
||||
import org.talend.commons.runtime.model.emf.provider.ResourceOption;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.runtime.service.ITaCoKitService;
|
||||
import org.talend.commons.ui.runtime.image.EImage;
|
||||
import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
@@ -99,6 +100,8 @@ import org.talend.designer.maven.tools.AggregatorPomsHelper;
|
||||
import org.talend.designer.maven.tools.MavenPomSynchronizer;
|
||||
import org.talend.migration.MigrationReportHelper;
|
||||
import org.talend.repository.items.importexport.handlers.ImportExportHandlersManager;
|
||||
import org.talend.repository.items.importexport.handlers.imports.IImportItemsHandler;
|
||||
import org.talend.repository.items.importexport.handlers.imports.ImportBasicHandler;
|
||||
import org.talend.repository.items.importexport.handlers.imports.ImportCacheHelper;
|
||||
import org.talend.repository.items.importexport.handlers.imports.ImportDependencyRelationsHelper;
|
||||
import org.talend.repository.items.importexport.handlers.model.EmptyFolderImportItem;
|
||||
@@ -342,7 +345,7 @@ public class ImportItemsWizardPage extends WizardPage {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IExchangeService.class)) {
|
||||
archivePathField.setEditable(false);
|
||||
|
||||
IExchangeService service = (IExchangeService) GlobalServiceRegister.getDefault().getService(
|
||||
IExchangeService service = GlobalServiceRegister.getDefault().getService(
|
||||
IExchangeService.class);
|
||||
|
||||
String selectedArchive = service.openExchangeDialog();
|
||||
@@ -807,9 +810,50 @@ public class ImportItemsWizardPage extends WizardPage {
|
||||
// already checked all
|
||||
return;
|
||||
}
|
||||
|
||||
List<ItemImportNode> allImportItemNode = nodesBuilder.getAllImportItemNode();
|
||||
ImportDependencyRelationsHelper.getInstance().checkImportRelationDependency(checkedNodeList, toSelectSet,
|
||||
nodesBuilder.getAllImportItemNode());
|
||||
allImportItemNode);
|
||||
|
||||
ITaCoKitService coKitService = ITaCoKitService.getInstance();
|
||||
|
||||
Set<ItemImportNode> parentNodetoSelectSet = new HashSet<ItemImportNode>();
|
||||
|
||||
if (coKitService != null) {
|
||||
for (ItemImportNode itemImportNode : toSelectSet) {
|
||||
|
||||
ImportItem itemRecord = itemImportNode.getItemRecord();
|
||||
|
||||
if (itemRecord != null) {
|
||||
ERepositoryObjectType repositoryType = itemRecord.getRepositoryType();
|
||||
|
||||
boolean isTaCoKitType = coKitService.isTaCoKitType(repositoryType);
|
||||
|
||||
if (isTaCoKitType) {
|
||||
IImportItemsHandler importHandler = itemRecord.getImportHandler();
|
||||
if (importHandler instanceof ImportBasicHandler) {
|
||||
((ImportBasicHandler) importHandler).resolveItem(resManager, itemRecord);
|
||||
Item item = itemRecord.getProperty().getItem();
|
||||
String parentItemId = coKitService.getParentItemIdFromItem(item);
|
||||
if (StringUtils.isNotBlank(parentItemId)) {
|
||||
for (ItemImportNode importNode : allImportItemNode) {
|
||||
ImportItem importItem = importNode.getItemRecord();
|
||||
if (importItem != null && importItem.getProperty() != null
|
||||
&& StringUtils.equals(parentItemId, importItem.getProperty().getId())) {
|
||||
parentNodetoSelectSet.add(importNode);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (parentNodetoSelectSet.size() > 0) {
|
||||
|
||||
toSelectSet.addAll(parentNodetoSelectSet);
|
||||
}
|
||||
filteredCheckboxTree.getViewer().setCheckedElements(toSelectSet.toArray());
|
||||
}
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@ LocalRepositoryFactory.Property_File_Broken=\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5
|
||||
LocalRepositoryFactory.logonDenyMsg=\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u53E4\u304F\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\u6700\u521D\u306B[{0}]\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044!
|
||||
LocalRepositoryFactory.productionLower01=Studio\u3068\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304F\u306B\u306F\u3001Studio [{0}]\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
LocalRepositoryFactory.productionLower02=Studio\u3068\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304F\u306B\u306F\u3001Studio\u30D1\u30C3\u30C1[{0}]\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
LocalRepositoryFactory.productionNewer01=[{1}]\u306B\u66F4\u65B0\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u3053\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3044\u3061\u3069\u9069\u7528\u3055\u308C\u308B\u3068\u3001\u305D\u308C\u3088\u308A\u53E4\u3044Studio\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u79FB\u884C\u3057\u307E\u3059\u304B?
|
||||
LocalRepositoryFactory.productionNewer02=[{1}]\u306B\u66F4\u65B0\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u3053\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u9069\u7528\u5F8C\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092Studio\u306E\u4E0B\u4F4D\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u958B\u304F\u3053\u3068\u306F\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u79FB\u884C\u3057\u307E\u3059\u304B? \n\u306A\u304A\u3001\u73FE\u5728\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u308F\u308C\u3066\u3044\u308B\u30D0\u30FC\u30B8\u30E7\u30F3\u306F[{0}]\u3067\u3059\u3002
|
||||
LocalRepositoryFactory.productionNewer01=[{1}]\u306B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u3053\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3044\u3061\u3069\u9069\u7528\u3055\u308C\u308B\u3068\u3001\u305D\u308C\u3088\u308A\u53E4\u3044Studio\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u79FB\u884C\u3057\u307E\u3059\u304B?
|
||||
LocalRepositoryFactory.productionNewer02=[{1}]\u306B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u3053\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u9069\u7528\u5F8C\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092Studio\u306E\u4E0B\u4F4D\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u958B\u304F\u3053\u3068\u306F\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u79FB\u884C\u3057\u307E\u3059\u304B? \n\u306A\u304A\u3001\u73FE\u5728\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u308F\u308C\u3066\u3044\u308B\u30D0\u30FC\u30B8\u30E7\u30F3\u306F[{0}]\u3067\u3059\u3002
|
||||
LocalRepositoryFactory.logonWarningTitle=\u30ED\u30B0\u30A4\u30F3\u60C5\u5831
|
||||
LocalRepositoryFactory.login.userCancel=\u30ED\u30B0\u30A4\u30F3\u304C\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
|
||||
|
||||
|
||||
@@ -102,12 +102,12 @@ MdmReceiveForm.previewNotAvailable=XSD\u30D5\u30A1\u30A4\u30EB\u306B\u5229\u7528
|
||||
FileStep3.metadataName=\u540D\u524D
|
||||
FileStep3.metadataComment=\u30B3\u30E1\u30F3\u30C8
|
||||
FileStep3.groupMetadata=\u30B9\u30AD\u30FC\u30DE
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
FileStep3.guess=\u63A8\u5B9A
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
|
||||
FileStep3.metadataDescription=\u30B9\u30AD\u30FC\u30DE\u306E\u8AAC\u660E
|
||||
FileStep3.guessConfirmation=\u5909\u66F4\u3092\u78BA\u5B9A\u3057\u307E\u3059\u304B?
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u3068\u3001\u73FE\u5728\u306E\u30C7\u30FC\u30BF\u304C\u3059\u3079\u3066\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u3044\u3044\u3048\u3092\u9078\u629E\u3059\u308C\u3070\u3001\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u3068\u3001\u73FE\u5728\u306E\u30C7\u30FC\u30BF\u304C\u3059\u3079\u3066\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u3044\u3044\u3048\u3092\u9078\u629E\u3059\u308C\u3070\u3001\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
FileStep3.guessIsDone=\u63A8\u5B9A\u306E\u6210\u529F
|
||||
FileStep1.nameAlert=\u540D\u524D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
FileStep1.nameAlertIllegalChar=\u540D\u524D\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u7981\u6B62\u6587\u5B57
|
||||
|
||||
@@ -154,8 +154,8 @@ DocumentationPage.sourceDocDoNotExist=\u30BD\u30FC\u30B9\u30C9\u30AD\u30E5\u30E1
|
||||
DocumentationPage.sourceDocIsNotSet=\u30BD\u30FC\u30B9\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u672A\u8A2D\u5B9A\u3067\u3059\u3002
|
||||
DocumentationPage.thisTitle.document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
|
||||
DocumentationPreferencePage.sourceCodeToHTML=HTML\u751F\u6210\u3078\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
|
||||
DocumentationUpdateWizard.mainPageDescription=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0
|
||||
DocumentationUpdateWizard.windowTitle=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0
|
||||
DocumentationUpdateWizard.mainPageDescription=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DocumentationUpdateWizard.windowTitle=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
EbcdicForm.noDir=x2j\u30D5\u30A1\u30A4\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
|
||||
EbcdicForm.genarateFailure=XC2J\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
|
||||
EbcdicForm.dataFile=\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB
|
||||
@@ -183,7 +183,7 @@ ExportProjectsAsAction.processProject=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092
|
||||
ExportTreeViewer.hideJobTree=\u30B8\u30E7\u30D6\u30C4\u30EA\u30FC\u3092\u975E\u8868\u793A
|
||||
ExportTreeViewer.selectItems=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u9078\u629E:
|
||||
ExportTreeViewer.showJobTree=\u30B8\u30E7\u30D6\u30C4\u30EA\u30FC\u3092\u8868\u793A
|
||||
ExtractDocumentationAction.fileErrorMessages=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u306E\u30EA\u30F3\u30AF\u3092\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
ExtractDocumentationAction.fileErrorMessages=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u306E\u30EA\u30F3\u30AF\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
ExtractDocumentationAction.fileErrorTitle=\u30D5\u30A1\u30A4\u30EB\u30A8\u30E9\u30FC
|
||||
ExtractDocumentationAction.text.saveAs=\u540D\u524D\u3092\u4ED8\u3051\u3066\u4FDD\u5B58...
|
||||
ExtractDocumentationAction.toolTipText.extractDoctoFileSys=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u62BD\u51FA
|
||||
@@ -282,14 +282,14 @@ FileStep3.filepathAlert=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u
|
||||
FileStep3.groupMetadata=\u30B9\u30AD\u30FC\u30DE
|
||||
FileStep3.guess=\u63A8\u5B9A
|
||||
FileStep3.guessConfirmation=\u5909\u66F4\u3092\u78BA\u5B9A\u3057\u307E\u3059\u304B?
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u3068\u73FE\u5728\u306E\u30C7\u30FC\u30BF\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u66F4\u65B0\u3057\u306A\u3044\u5834\u5408\u3001\u30C7\u30FC\u30BF\u306F\u73FE\u5728\u306E\u307E\u307E\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u64CD\u4F5C\u3092\u7D9A\u3051\u307E\u3059\u304B?
|
||||
FileStep3.guessConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u3068\u73FE\u5728\u306E\u30C7\u30FC\u30BF\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u306A\u3044\u5834\u5408\u3001\u30C7\u30FC\u30BF\u306F\u73FE\u5728\u306E\u307E\u307E\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002\u64CD\u4F5C\u3092\u7D9A\u3051\u307E\u3059\u304B?
|
||||
FileStep3.guessFailure=\u63A8\u5B9A\u306E\u5931\u6557
|
||||
FileStep3.guessFailureTip=\u63A8\u5B9A\u306E\u5931\u6557
|
||||
FileStep3.guessFailureTip2=\u30B9\u30C6\u30C3\u30D72\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u306B\u57FA\u3065\u304F\u63A8\u5B9A
|
||||
FileStep3.guessIsDone=\u63A8\u5B9A\u306E\u6210\u529F
|
||||
FileStep3.guessProgress=\u63A8\u5B9A\u3092\u5B9F\u884C\u4E2D...
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
FileStep3.guessTip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
|
||||
FileStep3.informationLabel=\u8A2D\u5B9A\u306B\u5F93\u3063\u3066\u4EE5\u4E0B\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
FileStep3.itemAlert=\u5C11\u306A\u304F\u3066\u30821\u3064\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u30B9\u30AD\u30FC\u30DE\u306B\u5FC5\u8981\u3067\u3059
|
||||
FileStep3.metadataComment=\u30B3\u30E1\u30F3\u30C8
|
||||
FileStep3.metadataDescription=\u30B9\u30AD\u30FC\u30DE\u306E\u8AAC\u660E
|
||||
@@ -633,15 +633,15 @@ StatusEditor.labelColumnTitle=\u30E9\u30D9\u30EB
|
||||
StatusPreferencePage.docStatusLabel=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30B9\u30C6\u30FC\u30BF\u30B9
|
||||
StatusPreferencePage.technicalStatusLabel=\u30C6\u30AF\u30CB\u30AB\u30EB\u30B9\u30C6\u30FC\u30BF\u30B9
|
||||
StoppablePreviewLoader.inforLabelText.previewInterrupted=\u4E2D\u65AD\u3055\u308C\u305F\u30D7\u30EC\u30D3\u30E5\u30FC
|
||||
UpdateDocumentationAction.updateDocActionText.updateDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0...
|
||||
UpdateDocumentationAction.updateDocActionTipText.updateDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u66F4\u65B0
|
||||
UpdateDocumentationAction.updateDocActionText.updateDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8...
|
||||
UpdateDocumentationAction.updateDocActionTipText.updateDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
VersionAuthorSection.authorLabel=\u4F5C\u6210\u8005
|
||||
VersionAuthorSection.lockerLabel=\u30ED\u30C3\u30AF\u4FDD\u6301\u8005
|
||||
VersionAuthorSection.versionLabel=\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
VersionManagementDialog.ConfirmMessage=\u9078\u629E\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u3059\u3079\u3066\u30D0\u30FC\u30B8\u30E7\u30F3{0}\u306B\u66F4\u65B0\u3057\u307E\u3059\u304B?
|
||||
VersionManagementDialog.ConfirmMessage=\u9078\u629E\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u3059\u3079\u3066\u30D0\u30FC\u30B8\u30E7\u30F3{0}\u306B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B?
|
||||
VersionManagementDialog.ConfirmTitle=\u78BA\u8A8D
|
||||
VersionManagementDialog.DeletedTip=\u524A\u9664
|
||||
VersionManagementDialog.EachVersion=\u5404\u30A2\u30A4\u30C6\u30E0\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
|
||||
VersionManagementDialog.EachVersion=\u5404\u30A2\u30A4\u30C6\u30E0\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
|
||||
VersionManagementDialog.FixedVersion=\u30A2\u30A4\u30C6\u30E0\u3092\u3059\u3079\u3066\u4E00\u5B9A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
|
||||
VersionManagementDialog.Items=\u30A2\u30A4\u30C6\u30E0
|
||||
VersionManagementDialog.MajorVersionTip=\u30E1\u30B8\u30E3\u30FC\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
@@ -658,7 +658,7 @@ VersionManagementDialog.WarningTitle=\u5909\u66F4\u306A\u3057
|
||||
VersionManagementDialog.AllDependencies=\u4F9D\u5B58\u9805\u76EE\u3092\u3059\u3079\u3066\u9078\u629E
|
||||
VersionManagementDialog.Subjob=\u30B5\u30D6\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u9078\u629E
|
||||
VersionManagementDialog.FixVersion=\u6700\u65B0\u306E\u5834\u5408\u306FtRunJob\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u540C\u4E00\u306B\u3059\u308B
|
||||
VersionManagementDialog.FixLastVersion=\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u66F4\u65B0\u3059\u308B\u6642\u306BtRunJob\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3079\u3066\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u3053\u306E\u51E6\u7406\u3092\u884C\u3046\u3068\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u5FA9\u5143\u3055\u308C\u307E\u3059\u3002\n\u305F\u3068\u3048\u3070\u7236\u89AA\u304C1.0 (tRunJob<child, Latest>)\u3067\u3042\u308B\u3068\u3057\u307E\u3059\u3002\n\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3059\u308B\u5834\u5408: \n - \u89AA\u306E\u30D0\u30FC\u30B8\u30E7\u30F31.0\u306F(tRunJob<child, 1.0>)\u3092\u542B\u307F\u307E\u3059\u3002\u5B50\u3082\u30D0\u30FC\u30B8\u30E7\u30F31.0\u3067\u5B9F\u884C\u3059\u308B\u305F\u3081\u3067\u3059\u3002\n - \u6700\u65B0\u7248\u3092\u4F7F\u3044\u7D9A\u3051\u308B\u305F\u3081\u3001\u7236\u89AA\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u306F(tRunJob<child, Latest>)\u304C\u542B\u307E\u308C\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002\n\n\u6CE8\u610F: \u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u65E2\u306B\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u304A\u3088\u3073\u6700\u65B0\u7248\u3092\u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u4F55\u3082\u3057\u307E\u305B\u3093\u3002
|
||||
VersionManagementDialog.FixLastVersion=\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u6642\u306BtRunJob\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3079\u3066\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u3053\u306E\u51E6\u7406\u3092\u884C\u3046\u3068\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u5FA9\u5143\u3055\u308C\u307E\u3059\u3002\n\u305F\u3068\u3048\u3070\u7236\u89AA\u304C1.0 (tRunJob<child, Latest>)\u3067\u3042\u308B\u3068\u3057\u307E\u3059\u3002\n\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3059\u308B\u5834\u5408: \n - \u89AA\u306E\u30D0\u30FC\u30B8\u30E7\u30F31.0\u306F(tRunJob<child, 1.0>)\u3092\u542B\u307F\u307E\u3059\u3002\u5B50\u3082\u30D0\u30FC\u30B8\u30E7\u30F31.0\u3067\u5B9F\u884C\u3059\u308B\u305F\u3081\u3067\u3059\u3002\n - \u6700\u65B0\u7248\u3092\u4F7F\u3044\u7D9A\u3051\u308B\u305F\u3081\u3001\u7236\u89AA\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u306F(tRunJob<child, Latest>)\u304C\u542B\u307E\u308C\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002\n\n\u6CE8\u610F: \u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u65E2\u306B\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u304A\u3088\u3073\u6700\u65B0\u7248\u3092\u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u4F55\u3082\u3057\u307E\u305B\u3093\u3002
|
||||
XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
|
||||
XmlFileStep1.groupSchemaTarget=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30AD\u30FC\u30DE
|
||||
XmlFileStep1.sourceSchema=\u30BD\u30FC\u30B9\u30B9\u30AD\u30FC\u30DE
|
||||
@@ -736,7 +736,7 @@ ExportItemWizardPage.labelText=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B\
|
||||
ExportItemWizardPage.waring=\u8B66\u544A
|
||||
ReloadSystemRoutinesAction.logInfo.sysRoutinesSuccessfullyReloaded=\u30B7\u30B9\u30C6\u30E0\u30EB\u30FC\u30C1\u30F3\u304C\u6B63\u3057\u304F\u30EA\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3057\u305F
|
||||
StatusManagementDialog.FixedStatus=\u3059\u3079\u3066\u306E\u30C6\u30AF\u30CB\u30AB\u30EB\u30A2\u30A4\u30C6\u30E0\u3092\u4E00\u5B9A\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
|
||||
StatusManagementDialog.EachStatus=\u5404\u30A2\u30A4\u30C6\u30E0\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u66F4\u65B0
|
||||
StatusManagementDialog.EachStatus=\u5404\u30A2\u30A4\u30C6\u30E0\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
StatusManagementDialog.FixedDocumentStatus=\u3059\u3079\u3066\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u9805\u76EE\u3092\u540C\u4E00\u30B9\u30C6\u30FC\u30BF\u30B9\u3078\u5909\u66F4
|
||||
StatusManagementDialog.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
|
||||
StatusManagementDialog.NewStatus=\u65B0\u898F\u30B9\u30C6\u30FC\u30BF\u30B9
|
||||
@@ -802,8 +802,8 @@ AbstractSalesforceStepForm.fetchModule=Salesforce\u30B5\u30FC\u30D3\u30B9\u306B\
|
||||
ConnectionContextHelper.ContextTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9
|
||||
ConnectionContextHelper.InConextMessages=\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u3057\u305F\u3002
|
||||
ConnectionContextHelper.OutConextMessages=\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
|
||||
ConnectionContextHelper.UpdateMessages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B?
|
||||
ConnectionContextHelper.UpdateTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u66F4\u65B0
|
||||
ConnectionContextHelper.UpdateMessages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B?
|
||||
ConnectionContextHelper.UpdateTitle=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
ContextSetsSelectionDialog.ContextSets=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30BB\u30C3\u30C8
|
||||
ContextSetsSelectionDialog.Messages=\u73FE\u5728\u306E\u63A5\u7D9A\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9\u3067\u3059\u3002
|
||||
ContextSetsSelectionDialog.Source=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30BD\u30FC\u30B9:
|
||||
@@ -1010,7 +1010,7 @@ DatabaseTableForm.illegalChar==\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\
|
||||
DatabaseTableForm.no_such_table=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u5B58\u5728\u3059\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
DatabaseTableForm.refresh.text=\u3053\u306E\u30DC\u30BF\u30F3\u3092\u62BC\u3057\u3066\u30B9\u30AD\u30FC\u30DE\u3092\u3059\u3079\u3066\u53D6\u5F97\u3057\u307E\u3059
|
||||
DatabaseTableForm.retreiveButtonConfirmation=\u5909\u66F4\u3092\u78BA\u5B9A\u3057\u307E\u3059\u304B?
|
||||
DatabaseTableForm.retreiveButtonConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3059\u308B\u3068\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\u7D9A\u3051\u307E\u3059\u304B\uFF1F
|
||||
DatabaseTableForm.retreiveButtonConfirmationMessage=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u3068\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\u7D9A\u3051\u307E\u3059\u304B\uFF1F
|
||||
DatabaseTableForm.retreiveButtonIsAccessible=[Retrieve Schema] (\u30B9\u30AD\u30FC\u30DE\u306E\u53D6\u5F97)\u30DC\u30BF\u30F3\u304C\u5229\u7528\u53EF\u80FD\u306B\u306A\u308A\u307E\u3057\u305F\u3002
|
||||
DatabaseTableForm.guessSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u63A8\u6E2C
|
||||
DatabaseTableForm.type=\u578B: {0}
|
||||
@@ -1019,15 +1019,15 @@ DatabaseTableForm.typeTable=\u30BF\u30A4\u30D7: TABLE
|
||||
DatabaseTableWizard.description=\u30C6\u30FC\u30D6\u30EB\u7528\u30D5\u30A3\u30EB\u30BF\u30FC\u3002
|
||||
DatabaseWizard.windowTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A
|
||||
DatabaseWizard.ReloadTitle=\u30EA\u30ED\u30FC\u30C9\u3092\u78BA\u8A8D
|
||||
DatabaseWizard.ReloadMessages=\u63A5\u7D9A\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F\u3002\u5206\u6790\u304C\u4F9D\u5B58\u3057\u3066\u3044\u308B\u3053\u306E\u63A5\u7D9A\u306E\u5206\u6790\u6E08\u307F\u30A8\u30EC\u30E1\u30F3\u30C8\u304C\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
DatabaseWizard.ReloadMessages=\u63A5\u7D9A\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u307E\u3057\u305F\u3002\u5206\u6790\u304C\u4F9D\u5B58\u3057\u3066\u3044\u308B\u3053\u306E\u63A5\u7D9A\u306E\u5206\u6790\u6E08\u307F\u30A8\u30EC\u30E1\u30F3\u30C8\u304C\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
|
||||
DatabaseWizardPage.descriptionCreate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5B9A\u7FA9
|
||||
DatabaseWizardPage.descriptionCreate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u5B9A\u7FA9
|
||||
DatabaseWizardPage.descriptionUpdate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0
|
||||
DatabaseWizardPage.descriptionUpdate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u66F4\u65B0
|
||||
DatabaseWizardPage.descriptionUpdate.Step1=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DatabaseWizardPage.descriptionUpdate.Step2=\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
DatabaseWizardPage.titleCreate.Step1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u4E0A\u306E\u65B0\u898F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A - \u30B9\u30C6\u30C3\u30D7 1/2
|
||||
DatabaseWizardPage.titleCreate.Step2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u4E0A\u306E\u65B0\u898F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A - \u30B9\u30C6\u30C3\u30D7 2/2
|
||||
DatabaseWizardPage.titleUpdate.Step1=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u66F4\u65B0 - \u30B9\u30C6\u30C3\u30D71/2
|
||||
DatabaseWizardPage.titleUpdate.Step2=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u66F4\u65B0 - \u30B9\u30C6\u30C3\u30D72/2
|
||||
DatabaseWizardPage.titleUpdate.Step1=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 - \u30B9\u30C6\u30C3\u30D71/2
|
||||
DatabaseWizardPage.titleUpdate.Step2=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 - \u30B9\u30C6\u30C3\u30D72/2
|
||||
DelimitedFilePreview.column=\u30AB\u30E9\u30E0
|
||||
DelimitedFileStep2Form.14=\u6570\u5024\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002
|
||||
DelimitedFileStep2Form.onlyNumber=\u6570\u5024\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002
|
||||
@@ -1057,27 +1057,27 @@ XmlFileStep2Form.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC
|
||||
XmlFileStep2Form.Output=\u51FA\u529B
|
||||
XmlFileStep2Form.fileViewer=\u30D5\u30A1\u30A4\u30EB\u30D3\u30E5\u30FC\u30A2\u30FC
|
||||
FileStep3Form.nameInvalid=\u540D\u524D\u304C\u7121\u52B9\u3067\u3059
|
||||
FileStep3.guessConfirmationMessageWithDQ=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u306E\u66F4\u65B0\u3092\u884C\u3046\u3068\u73FE\u6642\u70B9\u306E\u30C7\u30FC\u30BF\u304A\u3088\u3073DQ\u95A2\u9023\u306E\u5206\u6790\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002NO\u3092\u9078\u629E\u3059\u308B\u3068\u73FE\u6642\u70B9\u306E\u30C7\u30FC\u30BF\u3092\u305D\u306E\u307E\u307E\u4F7F\u7528\u3057\u307E\u3059\u3002\u64CD\u4F5C\u3092\u7D9A\u3051\u307E\u3059\u304B\uFF1F,,
|
||||
FileStep3.guessConfirmationMessageWithDQ=\u30B9\u30AD\u30FC\u30DE\u8A2D\u5B9A\u304C\u5909\u66F4\u3055\u308C\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u30D7\u30EC\u30D3\u30E5\u30FC\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30B9\u30AD\u30FC\u30DE\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u884C\u3046\u3068\u73FE\u6642\u70B9\u306E\u30C7\u30FC\u30BF\u304A\u3088\u3073DQ\u95A2\u9023\u306E\u5206\u6790\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002NO\u3092\u9078\u629E\u3059\u308B\u3068\u73FE\u6642\u70B9\u306E\u30C7\u30FC\u30BF\u3092\u305D\u306E\u307E\u307E\u4F7F\u7528\u3057\u307E\u3059\u3002\u64CD\u4F5C\u3092\u7D9A\u3051\u307E\u3059\u304B\uFF1F,,
|
||||
FileTableWizardPage.descriptionCreate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0
|
||||
FileTableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u3042\u308B\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3057\u307E\u3059
|
||||
FileTableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u3042\u308B\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
|
||||
FileTableWizardPage.titleCreate="{0}"\u4E0A\u306E\u65B0\u3057\u3044\u30B9\u30AD\u30FC\u30DE
|
||||
FileTableWizardPage.titleUpdate="{0}"\u3068\u3044\u3046\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
FileTableWizardPage.titleUpdate="{0}"\u3068\u3044\u3046\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizard.windowTitleCreate=\u65B0\u898F\u306E\u56FA\u5B9A\u9577\u30D5\u30A1\u30A4\u30EB
|
||||
FileWizard.windowTitleUpdate=\u65E2\u5B58\u306E\u56FA\u5B9A\u9577\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6
|
||||
FileWizardPage.descriptionCreateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionCreateStep3=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0\n\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionUpdateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0
|
||||
FileWizardPage.descriptionUpdateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u66F4\u65B0
|
||||
FileWizardPage.descriptionUpdateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u66F4\u65B0\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.descriptionUpdateStep0=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizardPage.descriptionUpdateStep1=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\n\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3068\u5F62\u5F0F\u8A2D\u5B9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
FileWizardPage.descriptionUpdateStep2=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3067\u65E2\u5B58\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\n\u89E3\u6790\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A\u3092\u5B9A\u7FA9
|
||||
FileWizardPage.of=of
|
||||
FileWizardPage.titleCreate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
|
||||
FileWizardPage.titleUpdate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
|
||||
GenericSchemaStep2Form.SelectDatabaseType=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u30BF\u30A4\u30D7\u3092\u9078\u629E
|
||||
GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
GenericSchemaWizard.SaveAsGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
|
||||
GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
LDAPSchemaStep1Form.CheckConnection= \u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u305F\u3081\u306B\u4E0B\u8A18\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
LDAPSchemaStep1Form.CheckNetWorkParameter=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30C1\u30A7\u30C3\u30AF
|
||||
LDAPSchemaStep1Form.EncryptionMethod=\u6697\u53F7\u5316\u65B9\u5F0F\uFF1A
|
||||
@@ -1112,7 +1112,7 @@ LDAPSchemaStep3Form.selectAllTipText=\u30B9\u30AD\u30FC\u30DE\u5C5E\u6027\u3092\
|
||||
LDAPSchemaStep3Form.selectNoneText=\u4F55\u3082\u9078\u629E\u3057\u306A\u3044
|
||||
LDAPSchemaStep3Form.selectNoneTipText=\u30B9\u30AD\u30FC\u30DE\u5C5E\u6027\u3092\u9078\u629E\u3057\u306A\u3044
|
||||
LDAPSchemaWizard.CreateNewLdapSchema=\u65B0\u3057\u3044LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
LDAPSchemaWizard.UpdateLdapSchema=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
LDAPSchemaWizard.UpdateLdapSchema=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
LDIFReader.ioException.cannotConstrauctURL=: URL\u3092\u69CB\u6210\u3067\u304D\u307E\u305B\u3093
|
||||
LDIFReader.ioException.protocolNotSupported=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30D7\u30ED\u30C8\u30B3\u30EB :
|
||||
LDIFReader.ioException.unknow=\u672A\u77E5\u306E\u30BF\u30A4\u30D7\u3002
|
||||
@@ -1193,9 +1193,9 @@ ShowAddedContextdialog.Title=\u8FFD\u52A0\u3055\u308C\u305F\u30B3\u30F3\u30C6\u3
|
||||
ShowAddedContextdialog.Variables=\u5909\u6570
|
||||
TableWizard.windowTitle=\u30B9\u30AD\u30FC\u30DE
|
||||
TableWizardPage.descriptionCreate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u8FFD\u52A0
|
||||
TableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306E\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
TableWizardPage.descriptionUpdate=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306E\u65E2\u5B58\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
TableWizardPage.titleCreate=\u63A5\u7D9A\u5185\u306E\u65B0\u3057\u3044\u30B9\u30AD\u30FC\u30DE
|
||||
TableWizardPage.titleUpdate=\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
TableWizardPage.titleUpdate=\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
WSDLSchemaStep1Form.ENDPOINTURI=\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8URI
|
||||
WSDLSchemaStep1Form.MethodName=\u30E1\u30BD\u30C3\u30C9
|
||||
WSDLSchemaStep1Form.NeedAuth=\u8A8D\u8A3C\u304C\u5FC5\u8981\u3067\u3059\u304B?
|
||||
@@ -1218,7 +1218,7 @@ WSDLSchemaStep1Form.preview=\u30D7\u30EC\u30D3\u30E5\u30FC
|
||||
WSDLSchemaStep1Form.TimeOutTitle=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u79D2)
|
||||
WSDLSchemaWizard.CreateNewWSDLSchema=\u65B0\u3057\u3044WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
|
||||
WSDLSchemaWizard.SaveAsWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
|
||||
WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
|
||||
WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
||||
XmlFileStep1.filepathXml=XML
|
||||
XmlFileStep1.groupFileViewer=\u30B9\u30AD\u30FC\u30DE\u30D3\u30E5\u30FC\u30A2\u30FC
|
||||
XmlFileStep1Form.limitation=\u5236\u9650
|
||||
@@ -1228,7 +1228,7 @@ XmlFileStep1Form.ImportSchemaNotExistError=\u5FC5\u8981\u306A\u53C2\u7167\u30B9\
|
||||
XmlFileWizard.windowTitleCreate=\u65B0\u3057\u3044XML\u30D5\u30A1\u30A4\u30EB
|
||||
XmlFileWizard.windowTitleUpdate=\u65E2\u5B58\u306EXML\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6
|
||||
XmlFileWizard.newColumnsDectect.title=\u65B0\u3057\u3044\u30AB\u30E9\u30E0\u3092\u691C\u51FA
|
||||
XmlFileWizard.newColumnsDectect.desc=\u65B0\u898F\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u62BD\u51FA\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u66F4\u65B0\u3092\u53CD\u6620\u3055\u305B\u308B\u305F\u3081\u306B\u306F\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u306A\u304A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
XmlFileWizard.newColumnsDectect.desc=\u65B0\u898F\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u62BD\u51FA\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u53CD\u6620\u3055\u305B\u308B\u305F\u3081\u306B\u306F\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u306A\u304A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
XmlFileOutputStep2Form.refresh=[\u30B9\u30AD\u30FC\u30DE\u30EA\u30B9\u30C8]\u30D3\u30E5\u30FC\u30A2\u30FC\u306E\u66F4\u65B0
|
||||
MetadataTableEditor.ColumnNameIsNull=\u30A8\u30E9\u30FC: \u30AB\u30E9\u30E0\u540D\u304CNULL\u3067\u3059\u3002
|
||||
MetadataTalendTypeEditor.button.edit=\u7DE8\u96C6(&D)
|
||||
|
||||
@@ -15,17 +15,17 @@ UpdateWizardModel.local.folder.must.be.folder=\u30ED\u30FC\u30AB\u30EB\u30D5\u30
|
||||
UpdateWizardModel.local.folder.must.exist.error=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u5B58\u5728\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
|
||||
UpdateWizardModel.local.folder.required.error=\u65E2\u5B58\u306E\u30ED\u30FC\u30AB\u30EB\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
UpdateWizardModel.url.invalid.error=\u30AB\u30B9\u30BF\u30E0\u30B5\u30A4\u30C8\u306EURL\u304C\u7121\u52B9\u3067\u3059\u3002
|
||||
UpdateWizardModel.url.missing.error=\u30AB\u30B9\u30BF\u30E0\u66F4\u65B0\u30B5\u30A4\u30C8\u306EURL\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
UpdateWizardModel.url.missing.error=\u30AB\u30B9\u30BF\u30E0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u306EURL\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
SelectExtraFeaturesToInstallWizardPage.one.feature.must.be.selected=\u6A5F\u80FD\u3092\u5C11\u306A\u304F\u3068\u30821\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
ChooseUpdateSitesWizardPage.choose.local.folder.dialog.title=\u66F4\u65B0\u30B5\u30A4\u30C8\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
ChooseUpdateSitesWizardPage.custom.remote.site.tooltip=\u30AB\u30B9\u30BF\u30E0\u66F4\u65B0\u30B5\u30A4\u30C8\u306EURL\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u9078\u629E\u3055\u308C\u305F\u6A5F\u80FD\u3092Talend\u66F4\u65B0\u30B5\u30A4\u30C8\u304B\u3089\u306E\u307F1\u56DE\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001\u3053\u306E\u5185\u90E8\u66F4\u65B0\u30B5\u30A4\u30C8\u3092\u7D4C\u7531\u3057\u3066\u3055\u307E\u3056\u307E\u306AStudio\u306B\u914D\u5E03\u3067\u304D\u307E\u3059\u3002\u4F8B: http://update.talend.org/
|
||||
ChooseUpdateSitesWizardPage.custom.remote.update.site=\u30AB\u30B9\u30BF\u30E0\u30EA\u30E2\u30FC\u30C8\u66F4\u65B0\u30B5\u30A4\u30C8
|
||||
ChooseUpdateSitesWizardPage.choose.local.folder.dialog.title=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
|
||||
ChooseUpdateSitesWizardPage.custom.remote.site.tooltip=\u30AB\u30B9\u30BF\u30E0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u306EURL\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u9078\u629E\u3055\u308C\u305F\u6A5F\u80FD\u3092Talend\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u304B\u3089\u306E\u307F1\u56DE\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001\u3053\u306E\u5185\u90E8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u3092\u7D4C\u7531\u3057\u3066\u3055\u307E\u3056\u307E\u306AStudio\u306B\u914D\u5E03\u3067\u304D\u307E\u3059\u3002\u4F8B: http://update.talend.org/
|
||||
ChooseUpdateSitesWizardPage.custom.remote.update.site=\u30AB\u30B9\u30BF\u30E0\u30EA\u30E2\u30FC\u30C8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8
|
||||
ChooseUpdateSitesWizardPage.default.remote.site.tooltip=\u9078\u629E\u3055\u308C\u305F\u6A5F\u80FD\u306FTalend\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u3002\u305D\u308C\u305E\u308C\u306EStudio\u3067\u9078\u629E\u3055\u308C\u305F\u6A5F\u80FD\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3053\u3068\u304C\u5FC5\u8981\u3068\u306A\u308A\u307E\u3059\u3002
|
||||
ChooseUpdateSitesWizardPage.default.remote.update.site=Talend\u30EA\u30E2\u30FC\u30C8\u66F4\u65B0\u30B5\u30A4\u30C8(\u30C7\u30D5\u30A9\u30EB\u30C8)
|
||||
ChooseUpdateSitesWizardPage.default.remote.update.site=Talend\u30EA\u30E2\u30FC\u30C8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8(\u30C7\u30D5\u30A9\u30EB\u30C8)
|
||||
ChooseUpdateSitesWizardPage.local.folder=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A9\u30EB\u30C0\u30FC
|
||||
ChooseUpdateSitesWizardPage.local.folder.tooltip=\u4E00\u3064\u307E\u305F\u306F\u8907\u6570(zip\u3055\u308C\u305F)\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u3092\u4FDD\u7BA1\u53EF\u80FD\u306A\u30ED\u30FC\u30AB\u30EB\u30D5\u30A9\u30EB\u30C0\u306B\u30D1\u30B9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u9078\u629E\u3055\u308C\u305F\u6A5F\u80FD\u306F\u30ED\u30FC\u30AB\u30EB\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u3002
|
||||
ChooseUpdateSitesWizardPage.page.description=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u306F\u30EA\u30E2\u30FC\u30C8\u3067\u3082\u30ED\u30FC\u30AB\u30EB\u3067\u3082\u7D50\u69CB\u3067\u3059\u3002\u30ED\u30FC\u30AB\u30EB\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u8907\u6570\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u3092\u540C\u3058\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u4FDD\u5B58\u3067\u304D\u307E\u3059\u3002
|
||||
ChooseUpdateSitesWizardPage.page.title=\u66F4\u65B0\u30B5\u30A4\u30C8\u3092\u9078\u629E
|
||||
ChooseUpdateSitesWizardPage.page.title=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30A4\u30C8\u3092\u9078\u629E
|
||||
SelectExtraFeaturesToInstallWizardPage.description.label=\u8AAC\u660E:
|
||||
SelectExtraFeaturesToInstallWizardPage.feature.column.name.name=\u540D\u524D
|
||||
SelectExtraFeaturesToInstallWizardPage.feature.list.label=\u4F7F\u7528\u53EF\u80FD\u306A\u6A5F\u80FD:
|
||||
@@ -50,7 +50,7 @@ ExtraFeaturesFactory.failed.to.read.licence=\u30E9\u30A4\u30BB\u30F3\u30B9\u304B
|
||||
ExtraFeaturesFactory.back.config.error=config.ini\u3092\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
|
||||
ExtraFeaturesFactory.restore.config.error=config.ini\u3092\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
|
||||
ExtraFeature.checking.is.installed={0}\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u308B\u304B\u3069\u3046\u304B\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059\u3002
|
||||
ExtraFeature.checking.need.update=\u6A5F\u80FD"{0}"\u306E\u66F4\u65B0\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059\u3002
|
||||
ExtraFeature.checking.need.update=\u6A5F\u80FD"{0}"\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059\u3002
|
||||
ExtraFeature.coud.not.create.p2.agent=P2\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
|
||||
ExtraFeature.could.not.find.feature=\u4EE5\u4E0B\u306E\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC{2}\u306B\u6A5F\u80FD{0}({1})\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
|
||||
ExtraFeature.error.installing.feature.uri.exception=URI\u4F8B\u5916\u306E\u305F\u3081\u3001{0} ({1})\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
|
||||
|
||||
@@ -87,46 +87,50 @@ public class ElementParameterParserTest {
|
||||
elementParametersWithChildrens.add(parameter);
|
||||
when(node.getElementParametersWithChildrens()).thenReturn(elementParametersWithChildrens);
|
||||
|
||||
// "ab"
|
||||
// input: "ab"
|
||||
String val = "\"ab\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("ab",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// "a\"b"
|
||||
// input: "a\"b"
|
||||
val = "\"a\\\"b\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("a\"b",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// "a\\b"
|
||||
// input: "a\\b" (keep the studio behavior)
|
||||
val = "\"a\\\\b\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("a\\b",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// "a\\\\b"
|
||||
val = "\"a\\\\\\\\b\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("a\\\\b",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// "test"+context.mypassword + "a"
|
||||
// input: "a\\\\b" (keep the studio behavior)
|
||||
val = "\"a\\\\\\\\b\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("a\\\\\\\\b",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// input: "test"+context.mypassword + "a"
|
||||
val = "\"test\"+context.mypassword + \"a\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals(val,
|
||||
ElementParameterParser.getEncryptedValue(node, paramName));
|
||||
// "a" + "b"
|
||||
// input: "a" + "b"
|
||||
val = "\"a\" + \"b\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals(val, ElementParameterParser.getEncryptedValue(node, paramName));
|
||||
// "\\123456/"
|
||||
// input: "\\123456/" (keep the studio behavior)
|
||||
val = "\"\\\\123456/\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("\\123456/",
|
||||
assertEquals("\\\\123456/",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// "\123456/"
|
||||
// input: "\123456/" (keep the studio behavior)
|
||||
val = "\"\\123456/\"";
|
||||
final String exp = "\123456/";
|
||||
final String exp = "\\123456/";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals(exp,
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
// input: "\,\n123\"" (keep the studio behavior)
|
||||
val = "\"\\,\\n123\\\"\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("\\,\\n123\"", decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -148,8 +152,8 @@ public class ElementParameterParserTest {
|
||||
// "c":"d"
|
||||
// }
|
||||
|
||||
// "{\r\n\"a\":\"b\",\r\n\"c\":\"d\"\r\n}"
|
||||
String val = "\"{\\r\\n\\\"a\\\":\\\"b\\\",\\r\\n\\\"c\\\":\\\"d\\\"\\r\\n}\"";
|
||||
// "{\r\n\"a\":\"b\",\r\n\"c\":\"d\"\r\n}" (keep the studio behavior)
|
||||
String val = "\"{\r\n\\\"a\\\":\\\"b\\\",\r\n\\\"c\\\":\\\"d\\\"\r\n}\"";
|
||||
when(parameter.getValue()).thenReturn(val);
|
||||
assertEquals("{\r\n\"a\":\"b\",\r\n\"c\":\"d\"\r\n}",
|
||||
decryptPassword(ElementParameterParser.getEncryptedValue(node, paramName)));
|
||||
|
||||
Reference in New Issue
Block a user